diff --git a/Cargo.lock b/Cargo.lock
index 2afdeaa4a..58d4b79d2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -272,10 +272,10 @@ dependencies = [
  "cw-utils 1.0.3",
  "cw20 1.1.2",
  "cw20-stake 2.3.0",
- "dao-dao-core 2.3.0",
- "dao-interface 2.3.0",
- "dao-pre-propose-single 2.3.0",
- "dao-proposal-single 2.3.0",
+ "dao-dao-core",
+ "dao-interface",
+ "dao-pre-propose-single",
+ "dao-proposal-single",
  "dao-voting 2.3.0",
  "dao-voting-cw20-staked",
  "env_logger",
@@ -385,9 +385,9 @@ checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f"
 
 [[package]]
 name = "core-foundation"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -395,9 +395,9 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.4"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
 
 [[package]]
 name = "cosm-orc"
@@ -673,8 +673,8 @@ dependencies = [
  "cw-utils 1.0.3",
  "cw2 1.1.2",
  "cw20-base 1.1.2",
- "dao-dao-core 2.3.0",
- "dao-interface 2.3.0",
+ "dao-dao-core",
+ "dao-interface",
  "thiserror",
 ]
 
@@ -800,18 +800,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "cw-denom"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f219a9606c7f447535bc0283d8d4077e1f71c28d3387e92c4f06c155c65e438c"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw20 1.1.2",
- "thiserror",
-]
-
 [[package]]
 name = "cw-fund-distributor"
 version = "0.1.0"
@@ -826,8 +814,8 @@ dependencies = [
  "cw20 1.1.2",
  "cw20-base 1.1.2",
  "cw20-stake 2.3.0",
- "dao-dao-core 2.3.0",
- "dao-interface 2.3.0",
+ "dao-dao-core",
+ "dao-interface",
  "dao-voting-cw20-staked",
  "thiserror",
 ]
@@ -842,18 +830,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "cw-hooks"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f11abd7f43a88d1d80da10cd042cbc088853a015286fe56d2bfdfaaf8ec6f12"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-storage-plus 1.2.0",
- "thiserror",
-]
-
 [[package]]
 name = "cw-multi-test"
 version = "0.18.0"
@@ -922,25 +898,13 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "cw-paginate-storage"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8693baa8dc275f86c5b4f6b86702994e859ac1657e19c5cbcb55d295592a5c04"
-dependencies = [
- "cosmwasm-std",
- "cosmwasm-storage",
- "cw-storage-plus 1.2.0",
- "serde",
-]
-
 [[package]]
 name = "cw-payroll-factory"
 version = "2.3.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cw-denom 2.3.0",
+ "cw-denom",
  "cw-multi-test",
  "cw-ownable",
  "cw-storage-plus 1.2.0",
@@ -1057,7 +1021,7 @@ dependencies = [
  "cw-ownable",
  "cw-storage-plus 1.2.0",
  "cw2 1.1.2",
- "osmosis-std 0.20.1",
+ "osmosis-std",
  "osmosis-test-tube",
  "prost 0.11.9",
  "schemars",
@@ -1128,7 +1092,7 @@ dependencies = [
  "anyhow",
  "cosmwasm-schema",
  "cosmwasm-std",
- "cw-denom 2.3.0",
+ "cw-denom",
  "cw-multi-test",
  "cw-ownable",
  "cw-paginate-storage 2.3.0",
@@ -1321,7 +1285,7 @@ dependencies = [
  "cosmwasm-std",
  "cosmwasm-storage",
  "cw-controllers 1.1.2",
- "cw-hooks 2.3.0",
+ "cw-hooks",
  "cw-multi-test",
  "cw-ownable",
  "cw-paginate-storage 2.3.0",
@@ -1332,7 +1296,7 @@ dependencies = [
  "cw20 1.1.2",
  "cw20-base 1.1.2",
  "cw20-stake 0.2.6",
- "dao-hooks 2.3.0",
+ "dao-hooks",
  "dao-voting 2.3.0",
  "thiserror",
 ]
@@ -1355,7 +1319,7 @@ dependencies = [
  "cw20 1.1.2",
  "cw20-base 1.1.2",
  "cw20-stake 2.3.0",
- "dao-hooks 2.3.0",
+ "dao-hooks",
  "stake-cw20-external-rewards",
  "thiserror",
 ]
@@ -1638,112 +1602,51 @@ dependencies = [
  "cw20-base 1.1.2",
  "cw721 0.18.0",
  "cw721-base 0.18.0",
- "dao-dao-macros 2.3.0",
- "dao-interface 2.3.0",
+ "dao-dao-macros",
+ "dao-interface",
  "dao-proposal-sudo",
  "dao-voting-cw20-balance",
  "thiserror",
 ]
 
-[[package]]
-name = "dao-dao-core"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "878af23075b3bedbcde1525eb97bb6748a9f73a5293d83641efc008dfd9d6c72"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-core",
- "cw-paginate-storage 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cw-storage-plus 1.2.0",
- "cw-utils 1.0.3",
- "cw2 1.1.2",
- "cw20 1.1.2",
- "cw721 0.18.0",
- "dao-dao-macros 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "dao-interface 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "thiserror",
-]
-
 [[package]]
 name = "dao-dao-macros"
 version = "2.3.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cw-hooks 2.3.0",
- "dao-interface 2.3.0",
+ "cw-hooks",
+ "dao-interface",
  "dao-voting 2.3.0",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "dao-dao-macros"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b66e0735469ee67c440801d7a988d024ba78a2150f4d7d06ed246f5ab2139bb5"
-dependencies = [
- "cosmwasm-schema",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "dao-hooks"
 version = "2.3.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cw-hooks 2.3.0",
+ "cw-hooks",
  "cw4 1.1.2",
- "dao-pre-propose-base 2.3.0",
+ "dao-pre-propose-base",
  "dao-voting 2.3.0",
 ]
 
-[[package]]
-name = "dao-hooks"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aabf3fdda5645923891c27c9cb9c754643779f810541000666c15aaa4f3c4d2c"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-hooks 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cw4 1.1.2",
- "dao-voting 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "dao-interface"
-version = "2.3.0"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-hooks 2.3.0",
- "cw-utils 1.0.3",
- "cw2 1.1.2",
- "cw20 1.1.2",
- "cw721 0.18.0",
- "osmosis-std 0.20.1",
-]
-
 [[package]]
 name = "dao-interface"
 version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f3c4bff13236ee621793b8cf7204ea62e963d6212fe04f622cfb0e77d6f7af8"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cw-hooks 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cw-hooks",
  "cw-utils 1.0.3",
  "cw2 1.1.2",
  "cw20 1.1.2",
  "cw721 0.18.0",
- "osmosis-std 0.19.2",
+ "osmosis-std",
 ]
 
 [[package]]
