diff --git a/packages/marketplace/contracts/mocks/LibFeeSideTest.sol b/packages/marketplace/contracts/mocks/LibFeeSideTest.sol
index 61dc7d6b73..6633f9962d 100644
--- a/packages/marketplace/contracts/mocks/LibFeeSideTest.sol
+++ b/packages/marketplace/contracts/mocks/LibFeeSideTest.sol
@@ -4,7 +4,6 @@ pragma solidity 0.8.21;
 
 import {LibAsset} from "../lib-asset/LibAsset.sol";
 
-// TODO: MAKE THE TESTS!!!
 contract LibFeeSideTest {
     function getFeeSideTest(
         LibAsset.AssetClassType maker,
diff --git a/packages/marketplace/hardhat.config.ts b/packages/marketplace/hardhat.config.ts
index 40dddac4aa..0d77d54045 100644
--- a/packages/marketplace/hardhat.config.ts
+++ b/packages/marketplace/hardhat.config.ts
@@ -20,8 +20,7 @@ const config: HardhatUserConfig = {
   },
   networks: {
     hardhat: {
-      // TODO remove after size issue is resolved
-      allowUnlimitedContractSize: true,
+      allowUnlimitedContractSize: false,
     },
   },
 };
diff --git a/packages/marketplace/test/exchange/Exchange.test.ts b/packages/marketplace/test/exchange/Exchange.test.ts
index c7fb504666..6b1cce660c 100644
--- a/packages/marketplace/test/exchange/Exchange.test.ts
+++ b/packages/marketplace/test/exchange/Exchange.test.ts
@@ -1646,7 +1646,6 @@ describe('Exchange.sol', function () {
     ).to.be.reverted;
   });
   describe('batching', function () {
-    // TODO: Add a lot more tests on batches.
     it('should be able to buy two tokens from different orders in one txs', async function () {
       const {
         ExchangeContractAsUser,
@@ -2247,7 +2246,4 @@ describe('Exchange.sol', function () {
       ]);
     });
   });
-  // TODO
-  // describe("test match from", function () {});
-  // describe("test on pause", function () {});
 });
diff --git a/packages/marketplace/test/exchange/OrderValidator.test.ts b/packages/marketplace/test/exchange/OrderValidator.test.ts
index 375e6f3e04..956d86c869 100644
--- a/packages/marketplace/test/exchange/OrderValidator.test.ts
+++ b/packages/marketplace/test/exchange/OrderValidator.test.ts
@@ -387,7 +387,4 @@ describe('OrderValidator.sol', function () {
       )
     ).to.be.equal(false);
   });
-  // TODO:
-  // it('should check start / end', async function () {});
-  // it('should check validate through the whitelist', async function () {});
 });
diff --git a/packages/marketplace/test/fixtures.ts b/packages/marketplace/test/fixtures.ts
index 5ccd2b2cc1..605cce9468 100644
--- a/packages/marketplace/test/fixtures.ts
+++ b/packages/marketplace/test/fixtures.ts
@@ -1,7 +1,6 @@
 import {ethers, upgrades} from 'hardhat';
 import {ZeroAddress} from 'ethers';
 
-// TODO: Split fixtures so we use only what is needed!!!
 async function deploy() {
   const [deployer, admin, user, defaultFeeReceiver, user1, user2] =
     await ethers.getSigners();
diff --git a/packages/marketplace/test/utils/assets.ts b/packages/marketplace/test/utils/assets.ts
index 781c707387..2193d55066 100644
--- a/packages/marketplace/test/utils/assets.ts
+++ b/packages/marketplace/test/utils/assets.ts
@@ -88,7 +88,6 @@ export const AssetERC721 = async (
       [await tokenContract.getAddress(), tokenId]
     ),
   },
-  // TODO: Test value !=1
   value: 1,
 });
 
diff --git a/packages/marketplace/test/utils/order.ts b/packages/marketplace/test/utils/order.ts
index 103e5e72a6..bc0b8c45ca 100644
--- a/packages/marketplace/test/utils/order.ts
+++ b/packages/marketplace/test/utils/order.ts
@@ -81,7 +81,6 @@ export const getSymmetricOrder = async (
   return {...ret, maker: o.taker};
 };
 
-// TODO: Test it.
 export function hashOrder(order: Order): string {
   const encoded = AbiCoder.defaultAbiCoder().encode(
     [