diff --git a/parse/table_definitions_base/aerodrome/CLFactory_event_PoolCreated.json b/parse/table_definitions_base/aerodrome/CLFactory_event_PoolCreated.json
index bfb52ac8..538f4b70 100644
--- a/parse/table_definitions_base/aerodrome/CLFactory_event_PoolCreated.json
+++ b/parse/table_definitions_base/aerodrome/CLFactory_event_PoolCreated.json
@@ -31,7 +31,7 @@
             "name": "PoolCreated",
             "type": "event"
         },
-        "contract_address": "SELECT b.pool FROM ref('Voter_event_GaugeCreated') a JOIN ref('CLFactory_event_PoolCreated') b ON a.pool = b.pool WHERE a.pool IS NOT NULL",
+        "contract_address": "0x5e7bb104d84c7cb9b682aac2f3d509f5f406809a",
         "field_mapping": {},
         "type": "log"
     },
diff --git a/parse/table_definitions_base/aerodrome/CLGauge_event_ClaimFees.json b/parse/table_definitions_base/aerodrome/CLGauge_event_ClaimFees.json
index 2a4eb1c8..3566b951 100644
--- a/parse/table_definitions_base/aerodrome/CLGauge_event_ClaimFees.json
+++ b/parse/table_definitions_base/aerodrome/CLGauge_event_ClaimFees.json
@@ -25,7 +25,7 @@
             "name": "ClaimFees",
             "type": "event"
         },
-        "contract_address": "SELECT b.pool FROM ref('Voter_event_GaugeCreated') a JOIN ref('CLFactory_event_PoolCreated') b ON a.pool = b.pool WHERE a.pool IS NOT NULL",
+        "contract_address": "0xf5601f95708256a118ef5971820327f362442d2d",
         "field_mapping": {},
         "type": "log"
     },
diff --git a/parse/table_definitions_base/aerodrome/CLGauge_event_ClaimRewards.json b/parse/table_definitions_base/aerodrome/CLGauge_event_ClaimRewards.json
index 4eeaa0e4..48e5413a 100644
--- a/parse/table_definitions_base/aerodrome/CLGauge_event_ClaimRewards.json
+++ b/parse/table_definitions_base/aerodrome/CLGauge_event_ClaimRewards.json
@@ -19,7 +19,7 @@
             "name": "ClaimRewards",
             "type": "event"
         },
-        "contract_address": "SELECT b.pool FROM ref('Voter_event_GaugeCreated') a JOIN ref('CLFactory_event_PoolCreated') b ON a.pool = b.pool WHERE a.pool IS NOT NULL",
+        "contract_address": "0xf5601f95708256a118ef5971820327f362442d2d",
         "field_mapping": {},
         "type": "log"
     },
diff --git a/parse/table_definitions_base/aerodrome/CLGauge_event_Deposit.json b/parse/table_definitions_base/aerodrome/CLGauge_event_Deposit.json
index 204f2095..a0a457d8 100644
--- a/parse/table_definitions_base/aerodrome/CLGauge_event_Deposit.json
+++ b/parse/table_definitions_base/aerodrome/CLGauge_event_Deposit.json
@@ -25,7 +25,7 @@
             "name": "Deposit",
             "type": "event"
         },
-        "contract_address": "SELECT b.pool FROM ref('Voter_event_GaugeCreated') a JOIN ref('CLFactory_event_PoolCreated') b ON a.pool = b.pool WHERE a.pool IS NOT NULL",
+        "contract_address": "0xf5601f95708256a118ef5971820327f362442d2d",
         "field_mapping": {},
         "type": "log"
     },
diff --git a/parse/table_definitions_base/aerodrome/CLGauge_event_NotifyReward.json b/parse/table_definitions_base/aerodrome/CLGauge_event_NotifyReward.json
index 4c04fdff..ab6817ed 100644
--- a/parse/table_definitions_base/aerodrome/CLGauge_event_NotifyReward.json
+++ b/parse/table_definitions_base/aerodrome/CLGauge_event_NotifyReward.json
@@ -19,7 +19,7 @@
             "name": "NotifyReward",
             "type": "event"
         },
-        "contract_address": "SELECT b.pool FROM ref('Voter_event_GaugeCreated') a JOIN ref('CLFactory_event_PoolCreated') b ON a.pool = b.pool WHERE a.pool IS NOT NULL",
+        "contract_address": "0xf5601f95708256a118ef5971820327f362442d2d",
         "field_mapping": {},
         "type": "log"
     },
