diff --git a/foundry.toml b/foundry.toml
deleted file mode 100644
index 4f3bf9f..0000000
--- a/foundry.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-[profile.default]
-src = 'contracts'
-out = 'out'
-libs = ['node_modules', 'lib']
-test = 'test'
-cache_path  = 'cache_forge'
\ No newline at end of file
diff --git a/hardhat.config.ts b/hardhat.config.ts
index 98bab67..8b2046b 100644
--- a/hardhat.config.ts
+++ b/hardhat.config.ts
@@ -2,8 +2,6 @@ import { HardhatUserConfig } from "hardhat/config";
 import "@nomicfoundation/hardhat-toolbox";
 import "@openzeppelin/hardhat-upgrades";
 import "@nomicfoundation/hardhat-chai-matchers";
-import "@nomicfoundation/hardhat-foundry";
-
 
 import * as dotenv from "dotenv";
 
@@ -11,54 +9,54 @@ dotenv.config();
 
 const RPC_URL = process.env.RPC_URL;
 const PRIVATE_KEY = process.env.PRIVATE_KEY;
-const COINMARKETCAP_API_KEY = process.env.COINMARKETCAP_API_KEY
+const COINMARKETCAP_API_KEY = process.env.COINMARKETCAP_API_KEY;
 
 const config: HardhatUserConfig = {
-  solidity: {
-    version: '0.8.24',
-    settings: {
-      optimizer: {
-        enabled: true,
-        runs: 200,
-      },
+    solidity: {
+        version: "0.8.24",
+        settings: {
+            optimizer: {
+                enabled: true,
+                runs: 200,
+            },
+        },
     },
-  },
-  defaultNetwork: "testnet",
-  networks: {
-    mainnet: {
-      chainId: 295, // hedera mainnet chainId
-      url: RPC_URL,
-      accounts: [PRIVATE_KEY || ""],
+    defaultNetwork: "testnet",
+    networks: {
+        mainnet: {
+            chainId: 295, // hedera mainnet chainId
+            url: RPC_URL,
+            accounts: [PRIVATE_KEY || ""],
+        },
+        testnet: {
+            chainId: 296, // hedera testnet chainId
+            url: RPC_URL,
+            accounts: [PRIVATE_KEY || ""],
+            timeout: 200000000,
+            allowUnlimitedContractSize: true,
+        },
+        previewnet: {
+            chainId: 297, // hedera previewnet chainId
+            url: RPC_URL,
+            accounts: [PRIVATE_KEY || ""],
+        },
+        hardhat: {
+            gas: 30000000,
+            allowUnlimitedContractSize: true,
+            // forking: {
+            //   url: process.env.RPC_URL || "",
+            // },
+        },
     },
-    testnet: {
-      chainId: 296, // hedera testnet chainId
-      url: RPC_URL,
-      accounts: [PRIVATE_KEY || ""],
-      timeout: 200000000,
-      allowUnlimitedContractSize: true,
-    },
-    previewnet: {
-      chainId: 297, // hedera previewnet chainId
-      url: RPC_URL,
-      accounts: [PRIVATE_KEY || ""],
+    gasReporter: {
+        enabled: true,
+        currency: "USD",
+        coinmarketcap: COINMARKETCAP_API_KEY,
+        token: "HBAR",
     },
-    hardhat: {
-      gas: 30000000,
-      allowUnlimitedContractSize: true,
-      // forking: {
-      //   url: process.env.RPC_URL || "",
-      // },
+    mocha: {
+        timeout: 100000000,
     },
-  },
-  gasReporter: {
-    enabled: true,
-    currency: "USD",
-    coinmarketcap: COINMARKETCAP_API_KEY,
-    token: 'HBAR'
-  },
-  mocha: {
-    timeout: 100000000,
-  },
 };
 
 export default config;
diff --git a/lib/forge-std b/lib/forge-std
deleted file mode 160000
index 07263d1..0000000
--- a/lib/forge-std
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 07263d193d621c4b2b0ce8b4d54af58f6957d97d
diff --git a/package.json b/package.json
index edc2cf2..c4e8419 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,6 @@
   "devDependencies": {
     "@nomicfoundation/hardhat-chai-matchers": "^2.0.0",
     "@nomicfoundation/hardhat-ethers": "^3.0.5",
-    "@nomicfoundation/hardhat-foundry": "^1.1.2",
     "@nomicfoundation/hardhat-network-helpers": "^1.0.0",
     "@nomicfoundation/hardhat-toolbox": "^4.0.0",
     "@nomicfoundation/hardhat-verify": "^2.0.0",
diff --git a/yarn.lock b/yarn.lock
index 13b7c36..663fd7f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -762,12 +762,6 @@
     debug "^4.1.1"
     lodash.isequal "^4.5.0"
 
-"@nomicfoundation/hardhat-foundry@^1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/hardhat-foundry/-/hardhat-foundry-1.1.2.tgz#4f5aaa1803b8f5d974dcbc361beb72d49c815562"
-  integrity sha512-f5Vhj3m2qvKGpr6NAINYwNgILDsai8dVCsFb1rAVLkJxOmD2pAtfCmOH5SBVr9yUI5B1z9rbTwPBJVrqnb+PXQ==
-  dependencies:
-    chalk "^2.4.2"
 
 "@nomicfoundation/hardhat-network-helpers@^1.0.0":
   version "1.0.10"