diff --git a/src/components/AddNetworkButton.tsx b/src/components/AddNetworkButton.tsx
index a10d5b5..fb5b107 100644
--- a/src/components/AddNetworkButton.tsx
+++ b/src/components/AddNetworkButton.tsx
@@ -1,10 +1,10 @@
+import { useState } from 'react';
 import { styled, Button } from '@mui/material';
 import { useTranslation } from 'next-i18next';
 import { useConnectModal } from '@rainbow-me/rainbowkit';
 import { useAccount } from 'wagmi';
 import { useRouter } from 'next/router';
 import Image from 'next/image';
-import { useState } from 'react';
 
 import { useCustomTheme, useData } from '~/hooks';
 import { addNetwork } from '~/utils';
diff --git a/src/components/TVL.tsx b/src/components/TVL.tsx
index 76211b2..c7148ed 100644
--- a/src/components/TVL.tsx
+++ b/src/components/TVL.tsx
@@ -36,7 +36,6 @@ export const TVL = () => {
 
           <STableBody>
             {tvl
-              //FIXME: Use bignumber here
               .sort((a, b) => parseFloat(b.amountUsd) - parseFloat(a.amountUsd))
               .map((token, index) => (
                 <STableBodyRow key={index}>
diff --git a/src/containers/Tokens/TokensTable.tsx b/src/containers/Tokens/TokensTable.tsx
index 626454f..1a7eb8e 100644
--- a/src/containers/Tokens/TokensTable.tsx
+++ b/src/containers/Tokens/TokensTable.tsx
@@ -34,7 +34,6 @@ export const TokensTable = ({ tvl }: TotalValueLockedProps) => {
 
           <STableBody>
             {tvl
-              //FIXME: Use bignumber here
               .sort((a, b) => parseFloat(b.amountUsd) - parseFloat(a.amountUsd))
               .map((token: TvlData, index) => (
                 <STableBodyRow key={index}>
diff --git a/src/utils/format.ts b/src/utils/format.ts
index e303cd0..542020c 100644
--- a/src/utils/format.ts
+++ b/src/utils/format.ts
@@ -7,7 +7,6 @@ export const formatTimestampToDate = (timestamp: number): string => {
 };
 
 export function formatDataNumber(input: string | number, formatDecimal = 3, currency?: boolean, compact?: boolean) {
-  //FIXME: use bignumber here to avoid floating point issues
   const res: number = Number.parseFloat(input.toString());
 
   if (res === 0 || isNaN(res)) return `${currency ? '$0' : '0'}`;