diff --git a/docs/connectors.json b/docs/connectors.json
index 858ea7bf..755b74da 100644
--- a/docs/connectors.json
+++ b/docs/connectors.json
@@ -1,14 +1,15 @@
 { 
   "1" : {
-    "1INCH-A": "0x2A6d6d4EE84015F7D64B4d1F66a409bA3f2BAC00",
-    "1INCH-B": "0x36880391afb430e99d43fe94217446b56d4f2c5b",
-    "AAVE-V1-A": "0x127d8cD0E2b2E0366D522DeA53A787bfE9002C14",
-    "AAVE-V2-A": "0x497Bc53507DF17e60F731e9534cff74E8BC9DBb8",
     "AUTHORITY-A": "0x351Bb32e90C35647Df7a584f3c1a3A0c38F31c68",
     "BASIC-A": "0x9926955e0Dd681Dc303370C52f4Ad0a4dd061687",
+    "1INCH-A": "0x235fca310ac7be45c7ad45f111203468743e4b7c",
+    "1INCH-B": "0xaBac3dCf164eD827EAfda8e05eCc8208D6bc5E04",
+    "COMPOUND-A": "0xbb153cf09a123746e0eb3b3a436c544a7eeb24b6",
+    "AAVE-V1-A": "0x612c5CA43230D9F97a0ac87E4420F66b8DF97e9D",
+    "AAVE-V2-A": "0x68b27A84101ac5120bBAb7Ce8d6b096C961df52C",
+    "MAKERDAO-A": "0x4049db23c605b197f764072569b8db2464653ef6",
+    "UNISWAP-V2-A": "0x1E5CE41BdB653734445FeC3553b61FebDdaFC43c",
     "COMP-A": "0xB446e325D44C52b93eC122Bf76301f235f90B9c9",
-    "COMPOUND-A": "0x911F4e4e762AeFA6F2Fc1b24e6B1A928200a88a8",
-    "MAKERDAO-A": "0x29AA7b765008b5dDbD687413B7F0D6E9d349F765",
     "UNISWAP-A": "0xA4BF319968986D2352FA1c550D781bBFCCE3FcaB",
     "POLYGON-BRIDGE-A": "0x1b79B302132370B434fb7807b36CB72FB0510aD5",
     "AAVE-CLAIM-A": "0x611C1FA59Aa1d6352c4C8bD44882063c6aEE85E0",
@@ -20,7 +21,7 @@
     "INSTAPOOL-A": "0x5806Af7AB22E2916fA582Ff05731Bf7C682387B2",
     "MAKERDAO-CLAIM-A": "0x2f8cBE650af98602a215b6482F2aD60893C5A4E8",
     "WETH-A": "0x22075fa719eFb02Ca3cF298AFa9C974B7465E5D3",
-    "REFINANCE-A": "0x9eA34bE6dA51aa9F6408FeA79c946FDCFA424442"
+    "REFINANCE-A": "0x9eA34bE6dA51aa9F6408FeA79c946FDCFA424442",
     "INST-A": "0x52C2C4a0db049255fF345EB9D3Fb1f555b7a924A"
   },
   "137" : {
diff --git a/hardhat.config.js b/hardhat.config.js
index a3d99c31..79716efc 100644
--- a/hardhat.config.js
+++ b/hardhat.config.js
@@ -24,7 +24,13 @@ module.exports = {
   solidity: {
     compilers: [
       {
-        version: "0.7.6"
+        version: "0.7.6",
+        settings: {
+          optimizer: {
+            enabled: false,
+            runs: 200
+          }
+        }
       },
       {
         version: "0.6.0"
@@ -47,7 +53,7 @@ module.exports = {
       url: `https://eth-mainnet.alchemyapi.io/v2/${ALCHEMY_ID}`,
       accounts: [`0x${PRIVATE_KEY}`],
       timeout: 150000,
-      gasPrice: parseInt(utils.parseUnits("34", "gwei"))
+      gasPrice: parseInt(utils.parseUnits("30", "gwei"))
     },
     hardhat: {
       forking: {
diff --git a/scripts/deploy.js b/scripts/deploy.js
index e00420c9..26f65d8e 100644
--- a/scripts/deploy.js
+++ b/scripts/deploy.js
@@ -28,15 +28,6 @@ async function main() {
     for (const key in connectMapping) {
         addressMapping[key] = await deployConnector(connectMapping[key])
     }
-    
-    const connectorsAbi = [
-        "function addConnectors(string[] _connectorNames, address[] _connectors)"
-    ]
-    
-    // Replace the address with correct v2 connectors registry address
-    const connectorsContract = new ethers.Contract("0x84b457c6D31025d56449D5A01F0c34bF78636f67", connectorsAbi, wallet)
-    
-    await connectorsContract.addConnectors(Object.keys(addressMapping), Object.values(addressMapping))
 }
 
 main()