diff --git a/parse/table_definitions_base/aerodrome/CLGauge_event_Withdraw.json b/parse/table_definitions_base/aerodrome/CLGauge_event_Withdraw.json
index 44096da1..cbd56379 100644
--- a/parse/table_definitions_base/aerodrome/CLGauge_event_Withdraw.json
+++ b/parse/table_definitions_base/aerodrome/CLGauge_event_Withdraw.json
@@ -25,7 +25,7 @@
             "name": "Withdraw",
             "type": "event"
         },
-        "contract_address": "SELECT b.pool FROM ref('Voter_event_GaugeCreated') a JOIN ref('CLFactory_event_PoolCreated') b ON a.pool = b.pool WHERE a.pool IS NOT NULL",
+        "contract_address": "0xf5601f95708256a118ef5971820327f362442d2d",
         "field_mapping": {},
         "type": "log"
     },
diff --git a/parse/table_definitions_base/aerodrome/Gauge_event_ClaimFees.json b/parse/table_definitions_base/aerodrome/Gauge_event_ClaimFees.json
deleted file mode 100644
index e8cb43ef..00000000
--- a/parse/table_definitions_base/aerodrome/Gauge_event_ClaimFees.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-    "parser": {
-        "abi": {
-            "anonymous": false,
-            "inputs": [
-                {
-                    "indexed": true,
-                    "internalType": "address",
-                    "name": "from",
-                    "type": "address"
-                },
-                {
-                    "indexed": false,
-                    "internalType": "uint256",
-                    "name": "claimed0",
-                    "type": "uint256"
-                },
-                {
-                    "indexed": false,
-                    "internalType": "uint256",
-                    "name": "claimed1",
-                    "type": "uint256"
-                }
-            ],
-            "name": "ClaimFees",
-            "type": "event"
-        },
-        "contract_address": "SELECT b.pool FROM ref('Voter_event_GaugeCreated') a JOIN ref('PoolFactory_event_PoolCreated') b ON a.pool = b.pool WHERE a.pool IS NOT NULL",
-        "field_mapping": {},
-        "type": "log"
-    },
-    "table": {
-        "dataset_name": "aerodrome",
-        "schema": [
-            {
-                "description": "",
-                "name": "from",
-                "type": "STRING"
-            },
-            {
-                "description": "",
-                "name": "claimed0",
-                "type": "STRING"
-            },
-            {
-                "description": "",
-                "name": "claimed1",
-                "type": "STRING"
-            }
-        ],
-        "table_description": "",
-        "table_name": "Gauge_event_ClaimFees"
-    }
-}
\ No newline at end of file
diff --git a/parse/table_definitions_base/aerodrome/Gauge_event_ClaimRewards.json b/parse/table_definitions_base/aerodrome/Gauge_event_ClaimRewards.json
deleted file mode 100644
index 0943c5f5..00000000
--- a/parse/table_definitions_base/aerodrome/Gauge_event_ClaimRewards.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    "parser": {
-        "abi": {
-            "anonymous": false,
-            "inputs": [
-                {
-                    "indexed": true,
-                    "internalType": "address",
-                    "name": "from",
-                    "type": "address"
-                },
-                {
-                    "indexed": false,
-                    "internalType": "uint256",
-                    "name": "amount",
-                    "type": "uint256"
-                }
-            ],
-            "name": "ClaimRewards",
-            "type": "event"
-        },
-        "contract_address": "SELECT b.pool FROM ref('Voter_event_GaugeCreated') a JOIN ref('PoolFactory_event_PoolCreated') b ON a.pool = b.pool WHERE a.pool IS NOT NULL",
-        "field_mapping": {},
-        "type": "log"
-    },
-    "table": {
-        "dataset_name": "aerodrome",
-        "schema": [
-            {
-                "description": "",
-                "name": "from",
-                "type": "STRING"
-            },
-            {
-                "description": "",
-                "name": "amount",
-                "type": "STRING"
-            }
-        ],
-        "table_description": "",
-        "table_name": "Gauge_event_ClaimRewards"
-    }
-}
\ No newline at end of file
diff --git a/parse/table_definitions_base/aerodrome/Gauge_event_Deposit.json b/parse/table_definitions_base/aerodrome/Gauge_event_Deposit.json
deleted file mode 100644
index 3bbc7724..00000000
--- a/parse/table_definitions_base/aerodrome/Gauge_event_Deposit.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-    "parser": {
-        "abi": {
-            "anonymous": false,
-            "inputs": [
-                {
-                    "indexed": true,
-                    "internalType": "address",
-                    "name": "from",
-                    "type": "address"
-                },
-                {
-                    "indexed": true,
-                    "internalType": "address",
-                    "name": "to",
-                    "type": "address"
-                },
-                {
-                    "indexed": false,
-                    "internalType": "uint256",
-                    "name": "amount",
-                    "type": "uint256"
-                }
-            ],
-            "name": "Deposit",
-            "type": "event"
-        },
-        "contract_address": "SELECT b.pool FROM ref('Voter_event_GaugeCreated') a JOIN ref('PoolFactory_event_PoolCreated') b ON a.pool = b.pool WHERE a.pool IS NOT NULL",
-        "field_mapping": {},
-        "type": "log"
-    },
-    "table": {
-        "dataset_name": "aerodrome",
-        "schema": [
-            {
-                "description": "",
-                "name": "from",
-                "type": "STRING"
-            },
-            {
-                "description": "",
-                "name": "to",
-                "type": "STRING"
-            },
-            {
-                "description": "",
-                "name": "amount",
-                "type": "STRING"
-            }
-        ],
-        "table_description": "",
-        "table_name": "Gauge_event_Deposit"
-    }
-}
\ No newline at end of file
diff --git a/parse/table_definitions_base/aerodrome/Gauge_event_NotifyReward.json b/parse/table_definitions_base/aerodrome/Gauge_event_NotifyReward.json
deleted file mode 100644
index 97177e6f..00000000
--- a/parse/table_definitions_base/aerodrome/Gauge_event_NotifyReward.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    "parser": {
-        "abi": {
-            "anonymous": false,
-            "inputs": [
-                {
-                    "indexed": true,
-                    "internalType": "address",
-                    "name": "from",
-                    "type": "address"
-                },
-                {
-                    "indexed": false,
-                    "internalType": "uint256",
-                    "name": "amount",
-                    "type": "uint256"
-                }
-            ],
-            "name": "NotifyReward",
-            "type": "event"
-        },
-        "contract_address": "SELECT b.pool FROM ref('Voter_event_GaugeCreated') a JOIN ref('PoolFactory_event_PoolCreated') b ON a.pool = b.pool WHERE a.pool IS NOT NULL",
-        "field_mapping": {},
-        "type": "log"
-    },
-    "table": {
-        "dataset_name": "aerodrome",
-        "schema": [
-            {
-                "description": "",
-                "name": "from",
-                "type": "STRING"
-            },
-            {
-                "description": "",
-                "name": "amount",
-                "type": "STRING"
-            }
-        ],
-        "table_description": "",
-        "table_name": "Gauge_event_NotifyReward"
-    }
-}
\ No newline at end of file
diff --git a/parse/table_definitions_base/aerodrome/Gauge_event_Withdraw.json b/parse/table_definitions_base/aerodrome/Gauge_event_Withdraw.json
deleted file mode 100644
index c369e5da..00000000
--- a/parse/table_definitions_base/aerodrome/Gauge_event_Withdraw.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    "parser": {
-        "abi": {
-            "anonymous": false,
-            "inputs": [
-                {
-                    "indexed": true,
-                    "internalType": "address",
-                    "name": "from",
-                    "type": "address"
-                },
-                {
-                    "indexed": false,
-                    "internalType": "uint256",
-                    "name": "amount",
-                    "type": "uint256"
-                }
-            ],
-            "name": "Withdraw",
-            "type": "event"
-        },
-        "contract_address": "SELECT b.pool FROM ref('Voter_event_GaugeCreated') a JOIN ref('PoolFactory_event_PoolCreated') b ON a.pool = b.pool WHERE a.pool IS NOT NULL",
-        "field_mapping": {},
-        "type": "log"
-    },
-    "table": {
-        "dataset_name": "aerodrome",
-        "schema": [
-            {
-                "description": "",
-                "name": "from",
-                "type": "STRING"
-            },
-            {
-                "description": "",
-                "name": "amount",
-                "type": "STRING"
-            }
-        ],
-        "table_description": "",
-        "table_name": "Gauge_event_Withdraw"
-    }
-}
\ No newline at end of file