@@ -1759,7 +1662,6 @@ dependencies = [
  "cw-proposal-single",
  "cw-storage-plus 1.2.0",
  "cw-utils 0.13.4",
- "cw-utils 0.16.0",
  "cw-utils 1.0.3",
  "cw2 1.1.2",
  "cw20 0.13.4",
@@ -1770,14 +1672,12 @@ dependencies = [
  "cw20-staked-balance-voting",
  "cw4 0.13.4",
  "cw4-voting",
- "dao-dao-core 2.3.0",
- "dao-dao-core 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "dao-interface 2.3.0",
- "dao-interface 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "dao-proposal-single 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dao-dao-core",
+ "dao-interface",
+ "dao-proposal-single",
  "dao-testing",
  "dao-voting 0.1.0",
- "dao-voting 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dao-voting 2.3.0",
  "dao-voting-cw20-staked",
  "dao-voting-cw4",
  "thiserror",
@@ -1789,7 +1689,7 @@ version = "2.3.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cw-denom 2.3.0",
+ "cw-denom",
  "cw-multi-test",
  "cw-paginate-storage 2.3.0",
  "cw-storage-plus 1.2.0",
@@ -1798,11 +1698,11 @@ dependencies = [
  "cw20 1.1.2",
  "cw20-base 1.1.2",
  "cw4-group 1.1.2",
- "dao-dao-core 2.3.0",
- "dao-hooks 2.3.0",
- "dao-interface 2.3.0",
- "dao-pre-propose-base 2.3.0",
- "dao-proposal-single 2.3.0",
+ "dao-dao-core",
+ "dao-hooks",
+ "dao-interface",
+ "dao-pre-propose-base",
+ "dao-proposal-single",
  "dao-testing",
  "dao-voting 2.3.0",
  "dao-voting-cw20-staked",
@@ -1816,7 +1716,7 @@ version = "2.3.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cw-denom 2.3.0",
+ "cw-denom",
  "cw-multi-test",
  "cw-storage-plus 1.2.0",
  "cw-utils 1.0.3",
@@ -1824,12 +1724,12 @@ dependencies = [
  "cw20 1.1.2",
  "cw20-base 1.1.2",
  "cw4-group 1.1.2",
- "dao-dao-core 2.3.0",
- "dao-hooks 2.3.0",
- "dao-interface 2.3.0",
+ "dao-dao-core",
+ "dao-hooks",
+ "dao-interface",
  "dao-pre-propose-approval-single",
- "dao-pre-propose-base 2.3.0",
- "dao-proposal-single 2.3.0",
+ "dao-pre-propose-base",
+ "dao-proposal-single",
  "dao-testing",
  "dao-voting 2.3.0",
  "dao-voting-cw20-staked",
@@ -1842,55 +1742,35 @@ version = "2.3.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cw-denom 2.3.0",
- "cw-hooks 2.3.0",
+ "cw-denom",
+ "cw-hooks",
  "cw-multi-test",
  "cw-storage-plus 1.2.0",
  "cw-utils 1.0.3",
  "cw2 1.1.2",
- "dao-interface 2.3.0",
+ "dao-interface",
  "dao-voting 2.3.0",
  "serde",
  "thiserror",
 ]
 
-[[package]]
-name = "dao-pre-propose-base"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a756d896e13fff2c611b6c295eba8f4581907bcbdf44a64142d4ade7c6f88f3a"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-denom 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cw-hooks 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cw-storage-plus 1.2.0",
- "cw-utils 1.0.3",
- "cw2 1.1.2",
- "dao-hooks 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "dao-interface 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "dao-voting 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde",
- "thiserror",
-]
-
 [[package]]
 name = "dao-pre-propose-multiple"
 version = "2.3.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cw-denom 2.3.0",
+ "cw-denom",
  "cw-multi-test",
  "cw-utils 1.0.3",
  "cw2 1.1.2",
  "cw20 1.1.2",
  "cw20-base 1.1.2",
  "cw4-group 1.1.2",
- "dao-dao-core 2.3.0",
- "dao-hooks 2.3.0",
- "dao-interface 2.3.0",
- "dao-pre-propose-base 2.3.0",
+ "dao-dao-core",
+ "dao-hooks",
+ "dao-interface",
+ "dao-pre-propose-base",
  "dao-proposal-multiple",
  "dao-testing",
  "dao-voting 2.3.0",
@@ -1904,38 +1784,25 @@ version = "2.3.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cw-denom 2.3.0",
- "cw-hooks 2.3.0",
+ "cw-denom",
+ "cw-hooks",
  "cw-multi-test",
  "cw-utils 1.0.3",
  "cw2 1.1.2",
  "cw20 1.1.2",
  "cw20-base 1.1.2",
  "cw4-group 1.1.2",
- "dao-dao-core 2.3.0",
- "dao-hooks 2.3.0",
- "dao-interface 2.3.0",
- "dao-pre-propose-base 2.3.0",
- "dao-proposal-single 2.3.0",
+ "dao-dao-core",
+ "dao-hooks",
+ "dao-interface",
+ "dao-pre-propose-base",
+ "dao-proposal-single",
  "dao-testing",
  "dao-voting 2.3.0",
  "dao-voting-cw20-staked",
  "dao-voting-cw4",
 ]
 
-[[package]]
-name = "dao-pre-propose-single"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "147c28fb44b315d886abd4c5bcf33b3cb738f42668103901ee4144a0cfb3d29e"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw2 1.1.2",
- "dao-pre-propose-base 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "dao-voting 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "dao-proposal-condorcet"
 version = "2.3.0"
@@ -1949,9 +1816,9 @@ dependencies = [
  "cw2 1.1.2",
  "cw4 1.1.2",
  "cw4-group 1.1.2",
- "dao-dao-core 2.3.0",
- "dao-dao-macros 2.3.0",
- "dao-interface 2.3.0",
+ "dao-dao-core",
+ "dao-dao-macros",
+ "dao-interface",
  "dao-testing",
  "dao-voting 2.3.0",
  "dao-voting-cw4",
@@ -1964,17 +1831,17 @@ version = "2.3.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cw-hooks 2.3.0",
+ "cw-hooks",
  "cw-multi-test",
  "cw-storage-plus 1.2.0",
  "cw-utils 1.0.3",
  "cw2 1.1.2",
  "cw20 1.1.2",
  "cw20-base 1.1.2",
- "dao-dao-core 2.3.0",
- "dao-hooks 2.3.0",
- "dao-interface 2.3.0",
- "dao-proposal-single 2.3.0",
+ "dao-dao-core",
+ "dao-hooks",
+ "dao-interface",
+ "dao-proposal-single",
  "dao-voting 2.3.0",
  "dao-voting-cw20-balance",
  "thiserror",
@@ -1987,8 +1854,8 @@ dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
  "cosmwasm-storage",
- "cw-denom 2.3.0",
- "cw-hooks 2.3.0",
+ "cw-denom",
+ "cw-hooks",
  "cw-multi-test",
  "cw-storage-plus 1.2.0",
  "cw-utils 1.0.3",
@@ -2000,10 +1867,10 @@ dependencies = [
  "cw4 1.1.2",
  "cw4-group 1.1.2",
  "cw721-base 0.18.0",
- "dao-dao-macros 2.3.0",
- "dao-hooks 2.3.0",
- "dao-interface 2.3.0",
- "dao-pre-propose-base 2.3.0",
+ "dao-dao-macros",
+ "dao-hooks",
+ "dao-interface",
+ "dao-pre-propose-base",
  "dao-pre-propose-multiple",
  "dao-testing",
  "dao-voting 0.1.0",
@@ -2025,8 +1892,8 @@ dependencies = [
  "cosmwasm-std",
  "cosmwasm-storage",
  "cw-core",
- "cw-denom 2.3.0",
- "cw-hooks 2.3.0",
+ "cw-denom",
+ "cw-hooks",
  "cw-multi-test",
  "cw-proposal-single",
  "cw-storage-plus 1.2.0",
@@ -2040,12 +1907,12 @@ dependencies = [
  "cw4 1.1.2",
  "cw4-group 1.1.2",
  "cw721-base 0.18.0",
- "dao-dao-core 2.3.0",
- "dao-dao-macros 2.3.0",
- "dao-hooks 2.3.0",
- "dao-interface 2.3.0",
- "dao-pre-propose-base 2.3.0",
- "dao-pre-propose-single 2.3.0",
+ "dao-dao-core",
+ "dao-dao-macros",
+ "dao-hooks",
+ "dao-interface",
+ "dao-pre-propose-base",
+ "dao-pre-propose-single",
  "dao-testing",
  "dao-voting 0.1.0",
  "dao-voting 2.3.0",
@@ -2057,32 +1924,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "dao-proposal-single"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c3cd823ad44f90fc592a144f45b4c8505a02d4ca64b5f9f80f99bf801fef858"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cosmwasm-storage",
- "cw-hooks 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cw-proposal-single",
- "cw-storage-plus 1.2.0",
- "cw-utils 0.13.4",
- "cw-utils 1.0.3",
- "cw2 1.1.2",
- "cw20 1.1.2",
- "cw3 1.1.2",
- "dao-dao-macros 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "dao-hooks 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "dao-interface 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "dao-pre-propose-base 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "dao-voting 0.1.0",
- "dao-voting 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "thiserror",
-]
-
 [[package]]
 name = "dao-proposal-sudo"
 version = "2.3.0"
@@ -2093,8 +1934,8 @@ dependencies = [
  "cw-multi-test",
  "cw-storage-plus 1.2.0",
  "cw2 1.1.2",
- "dao-dao-macros 2.3.0",
- "dao-interface 2.3.0",
+ "dao-dao-macros",
+ "dao-interface",
  "thiserror",
 ]
 
@@ -2113,8 +1954,8 @@ dependencies = [
  "cw2 1.1.2",
  "cw721 0.18.0",
  "cw721-base 0.18.0",
- "dao-dao-macros 2.3.0",
- "dao-interface 2.3.0",
+ "dao-dao-macros",
+ "dao-interface",
  "dao-voting 2.3.0",
  "thiserror",
 ]
@@ -2126,7 +1967,7 @@ dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
  "cw-core",
- "cw-hooks 2.3.0",
+ "cw-hooks",
  "cw-multi-test",
  "cw-proposal-single",
  "cw-tokenfactory-issuer",
@@ -2140,15 +1981,12 @@ dependencies = [
  "cw4-group 1.1.2",
  "cw721-base 0.18.0",
  "cw721-roles",
- "dao-dao-core 2.3.0",
- "dao-dao-core 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "dao-interface 2.3.0",
+ "dao-dao-core",
+ "dao-interface",
  "dao-pre-propose-multiple",
- "dao-pre-propose-single 2.3.0",
- "dao-pre-propose-single 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dao-pre-propose-single",
  "dao-proposal-condorcet",
- "dao-proposal-single 2.3.0",
- "dao-proposal-single 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dao-proposal-single",
  "dao-test-custom-factory",
  "dao-voting 0.1.0",
  "dao-voting 2.3.0",
@@ -2158,7 +1996,7 @@ dependencies = [
  "dao-voting-cw721-roles",
  "dao-voting-cw721-staked",
  "dao-voting-token-staked",
- "osmosis-std 0.20.1",
+ "osmosis-std",
  "osmosis-test-tube",
  "rand",
  "serde",
@@ -2185,29 +2023,12 @@ version = "2.3.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cw-denom 2.3.0",
- "cw-storage-plus 1.2.0",
- "cw-utils 1.0.3",
- "cw20 1.1.2",
- "dao-dao-macros 2.3.0",
- "dao-interface 2.3.0",
- "thiserror",
-]
-
-[[package]]
-name = "dao-voting"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ebc481f1e9a828c5e8b0230c51a7a7cef9d1875c76f5504bac2213054b87c9"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-denom 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cw-denom",
  "cw-storage-plus 1.2.0",
  "cw-utils 1.0.3",
  "cw20 1.1.2",
- "dao-dao-macros 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "dao-interface 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dao-dao-macros",
+ "dao-interface",
  "thiserror",
 ]
 
@@ -2223,8 +2044,8 @@ dependencies = [
  "cw2 1.1.2",
  "cw20 1.1.2",
  "cw20-base 1.1.2",
- "dao-dao-macros 2.3.0",
- "dao-interface 2.3.0",
+ "dao-dao-macros",
+ "dao-interface",
  "thiserror",
 ]
 
@@ -2242,8 +2063,8 @@ dependencies = [
  "cw20 1.1.2",
  "cw20-base 1.1.2",
  "cw20-stake 2.3.0",
- "dao-dao-macros 2.3.0",
- "dao-interface 2.3.0",
+ "dao-dao-macros",
+ "dao-interface",
  "dao-voting 2.3.0",
  "thiserror",
 ]
@@ -2261,8 +2082,8 @@ dependencies = [
  "cw2 1.1.2",
  "cw4 1.1.2",
  "cw4-group 1.1.2",
- "dao-dao-macros 2.3.0",
- "dao-interface 2.3.0",
+ "dao-dao-macros",
+ "dao-interface",
  "thiserror",
 ]
 
@@ -2285,8 +2106,8 @@ dependencies = [
  "cw721-controllers",
  "cw721-roles",
  "dao-cw721-extensions",
- "dao-dao-macros 2.3.0",
- "dao-interface 2.3.0",
+ "dao-dao-macros",
+ "dao-interface",
  "dao-testing",
  "thiserror",
 ]
@@ -2299,7 +2120,7 @@ dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
  "cw-controllers 1.1.2",
- "cw-hooks 2.3.0",
+ "cw-hooks",
  "cw-multi-test",
  "cw-paginate-storage 2.3.0",
  "cw-storage-plus 1.2.0",
@@ -2308,15 +2129,15 @@ dependencies = [
  "cw721 0.18.0",
  "cw721-base 0.18.0",
  "cw721-controllers",
- "dao-dao-macros 2.3.0",
- "dao-hooks 2.3.0",
- "dao-interface 2.3.0",
+ "dao-dao-macros",
+ "dao-hooks",
+ "dao-interface",
  "dao-proposal-hook-counter",
- "dao-proposal-single 2.3.0",
+ "dao-proposal-single",
  "dao-test-custom-factory",
  "dao-testing",
  "dao-voting 2.3.0",
- "osmosis-std 0.20.1",
+ "osmosis-std",
  "osmosis-test-tube",
  "serde",
  "thiserror",
@@ -2331,7 +2152,7 @@ dependencies = [
  "cosmwasm-std",
  "cosmwasm-storage",
  "cw-controllers 1.1.2",
- "cw-hooks 2.3.0",
+ "cw-hooks",
  "cw-multi-test",
  "cw-ownable",
  "cw-paginate-storage 2.3.0",
@@ -2339,15 +2160,15 @@ dependencies = [
  "cw-tokenfactory-issuer",
  "cw-utils 1.0.3",
  "cw2 1.1.2",
- "dao-dao-macros 2.3.0",
- "dao-hooks 2.3.0",
- "dao-interface 2.3.0",
+ "dao-dao-macros",
+ "dao-hooks",
+ "dao-interface",
  "dao-proposal-hook-counter",
- "dao-proposal-single 2.3.0",
+ "dao-proposal-single",
  "dao-test-custom-factory",
  "dao-testing",
  "dao-voting 2.3.0",
- "osmosis-std 0.20.1",
+ "osmosis-std",
  "osmosis-test-tube",
  "serde",
  "thiserror",
@@ -2440,7 +2261,7 @@ dependencies = [
  "elliptic-curve 0.13.8",
  "rfc6979 0.4.0",
  "signature 2.2.0",
- "spki 0.7.2",
+ "spki 0.7.3",
 ]
 
 [[package]]
@@ -2554,12 +2375,12 @@ dependencies = [
 
 [[package]]
 name = "errno"
-version = "0.3.7"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8"
+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
 dependencies = [
  "libc",
- "windows-sys",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -2855,7 +2676,7 @@ version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"
 dependencies = [
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -3038,10 +2859,10 @@ dependencies = [
  "cw721 0.18.0",
  "cw721-base 0.18.0",
  "cw721-roles",
- "dao-dao-core 2.3.0",
- "dao-interface 2.3.0",
- "dao-pre-propose-single 2.3.0",
- "dao-proposal-single 2.3.0",
+ "dao-dao-core",
+ "dao-interface",
+ "dao-pre-propose-single",
+ "dao-proposal-single",
  "dao-test-custom-factory",
  "dao-voting 2.3.0",
  "dao-voting-cw20-staked",
@@ -3062,7 +2883,7 @@ checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
 dependencies = [
  "hermit-abi",
  "rustix",
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -3091,9 +2912,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
 
 [[package]]
 name = "js-sys"
-version = "0.3.65"
+version = "0.3.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8"
+checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -3181,9 +3002,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.11"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829"
+checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456"
 
 [[package]]
 name = "log"
@@ -3232,7 +3053,7 @@ checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
 dependencies = [
  "libc",
  "wasi",
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -3321,22 +3142,6 @@ dependencies = [
  "hashbrown 0.12.3",
 ]
 
-[[package]]
-name = "osmosis-std"
-version = "0.19.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "798fade51443a0e07eb25b59a11b320b9e8f03e6e8fbe14c520258f04742fe13"
-dependencies = [
- "chrono",
- "cosmwasm-std",
- "osmosis-std-derive 0.16.2",
- "prost 0.11.9",
- "prost-types",
- "schemars",
- "serde",
- "serde-cw-value",
-]
-
 [[package]]
 name = "osmosis-std"
 version = "0.20.1"
@@ -3345,7 +3150,7 @@ checksum = "47d7aa053bc3fad557ac90a0377688b400c395e2537f0f1de3293a15cad2e970"
 dependencies = [
  "chrono",
  "cosmwasm-std",
- "osmosis-std-derive 0.20.1",
+ "osmosis-std-derive",
  "prost 0.11.9",
  "prost-types",
  "schemars",
@@ -3353,19 +3158,6 @@ dependencies = [
  "serde-cw-value",
 ]
 
-[[package]]
-name = "osmosis-std-derive"
-version = "0.16.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f47f0b2f22adb341bb59e5a3a1b464dde033181954bd055b9ae86d6511ba465b"
-dependencies = [
- "itertools 0.10.5",
- "proc-macro2",
- "prost-types",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "osmosis-std-derive"
 version = "0.20.1"
@@ -3389,7 +3181,7 @@ dependencies = [
  "bindgen",
  "cosmrs 0.9.0",
  "cosmwasm-std",
- "osmosis-std 0.20.1",
+ "osmosis-std",
  "prost 0.11.9",
  "serde",
  "serde_json",
@@ -3551,7 +3343,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
 dependencies = [
  "der 0.7.8",
- "spki 0.7.2",
+ "spki 0.7.3",
 ]
 
 [[package]]
@@ -3811,15 +3603,15 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "rustix"
-version = "0.38.25"
+version = "0.38.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e"
+checksum = "9470c4bf8246c8daf25f9598dca807fb6510347b1e1cfa55749113850c79d88a"
 dependencies = [
  "bitflags 2.4.1",
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3874,7 +3666,7 @@ version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
 dependencies = [
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -4158,7 +3950,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
 dependencies = [
  "libc",
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -4179,9 +3971,9 @@ dependencies = [
 
 [[package]]
 name = "spki"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a"
+checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
 dependencies = [
  "base64ct",
  "der 0.7.8",
@@ -4544,7 +4336,7 @@ dependencies = [
  "base64 0.13.1",
  "cosmrs 0.9.0",
  "cosmwasm-std",
- "osmosis-std 0.20.1",
+ "osmosis-std",
  "prost 0.11.9",
  "serde",
  "serde_json",
@@ -4629,7 +4421,7 @@ dependencies = [
  "pin-project-lite",
  "socket2 0.5.5",
  "tokio-macros",
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -4944,9 +4736,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.88"
+version = "0.2.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce"
+checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -4954,9 +4746,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.88"
+version = "0.2.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217"
+checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826"
 dependencies = [
  "bumpalo",
  "log",
@@ -4969,9 +4761,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.88"
+version = "0.2.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2"
+checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -4979,9 +4771,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.88"
+version = "0.2.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907"
+checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4992,15 +4784,15 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.88"
+version = "0.2.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b"
+checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f"
 
 [[package]]
 name = "web-sys"
-version = "0.3.65"
+version = "0.3.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85"
+checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -5074,7 +4866,16 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.0",
 ]
 
 [[package]]
@@ -5083,13 +4884,28 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
 dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.0",
+ "windows_aarch64_msvc 0.52.0",
+ "windows_i686_gnu 0.52.0",
+ "windows_i686_msvc 0.52.0",
+ "windows_x86_64_gnu 0.52.0",
+ "windows_x86_64_gnullvm 0.52.0",
+ "windows_x86_64_msvc 0.52.0",
 ]
 
 [[package]]
@@ -5098,42 +4914,84 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+
 [[package]]
 name = "wynd-utils"
 version = "0.4.1"
diff --git a/Cargo.toml b/Cargo.toml
index b588c50f9..f87c6a177 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -124,15 +124,5 @@ cw20-stake-reward-distributor-v1 = { package = "stake-cw20-reward-distributor",
 cw20-stake-v1 = { package = "cw20-stake", version = "0.2.6" }
 cw20-staked-balance-voting-v1 = { package = "cw20-staked-balance-voting", version = "0.1.0" }
 cw4-voting-v1 = { package = "cw4-voting", version = "0.1.0" }
-voting-v1 = { package = "dao-voting", version = "0.1.0" }
 stake-cw20-v03 = { package = "stake-cw20", version = "0.2.6" }
-
-
-# v2 dependencies. used for state migrations
-cw-utils-v2 = { package = "cw-utils", version = "0.16" }
-dao-dao-core-v2 = { package = "dao-dao-core", version = "2.2.0" }
-dao-interface-v2 = { package = "dao-interface", version = "2.2.0" }
-dao-proposal-single-v2 = { package = "dao-proposal-single", version = "2.2.0" }
-dao-pre-propose-single-v2 = { package = "dao-pre-propose-single", version = "2.2.0" }
-voting-v2 = { package = "dao-voting", version = "2.2.0"}
-
+voting-v1 = { package = "dao-voting", version = "0.1.0" }
diff --git a/contracts/external/dao-migrator/Cargo.toml b/contracts/external/dao-migrator/Cargo.toml
index 78daa9cc1..4d2b48cb8 100644
--- a/contracts/external/dao-migrator/Cargo.toml
+++ b/contracts/external/dao-migrator/Cargo.toml
@@ -26,13 +26,14 @@ cw2              = { workspace = true }
 cw20             = { workspace = true }
 dao-interface    = { workspace = true }
 
-dao-dao-core               = { workspace = true, features = ["library"] }
+dao-dao-core           = { workspace = true, features = ["library"] }
+dao-voting             = { workspace = true }
+dao-proposal-single    = { workspace = true, features = ["library"] }
 dao-voting-cw4         = { workspace = true, features = ["library"] }
 cw20-stake             = { workspace = true, features = ["library"] }
 dao-voting-cw20-staked = { workspace = true, features = ["library"] }
 cw20-base              = { workspace = true, features = ["library"] }
 
-# v1 migration
 cw-utils-v1                   = { workspace = true }
 voting-v1                     = { workspace = true }
 cw-core-v1                    = { workspace = true, features = ["library"] }
@@ -44,13 +45,6 @@ cw4-voting-v1                 = { package = "cw4-voting", version = "0.1.0", git
 cw20-v1                       = { version = "0.13", package = "cw20" }
 cw4-v1                        = { version = "0.13", package = "cw4" }
 
-# v2 migration
-dao-dao-core-v2 = { workspace = true }
-dao-interface-v2 = { workspace = true }
-cw-utils-v2 = { workspace = true }
-dao-proposal-single-v2 = { workspace = true, features = ["library"] }
-voting-v2 = { workspace = true}
-
 [dev-dependencies]
 cosmwasm-schema = { workspace = true }
 cw-multi-test   = { workspace = true }
diff --git a/contracts/external/dao-migrator/src/contract.rs b/contracts/external/dao-migrator/src/contract.rs
index 5f8a76477..625d0276b 100644
--- a/contracts/external/dao-migrator/src/contract.rs
+++ b/contracts/external/dao-migrator/src/contract.rs
@@ -7,7 +7,7 @@ use cosmwasm_std::{
     StdResult, SubMsg, WasmMsg,
 };
 use cw2::set_contract_version;
-use dao_interface_v2::{
+use dao_interface::{
     query::SubDao,
     state::{ModuleInstantiateCallback, ProposalModule},
 };
@@ -111,10 +111,11 @@ fn execute_migration_v1_v2(
                     v1_code_ids.proposal_single,
                     v2_code_ids.proposal_single,
                     MigrationMsgs::DaoProposalSingle(
-                        dao_proposal_single_v2::msg::MigrateMsg::FromV1 {
+                        dao_proposal_single::msg::MigrateMsg::FromV1 {
                             close_proposal_on_execution_failure: proposal_params
                                 .close_proposal_on_execution_failure,
                             pre_propose_info: proposal_params.pre_propose_info,
+                            veto: proposal_params.veto,
                         },
                     ),
                 ),
@@ -147,7 +148,7 @@ fn execute_migration_v1_v2(
     // --------------------
     let voting_module: Addr = deps.querier.query_wasm_smart(
         info.sender.clone(),
-        &dao_interface_v2::msg::QueryMsg::VotingModule {},
+        &dao_interface::msg::QueryMsg::VotingModule {},
     )?;
 
     let voting_code_id =
@@ -227,7 +228,7 @@ fn execute_migration_v1_v2(
     // We take all the proposal modules of the DAO.
     let proposal_modules: Vec<ProposalModule> = deps.querier.query_wasm_smart(
         info.sender.clone(),
-        &dao_interface_v2::msg::QueryMsg::ProposalModules {
+        &dao_interface::msg::QueryMsg::ProposalModules {
             start_after: None,
             limit: None,
         },
@@ -305,7 +306,7 @@ fn execute_migration_v1_v2(
     msgs.push(
         WasmMsg::Execute {
             contract_addr: info.sender.to_string(),
-            msg: to_json_binary(&dao_interface_v2::msg::ExecuteMsg::UpdateSubDaos {
+            msg: to_json_binary(&dao_interface::msg::ExecuteMsg::UpdateSubDaos {
                 to_add: sub_daos,
                 to_remove: vec![],
             })?,
@@ -318,7 +319,7 @@ fn execute_migration_v1_v2(
     let proposal_hook_msg = SubMsg::reply_on_success(
         WasmMsg::Execute {
             contract_addr: info.sender.to_string(),
-            msg: to_json_binary(&dao_interface_v2::msg::ExecuteMsg::ExecuteProposalHook { msgs })?,
+            msg: to_json_binary(&dao_interface::msg::ExecuteMsg::ExecuteProposalHook { msgs })?,
             funds: vec![],
         },
         V1_V2_REPLY_ID,
@@ -345,11 +346,11 @@ pub fn reply(deps: DepsMut, env: Env, reply: Reply) -> Result<Response, Contract
             // and only then delete our module if everything worked out.
             let remove_msg = WasmMsg::Execute {
                 contract_addr: core_addr.to_string(),
-                msg: to_json_binary(&dao_interface_v2::msg::ExecuteMsg::ExecuteProposalHook {
+                msg: to_json_binary(&dao_interface::msg::ExecuteMsg::ExecuteProposalHook {
                     msgs: vec![WasmMsg::Execute {
                         contract_addr: core_addr.to_string(),
                         msg: to_json_binary(
-                            &dao_interface_v2::msg::ExecuteMsg::UpdateProposalModules {
+                            &dao_interface::msg::ExecuteMsg::UpdateProposalModules {
                                 to_add: vec![],
                                 to_disable: vec![env.contract.address.to_string()],
                             },
diff --git a/contracts/external/dao-migrator/src/msg.rs b/contracts/external/dao-migrator/src/msg.rs
index 05cbc33c9..8cca0a3c7 100644
--- a/contracts/external/dao-migrator/src/msg.rs
+++ b/contracts/external/dao-migrator/src/msg.rs
@@ -1,5 +1,5 @@
 use cosmwasm_schema::{cw_serde, QueryResponses};
-use dao_interface_v2::query::SubDao;
+use dao_interface::query::SubDao;
 
 use crate::types::{MigrationParams, V1CodeIds, V2CodeIds};
 
diff --git a/contracts/external/dao-migrator/src/testing/helpers.rs b/contracts/external/dao-migrator/src/testing/helpers.rs
index 6696e14ee..c25d13507 100644
--- a/contracts/external/dao-migrator/src/testing/helpers.rs
+++ b/contracts/external/dao-migrator/src/testing/helpers.rs
@@ -3,10 +3,10 @@ use cosmwasm_std::{
     Uint128, WasmMsg,
 };
 use cw_multi_test::{next_block, App, Contract, ContractWrapper, Executor};
+use dao_interface::query::SubDao;
 use dao_testing::contracts::{
-    cw20_base_contract, cw20_staked_balances_voting_contract, cw4_group_contract,
-    v1_dao_dao_contract, v1_proposal_single_contract, v2_dao_dao_contract,
-    v2_proposal_single_contract,
+    cw20_base_contract, cw20_staked_balances_voting_contract, cw4_group_contract, dao_dao_contract,
+    proposal_single_contract, v1_dao_dao_contract, v1_proposal_single_contract,
 };
 
 use crate::{
@@ -28,7 +28,7 @@ pub struct CodeIds {
 }
 
 pub struct ExecuteParams {
-    pub sub_daos: Option<Vec<dao_interface_v2::query::SubDao>>,
+    pub sub_daos: Option<Vec<SubDao>>,
     pub migrate_cw20: Option<bool>,
 }
 
@@ -70,8 +70,8 @@ pub fn get_v1_code_ids(app: &mut App) -> (CodeIds, V1CodeIds) {
 
 pub fn get_v2_code_ids(app: &mut App) -> (CodeIds, V2CodeIds) {
     let code_ids = CodeIds {
-        core: app.store_code(v2_dao_dao_contract()),
-        proposal_single: app.store_code(v2_proposal_single_contract()),
+        core: app.store_code(dao_dao_contract()),
+        proposal_single: app.store_code(proposal_single_contract()),
         cw20_base: app.store_code(cw20_base_contract()),
         cw20_stake: app.store_code(v2_cw20_stake_contract()),
         cw20_voting: app.store_code(dao_voting_cw20_staked_contract()),
diff --git a/contracts/external/dao-migrator/src/testing/setup.rs b/contracts/external/dao-migrator/src/testing/setup.rs
index 4c1298319..becb49522 100644
--- a/contracts/external/dao-migrator/src/testing/setup.rs
+++ b/contracts/external/dao-migrator/src/testing/setup.rs
@@ -2,7 +2,7 @@ use std::borrow::BorrowMut;
 
 use cosmwasm_std::{to_json_binary, Addr, WasmMsg};
 use cw_multi_test::{next_block, App, AppResponse, Executor};
-use dao_interface_v2::state::{Admin, ModuleInstantiateInfo};
+use dao_interface::state::{Admin, ModuleInstantiateInfo};
 use dao_testing::contracts::stake_cw20_v03_contract;
 
 use crate::{
@@ -274,7 +274,8 @@ pub fn execute_migration(
                     ProposalParams {
                         close_proposal_on_execution_failure: true,
                         pre_propose_info:
-                            voting_v2::pre_propose::PreProposeInfo::AnyoneMayPropose {},
+                            dao_voting::pre_propose::PreProposeInfo::AnyoneMayPropose {},
+                        veto: None,
                     },
                 )
             })
@@ -291,7 +292,7 @@ pub fn execute_migration(
                 WasmMsg::Migrate {
                     contract_addr: module_addrs.core.to_string(),
                     new_code_id: new_code_ids.core,
-                    msg: to_json_binary(&dao_interface_v2::msg::MigrateMsg::FromV1 {
+                    msg: to_json_binary(&dao_interface::msg::MigrateMsg::FromV1 {
                         dao_uri: None,
                         params: None,
                     })
@@ -300,27 +301,25 @@ pub fn execute_migration(
                 .into(),
                 WasmMsg::Execute {
                     contract_addr: module_addrs.core.to_string(),
-                    msg: to_json_binary(
-                        &dao_interface_v2::msg::ExecuteMsg::UpdateProposalModules {
-                            to_add: vec![ModuleInstantiateInfo {
-                                code_id: migrator_code_id,
-                                msg: to_json_binary(&crate::msg::InstantiateMsg {
-                                    sub_daos: params.sub_daos.unwrap(),
-                                    migration_params: MigrationParams {
-                                        migrate_stake_cw20_manager: params.migrate_cw20,
-                                        proposal_params,
-                                    },
-                                    v1_code_ids,
-                                    v2_code_ids,
-                                })
-                                .unwrap(),
-                                admin: Some(Admin::CoreModule {}),
-                                funds: vec![],
-                                label: "migrator".to_string(),
-                            }],
-                            to_disable: vec![],
-                        },
-                    )
+                    msg: to_json_binary(&dao_interface::msg::ExecuteMsg::UpdateProposalModules {
+                        to_add: vec![ModuleInstantiateInfo {
+                            code_id: migrator_code_id,
+                            msg: to_json_binary(&crate::msg::InstantiateMsg {
+                                sub_daos: params.sub_daos.unwrap(),
+                                migration_params: MigrationParams {
+                                    migrate_stake_cw20_manager: params.migrate_cw20,
+                                    proposal_params,
+                                },
+                                v1_code_ids,
+                                v2_code_ids,
+                            })
+                            .unwrap(),
+                            admin: Some(Admin::CoreModule {}),
+                            funds: vec![],
+                            label: "migrator".to_string(),
+                        }],
+                        to_disable: vec![],
+                    })
                     .unwrap(),
                     funds: vec![],
                 }
@@ -382,14 +381,14 @@ pub fn execute_migration_from_core(
         .map(|addr| {
             (
                 addr.clone().into(),
-                dao_interface_v2::migrate_msg::ProposalParams {
+                dao_interface::migrate_msg::ProposalParams {
                     close_proposal_on_execution_failure: true,
                     pre_propose_info:
-                        dao_interface_v2::migrate_msg::PreProposeInfo::AnyoneMayPropose {},
+                        dao_interface::migrate_msg::PreProposeInfo::AnyoneMayPropose {},
                 },
             )
         })
-        .collect::<Vec<(String, dao_interface_v2::migrate_msg::ProposalParams)>>();
+        .collect::<Vec<(String, dao_interface::migrate_msg::ProposalParams)>>();
 
     app.execute_contract(
         sender.clone(),
@@ -400,17 +399,16 @@ pub fn execute_migration_from_core(
             msgs: vec![WasmMsg::Migrate {
                 contract_addr: module_addrs.core.to_string(),
                 new_code_id: new_code_ids.core,
-                msg: to_json_binary(&dao_interface_v2::msg::MigrateMsg::FromV1 {
+                msg: to_json_binary(&dao_interface::msg::MigrateMsg::FromV1 {
                     dao_uri: None,
-                    params: Some(dao_interface_v2::migrate_msg::MigrateParams {
+                    params: Some(dao_interface::migrate_msg::MigrateParams {
                         migrator_code_id,
-                        params: dao_interface_v2::migrate_msg::MigrateV1ToV2 {
+                        params: dao_interface::migrate_msg::MigrateV1ToV2 {
                             sub_daos: params.sub_daos.unwrap(),
-                            migration_params:
-                                dao_interface_v2::migrate_msg::MigrationModuleParams {
-                                    migrate_stake_cw20_manager: params.migrate_cw20,
-                                    proposal_params,
-                                },
+                            migration_params: dao_interface::migrate_msg::MigrationModuleParams {
+                                migrate_stake_cw20_manager: params.migrate_cw20,
+                                proposal_params,
+                            },
                             v1_code_ids: v1_code_ids.to(),
                             v2_code_ids: v2_code_ids.to(),
                         },
diff --git a/contracts/external/dao-migrator/src/testing/state_helpers.rs b/contracts/external/dao-migrator/src/testing/state_helpers.rs
index 7abebb8f2..13dbb82ef 100644
--- a/contracts/external/dao-migrator/src/testing/state_helpers.rs
+++ b/contracts/external/dao-migrator/src/testing/state_helpers.rs
@@ -8,7 +8,7 @@ use crate::utils::query_helpers::{
 #[derive(PartialEq, Debug, Clone)]
 pub struct TestState {
     pub proposal_count: u64,
-    pub proposal: dao_proposal_single_v2::proposal::SingleChoiceProposal,
+    pub proposal: dao_proposal_single::proposal::SingleChoiceProposal,
     pub total_power: Uint128,
     pub single_power: Uint128,
 }
@@ -16,7 +16,7 @@ pub struct TestState {
 pub fn query_proposal_v1(
     app: &mut App,
     proposal_addr: Addr,
-) -> (u64, dao_proposal_single_v2::proposal::SingleChoiceProposal) {
+) -> (u64, dao_proposal_single::proposal::SingleChoiceProposal) {
     // proposal count
     let proposal_count: u64 = app
         .wrap()
@@ -41,7 +41,7 @@ pub fn query_proposal_v1(
         .clone()
         .proposal;
 
-    let proposal = dao_proposal_single_v2::proposal::SingleChoiceProposal {
+    let proposal = dao_proposal_single::proposal::SingleChoiceProposal {
         title: proposal.title,
         description: proposal.description,
         proposer: proposal.proposer,
@@ -54,6 +54,7 @@ pub fn query_proposal_v1(
         status: v1_status_to_v2(proposal.status),
         votes: v1_votes_to_v2(proposal.votes),
         allow_revoting: proposal.allow_revoting,
+        veto: None,
     };
 
     (proposal_count, proposal)
@@ -62,22 +63,22 @@ pub fn query_proposal_v1(
 pub fn query_proposal_v2(
     app: &mut App,
     proposal_addr: Addr,
-) -> (u64, dao_proposal_single_v2::proposal::SingleChoiceProposal) {
+) -> (u64, dao_proposal_single::proposal::SingleChoiceProposal) {
     // proposal count
     let proposal_count: u64 = app
         .wrap()
         .query_wasm_smart(
             proposal_addr.clone(),
-            &dao_proposal_single_v2::msg::QueryMsg::ProposalCount {},
+            &dao_proposal_single::msg::QueryMsg::ProposalCount {},
         )
         .unwrap();
 
     // query proposal
     let proposal = app
         .wrap()
-        .query_wasm_smart::<dao_proposal_single_v2::query::ProposalListResponse>(
+        .query_wasm_smart::<dao_proposal_single::query::ProposalListResponse>(
             proposal_addr,
-            &dao_proposal_single_v2::msg::QueryMsg::ListProposals {
+            &dao_proposal_single::msg::QueryMsg::ListProposals {
                 start_after: None,
                 limit: None,
             },
diff --git a/contracts/external/dao-migrator/src/testing/test_migration.rs b/contracts/external/dao-migrator/src/testing/test_migration.rs
index ab0d06f1b..691e00c9f 100644
--- a/contracts/external/dao-migrator/src/testing/test_migration.rs
+++ b/contracts/external/dao-migrator/src/testing/test_migration.rs
@@ -2,7 +2,7 @@ use std::borrow::BorrowMut;
 
 use cosmwasm_std::Addr;
 use cw_multi_test::Executor;
-use dao_interface_v2::{query::SubDao, state::ProposalModuleStatus};
+use dao_interface::{query::SubDao, state::ProposalModuleStatus};
 
 use crate::{
     testing::{
@@ -71,11 +71,11 @@ pub fn basic_test(voting_type: VotingType, from_core: bool) {
 
     assert_eq!(test_state_v1, test_state_v2);
 
-    let modules: Vec<dao_interface_v2::state::ProposalModule> = app
+    let modules: Vec<dao_interface::state::ProposalModule> = app
         .wrap()
         .query_wasm_smart(
             module_addrs.core,
-            &dao_interface_v2::msg::QueryMsg::ProposalModules {
+            &dao_interface::msg::QueryMsg::ProposalModules {
                 start_after: None,
                 limit: None,
             },
@@ -139,11 +139,11 @@ fn test_migrator_address_is_first() {
 
     assert_eq!(test_state_v1, test_state_v2);
 
-    let modules: Vec<dao_interface_v2::state::ProposalModule> = app
+    let modules: Vec<dao_interface::state::ProposalModule> = app
         .wrap()
         .query_wasm_smart(
             module_addrs.core,
-            &dao_interface_v2::msg::QueryMsg::ProposalModules {
+            &dao_interface::msg::QueryMsg::ProposalModules {
                 start_after: None,
                 limit: None,
             },
@@ -188,14 +188,16 @@ fn test_duplicate_proposal_params() {
             module_addrs.proposals[0].to_string(),
             ProposalParams {
                 close_proposal_on_execution_failure: true,
-                pre_propose_info: voting_v2::pre_propose::PreProposeInfo::AnyoneMayPropose {},
+                pre_propose_info: dao_voting::pre_propose::PreProposeInfo::AnyoneMayPropose {},
+                veto: None,
             },
         ),
         (
             module_addrs.proposals[0].to_string(),
             ProposalParams {
                 close_proposal_on_execution_failure: true,
-                pre_propose_info: voting_v2::pre_propose::PreProposeInfo::AnyoneMayPropose {},
+                pre_propose_info: dao_voting::pre_propose::PreProposeInfo::AnyoneMayPropose {},
+                veto: None,
             },
         ),
     ];
@@ -348,11 +350,11 @@ fn test_sub_daos() {
     )
     .unwrap();
 
-    let sub_daos: Vec<dao_interface_v2::query::SubDao> = app
+    let sub_daos: Vec<dao_interface::query::SubDao> = app
         .wrap()
         .query_wasm_smart(
             module_addrs.core,
-            &dao_interface_v2::msg::QueryMsg::ListSubDaos {
+            &dao_interface::msg::QueryMsg::ListSubDaos {
                 start_after: None,
                 limit: None,
             },
diff --git a/contracts/external/dao-migrator/src/types.rs b/contracts/external/dao-migrator/src/types.rs
index 43f20d31b..4663bdee2 100644
--- a/contracts/external/dao-migrator/src/types.rs
+++ b/contracts/external/dao-migrator/src/types.rs
@@ -1,5 +1,6 @@
 use cosmwasm_schema::cw_serde;
 use cosmwasm_std::{Addr, Uint128};
+use dao_voting::veto::VetoConfig;
 
 use crate::ContractError;
 
@@ -12,8 +13,8 @@ pub struct V1CodeIds {
 }
 
 impl V1CodeIds {
-    pub fn to(self) -> dao_interface_v2::migrate_msg::V1CodeIds {
-        dao_interface_v2::migrate_msg::V1CodeIds {
+    pub fn to(self) -> dao_interface::migrate_msg::V1CodeIds {
+        dao_interface::migrate_msg::V1CodeIds {
             proposal_single: self.proposal_single,
             cw4_voting: self.cw4_voting,
             cw20_stake: self.cw20_stake,
@@ -31,8 +32,8 @@ pub struct V2CodeIds {
 }
 
 impl V2CodeIds {
-    pub fn to(self) -> dao_interface_v2::migrate_msg::V2CodeIds {
-        dao_interface_v2::migrate_msg::V2CodeIds {
+    pub fn to(self) -> dao_interface::migrate_msg::V2CodeIds {
+        dao_interface::migrate_msg::V2CodeIds {
             proposal_single: self.proposal_single,
             cw4_voting: self.cw4_voting,
             cw20_stake: self.cw20_stake,
@@ -45,7 +46,8 @@ impl V2CodeIds {
 #[cw_serde]
 pub struct ProposalParams {
     pub close_proposal_on_execution_failure: bool,
-    pub pre_propose_info: voting_v2::pre_propose::PreProposeInfo,
+    pub pre_propose_info: dao_voting::pre_propose::PreProposeInfo,
+    pub veto: Option<VetoConfig>,
 }
 
 #[cw_serde]
@@ -65,7 +67,7 @@ pub struct MigrationParams {
 #[cw_serde]
 #[serde(untagged)]
 pub enum MigrationMsgs {
-    DaoProposalSingle(dao_proposal_single_v2::msg::MigrateMsg),
+    DaoProposalSingle(dao_proposal_single::msg::MigrateMsg),
     DaoVotingCw4(dao_voting_cw4::msg::MigrateMsg),
     Cw20Stake(cw20_stake::msg::MigrateMsg),
     DaoVotingCw20Staked(dao_voting_cw20_staked::msg::MigrateMsg),
@@ -124,7 +126,7 @@ pub struct SingleProposalData {
 #[cw_serde]
 pub struct TestState {
     pub proposal_counts: Vec<u64>,
-    pub proposals: Vec<dao_proposal_single_v2::proposal::SingleChoiceProposal>,
+    pub proposals: Vec<dao_proposal_single::proposal::SingleChoiceProposal>,
     pub total_voting_power: Uint128,
     /// This is the voting power of the proposer of the sample proposal
     pub single_voting_power: Uint128,
diff --git a/contracts/external/dao-migrator/src/utils/query_helpers.rs b/contracts/external/dao-migrator/src/utils/query_helpers.rs
index b2744eed9..dc5a433cd 100644
--- a/contracts/external/dao-migrator/src/utils/query_helpers.rs
+++ b/contracts/external/dao-migrator/src/utils/query_helpers.rs
@@ -1,5 +1,5 @@
 use cw_utils::Expiration;
-use voting_v2::{
+use dao_voting::{
     status::Status,
     threshold::{PercentageThreshold, Threshold},
     voting::Votes,
diff --git a/contracts/external/dao-migrator/src/utils/state_queries.rs b/contracts/external/dao-migrator/src/utils/state_queries.rs
index fcfb91835..338281d93 100644
--- a/contracts/external/dao-migrator/src/utils/state_queries.rs
+++ b/contracts/external/dao-migrator/src/utils/state_queries.rs
@@ -24,7 +24,7 @@ pub fn query_proposal_count_v2(deps: Deps, proposals_addrs: Vec<Addr>) -> StdRes
         .map(|proposal_addr| {
             deps.querier.query_wasm_smart(
                 proposal_addr,
-                &dao_proposal_single_v2::msg::QueryMsg::ProposalCount {},
+                &dao_proposal_single::msg::QueryMsg::ProposalCount {},
             )
         })
         .collect()
@@ -35,7 +35,7 @@ pub fn query_proposal_v1(
     proposals_addrs: Vec<Addr>,
 ) -> Result<
     (
-        Vec<dao_proposal_single_v2::proposal::SingleChoiceProposal>,
+        Vec<dao_proposal_single::proposal::SingleChoiceProposal>,
         SingleProposalData,
     ),
     ContractError,
@@ -70,7 +70,7 @@ pub fn query_proposal_v1(
                 });
             }
 
-            Ok(dao_proposal_single_v2::proposal::SingleChoiceProposal {
+            Ok(dao_proposal_single::proposal::SingleChoiceProposal {
                 title: proposal.title,
                 description: proposal.description,
                 proposer: proposal.proposer,
@@ -83,9 +83,10 @@ pub fn query_proposal_v1(
                 status: v1_status_to_v2(proposal.status),
                 votes: v1_votes_to_v2(proposal.votes),
                 allow_revoting: proposal.allow_revoting,
+                veto: None,
             })
         })
-        .collect::<Result<Vec<dao_proposal_single_v2::proposal::SingleChoiceProposal>, ContractError>>(
+        .collect::<Result<Vec<dao_proposal_single::proposal::SingleChoiceProposal>, ContractError>>(
         )?;
 
     Ok((proposals, sample_proposal.unwrap()))
@@ -96,7 +97,7 @@ pub fn query_proposal_v2(
     proposals_addrs: Vec<Addr>,
 ) -> Result<
     (
-        Vec<dao_proposal_single_v2::proposal::SingleChoiceProposal>,
+        Vec<dao_proposal_single::proposal::SingleChoiceProposal>,
         SingleProposalData,
     ),
     ContractError,
@@ -106,10 +107,10 @@ pub fn query_proposal_v2(
     let proposals = proposals_addrs
         .into_iter()
         .map(|proposal_addr| {
-            let proposals: dao_proposal_single_v2::query::ProposalListResponse =
+            let proposals: dao_proposal_single::query::ProposalListResponse =
                 deps.querier.query_wasm_smart(
                     proposal_addr.clone(),
-                    &dao_proposal_single_v2::msg::QueryMsg::ReverseProposals {
+                    &dao_proposal_single::msg::QueryMsg::ReverseProposals {
                         start_before: None,
                         limit: None,
                     },
@@ -132,7 +133,7 @@ pub fn query_proposal_v2(
 
             Ok(proposal)
         })
-        .collect::<Result<Vec<dao_proposal_single_v2::proposal::SingleChoiceProposal>, ContractError>>(
+        .collect::<Result<Vec<dao_proposal_single::proposal::SingleChoiceProposal>, ContractError>>(
         )?;
 
     Ok((proposals, sample_proposal.unwrap()))
diff --git a/packages/dao-testing/Cargo.toml b/packages/dao-testing/Cargo.toml
index 72c1efbc1..677709d53 100644
--- a/packages/dao-testing/Cargo.toml
+++ b/packages/dao-testing/Cargo.toml
@@ -44,14 +44,11 @@ cw721-base = { workspace = true }
 cw721-roles = { workspace = true }
 cw-tokenfactory-issuer = { workspace = true }
 dao-dao-core = { workspace = true, features = ["library"] }
-dao-dao-core-v2 = { workspace = true, features = ["library"] }
 dao-interface = { workspace = true }
 dao-pre-propose-multiple = { workspace = true }
 dao-pre-propose-single = { workspace = true }
-dao-pre-propose-single-v2 = { workspace = true }
 dao-proposal-condorcet = { workspace = true }
 dao-proposal-single = { workspace = true }
-dao-proposal-single-v2 = { workspace = true }
 dao-test-custom-factory = { workspace = true }
 dao-voting = { workspace = true }
 dao-voting-cw20-balance = { workspace = true }
diff --git a/packages/dao-testing/src/contracts.rs b/packages/dao-testing/src/contracts.rs
index 88d8630ea..a0418a48f 100644
--- a/packages/dao-testing/src/contracts.rs
+++ b/packages/dao-testing/src/contracts.rs
@@ -179,37 +179,6 @@ pub fn v1_dao_dao_contract() -> Box<dyn Contract<Empty>> {
     Box::new(contract)
 }
 
-pub fn v2_proposal_single_contract() -> Box<dyn Contract<Empty>> {
-    let contract = ContractWrapper::new(
-        dao_proposal_single_v2::contract::execute,
-        dao_proposal_single_v2::contract::instantiate,
-        dao_proposal_single_v2::contract::query,
-    )
-    .with_reply(dao_proposal_single_v2::contract::reply)
-    .with_migrate(dao_proposal_single_v2::contract::migrate);
-    Box::new(contract)
-}
-
-pub fn v2_pre_propose_single_contract() -> Box<dyn Contract<Empty>> {
-    let contract = ContractWrapper::new(
-        dao_pre_propose_single_v2::contract::execute,
-        dao_pre_propose_single_v2::contract::instantiate,
-        dao_pre_propose_single_v2::contract::query,
-    );
-    Box::new(contract)
-}
-
-pub fn v2_dao_dao_contract() -> Box<dyn Contract<Empty>> {
-    let contract = ContractWrapper::new(
-        dao_dao_core_v2::contract::execute,
-        dao_dao_core_v2::contract::instantiate,
-        dao_dao_core_v2::contract::query,
-    )
-    .with_reply(dao_dao_core_v2::contract::reply)
-    .with_migrate(dao_dao_core_v2::contract::migrate);
-    Box::new(contract)
-}
-
 pub fn cw_vesting_contract() -> Box<dyn Contract<Empty>> {
     let contract = ContractWrapper::new(
         cw_vesting::contract::execute,