diff --git a/gov-input/mainnet/AddCollateral-ARB-Castle-Capital.json b/gov-input/mainnet/AddCollateral-ARB-Castle-Capital.json
deleted file mode 100644
index ad4c8e0..0000000
--- a/gov-input/mainnet/AddCollateral-ARB-Castle-Capital.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "chainid": "42161",
-  "description": "Add ARB-Castle-Capital as a collateral type",
-  "network": "mainnet",
-  "newCollateralAddress": "0xa513E6E4b8f2a923D98304ec87F64353C4D5C853",
-  "newCollateralType": "ARB-Castle-Capital",
-  "proposalType": "AddCollateral",
-  "ProtocolToken_Address": "",
-  "ODGovernor_Address": "",
-  "SAFEEngine_Address": "",
-  "OracleRelayer_Address": "",
-  "LiquidationEngine_Address": "",
-  "TaxCollector_Address": "",
-  "GlobalSettlement_Address": "",
-  "Delegatee": "0x5162728cc4d7d111400056925a1b3df82308bee0",
-  "CollateralAuctionHouseParams": {
-    "minimumBid": "100000000000000000000",
-    "minDiscount": "1000000000000000000",
-    "maxDiscount": "900000000000000000",
-    "perSecondDiscountUpdateRate": "999985752120000000000000000"
-  },
-  "SAFEEngineCollateralParams": {
-    "collateralDebtCeiling": "5000000000000000000000000000000000000000000000000000",
-    "collateralDebtFloor": "200000000000000000000000000000000000000000000000"
-  },
-  "TaxCollectorCollateralParams": {
-    "stabilityFee": "1000000001547125957863212448"
-  },
-  "LiquidationEngineCollateralParams": {
-    "newCAHChild": "0x5Ff75C273C580114d8915603Be0b7A0Fa2fBf34f",
-    "liquidationPenalty": "1100000000000000000",
-    "liquidationQuantity": "100000000000000000000000000000000000000000000000000"
-  },
-  "OracleRelayerCollateralParams": {
-    "delayedOracle": "0xa4e0410E7eb9a02aa9C0505F629d01890c816A77",
-    "safetyCRatio": "1850000000000000000000000000",
-    "liquidationCRatio": "1750000000000000000000000000"
-  },
-  "TaxReceiver": {
-    "receiver": "0x9C86C719Aa29D426C50Ee3BAEd40008D292b02CF",
-    "canTakeBackTax": true,
-    "taxPercentage": "500000000000000000"
-  }
-}
\ No newline at end of file
diff --git a/gov-input/mainnet/templates/template-AddCollateral.json b/gov-input/mainnet/templates/Geb/template-AddCollateral.json
similarity index 100%
rename from gov-input/mainnet/templates/template-AddCollateral.json
rename to gov-input/mainnet/templates/Geb/template-AddCollateral.json
diff --git a/gov-input/mainnet/templates/template-ModifyParameters.json b/gov-input/mainnet/templates/Geb/template-ModifyParameters.json
similarity index 100%
rename from gov-input/mainnet/templates/template-ModifyParameters.json
rename to gov-input/mainnet/templates/Geb/template-ModifyParameters.json
diff --git a/gov-input/mainnet/templates/template-UpdateDelay.json b/gov-input/mainnet/templates/Geb/template-UpdateDelay.json
similarity index 100%
rename from gov-input/mainnet/templates/template-UpdateDelay.json
rename to gov-input/mainnet/templates/Geb/template-UpdateDelay.json
diff --git a/gov-input/mainnet/templates/template-FlexibleProposal.json b/gov-input/mainnet/templates/template-FlexibleProposal.json
deleted file mode 100644
index 15f7ecc..0000000
--- a/gov-input/mainnet/templates/template-FlexibleProposal.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "chainid": 42161,
-  "description": "Reduce governance threshold to 2,000 ODG",
-  "network": "mainnet",
-  "proposalType": "flexible",
-  "targets": ["0xf704735CE81165261156b41D33AB18a08803B86F"],
-  "calldatas": [
-    "0xece40cc100000000000000000000000000000000000000000000006c6b935b8bbd400000"
-  ],
-  "values": [0]
-}
diff --git a/gov-output/mainnet/add-collateral-8_20_2024-40646174.json b/gov-output/mainnet/add-collateral-8_20_2024-40646174.json
deleted file mode 100644
index 9cbb00a..0000000
--- a/gov-output/mainnet/add-collateral-8_20_2024-40646174.json
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-  "CollateralAuctionHouseParams": {
-    "minimumBid": "100000000000000000000",
-    "minDiscount": "1000000000000000000",
-    "maxDiscount": "900000000000000000",
-    "perSecondDiscountUpdateRate": "999985752120000000000000000"
-  },
-  "Delegatee": "0x5162728cc4d7d111400056925a1b3df82308bee0",
-  "GlobalSettlement_Address": "0x1c6B7ab018be82ed6b5c63aE82D9f07bb7B231A2",
-  "LiquidationEngineCollateralParams": {
-    "newCAHChild": "0x5Ff75C273C580114d8915603Be0b7A0Fa2fBf34f",
-    "liquidationPenalty": "1100000000000000000",
-    "liquidationQuantity": "100000000000000000000000000000000000000000000000000"
-  },
-  "LiquidationEngine_Address": "0x17e546dDCE2EA8A74Bd667269457A2e80b309965",
-  "ODGovernor_Address": "0xf704735CE81165261156b41D33AB18a08803B86F",
-  "OracleRelayerCollateralParams": {
-    "delayedOracle": "0xa4e0410E7eb9a02aa9C0505F629d01890c816A77",
-    "safetyCRatio": "1850000000000000000000000000",
-    "liquidationCRatio": "1750000000000000000000000000"
-  },
-  "OracleRelayer_Address": "0x7404fc1F3796748FAE17011b57Fad9713185c1d6",
-  "ProtocolToken_Address": "0x000D636bD52BFc1B3a699165Ef5aa340BEA8939c",
-  "SAFEEngineCollateralParams": {
-    "collateralDebtCeiling": "5000000000000000000000000000000000000000000000000000",
-    "collateralDebtFloor": "200000000000000000000000000000000000000000000000"
-  },
-  "SAFEEngine_Address": "0xEff45E8e2353893BD0558bD5892A42786E9142F1",
-  "TaxCollectorCollateralParams": {
-    "stabilityFee": "1000000001547125957863212448"
-  },
-  "TaxCollector_Address": "0xc93F938A95488a03b976A15B20fAcFD52D087fB2",
-  "TaxReceiver": {
-    "receiver": "0x9C86C719Aa29D426C50Ee3BAEd40008D292b02CF",
-    "canTakeBackTax": true,
-    "taxPercentage": "500000000000000000"
-  },
-  "calldatas": [
-    "0x25e792e84152422d436173746c652d4361706974616c0000000000000000000000000000000000000000000000000000a513e6e4b8f2a923d98304ec87f64353c4d5c8530000000000000000000000005162728cc4d7d111400056925a1b3df82308bee0",
-    "0x34463c604152422d436173746c652d4361706974616c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000056bc75e2d631000000000000000000000000000000000000000000000000000000de0b6b3a76400000000000000000000000000000000000000000000000000000c7d713b49da00000000000000000000000000000000000000000000033b2b383ec254bdcf6c0000",
-    "0x34463c604152422d436173746c652d4361706974616c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000040000000000000000000000d5d238a4abe9806872a4904598d6d8800000000000000000000000000000000000023084f676940b7915149bd08b30d000000000000",
-    "0x34463c604152422d436173746c652d4361706974616c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000033b2e3cb548ff197d3905a0",
-    "0x34463c604152422d436173746c652d4361706974616c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000600000000000000000000000005ff75c273c580114d8915603be0b7a0fa2fbf34f0000000000000000000000000000000000000000000000000f43fc2c04ee00000000000000000000000000446c3b15f9926687d2c40534fdb564000000000000",
-    "0x34463c604152422d436173746c652d4361706974616c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000060000000000000000000000000a4e0410e7eb9a02aa9c0505f629d01890c816a77000000000000000000000000000000000000000005fa48bcf474ed3d7a000000000000000000000000000000000000000000000005a790ea17ace06a96000000",
-    "0x12f335264152422d436173746c652d4361706974616c00000000000000000000000000007365636f6e646172795461785265636569766572000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000009c86c719aa29d426c50ee3baed40008d292b02cf000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000006f05b59d3b20000"
-  ],
-  "chainid": "42161",
-  "description": "Add ARB-Castle-Capital as a collateral type",
-  "descriptionHash": "0x59e215562efb535464bdd6334fa2d048b75b747ea5dab25a4fff1df33687d6fe",
-  "network": "mainnet",
-  "newCollateralAddress": "0xa513E6E4b8f2a923D98304ec87F64353C4D5C853",
-  "newCollateralType": "ARB-Castle-Capital",
-  "proposalId": "40646174501266708582111670402806236204871894453401189037392607915959446369362",
-  "proposalType": "AddCollateral",
-  "targets": [
-    "0xa83c0f1e9eD8E383919Dde0fC90744ae370EB7B3",
-    "0x5dc1E86361faC018f24Ae0D1E5eB01D70AB32A82",
-    "0xEff45E8e2353893BD0558bD5892A42786E9142F1",
-    "0xc93F938A95488a03b976A15B20fAcFD52D087fB2",
-    "0x17e546dDCE2EA8A74Bd667269457A2e80b309965",
-    "0x7404fc1F3796748FAE17011b57Fad9713185c1d6",
-    "0xc93F938A95488a03b976A15B20fAcFD52D087fB2"
-  ],
-  "values": [
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-  ]
-}
\ No newline at end of file