From d2455497140a990bd347b2804d10a0d93bcbc370 Mon Sep 17 00:00:00 2001
From: pr0n00gler <programmer10110@gmail.com>
Date: Wed, 18 Oct 2023 15:30:32 +0300
Subject: [PATCH] remove lp migration logic

---
 Cargo.lock                                    | 267 +------
 .../lockdrop-vault-for-cl-pools/.cargo/config |   4 -
 .../lockdrop-vault-for-cl-pools/Cargo.toml    |  36 -
 .../lockdrop-vault-for-cl-pools/README.md     |   3 -
 .../examples/schema.rs                        |  31 -
 .../schema/execute_msg.json                   |  94 ---
 .../schema/instantiate_msg.json               |  39 -
 .../schema/query_msg.json                     | 181 -----
 .../src/contract.rs                           | 293 -------
 .../lockdrop-vault-for-cl-pools/src/lib.rs    |   5 -
 .../lockdrop-vault-for-cl-pools/src/state.rs  |   6 -
 .../lockdrop-vault-for-cl-pools/src/tests.rs  | 444 -----------
 .../.cargo/config                             |   4 -
 .../vesting-lp-vault-for-cl-pools/Cargo.toml  |  39 -
 .../vesting-lp-vault-for-cl-pools/README.md   |   3 -
 .../examples/schema.rs                        |  34 -
 .../schema/bonding_status_response.json       |  29 -
 .../schema/dao_response.json                  |   6 -
 .../schema/execute_msg.json                   |  88 ---
 .../schema/get_config_response.json           |  43 --
 .../schema/info_response.json                 |  33 -
 .../schema/instantiate_msg.json               |  44 --
 .../schema/migrate_msg.json                   |   5 -
 .../schema/query_msg.json                     | 181 -----
 .../total_power_at_height_response.json       |  25 -
 .../voting_power_at_height_response.json      |  25 -
 .../src/contract.rs                           | 301 --------
 .../vesting-lp-vault-for-cl-pools/src/lib.rs  |   5 -
 .../src/state.rs                              |   6 -
 .../src/tests.rs                              | 727 ------------------
 .../Cargo.toml                                |  19 -
 .../src/error.rs                              |  25 -
 .../src/lib.rs                                |   4 -
 .../src/msg.rs                                |  51 --
 .../src/types.rs                              |  73 --
 .../src/voting_power.rs                       |  69 --
 .../Cargo.toml                                |  16 -
 .../src/error.rs                              |  28 -
 .../src/lib.rs                                |   3 -
 .../src/msg.rs                                |  54 --
 .../src/types.rs                              |  76 --
 packages/neutron-voting-power/Cargo.toml      |  11 -
 packages/neutron-voting-power/src/lib.rs      |   1 -
 .../neutron-voting-power/src/voting_power.rs  |  34 -
 44 files changed, 10 insertions(+), 3455 deletions(-)
 delete mode 100644 contracts/dao/voting/lockdrop-vault-for-cl-pools/.cargo/config
 delete mode 100644 contracts/dao/voting/lockdrop-vault-for-cl-pools/Cargo.toml
 delete mode 100644 contracts/dao/voting/lockdrop-vault-for-cl-pools/README.md
 delete mode 100644 contracts/dao/voting/lockdrop-vault-for-cl-pools/examples/schema.rs
 delete mode 100644 contracts/dao/voting/lockdrop-vault-for-cl-pools/schema/execute_msg.json
 delete mode 100644 contracts/dao/voting/lockdrop-vault-for-cl-pools/schema/instantiate_msg.json
 delete mode 100644 contracts/dao/voting/lockdrop-vault-for-cl-pools/schema/query_msg.json
 delete mode 100644 contracts/dao/voting/lockdrop-vault-for-cl-pools/src/contract.rs
 delete mode 100644 contracts/dao/voting/lockdrop-vault-for-cl-pools/src/lib.rs
 delete mode 100644 contracts/dao/voting/lockdrop-vault-for-cl-pools/src/state.rs
 delete mode 100644 contracts/dao/voting/lockdrop-vault-for-cl-pools/src/tests.rs
 delete mode 100644 contracts/dao/voting/vesting-lp-vault-for-cl-pools/.cargo/config
 delete mode 100644 contracts/dao/voting/vesting-lp-vault-for-cl-pools/Cargo.toml
 delete mode 100644 contracts/dao/voting/vesting-lp-vault-for-cl-pools/README.md
 delete mode 100644 contracts/dao/voting/vesting-lp-vault-for-cl-pools/examples/schema.rs
 delete mode 100644 contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/bonding_status_response.json
 delete mode 100644 contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/dao_response.json
 delete mode 100644 contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/execute_msg.json
 delete mode 100644 contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/get_config_response.json
 delete mode 100644 contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/info_response.json
 delete mode 100644 contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/instantiate_msg.json
 delete mode 100644 contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/migrate_msg.json
 delete mode 100644 contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/query_msg.json
 delete mode 100644 contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/total_power_at_height_response.json
 delete mode 100644 contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/voting_power_at_height_response.json
 delete mode 100644 contracts/dao/voting/vesting-lp-vault-for-cl-pools/src/contract.rs
 delete mode 100644 contracts/dao/voting/vesting-lp-vault-for-cl-pools/src/lib.rs
 delete mode 100644 contracts/dao/voting/vesting-lp-vault-for-cl-pools/src/state.rs
 delete mode 100644 contracts/dao/voting/vesting-lp-vault-for-cl-pools/src/tests.rs
 delete mode 100644 packages/neutron-lockdrop-vault-for-cl-pools/Cargo.toml
 delete mode 100644 packages/neutron-lockdrop-vault-for-cl-pools/src/error.rs
 delete mode 100644 packages/neutron-lockdrop-vault-for-cl-pools/src/lib.rs
 delete mode 100644 packages/neutron-lockdrop-vault-for-cl-pools/src/msg.rs
 delete mode 100644 packages/neutron-lockdrop-vault-for-cl-pools/src/types.rs
 delete mode 100644 packages/neutron-lockdrop-vault-for-cl-pools/src/voting_power.rs
 delete mode 100644 packages/neutron-vesting-lp-vault-for-cl-pools/Cargo.toml
 delete mode 100644 packages/neutron-vesting-lp-vault-for-cl-pools/src/error.rs
 delete mode 100644 packages/neutron-vesting-lp-vault-for-cl-pools/src/lib.rs
 delete mode 100644 packages/neutron-vesting-lp-vault-for-cl-pools/src/msg.rs
 delete mode 100644 packages/neutron-vesting-lp-vault-for-cl-pools/src/types.rs
 delete mode 100644 packages/neutron-voting-power/Cargo.toml
 delete mode 100644 packages/neutron-voting-power/src/lib.rs
 delete mode 100644 packages/neutron-voting-power/src/voting_power.rs

diff --git a/Cargo.lock b/Cargo.lock
index 49d33860..add039ec 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -32,19 +32,6 @@ dependencies = [
  "uint",
 ]
 
-[[package]]
-name = "astroport"
-version = "2.0.0"
-source = "git+https://github.com/neutron-org/neutron-tge-contracts.git?rev=e306308dd23d567399c15d899f295a910ede945b#e306308dd23d567399c15d899f295a910ede945b"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-storage-plus 0.15.1",
- "cw20 0.15.1",
- "itertools 0.10.5",
- "uint",
-]
-
 [[package]]
 name = "astroport"
 version = "2.0.0"
@@ -72,52 +59,6 @@ dependencies = [
  "uint",
 ]
 
-[[package]]
-name = "astroport"
-version = "2.8.0"
-source = "git+https://github.com/astroport-fi/astroport-core.git?tag=v2.8.0#3b44a4044b823a145730f66ffaf7ae4205b2cd35"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-storage-plus 0.15.1",
- "cw-utils 0.15.1",
- "cw20 0.15.1",
- "itertools 0.10.5",
- "uint",
-]
-
-[[package]]
-name = "astroport-factory"
-version = "1.5.1"
-source = "git+https://github.com/astroport-fi/astroport-core.git?tag=v2.8.0#3b44a4044b823a145730f66ffaf7ae4205b2cd35"
-dependencies = [
- "astroport 2.8.0",
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-storage-plus 0.15.1",
- "cw2 0.15.1",
- "itertools 0.10.5",
- "protobuf 2.28.0",
- "thiserror",
-]
-
-[[package]]
-name = "astroport-pair-concentrated"
-version = "1.2.0"
-source = "git+https://github.com/astroport-fi/astroport-core.git?tag=v2.8.0#3b44a4044b823a145730f66ffaf7ae4205b2cd35"
-dependencies = [
- "astroport 2.8.0",
- "astroport-factory",
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-storage-plus 0.15.1",
- "cw-utils 0.15.1",
- "cw2 0.15.1",
- "cw20 0.15.1",
- "itertools 0.10.5",
- "thiserror",
-]
-
 [[package]]
 name = "astroport-periphery"
 version = "1.1.0"
@@ -133,36 +74,6 @@ dependencies = [
  "terraswap",
 ]
 
-[[package]]
-name = "astroport-periphery"
-version = "1.1.0"
-source = "git+https://github.com/neutron-org/neutron-tge-contracts.git?rev=e306308dd23d567399c15d899f295a910ede945b#e306308dd23d567399c15d899f295a910ede945b"
-dependencies = [
- "astroport 2.5.0",
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-storage-plus 0.15.1",
- "cw20 0.13.4",
- "schemars",
- "serde",
- "terraswap",
-]
-
-[[package]]
-name = "astroport-xastro-token"
-version = "1.0.2"
-source = "git+https://github.com/astroport-fi/astroport-core.git?tag=v2.8.0#3b44a4044b823a145730f66ffaf7ae4205b2cd35"
-dependencies = [
- "astroport 2.8.0",
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-storage-plus 0.15.1",
- "cw2 0.15.1",
- "cw20 0.15.1",
- "cw20-base 0.15.1",
- "snafu",
-]
-
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -495,7 +406,7 @@ dependencies = [
  "cosmwasm-std",
  "cw-multi-test",
  "cw20 1.1.1",
- "cw20-base 1.1.1",
+ "cw20-base",
  "schemars",
  "serde",
  "thiserror",
@@ -783,24 +694,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "cw20-base"
-version = "0.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0909c56d0c14601fbdc69382189799482799dcad87587926aec1f3aa321abc41"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-storage-plus 0.15.1",
- "cw-utils 0.15.1",
- "cw2 0.15.1",
- "cw20 0.15.1",
- "schemars",
- "semver",
- "serde",
- "thiserror",
-]
-
 [[package]]
 name = "cw20-base"
 version = "1.1.1"
@@ -1052,7 +945,7 @@ dependencies = [
  "cw-utils 1.0.2",
  "cw2 1.1.1",
  "cw20 1.1.1",
- "cw20-base 1.1.1",
+ "cw20-base",
  "cw4-group",
  "cwd-core",
  "cwd-interface",
@@ -1101,7 +994,7 @@ dependencies = [
  "cw-utils 1.0.2",
  "cw2 1.1.1",
  "cw20 1.1.1",
- "cw20-base 1.1.1",
+ "cw20-base",
  "cw4-group",
  "cwd-core",
  "cwd-interface",
@@ -1138,7 +1031,7 @@ dependencies = [
  "cw-utils 1.0.2",
  "cw2 1.1.1",
  "cw20 1.1.1",
- "cw20-base 1.1.1",
+ "cw20-base",
  "cw3 1.1.1",
  "cw4",
  "cw4-group",
@@ -1178,7 +1071,7 @@ dependencies = [
  "cw-utils 1.0.2",
  "cw2 1.1.1",
  "cw20 1.1.1",
- "cw20-base 1.1.1",
+ "cw20-base",
  "cw3 1.1.1",
  "cw4",
  "cw4-group",
@@ -1289,7 +1182,7 @@ dependencies = [
  "cw-utils 1.0.2",
  "cw2 1.1.1",
  "cw20 1.1.1",
- "cw20-base 1.1.1",
+ "cw20-base",
  "cw3 1.1.1",
  "cw4",
  "cw4-group",
@@ -1352,7 +1245,7 @@ dependencies = [
  "cw-utils 1.0.2",
  "cw2 1.1.1",
  "cw20 1.1.1",
- "cw20-base 1.1.1",
+ "cw20-base",
  "cw4",
  "cw4-group",
  "cw721-base 0.18.0",
@@ -1459,12 +1352,6 @@ dependencies = [
  "subtle",
 ]
 
-[[package]]
-name = "doc-comment"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
-
 [[package]]
 name = "dyn-clone"
 version = "1.0.14"
@@ -1768,7 +1655,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "astroport 2.0.0 (git+https://github.com/neutron-org/neutron-tge-contracts.git?branch=main)",
- "astroport-periphery 1.1.0 (git+https://github.com/neutron-org/neutron-tge-contracts.git?branch=main)",
+ "astroport-periphery",
  "cosmwasm-schema",
  "cosmwasm-std",
  "cw-multi-test",
@@ -1784,28 +1671,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "lockdrop-vault-for-cl-pools"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "astroport 2.0.0 (git+https://github.com/neutron-org/neutron-tge-contracts.git?rev=e306308dd23d567399c15d899f295a910ede945b)",
- "astroport-periphery 1.1.0 (git+https://github.com/neutron-org/neutron-tge-contracts.git?rev=e306308dd23d567399c15d899f295a910ede945b)",
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-multi-test",
- "cw-storage-plus 1.1.0",
- "cw2 1.1.1",
- "cw20 1.1.1",
- "cwd-interface",
- "cwd-macros",
- "cwd-voting",
- "neutron-lockdrop-vault-for-cl-pools",
- "schemars",
- "serde",
- "thiserror",
-]
-
 [[package]]
 name = "neutron-dao-pre-propose-overrule"
 version = "0.1.0"
@@ -1833,7 +1698,7 @@ dependencies = [
 name = "neutron-lockdrop-vault"
 version = "0.1.0"
 dependencies = [
- "astroport-periphery 1.1.0 (git+https://github.com/neutron-org/neutron-tge-contracts.git?branch=main)",
+ "astroport-periphery",
  "cosmwasm-schema",
  "cosmwasm-std",
  "cwd-interface",
@@ -1844,22 +1709,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "neutron-lockdrop-vault-for-cl-pools"
-version = "0.1.0"
-dependencies = [
- "astroport 2.0.0 (git+https://github.com/neutron-org/neutron-tge-contracts.git?rev=e306308dd23d567399c15d899f295a910ede945b)",
- "astroport-periphery 1.1.0 (git+https://github.com/neutron-org/neutron-tge-contracts.git?rev=e306308dd23d567399c15d899f295a910ede945b)",
- "cosmwasm-schema",
- "cosmwasm-std",
- "cwd-interface",
- "cwd-macros",
- "neutron-voting-power",
- "schemars",
- "serde",
- "thiserror",
-]
-
 [[package]]
 name = "neutron-oracle"
 version = "0.1.0"
@@ -2009,27 +1858,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "neutron-vesting-lp-vault-for-cl-pools"
-version = "0.1.0"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cwd-interface",
- "cwd-macros",
- "schemars",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "neutron-voting-power"
-version = "0.1.0"
-dependencies = [
- "astroport 2.8.0",
- "cosmwasm-std",
-]
-
 [[package]]
 name = "neutron-voting-registry"
 version = "0.3.0"
@@ -2469,27 +2297,6 @@ dependencies = [
  "rand_core 0.6.4",
 ]
 
-[[package]]
-name = "snafu"
-version = "0.6.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eab12d3c261b2308b0d80c26fffb58d17eba81a4be97890101f416b478c79ca7"
-dependencies = [
- "doc-comment",
- "snafu-derive",
-]
-
-[[package]]
-name = "snafu-derive"
-version = "0.6.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1508efa03c362e23817f96cde18abed596a25219a8b2c66e8db33c03543d315b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "spki"
 version = "0.6.0"
@@ -2679,22 +2486,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "vesting-base"
-version = "1.1.0"
-source = "git+https://github.com/neutron-org/neutron-tge-contracts.git?rev=e306308dd23d567399c15d899f295a910ede945b#e306308dd23d567399c15d899f295a910ede945b"
-dependencies = [
- "astroport 2.0.0 (git+https://github.com/neutron-org/neutron-tge-contracts.git?rev=e306308dd23d567399c15d899f295a910ede945b)",
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-storage-plus 0.15.1",
- "cw-utils 0.15.1",
- "cw2 0.15.1",
- "cw20 0.15.1",
- "serde",
- "thiserror",
-]
-
 [[package]]
 name = "vesting-base"
 version = "1.1.0"
@@ -2724,19 +2515,6 @@ dependencies = [
  "vesting-base 1.1.0 (git+https://github.com/neutron-org/neutron-tge-contracts.git?branch=main)",
 ]
 
-[[package]]
-name = "vesting-lp"
-version = "1.1.0"
-source = "git+https://github.com/neutron-org/neutron-tge-contracts.git?rev=e306308dd23d567399c15d899f295a910ede945b#e306308dd23d567399c15d899f295a910ede945b"
-dependencies = [
- "astroport 2.0.0 (git+https://github.com/neutron-org/neutron-tge-contracts.git?rev=e306308dd23d567399c15d899f295a910ede945b)",
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-storage-plus 0.15.1",
- "cw2 0.15.1",
- "vesting-base 1.1.0 (git+https://github.com/neutron-org/neutron-tge-contracts.git?rev=e306308dd23d567399c15d899f295a910ede945b)",
-]
-
 [[package]]
 name = "vesting-lp-vault"
 version = "0.1.0"
@@ -2755,32 +2533,7 @@ dependencies = [
  "serde",
  "thiserror",
  "vesting-base 1.1.0 (git+https://github.com/neutron-org/neutron-tge-contracts.git?branch=main)",
- "vesting-lp 1.1.0 (git+https://github.com/neutron-org/neutron-tge-contracts.git?branch=main)",
-]
-
-[[package]]
-name = "vesting-lp-vault-for-cl-pools"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "astroport 2.0.0 (git+https://github.com/neutron-org/neutron-tge-contracts.git?rev=e306308dd23d567399c15d899f295a910ede945b)",
- "astroport 2.8.0",
- "astroport-pair-concentrated",
- "astroport-xastro-token",
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-multi-test",
- "cw-storage-plus 1.1.0",
- "cw2 1.1.1",
- "cwd-interface",
- "cwd-macros",
- "neutron-vesting-lp-vault-for-cl-pools",
- "neutron-voting-power",
- "schemars",
- "serde",
- "thiserror",
- "vesting-base 1.1.0 (git+https://github.com/neutron-org/neutron-tge-contracts.git?rev=e306308dd23d567399c15d899f295a910ede945b)",
- "vesting-lp 1.1.0 (git+https://github.com/neutron-org/neutron-tge-contracts.git?rev=e306308dd23d567399c15d899f295a910ede945b)",
+ "vesting-lp",
 ]
 
 [[package]]
diff --git a/contracts/dao/voting/lockdrop-vault-for-cl-pools/.cargo/config b/contracts/dao/voting/lockdrop-vault-for-cl-pools/.cargo/config
deleted file mode 100644
index 336b618a..00000000
--- a/contracts/dao/voting/lockdrop-vault-for-cl-pools/.cargo/config
+++ /dev/null
@@ -1,4 +0,0 @@
-[alias]
-wasm = "build --release --target wasm32-unknown-unknown"
-unit-test = "test --lib"
-schema = "run --example schema"
diff --git a/contracts/dao/voting/lockdrop-vault-for-cl-pools/Cargo.toml b/contracts/dao/voting/lockdrop-vault-for-cl-pools/Cargo.toml
deleted file mode 100644
index 579a5177..00000000
--- a/contracts/dao/voting/lockdrop-vault-for-cl-pools/Cargo.toml
+++ /dev/null
@@ -1,36 +0,0 @@
-[package]
-name = "lockdrop-vault-for-cl-pools"
-version = "0.1.0"
-authors = ["Sergei Sotnikov <sergei.s@p2p.org>"]
-edition = "2021"
-license = "Apache-2.0"
-repository = "https://github.com/neutron/neutron-dao"
-
-[lib]
-crate-type = ["cdylib", "rlib"]
-
-[features]
-# for more explicit tests, cargo test --features=backtraces
-backtraces = ["cosmwasm-std/backtraces"]
-# use library feature to disable all instantiate/execute/query exports
-library = []
-
-[dependencies]
-cosmwasm-std = { version = "1.3.0" }
-cw-storage-plus = "1.1.0"
-cw2 = "1.1.0"
-cw20 = "1.1.0"
-schemars = "0.8.8"
-serde = { version = "1.0.175", default-features = false, features = ["derive"] }
-thiserror = { version = "1.0" }
-cwd-macros = { path = "../../../../packages/cwd-macros" }
-cwd-interface = { path = "../../../../packages/cwd-interface" }
-cwd-voting = { path = "../../../../packages/cwd-voting" }
-neutron-lockdrop-vault-for-cl-pools = { path = "../../../../packages/neutron-lockdrop-vault-for-cl-pools" }
-astroport-periphery = { package="astroport-periphery", git = "https://github.com/neutron-org/neutron-tge-contracts.git", rev = "e306308dd23d567399c15d899f295a910ede945b" }
-astroport = { package="astroport", git = "https://github.com/neutron-org/neutron-tge-contracts.git", rev = "e306308dd23d567399c15d899f295a910ede945b" }
-
-[dev-dependencies]
-cosmwasm-schema = { version = "^1.2.1" }
-cw-multi-test = "0.16.5"
-anyhow = "1.0.57"
diff --git a/contracts/dao/voting/lockdrop-vault-for-cl-pools/README.md b/contracts/dao/voting/lockdrop-vault-for-cl-pools/README.md
deleted file mode 100644
index d9277633..00000000
--- a/contracts/dao/voting/lockdrop-vault-for-cl-pools/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-### Neutron Lockdrop Voting Vault
-
-This contract is not really a voting vault. It's rather an interface to get voting power from a Lockdrop contract. It's not possible to Bond or Unbond funds to this vault cause these ExecuteMsg handlers are introduced just to make the contract comply with the voting vault interface.
diff --git a/contracts/dao/voting/lockdrop-vault-for-cl-pools/examples/schema.rs b/contracts/dao/voting/lockdrop-vault-for-cl-pools/examples/schema.rs
deleted file mode 100644
index 9293d06d..00000000
--- a/contracts/dao/voting/lockdrop-vault-for-cl-pools/examples/schema.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2022 Neutron
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-use std::env::current_dir;
-use std::fs::create_dir_all;
-
-use cosmwasm_schema::{export_schema, remove_schemas, schema_for};
-
-use neutron_lockdrop_vault_for_cl_pools::msg::{ExecuteMsg, InstantiateMsg, QueryMsg};
-
-fn main() {
-    let mut out_dir = current_dir().unwrap();
-    out_dir.push("schema");
-    create_dir_all(&out_dir).unwrap();
-    remove_schemas(&out_dir).unwrap();
-
-    export_schema(&schema_for!(InstantiateMsg), &out_dir);
-    export_schema(&schema_for!(ExecuteMsg), &out_dir);
-    export_schema(&schema_for!(QueryMsg), &out_dir);
-}
diff --git a/contracts/dao/voting/lockdrop-vault-for-cl-pools/schema/execute_msg.json b/contracts/dao/voting/lockdrop-vault-for-cl-pools/schema/execute_msg.json
deleted file mode 100644
index f9553568..00000000
--- a/contracts/dao/voting/lockdrop-vault-for-cl-pools/schema/execute_msg.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "ExecuteMsg",
-  "oneOf": [
-    {
-      "type": "object",
-      "required": [
-        "update_config"
-      ],
-      "properties": {
-        "update_config": {
-          "type": "object",
-          "properties": {
-            "atom_cl_pool_contract": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "description": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "lockdrop_contract": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "name": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "owner": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "usdc_cl_pool_contract": {
-              "type": [
-                "string",
-                "null"
-              ]
-            }
-          }
-        }
-      },
-      "additionalProperties": false
-    },
-    {
-      "type": "object",
-      "required": [
-        "bond"
-      ],
-      "properties": {
-        "bond": {
-          "type": "object"
-        }
-      },
-      "additionalProperties": false
-    },
-    {
-      "type": "object",
-      "required": [
-        "unbond"
-      ],
-      "properties": {
-        "unbond": {
-          "type": "object",
-          "required": [
-            "amount"
-          ],
-          "properties": {
-            "amount": {
-              "$ref": "#/definitions/Uint128"
-            }
-          }
-        }
-      },
-      "additionalProperties": false
-    }
-  ],
-  "definitions": {
-    "Uint128": {
-      "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
-      "type": "string"
-    }
-  }
-}
diff --git a/contracts/dao/voting/lockdrop-vault-for-cl-pools/schema/instantiate_msg.json b/contracts/dao/voting/lockdrop-vault-for-cl-pools/schema/instantiate_msg.json
deleted file mode 100644
index b8baf0bb..00000000
--- a/contracts/dao/voting/lockdrop-vault-for-cl-pools/schema/instantiate_msg.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "InstantiateMsg",
-  "type": "object",
-  "required": [
-    "atom_cl_pool_contract",
-    "description",
-    "lockdrop_contract",
-    "name",
-    "owner",
-    "usdc_cl_pool_contract"
-  ],
-  "properties": {
-    "atom_cl_pool_contract": {
-      "description": "The ATOM/NTRN CL pool oracle contract.",
-      "type": "string"
-    },
-    "description": {
-      "description": "Description contains information that characterizes the vault.",
-      "type": "string"
-    },
-    "lockdrop_contract": {
-      "description": "The lockdrop contract behind the vault.",
-      "type": "string"
-    },
-    "name": {
-      "description": "Name contains the vault name which is used to ease the vault's recognition.",
-      "type": "string"
-    },
-    "owner": {
-      "description": "Owner can update all configs including changing the owner. This will generally be a DAO.",
-      "type": "string"
-    },
-    "usdc_cl_pool_contract": {
-      "description": "The USDC/NTRN CL pool contract.",
-      "type": "string"
-    }
-  }
-}
diff --git a/contracts/dao/voting/lockdrop-vault-for-cl-pools/schema/query_msg.json b/contracts/dao/voting/lockdrop-vault-for-cl-pools/schema/query_msg.json
deleted file mode 100644
index da19bedd..00000000
--- a/contracts/dao/voting/lockdrop-vault-for-cl-pools/schema/query_msg.json
+++ /dev/null
@@ -1,181 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "QueryMsg",
-  "oneOf": [
-    {
-      "type": "object",
-      "required": [
-        "config"
-      ],
-      "properties": {
-        "config": {
-          "type": "object",
-          "additionalProperties": false
-        }
-      },
-      "additionalProperties": false
-    },
-    {
-      "type": "object",
-      "required": [
-        "voting_power_at_height"
-      ],
-      "properties": {
-        "voting_power_at_height": {
-          "type": "object",
-          "required": [
-            "address"
-          ],
-          "properties": {
-            "address": {
-              "type": "string"
-            },
-            "height": {
-              "type": [
-                "integer",
-                "null"
-              ],
-              "format": "uint64",
-              "minimum": 0.0
-            }
-          },
-          "additionalProperties": false
-        }
-      },
-      "additionalProperties": false
-    },
-    {
-      "type": "object",
-      "required": [
-        "total_power_at_height"
-      ],
-      "properties": {
-        "total_power_at_height": {
-          "type": "object",
-          "properties": {
-            "height": {
-              "type": [
-                "integer",
-                "null"
-              ],
-              "format": "uint64",
-              "minimum": 0.0
-            }
-          },
-          "additionalProperties": false
-        }
-      },
-      "additionalProperties": false
-    },
-    {
-      "type": "object",
-      "required": [
-        "bonding_status"
-      ],
-      "properties": {
-        "bonding_status": {
-          "type": "object",
-          "required": [
-            "address"
-          ],
-          "properties": {
-            "address": {
-              "type": "string"
-            },
-            "height": {
-              "type": [
-                "integer",
-                "null"
-              ],
-              "format": "uint64",
-              "minimum": 0.0
-            }
-          },
-          "additionalProperties": false
-        }
-      },
-      "additionalProperties": false
-    },
-    {
-      "type": "object",
-      "required": [
-        "dao"
-      ],
-      "properties": {
-        "dao": {
-          "type": "object",
-          "additionalProperties": false
-        }
-      },
-      "additionalProperties": false
-    },
-    {
-      "type": "object",
-      "required": [
-        "name"
-      ],
-      "properties": {
-        "name": {
-          "type": "object",
-          "additionalProperties": false
-        }
-      },
-      "additionalProperties": false
-    },
-    {
-      "type": "object",
-      "required": [
-        "description"
-      ],
-      "properties": {
-        "description": {
-          "type": "object",
-          "additionalProperties": false
-        }
-      },
-      "additionalProperties": false
-    },
-    {
-      "type": "object",
-      "required": [
-        "list_bonders"
-      ],
-      "properties": {
-        "list_bonders": {
-          "type": "object",
-          "properties": {
-            "limit": {
-              "type": [
-                "integer",
-                "null"
-              ],
-              "format": "uint32",
-              "minimum": 0.0
-            },
-            "start_after": {
-              "type": [
-                "string",
-                "null"
-              ]
-            }
-          },
-          "additionalProperties": false
-        }
-      },
-      "additionalProperties": false
-    },
-    {
-      "type": "object",
-      "required": [
-        "info"
-      ],
-      "properties": {
-        "info": {
-          "type": "object",
-          "additionalProperties": false
-        }
-      },
-      "additionalProperties": false
-    }
-  ]
-}
diff --git a/contracts/dao/voting/lockdrop-vault-for-cl-pools/src/contract.rs b/contracts/dao/voting/lockdrop-vault-for-cl-pools/src/contract.rs
deleted file mode 100644
index fccd8a11..00000000
--- a/contracts/dao/voting/lockdrop-vault-for-cl-pools/src/contract.rs
+++ /dev/null
@@ -1,293 +0,0 @@
-#[cfg(not(feature = "library"))]
-use cosmwasm_std::entry_point;
-use cosmwasm_std::{to_binary, Binary, Deps, DepsMut, Env, MessageInfo, Response, Uint128};
-use cw2::set_contract_version;
-use cwd_interface::voting::{
-    BondingStatusResponse, TotalPowerAtHeightResponse, VotingPowerAtHeightResponse,
-};
-use neutron_lockdrop_vault_for_cl_pools::voting_power::{
-    get_voting_power_for_address, get_voting_power_total,
-};
-
-use crate::state::{CONFIG, DAO};
-
-use astroport_periphery::lockdrop::PoolType;
-use neutron_lockdrop_vault_for_cl_pools::error::{ContractError, ContractResult};
-use neutron_lockdrop_vault_for_cl_pools::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
-use neutron_lockdrop_vault_for_cl_pools::types::Config;
-
-pub(crate) const CONTRACT_NAME: &str = "crates.io:neutron-lockdrop-vault-for-cl-pools";
-pub(crate) const CONTRACT_VERSION: &str = env!("CARGO_PKG_VERSION");
-
-#[cfg_attr(not(feature = "library"), entry_point)]
-pub fn instantiate(
-    deps: DepsMut,
-    _env: Env,
-    info: MessageInfo,
-    msg: InstantiateMsg,
-) -> ContractResult<Response> {
-    set_contract_version(deps.storage, CONTRACT_NAME, CONTRACT_VERSION)?;
-
-    let owner = deps.api.addr_validate(&msg.owner)?;
-
-    let config = Config {
-        name: msg.name,
-        description: msg.description,
-        lockdrop_contract: deps.api.addr_validate(&msg.lockdrop_contract)?,
-        usdc_cl_pool_contract: deps.api.addr_validate(&msg.usdc_cl_pool_contract)?,
-        atom_cl_pool_contract: deps.api.addr_validate(&msg.atom_cl_pool_contract)?,
-        owner,
-    };
-    config.validate()?;
-    CONFIG.save(deps.storage, &config)?;
-    DAO.save(deps.storage, &info.sender)?;
-
-    Ok(Response::new()
-        .add_attribute("action", "instantiate")
-        .add_attribute("name", config.name)
-        .add_attribute("description", config.description)
-        .add_attribute("owner", config.owner)
-        .add_attribute("lockdrop_contract", config.lockdrop_contract)
-        .add_attribute("oracle_usdc_contract", config.usdc_cl_pool_contract)
-        .add_attribute("oracle_atom_contract", config.atom_cl_pool_contract))
-}
-
-#[cfg_attr(not(feature = "library"), entry_point)]
-pub fn execute(
-    deps: DepsMut,
-    env: Env,
-    info: MessageInfo,
-    msg: ExecuteMsg,
-) -> ContractResult<Response> {
-    match msg {
-        ExecuteMsg::Bond {} => execute_bond(deps, env, info),
-        ExecuteMsg::Unbond { amount } => execute_unbond(deps, env, info, amount),
-        ExecuteMsg::UpdateConfig {
-            owner,
-            lockdrop_contract,
-            usdc_cl_pool_contract,
-            atom_cl_pool_contract,
-            name,
-            description,
-        } => execute_update_config(
-            deps,
-            info,
-            owner,
-            lockdrop_contract,
-            usdc_cl_pool_contract,
-            atom_cl_pool_contract,
-            name,
-            description,
-        ),
-    }
-}
-
-pub fn execute_bond(_deps: DepsMut, _env: Env, _info: MessageInfo) -> ContractResult<Response> {
-    Err(ContractError::BondingDisabled {})
-}
-
-pub fn execute_unbond(
-    _deps: DepsMut,
-    _env: Env,
-    _info: MessageInfo,
-    _amount: Uint128,
-) -> ContractResult<Response> {
-    Err(ContractError::DirectUnbondingDisabled {})
-}
-
-#[allow(clippy::too_many_arguments)]
-pub fn execute_update_config(
-    deps: DepsMut,
-    info: MessageInfo,
-    new_owner: Option<String>,
-    new_lockdrop_contract: Option<String>,
-    new_usdc_cl_pool_contract: Option<String>,
-    new_atom_cl_pool_contract: Option<String>,
-    new_name: Option<String>,
-    new_description: Option<String>,
-) -> ContractResult<Response> {
-    let mut config: Config = CONFIG.load(deps.storage)?;
-    if info.sender != config.owner {
-        return Err(ContractError::Unauthorized {});
-    }
-
-    let new_owner = new_owner
-        .map(|new_owner| deps.api.addr_validate(&new_owner))
-        .transpose()?;
-
-    let new_lockdrop_contract = new_lockdrop_contract
-        .map(|new_lockdrop_contract| deps.api.addr_validate(&new_lockdrop_contract))
-        .transpose()?;
-
-    let new_usdc_pool_contract = new_usdc_cl_pool_contract
-        .map(|new_usdc_pool_contract| deps.api.addr_validate(&new_usdc_pool_contract))
-        .transpose()?;
-
-    let new_atom_pool_contract = new_atom_cl_pool_contract
-        .map(|new_atom_pool_contract| deps.api.addr_validate(&new_atom_pool_contract))
-        .transpose()?;
-
-    if let Some(owner) = new_owner {
-        config.owner = owner;
-    }
-
-    if let Some(lockdrop_contract) = new_lockdrop_contract {
-        config.lockdrop_contract = lockdrop_contract;
-    }
-    if let Some(oracle_contract) = new_usdc_pool_contract {
-        config.usdc_cl_pool_contract = oracle_contract;
-    }
-    if let Some(oracle_contract) = new_atom_pool_contract {
-        config.atom_cl_pool_contract = oracle_contract;
-    }
-    if let Some(name) = new_name {
-        config.name = name;
-    }
-    if let Some(description) = new_description {
-        config.description = description;
-    }
-
-    config.validate()?;
-    CONFIG.save(deps.storage, &config)?;
-
-    Ok(Response::new()
-        .add_attribute("action", "update_config")
-        .add_attribute("description", config.description)
-        .add_attribute("owner", config.owner)
-        .add_attribute("lockdrop_contract", config.lockdrop_contract)
-        .add_attribute("oracle_usdc_contract", config.usdc_cl_pool_contract)
-        .add_attribute("oracle_atom_contract", config.atom_cl_pool_contract))
-}
-
-#[cfg_attr(not(feature = "library"), entry_point)]
-pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> ContractResult<Binary> {
-    match msg {
-        QueryMsg::VotingPowerAtHeight { address, height } => Ok(to_binary(
-            &query_voting_power_at_height(deps, env, address, height)?,
-        )?),
-        QueryMsg::TotalPowerAtHeight { height } => {
-            Ok(to_binary(&query_total_power_at_height(deps, env, height)?)?)
-        }
-        QueryMsg::Info {} => query_info(deps),
-        QueryMsg::Dao {} => query_dao(deps),
-        QueryMsg::Name {} => query_name(deps),
-        QueryMsg::Description {} => query_description(deps),
-        QueryMsg::Config {} => query_config(deps),
-        QueryMsg::ListBonders { start_after, limit } => {
-            query_list_bonders(deps, start_after, limit)
-        }
-        QueryMsg::BondingStatus { height, address } => Ok(to_binary(&query_bonding_status(
-            deps, env, height, address,
-        )?)?),
-    }
-}
-
-pub fn query_voting_power_at_height(
-    deps: Deps,
-    env: Env,
-    address: String,
-    height: Option<u64>,
-) -> ContractResult<VotingPowerAtHeightResponse> {
-    let config = CONFIG.load(deps.storage)?;
-
-    let height = height.unwrap_or(env.block.height);
-
-    let atom_power = get_voting_power_for_address(
-        deps,
-        &config.lockdrop_contract,
-        &config.atom_cl_pool_contract,
-        PoolType::ATOM,
-        address.clone(),
-        height,
-    )?;
-    let usdc_power = get_voting_power_for_address(
-        deps,
-        &config.lockdrop_contract,
-        &config.usdc_cl_pool_contract,
-        PoolType::USDC,
-        address,
-        height,
-    )?;
-
-    let power = atom_power + usdc_power;
-
-    Ok(VotingPowerAtHeightResponse { power, height })
-}
-
-pub fn query_total_power_at_height(
-    deps: Deps,
-    env: Env,
-    height: Option<u64>,
-) -> ContractResult<TotalPowerAtHeightResponse> {
-    let config = CONFIG.load(deps.storage)?;
-
-    let height = height.unwrap_or(env.block.height);
-
-    let atom_power = get_voting_power_total(
-        deps,
-        &config.lockdrop_contract,
-        &config.atom_cl_pool_contract,
-        PoolType::ATOM,
-        height,
-    )?;
-    let usdc_power = get_voting_power_total(
-        deps,
-        &config.lockdrop_contract,
-        &config.usdc_cl_pool_contract,
-        PoolType::USDC,
-        height,
-    )?;
-
-    let power = atom_power + usdc_power;
-
-    Ok(TotalPowerAtHeightResponse { power, height })
-}
-
-pub fn query_info(deps: Deps) -> ContractResult<Binary> {
-    let info = cw2::get_contract_version(deps.storage)?;
-    Ok(to_binary(&cwd_interface::voting::InfoResponse { info })?)
-}
-
-pub fn query_dao(deps: Deps) -> ContractResult<Binary> {
-    let dao = DAO.load(deps.storage)?;
-    Ok(to_binary(&dao)?)
-}
-
-pub fn query_name(deps: Deps) -> ContractResult<Binary> {
-    let config = CONFIG.load(deps.storage)?;
-    Ok(to_binary(&config.name)?)
-}
-
-pub fn query_description(deps: Deps) -> ContractResult<Binary> {
-    let config = CONFIG.load(deps.storage)?;
-    Ok(to_binary(&config.description)?)
-}
-
-pub fn query_config(deps: Deps) -> ContractResult<Binary> {
-    let config = CONFIG.load(deps.storage)?;
-    Ok(to_binary(&config)?)
-}
-
-pub fn query_list_bonders(
-    _deps: Deps,
-    _start_after: Option<String>,
-    _limit: Option<u32>,
-) -> ContractResult<Binary> {
-    Err(ContractError::BondingDisabled {})
-}
-
-pub fn query_bonding_status(
-    _deps: Deps,
-    _env: Env,
-    _height: Option<u64>,
-    _address: String,
-) -> ContractResult<BondingStatusResponse> {
-    Err(ContractError::BondingDisabled {})
-}
-
-#[cfg_attr(not(feature = "library"), entry_point)]
-pub fn migrate(deps: DepsMut, _env: Env, _: MigrateMsg) -> ContractResult<Response> {
-    set_contract_version(deps.storage, CONTRACT_NAME, CONTRACT_VERSION)?;
-
-    Ok(Response::default())
-}
diff --git a/contracts/dao/voting/lockdrop-vault-for-cl-pools/src/lib.rs b/contracts/dao/voting/lockdrop-vault-for-cl-pools/src/lib.rs
deleted file mode 100644
index da3bbc25..00000000
--- a/contracts/dao/voting/lockdrop-vault-for-cl-pools/src/lib.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-pub mod contract;
-pub mod state;
-
-#[cfg(test)]
-mod tests;
diff --git a/contracts/dao/voting/lockdrop-vault-for-cl-pools/src/state.rs b/contracts/dao/voting/lockdrop-vault-for-cl-pools/src/state.rs
deleted file mode 100644
index fd89a2d1..00000000
--- a/contracts/dao/voting/lockdrop-vault-for-cl-pools/src/state.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use cosmwasm_std::Addr;
-use cw_storage_plus::Item;
-use neutron_lockdrop_vault_for_cl_pools::types::Config;
-
-pub const CONFIG: Item<Config> = Item::new("config");
-pub const DAO: Item<Addr> = Item::new("dao");
diff --git a/contracts/dao/voting/lockdrop-vault-for-cl-pools/src/tests.rs b/contracts/dao/voting/lockdrop-vault-for-cl-pools/src/tests.rs
deleted file mode 100644
index d97a7e64..00000000
--- a/contracts/dao/voting/lockdrop-vault-for-cl-pools/src/tests.rs
+++ /dev/null
@@ -1,444 +0,0 @@
-use crate::contract::{migrate, CONTRACT_NAME, CONTRACT_VERSION};
-use cosmwasm_std::testing::{mock_dependencies, mock_env};
-use cosmwasm_std::{coins, Addr, Coin, Empty, Uint128};
-use cw_multi_test::{custom_app, App, AppResponse, Contract, ContractWrapper, Executor};
-use cwd_interface::voting::InfoResponse;
-use neutron_lockdrop_vault_for_cl_pools::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
-use neutron_lockdrop_vault_for_cl_pools::types::Config;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-
-const DAO_ADDR: &str = "dao";
-const NAME: &str = "name";
-const NEW_NAME: &str = "new_name";
-const DESCRIPTION: &str = "description";
-const NEW_DESCRIPTION: &str = "new description";
-const LOCKDROP_ADDR: &str = "lockdrop";
-const USDC_CL_POOL_ADDR: &str = "usdc_cl_pool";
-const ATOM_CL_POOL_ADDR: &str = "atom_cl_pool";
-const NEW_LOCKDROP_ADDR: &str = "new_lockdrop";
-const NEW_USDC_CL_POOL_ADDR: &str = "new_usdc_cl_pool";
-const NEW_ATOM_CL_POOL_ADDR: &str = "new_atom_cl_pool";
-const ADDR1: &str = "addr1";
-const ADDR2: &str = "addr2";
-const DENOM: &str = "ujuno";
-const INIT_BALANCE: Uint128 = Uint128::new(10000);
-
-fn vault_contract() -> Box<dyn Contract<Empty>> {
-    let contract = ContractWrapper::new(
-        crate::contract::execute,
-        crate::contract::instantiate,
-        crate::contract::query,
-    );
-    Box::new(contract)
-}
-
-fn mock_app() -> App {
-    custom_app(|r, _a, s| {
-        r.bank
-            .init_balance(
-                s,
-                &Addr::unchecked(DAO_ADDR),
-                vec![Coin {
-                    denom: DENOM.to_string(),
-                    amount: INIT_BALANCE,
-                }],
-            )
-            .unwrap();
-        r.bank
-            .init_balance(
-                s,
-                &Addr::unchecked(ADDR1),
-                vec![Coin {
-                    denom: DENOM.to_string(),
-                    amount: INIT_BALANCE,
-                }],
-            )
-            .unwrap();
-        r.bank
-            .init_balance(
-                s,
-                &Addr::unchecked(ADDR2),
-                vec![Coin {
-                    denom: DENOM.to_string(),
-                    amount: INIT_BALANCE,
-                }],
-            )
-            .unwrap();
-    })
-}
-
-#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone)]
-#[serde(rename_all = "snake_case")]
-pub struct EmptyMsg {}
-
-fn instantiate_vault(app: &mut App, id: u64, msg: InstantiateMsg) -> Addr {
-    app.instantiate_contract(id, Addr::unchecked(DAO_ADDR), &msg, &[], "vault", None)
-        .unwrap()
-}
-
-fn bond_tokens(
-    app: &mut App,
-    contract_addr: Addr,
-    sender: &str,
-    amount: u128,
-    denom: &str,
-) -> anyhow::Result<AppResponse> {
-    app.execute_contract(
-        Addr::unchecked(sender),
-        contract_addr,
-        &ExecuteMsg::Bond {},
-        &coins(amount, denom),
-    )
-}
-
-fn unbond_tokens(
-    app: &mut App,
-    contract_addr: Addr,
-    sender: &str,
-    amount: u128,
-) -> anyhow::Result<AppResponse> {
-    app.execute_contract(
-        Addr::unchecked(sender),
-        contract_addr,
-        &ExecuteMsg::Unbond {
-            amount: Uint128::new(amount),
-        },
-        &[],
-    )
-}
-
-#[allow(clippy::too_many_arguments)]
-fn update_config(
-    app: &mut App,
-    contract_addr: Addr,
-    sender: &str,
-    owner: Option<String>,
-    lockdrop_contract: Option<String>,
-    usdc_cl_pool_contract: Option<String>,
-    atom_cl_pool_contract: Option<String>,
-    name: Option<String>,
-    description: Option<String>,
-) -> anyhow::Result<AppResponse> {
-    app.execute_contract(
-        Addr::unchecked(sender),
-        contract_addr,
-        &ExecuteMsg::UpdateConfig {
-            owner,
-            lockdrop_contract,
-            usdc_cl_pool_contract,
-            atom_cl_pool_contract,
-            name,
-            description,
-        },
-        &[],
-    )
-}
-
-fn get_config(app: &mut App, contract_addr: Addr) -> Config {
-    app.wrap()
-        .query_wasm_smart(contract_addr, &QueryMsg::Config {})
-        .unwrap()
-}
-
-fn get_dao(app: &App, contract_addr: &Addr) -> String {
-    app.wrap()
-        .query_wasm_smart(contract_addr, &QueryMsg::Dao {})
-        .unwrap()
-}
-
-#[test]
-fn test_instantiate() {
-    let mut app = mock_app();
-    let vault_id = app.store_code(vault_contract());
-    let addr = instantiate_vault(
-        &mut app,
-        vault_id,
-        InstantiateMsg {
-            name: NAME.to_string(),
-            description: DESCRIPTION.to_string(),
-            owner: DAO_ADDR.to_string(),
-            lockdrop_contract: LOCKDROP_ADDR.to_string(),
-            usdc_cl_pool_contract: USDC_CL_POOL_ADDR.to_string(),
-            atom_cl_pool_contract: ATOM_CL_POOL_ADDR.to_string(),
-        },
-    );
-    assert_eq!(get_dao(&app, &addr), String::from(DAO_ADDR));
-}
-
-#[test]
-#[should_panic(expected = "Bonding is not available for this contract")]
-fn test_bond() {
-    let mut app = mock_app();
-    let vault_id = app.store_code(vault_contract());
-    let addr = instantiate_vault(
-        &mut app,
-        vault_id,
-        InstantiateMsg {
-            name: NAME.to_string(),
-            description: DESCRIPTION.to_string(),
-            owner: DAO_ADDR.to_string(),
-            lockdrop_contract: LOCKDROP_ADDR.to_string(),
-            usdc_cl_pool_contract: USDC_CL_POOL_ADDR.to_string(),
-            atom_cl_pool_contract: ATOM_CL_POOL_ADDR.to_string(),
-        },
-    );
-
-    // Try and bond an invalid denom
-    bond_tokens(&mut app, addr, ADDR1, 100, DENOM).unwrap();
-}
-
-#[test]
-#[should_panic(expected = "Direct unbonding is not available for this contract")]
-fn test_unbond() {
-    let mut app = mock_app();
-    let vault_id = app.store_code(vault_contract());
-    let addr = instantiate_vault(
-        &mut app,
-        vault_id,
-        InstantiateMsg {
-            name: NAME.to_string(),
-            description: DESCRIPTION.to_string(),
-            owner: DAO_ADDR.to_string(),
-            lockdrop_contract: LOCKDROP_ADDR.to_string(),
-            usdc_cl_pool_contract: USDC_CL_POOL_ADDR.to_string(),
-            atom_cl_pool_contract: ATOM_CL_POOL_ADDR.to_string(),
-        },
-    );
-
-    unbond_tokens(&mut app, addr, ADDR1, 100).unwrap();
-}
-
-#[test]
-#[should_panic(expected = "Unauthorized")]
-fn test_update_config_unauthorized() {
-    let mut app = mock_app();
-    let vault_id = app.store_code(vault_contract());
-    let addr = instantiate_vault(
-        &mut app,
-        vault_id,
-        InstantiateMsg {
-            name: NAME.to_string(),
-            description: DESCRIPTION.to_string(),
-            owner: DAO_ADDR.to_string(),
-            lockdrop_contract: LOCKDROP_ADDR.to_string(),
-            usdc_cl_pool_contract: USDC_CL_POOL_ADDR.to_string(),
-            atom_cl_pool_contract: ATOM_CL_POOL_ADDR.to_string(),
-        },
-    );
-
-    // From ADDR2, so not owner
-    update_config(
-        &mut app,
-        addr,
-        ADDR2,
-        Some(ADDR1.to_string()),
-        Some(NEW_LOCKDROP_ADDR.to_string()),
-        Some(NEW_USDC_CL_POOL_ADDR.to_string()),
-        Some(NEW_ATOM_CL_POOL_ADDR.to_string()),
-        Some(NEW_NAME.to_string()),
-        Some(NEW_DESCRIPTION.to_string()),
-    )
-    .unwrap();
-}
-
-#[test]
-fn test_update_config_as_owner() {
-    let mut app = mock_app();
-    let vault_id = app.store_code(vault_contract());
-    let addr = instantiate_vault(
-        &mut app,
-        vault_id,
-        InstantiateMsg {
-            name: NAME.to_string(),
-            description: DESCRIPTION.to_string(),
-            owner: DAO_ADDR.to_string(),
-            lockdrop_contract: LOCKDROP_ADDR.to_string(),
-            usdc_cl_pool_contract: USDC_CL_POOL_ADDR.to_string(),
-            atom_cl_pool_contract: ATOM_CL_POOL_ADDR.to_string(),
-        },
-    );
-
-    // Change owner, description, name and lockdrop contract
-    update_config(
-        &mut app,
-        addr.clone(),
-        DAO_ADDR,
-        Some(ADDR1.to_string()),
-        Some(NEW_LOCKDROP_ADDR.to_string()),
-        Some(NEW_USDC_CL_POOL_ADDR.to_string()),
-        Some(NEW_ATOM_CL_POOL_ADDR.to_string()),
-        Some(NEW_NAME.to_string()),
-        Some(NEW_DESCRIPTION.to_string()),
-    )
-    .unwrap();
-
-    let config = get_config(&mut app, addr);
-    assert_eq!(
-        Config {
-            name: NEW_NAME.to_string(),
-            description: NEW_DESCRIPTION.to_string(),
-            owner: Addr::unchecked(ADDR1),
-            lockdrop_contract: Addr::unchecked(NEW_LOCKDROP_ADDR),
-            usdc_cl_pool_contract: Addr::unchecked(NEW_USDC_CL_POOL_ADDR),
-            atom_cl_pool_contract: Addr::unchecked(NEW_ATOM_CL_POOL_ADDR),
-        },
-        config
-    );
-}
-
-#[test]
-#[should_panic(expected = "config description cannot be empty.")]
-fn test_update_config_invalid_description() {
-    let mut app = mock_app();
-    let vault_id = app.store_code(vault_contract());
-    let addr = instantiate_vault(
-        &mut app,
-        vault_id,
-        InstantiateMsg {
-            name: NAME.to_string(),
-            description: DESCRIPTION.to_string(),
-            owner: DAO_ADDR.to_string(),
-            lockdrop_contract: LOCKDROP_ADDR.to_string(),
-            usdc_cl_pool_contract: USDC_CL_POOL_ADDR.to_string(),
-            atom_cl_pool_contract: ATOM_CL_POOL_ADDR.to_string(),
-        },
-    );
-
-    // Change name
-    update_config(
-        &mut app,
-        addr,
-        DAO_ADDR,
-        Some(DAO_ADDR.to_string()),
-        Some(LOCKDROP_ADDR.to_string()),
-        Some(USDC_CL_POOL_ADDR.to_string()),
-        Some(ATOM_CL_POOL_ADDR.to_string()),
-        Some(NEW_NAME.to_string()),
-        Some(String::from("")),
-    )
-    .unwrap();
-}
-
-#[test]
-#[should_panic(expected = "config name cannot be empty.")]
-fn test_update_config_invalid_name() {
-    let mut app = mock_app();
-    let vault_id = app.store_code(vault_contract());
-    let addr = instantiate_vault(
-        &mut app,
-        vault_id,
-        InstantiateMsg {
-            name: NAME.to_string(),
-            description: DESCRIPTION.to_string(),
-            owner: DAO_ADDR.to_string(),
-            lockdrop_contract: LOCKDROP_ADDR.to_string(),
-            usdc_cl_pool_contract: USDC_CL_POOL_ADDR.to_string(),
-            atom_cl_pool_contract: ATOM_CL_POOL_ADDR.to_string(),
-        },
-    );
-
-    // Change description
-    update_config(
-        &mut app,
-        addr,
-        DAO_ADDR,
-        Some(DAO_ADDR.to_string()),
-        Some(LOCKDROP_ADDR.to_string()),
-        Some(USDC_CL_POOL_ADDR.to_string()),
-        Some(ATOM_CL_POOL_ADDR.to_string()),
-        Some(String::from("")),
-        Some(NEW_DESCRIPTION.to_string()),
-    )
-    .unwrap();
-}
-
-#[test]
-fn test_query_dao() {
-    let mut app = mock_app();
-    let vault_id = app.store_code(vault_contract());
-    let addr = instantiate_vault(
-        &mut app,
-        vault_id,
-        InstantiateMsg {
-            name: NAME.to_string(),
-            description: DESCRIPTION.to_string(),
-            owner: DAO_ADDR.to_string(),
-            lockdrop_contract: LOCKDROP_ADDR.to_string(),
-            usdc_cl_pool_contract: USDC_CL_POOL_ADDR.to_string(),
-            atom_cl_pool_contract: ATOM_CL_POOL_ADDR.to_string(),
-        },
-    );
-
-    let msg = QueryMsg::Dao {};
-    let dao: Addr = app.wrap().query_wasm_smart(addr, &msg).unwrap();
-    assert_eq!(dao, Addr::unchecked(DAO_ADDR));
-}
-
-#[test]
-fn test_query_info() {
-    let mut app = mock_app();
-    let vault_id = app.store_code(vault_contract());
-    let addr = instantiate_vault(
-        &mut app,
-        vault_id,
-        InstantiateMsg {
-            name: NAME.to_string(),
-            description: DESCRIPTION.to_string(),
-            owner: DAO_ADDR.to_string(),
-            lockdrop_contract: LOCKDROP_ADDR.to_string(),
-            usdc_cl_pool_contract: USDC_CL_POOL_ADDR.to_string(),
-            atom_cl_pool_contract: ATOM_CL_POOL_ADDR.to_string(),
-        },
-    );
-
-    let msg = QueryMsg::Info {};
-    let resp: InfoResponse = app.wrap().query_wasm_smart(addr, &msg).unwrap();
-    assert_eq!(
-        resp.info.contract,
-        "crates.io:neutron-lockdrop-vault-for-cl-pools"
-    );
-}
-
-#[test]
-fn test_query_get_config() {
-    let mut app = mock_app();
-    let vault_id = app.store_code(vault_contract());
-    let addr = instantiate_vault(
-        &mut app,
-        vault_id,
-        InstantiateMsg {
-            name: NAME.to_string(),
-            description: DESCRIPTION.to_string(),
-            owner: DAO_ADDR.to_string(),
-            lockdrop_contract: LOCKDROP_ADDR.to_string(),
-            usdc_cl_pool_contract: USDC_CL_POOL_ADDR.to_string(),
-            atom_cl_pool_contract: ATOM_CL_POOL_ADDR.to_string(),
-        },
-    );
-
-    let config = get_config(&mut app, addr);
-    assert_eq!(
-        config,
-        Config {
-            name: NAME.to_string(),
-            description: DESCRIPTION.to_string(),
-            owner: Addr::unchecked(DAO_ADDR),
-            lockdrop_contract: Addr::unchecked(LOCKDROP_ADDR),
-            usdc_cl_pool_contract: Addr::unchecked(USDC_CL_POOL_ADDR),
-            atom_cl_pool_contract: Addr::unchecked(ATOM_CL_POOL_ADDR),
-        }
-    )
-}
-
-#[test]
-pub fn test_migrate_update_version() {
-    let mut deps = mock_dependencies();
-    cw2::set_contract_version(&mut deps.storage, "my-contract", "old-version").unwrap();
-
-    migrate(deps.as_mut(), mock_env(), MigrateMsg {}).unwrap();
-    let version = cw2::get_contract_version(&deps.storage).unwrap();
-
-    assert_eq!(version.version, CONTRACT_VERSION);
-    assert_eq!(version.contract, CONTRACT_NAME);
-}
diff --git a/contracts/dao/voting/vesting-lp-vault-for-cl-pools/.cargo/config b/contracts/dao/voting/vesting-lp-vault-for-cl-pools/.cargo/config
deleted file mode 100644
index 336b618a..00000000
--- a/contracts/dao/voting/vesting-lp-vault-for-cl-pools/.cargo/config
+++ /dev/null
@@ -1,4 +0,0 @@
-[alias]
-wasm = "build --release --target wasm32-unknown-unknown"
-unit-test = "test --lib"
-schema = "run --example schema"
diff --git a/contracts/dao/voting/vesting-lp-vault-for-cl-pools/Cargo.toml b/contracts/dao/voting/vesting-lp-vault-for-cl-pools/Cargo.toml
deleted file mode 100644
index b950ea48..00000000
--- a/contracts/dao/voting/vesting-lp-vault-for-cl-pools/Cargo.toml
+++ /dev/null
@@ -1,39 +0,0 @@
-[package]
-name = "vesting-lp-vault-for-cl-pools"
-version = "0.1.0"
-authors = ["Sergei Sotnikov <sergei.s@p2p.org>", "Murad Karammaev <karammaev.murad@p2p.org>"]
-edition = "2021"
-license = "Apache-2.0"
-repository = "https://github.com/neutron/neutron-dao"
-
-[lib]
-crate-type = ["cdylib", "rlib"]
-
-[features]
-# for more explicit tests, cargo test --features=backtraces
-backtraces = ["cosmwasm-std/backtraces"]
-# use library feature to disable all instantiate/execute/query exports
-library = []
-
-[dependencies]
-cosmwasm-std = { version = "1.3.0" }
-cw-storage-plus = "1.1.0"
-cw2 = "1.1.0"
-schemars = "0.8.8"
-serde = { version = "1.0.175", default-features = false, features = ["derive"] }
-thiserror = { version = "1.0" }
-cwd-macros = { path = "../../../../packages/cwd-macros" }
-cwd-interface = { path = "../../../../packages/cwd-interface" }
-neutron-vesting-lp-vault-for-cl-pools = { path = "../../../../packages/neutron-vesting-lp-vault-for-cl-pools" }
-neutron-voting-power = { path = "../../../../packages/neutron-voting-power" }
-vesting-base = { git = "https://github.com/neutron-org/neutron-tge-contracts", rev = "e306308dd23d567399c15d899f295a910ede945b" }
-vesting-lp = { git = "https://github.com/neutron-org/neutron-tge-contracts", rev = "e306308dd23d567399c15d899f295a910ede945b" }
-astroport = { package="astroport", git = "https://github.com/neutron-org/neutron-tge-contracts.git", rev = "e306308dd23d567399c15d899f295a910ede945b" }
-
-[dev-dependencies]
-cosmwasm-schema = { version = "1.3.0" }
-cw-multi-test = "0.16.5"
-anyhow = "1.0.57"
-astroport-xastro-token = { git = "https://github.com/astroport-fi/astroport-core.git", tag = "v2.8.0" }
-astroport-pair-concentrated = { git = "https://github.com/astroport-fi/astroport-core.git", tag = "v2.8.0" }
-astroport-original = { package = "astroport", git = "https://github.com/astroport-fi/astroport-core.git", tag = "v2.8.0" }
\ No newline at end of file
diff --git a/contracts/dao/voting/vesting-lp-vault-for-cl-pools/README.md b/contracts/dao/voting/vesting-lp-vault-for-cl-pools/README.md
deleted file mode 100644
index b7c0e790..00000000
--- a/contracts/dao/voting/vesting-lp-vault-for-cl-pools/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-### Neutron Vesting LP Voting Vault
-
-This contract is not really a voting vault. It's rather an interface to get voting power from a Vesting LP contract. It's not possible to Bond or Unbond funds to this vault cause these ExecuteMsg handlers are introduced just to make the contract comply with the voting vault interface.
diff --git a/contracts/dao/voting/vesting-lp-vault-for-cl-pools/examples/schema.rs b/contracts/dao/voting/vesting-lp-vault-for-cl-pools/examples/schema.rs
deleted file mode 100644
index 2d4c537b..00000000
--- a/contracts/dao/voting/vesting-lp-vault-for-cl-pools/examples/schema.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-use std::env::current_dir;
-use std::fs::create_dir_all;
-
-use cosmwasm_schema::{export_schema, export_schema_with_title, remove_schemas, schema_for};
-use cosmwasm_std::Addr;
-use cwd_interface::voting::{
-    BondingStatusResponse, InfoResponse, TotalPowerAtHeightResponse, VotingPowerAtHeightResponse,
-};
-use neutron_vesting_lp_vault_for_cl_pools::{
-    msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg},
-    types::Config,
-};
-
-fn main() {
-    let mut out_dir = current_dir().unwrap();
-    out_dir.push("schema");
-    create_dir_all(&out_dir).unwrap();
-    remove_schemas(&out_dir).unwrap();
-
-    export_schema(&schema_for!(InstantiateMsg), &out_dir);
-    export_schema(&schema_for!(ExecuteMsg), &out_dir);
-    export_schema(&schema_for!(QueryMsg), &out_dir);
-    export_schema(&schema_for!(MigrateMsg), &out_dir);
-
-    export_schema(&schema_for!(InfoResponse), &out_dir);
-    export_schema(&schema_for!(TotalPowerAtHeightResponse), &out_dir);
-    export_schema(&schema_for!(VotingPowerAtHeightResponse), &out_dir);
-    export_schema(&schema_for!(BondingStatusResponse), &out_dir);
-
-    // Auto TS code generation expects the query return type as QueryNameResponse
-    // Here we map query resonses to the correct name
-    export_schema_with_title(&schema_for!(Addr), &out_dir, "DaoResponse");
-    export_schema_with_title(&schema_for!(Config), &out_dir, "GetConfigResponse");
-}
diff --git a/contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/bonding_status_response.json b/contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/bonding_status_response.json
deleted file mode 100644
index 8fcbb2be..00000000
--- a/contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/bonding_status_response.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "BondingStatusResponse",
-  "type": "object",
-  "required": [
-    "bonding_enabled",
-    "height",
-    "unbondable_abount"
-  ],
-  "properties": {
-    "bonding_enabled": {
-      "type": "boolean"
-    },
-    "height": {
-      "type": "integer",
-      "format": "uint64",
-      "minimum": 0.0
-    },
-    "unbondable_abount": {
-      "$ref": "#/definitions/Uint128"
-    }
-  },
-  "definitions": {
-    "Uint128": {
-      "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
-      "type": "string"
-    }
-  }
-}
diff --git a/contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/dao_response.json b/contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/dao_response.json
deleted file mode 100644
index 9518ba3b..00000000
--- a/contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/dao_response.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "DaoResponse",
-  "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
-  "type": "string"
-}
diff --git a/contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/execute_msg.json b/contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/execute_msg.json
deleted file mode 100644
index ad012325..00000000
--- a/contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/execute_msg.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "ExecuteMsg",
-  "oneOf": [
-    {
-      "type": "object",
-      "required": [
-        "update_config"
-      ],
-      "properties": {
-        "update_config": {
-          "type": "object",
-          "required": [
-            "atom_cl_pool_contract",
-            "atom_vesting_lp_contract",
-            "description",
-            "name",
-            "owner",
-            "usdc_cl_pool_contract",
-            "usdc_vesting_lp_contract"
-          ],
-          "properties": {
-            "atom_cl_pool_contract": {
-              "type": "string"
-            },
-            "atom_vesting_lp_contract": {
-              "type": "string"
-            },
-            "description": {
-              "type": "string"
-            },
-            "name": {
-              "type": "string"
-            },
-            "owner": {
-              "type": "string"
-            },
-            "usdc_cl_pool_contract": {
-              "type": "string"
-            },
-            "usdc_vesting_lp_contract": {
-              "type": "string"
-            }
-          }
-        }
-      },
-      "additionalProperties": false
-    },
-    {
-      "type": "object",
-      "required": [
-        "bond"
-      ],
-      "properties": {
-        "bond": {
-          "type": "object"
-        }
-      },
-      "additionalProperties": false
-    },
-    {
-      "type": "object",
-      "required": [
-        "unbond"
-      ],
-      "properties": {
-        "unbond": {
-          "type": "object",
-          "required": [
-            "amount"
-          ],
-          "properties": {
-            "amount": {
-              "$ref": "#/definitions/Uint128"
-            }
-          }
-        }
-      },
-      "additionalProperties": false
-    }
-  ],
-  "definitions": {
-    "Uint128": {
-      "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
-      "type": "string"
-    }
-  }
-}
diff --git a/contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/get_config_response.json b/contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/get_config_response.json
deleted file mode 100644
index 9d7c2f88..00000000
--- a/contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/get_config_response.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "GetConfigResponse",
-  "type": "object",
-  "required": [
-    "atom_cl_pool_contract",
-    "atom_vesting_lp_contract",
-    "description",
-    "name",
-    "owner",
-    "usdc_cl_pool_contract",
-    "usdc_vesting_lp_contract"
-  ],
-  "properties": {
-    "atom_cl_pool_contract": {
-      "$ref": "#/definitions/Addr"
-    },
-    "atom_vesting_lp_contract": {
-      "$ref": "#/definitions/Addr"
-    },
-    "description": {
-      "type": "string"
-    },
-    "name": {
-      "type": "string"
-    },
-    "owner": {
-      "$ref": "#/definitions/Addr"
-    },
-    "usdc_cl_pool_contract": {
-      "$ref": "#/definitions/Addr"
-    },
-    "usdc_vesting_lp_contract": {
-      "$ref": "#/definitions/Addr"
-    }
-  },
-  "definitions": {
-    "Addr": {
-      "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
-      "type": "string"
-    }
-  }
-}
diff --git a/contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/info_response.json b/contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/info_response.json
deleted file mode 100644
index 1419f2c2..00000000
--- a/contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/info_response.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "InfoResponse",
-  "type": "object",
-  "required": [
-    "info"
-  ],
-  "properties": {
-    "info": {
-      "$ref": "#/definitions/ContractVersion"
-    }
-  },
-  "definitions": {
-    "ContractVersion": {
-      "type": "object",
-      "required": [
-        "contract",
-        "version"
-      ],
-      "properties": {
-        "contract": {
-          "description": "contract is the crate name of the implementing contract, eg. `crate:cw20-base` we will use other prefixes for other languages, and their standard global namespacing",
-          "type": "string"
-        },
-        "version": {
-          "description": "version is any string that this implementation knows. It may be simple counter \"1\", \"2\". or semantic version on release tags \"v0.7.0\", or some custom feature flag list. the only code that needs to understand the version parsing is code that knows how to migrate from the given contract (and is tied to it's implementation somehow)",
-          "type": "string"
-        }
-      },
-      "additionalProperties": false
-    }
-  }
-}
diff --git a/contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/instantiate_msg.json b/contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/instantiate_msg.json
deleted file mode 100644
index ea001c18..00000000
--- a/contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/instantiate_msg.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "InstantiateMsg",
-  "type": "object",
-  "required": [
-    "atom_cl_pool_contract",
-    "atom_vesting_lp_contract",
-    "description",
-    "name",
-    "owner",
-    "usdc_cl_pool_contract",
-    "usdc_vesting_lp_contract"
-  ],
-  "properties": {
-    "atom_cl_pool_contract": {
-      "description": "The ATOM/NTRN CL pool contract.",
-      "type": "string"
-    },
-    "atom_vesting_lp_contract": {
-      "description": "The ATOM Vesting LP contract behind the vault.",
-      "type": "string"
-    },
-    "description": {
-      "description": "Description contains information that characterizes the vault.",
-      "type": "string"
-    },
-    "name": {
-      "description": "Name contains the vault name which is used to ease the vault's recognition.",
-      "type": "string"
-    },
-    "owner": {
-      "description": "Owner can update all configs including changing the owner. This will generally be a DAO.",
-      "type": "string"
-    },
-    "usdc_cl_pool_contract": {
-      "description": "The USDC/NTRN CL pool oracle contract.",
-      "type": "string"
-    },
-    "usdc_vesting_lp_contract": {
-      "description": "The USDC Vesting LP contract behind the vault.",
-      "type": "string"
-    }
-  }
-}
diff --git a/contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/migrate_msg.json b/contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/migrate_msg.json
deleted file mode 100644
index 87b18ea7..00000000
--- a/contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/migrate_msg.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "MigrateMsg",
-  "type": "object"
-}
diff --git a/contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/query_msg.json b/contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/query_msg.json
deleted file mode 100644
index da19bedd..00000000
--- a/contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/query_msg.json
+++ /dev/null
@@ -1,181 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "QueryMsg",
-  "oneOf": [
-    {
-      "type": "object",
-      "required": [
-        "config"
-      ],
-      "properties": {
-        "config": {
-          "type": "object",
-          "additionalProperties": false
-        }
-      },
-      "additionalProperties": false
-    },
-    {
-      "type": "object",
-      "required": [
-        "voting_power_at_height"
-      ],
-      "properties": {
-        "voting_power_at_height": {
-          "type": "object",
-          "required": [
-            "address"
-          ],
-          "properties": {
-            "address": {
-              "type": "string"
-            },
-            "height": {
-              "type": [
-                "integer",
-                "null"
-              ],
-              "format": "uint64",
-              "minimum": 0.0
-            }
-          },
-          "additionalProperties": false
-        }
-      },
-      "additionalProperties": false
-    },
-    {
-      "type": "object",
-      "required": [
-        "total_power_at_height"
-      ],
-      "properties": {
-        "total_power_at_height": {
-          "type": "object",
-          "properties": {
-            "height": {
-              "type": [
-                "integer",
-                "null"
-              ],
-              "format": "uint64",
-              "minimum": 0.0
-            }
-          },
-          "additionalProperties": false
-        }
-      },
-      "additionalProperties": false
-    },
-    {
-      "type": "object",
-      "required": [
-        "bonding_status"
-      ],
-      "properties": {
-        "bonding_status": {
-          "type": "object",
-          "required": [
-            "address"
-          ],
-          "properties": {
-            "address": {
-              "type": "string"
-            },
-            "height": {
-              "type": [
-                "integer",
-                "null"
-              ],
-              "format": "uint64",
-              "minimum": 0.0
-            }
-          },
-          "additionalProperties": false
-        }
-      },
-      "additionalProperties": false
-    },
-    {
-      "type": "object",
-      "required": [
-        "dao"
-      ],
-      "properties": {
-        "dao": {
-          "type": "object",
-          "additionalProperties": false
-        }
-      },
-      "additionalProperties": false
-    },
-    {
-      "type": "object",
-      "required": [
-        "name"
-      ],
-      "properties": {
-        "name": {
-          "type": "object",
-          "additionalProperties": false
-        }
-      },
-      "additionalProperties": false
-    },
-    {
-      "type": "object",
-      "required": [
-        "description"
-      ],
-      "properties": {
-        "description": {
-          "type": "object",
-          "additionalProperties": false
-        }
-      },
-      "additionalProperties": false
-    },
-    {
-      "type": "object",
-      "required": [
-        "list_bonders"
-      ],
-      "properties": {
-        "list_bonders": {
-          "type": "object",
-          "properties": {
-            "limit": {
-              "type": [
-                "integer",
-                "null"
-              ],
-              "format": "uint32",
-              "minimum": 0.0
-            },
-            "start_after": {
-              "type": [
-                "string",
-                "null"
-              ]
-            }
-          },
-          "additionalProperties": false
-        }
-      },
-      "additionalProperties": false
-    },
-    {
-      "type": "object",
-      "required": [
-        "info"
-      ],
-      "properties": {
-        "info": {
-          "type": "object",
-          "additionalProperties": false
-        }
-      },
-      "additionalProperties": false
-    }
-  ]
-}
diff --git a/contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/total_power_at_height_response.json b/contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/total_power_at_height_response.json
deleted file mode 100644
index 8018462b..00000000
--- a/contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/total_power_at_height_response.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "TotalPowerAtHeightResponse",
-  "type": "object",
-  "required": [
-    "height",
-    "power"
-  ],
-  "properties": {
-    "height": {
-      "type": "integer",
-      "format": "uint64",
-      "minimum": 0.0
-    },
-    "power": {
-      "$ref": "#/definitions/Uint128"
-    }
-  },
-  "definitions": {
-    "Uint128": {
-      "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
-      "type": "string"
-    }
-  }
-}
diff --git a/contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/voting_power_at_height_response.json b/contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/voting_power_at_height_response.json
deleted file mode 100644
index 15e986bf..00000000
--- a/contracts/dao/voting/vesting-lp-vault-for-cl-pools/schema/voting_power_at_height_response.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "VotingPowerAtHeightResponse",
-  "type": "object",
-  "required": [
-    "height",
-    "power"
-  ],
-  "properties": {
-    "height": {
-      "type": "integer",
-      "format": "uint64",
-      "minimum": 0.0
-    },
-    "power": {
-      "$ref": "#/definitions/Uint128"
-    }
-  },
-  "definitions": {
-    "Uint128": {
-      "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
-      "type": "string"
-    }
-  }
-}
diff --git a/contracts/dao/voting/vesting-lp-vault-for-cl-pools/src/contract.rs b/contracts/dao/voting/vesting-lp-vault-for-cl-pools/src/contract.rs
deleted file mode 100644
index 1f21cdb5..00000000
--- a/contracts/dao/voting/vesting-lp-vault-for-cl-pools/src/contract.rs
+++ /dev/null
@@ -1,301 +0,0 @@
-use astroport::asset::AssetInfo;
-#[cfg(not(feature = "library"))]
-use cosmwasm_std::entry_point;
-use cosmwasm_std::{
-    to_binary, Binary, Deps, DepsMut, Env, MessageInfo, Response, StdError, Uint128,
-};
-use cw2::set_contract_version;
-use cwd_interface::voting::{
-    BondingStatusResponse, TotalPowerAtHeightResponse, VotingPowerAtHeightResponse,
-};
-use serde::Serialize;
-
-use crate::state::{CONFIG, DAO};
-use neutron_vesting_lp_vault_for_cl_pools::{
-    error::{ContractError, ContractResult},
-    msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg},
-    types::Config,
-};
-use neutron_voting_power::voting_power::voting_power_from_lp_tokens;
-use vesting_base::msg::{QueryMsg as VestingLpQueryMsg, QueryMsgHistorical};
-use vesting_base::types::Config as VestingBaseConfig;
-
-pub(crate) const CONTRACT_NAME: &str = "crates.io:neutron-vesting-lp-vault-for-cl-pools";
-pub(crate) const CONTRACT_VERSION: &str = env!("CARGO_PKG_VERSION");
-
-#[cfg_attr(not(feature = "library"), entry_point)]
-pub fn instantiate(
-    deps: DepsMut,
-    _env: Env,
-    info: MessageInfo,
-    msg: InstantiateMsg,
-) -> ContractResult<Response> {
-    set_contract_version(deps.storage, CONTRACT_NAME, CONTRACT_VERSION)?;
-
-    let owner = deps.api.addr_validate(&msg.owner)?;
-
-    let config = Config {
-        name: msg.name,
-        description: msg.description,
-        atom_vesting_lp_contract: deps.api.addr_validate(&msg.atom_vesting_lp_contract)?,
-        atom_cl_pool_contract: deps.api.addr_validate(&msg.atom_cl_pool_contract)?,
-        usdc_vesting_lp_contract: deps.api.addr_validate(&msg.usdc_vesting_lp_contract)?,
-        usdc_cl_pool_contract: deps.api.addr_validate(&msg.usdc_cl_pool_contract)?,
-        owner,
-    };
-    config.validate()?;
-    CONFIG.save(deps.storage, &config)?;
-    DAO.save(deps.storage, &info.sender)?;
-
-    Ok(Response::new()
-        .add_attribute("action", "instantiate")
-        .add_attribute("name", config.name)
-        .add_attribute("description", config.description)
-        .add_attribute("owner", config.owner)
-        .add_attribute("atom_vesting_lp_contract", config.atom_vesting_lp_contract)
-        .add_attribute("atom_cl_pool_contract", config.atom_cl_pool_contract)
-        .add_attribute("usdc_vesting_lp_contract", config.usdc_vesting_lp_contract)
-        .add_attribute("usdc_cl_pool_contract", config.usdc_cl_pool_contract))
-}
-
-#[cfg_attr(not(feature = "library"), entry_point)]
-pub fn execute(
-    deps: DepsMut,
-    env: Env,
-    info: MessageInfo,
-    msg: ExecuteMsg,
-) -> ContractResult<Response> {
-    match msg {
-        ExecuteMsg::Bond {} => execute_bond(deps, env, info),
-        ExecuteMsg::Unbond { amount } => execute_unbond(deps, env, info, amount),
-        ExecuteMsg::UpdateConfig {
-            owner,
-            atom_vesting_lp_contract,
-            atom_cl_pool_contract: atom_oracle_contract,
-            usdc_vesting_lp_contract,
-            usdc_cl_pool_contract: usdc_oracle_contract,
-            name,
-            description,
-        } => execute_update_config(
-            deps,
-            info,
-            owner,
-            atom_vesting_lp_contract,
-            atom_oracle_contract,
-            usdc_vesting_lp_contract,
-            usdc_oracle_contract,
-            name,
-            description,
-        ),
-    }
-}
-
-pub fn execute_bond(_deps: DepsMut, _env: Env, _info: MessageInfo) -> ContractResult<Response> {
-    Err(ContractError::BondingDisabled {})
-}
-
-pub fn execute_unbond(
-    _deps: DepsMut,
-    _env: Env,
-    _info: MessageInfo,
-    _amount: Uint128,
-) -> ContractResult<Response> {
-    Err(ContractError::DirectUnbondingDisabled {})
-}
-
-#[allow(clippy::too_many_arguments)]
-pub fn execute_update_config(
-    deps: DepsMut,
-    info: MessageInfo,
-    new_owner: String,
-    new_atom_vesting_lp_contract: String,
-    new_atom_oracle_contract: String,
-    new_usdc_vesting_lp_contract: String,
-    new_usdc_oracle_contract: String,
-    new_name: String,
-    new_description: String,
-) -> ContractResult<Response> {
-    let mut config: Config = CONFIG.load(deps.storage)?;
-    if info.sender != config.owner {
-        return Err(ContractError::Unauthorized {});
-    }
-
-    let new_owner = deps.api.addr_validate(&new_owner)?;
-    let new_atom_vesting_lp_contract = deps.api.addr_validate(&new_atom_vesting_lp_contract)?;
-    let new_atom_oracle_contract = deps.api.addr_validate(&new_atom_oracle_contract)?;
-    let new_usdc_vesting_lp_contract = deps.api.addr_validate(&new_usdc_vesting_lp_contract)?;
-    let new_usdc_oracle_contract = deps.api.addr_validate(&new_usdc_oracle_contract)?;
-
-    config.owner = new_owner;
-    config.atom_vesting_lp_contract = new_atom_vesting_lp_contract;
-    config.atom_cl_pool_contract = new_atom_oracle_contract;
-    config.usdc_vesting_lp_contract = new_usdc_vesting_lp_contract;
-    config.usdc_cl_pool_contract = new_usdc_oracle_contract;
-    config.name = new_name;
-    config.description = new_description;
-    config.validate()?;
-    CONFIG.save(deps.storage, &config)?;
-
-    Ok(Response::new()
-        .add_attribute("action", "update_config")
-        .add_attribute("description", config.description)
-        .add_attribute("owner", config.owner)
-        .add_attribute("atom_vesting_lp_contract", config.atom_vesting_lp_contract)
-        .add_attribute("atom_oracle_contract", config.atom_cl_pool_contract)
-        .add_attribute("usdc_vesting_lp_contract", config.usdc_vesting_lp_contract)
-        .add_attribute("usdc_oracle_contract", config.usdc_cl_pool_contract))
-}
-
-#[cfg_attr(not(feature = "library"), entry_point)]
-pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> ContractResult<Binary> {
-    match msg {
-        QueryMsg::VotingPowerAtHeight { address, height } => Ok(to_binary(
-            &query_voting_power_at_height(deps, env, address, height)?,
-        )?),
-        QueryMsg::TotalPowerAtHeight { height } => {
-            Ok(to_binary(&query_total_power_at_height(deps, env, height)?)?)
-        }
-        QueryMsg::Info {} => query_info(deps),
-        QueryMsg::Dao {} => query_dao(deps),
-        QueryMsg::Name {} => query_name(deps),
-        QueryMsg::Description {} => query_description(deps),
-        QueryMsg::Config {} => query_config(deps),
-        QueryMsg::ListBonders { start_after, limit } => {
-            query_list_bonders(deps, start_after, limit)
-        }
-        QueryMsg::BondingStatus { height, address } => Ok(to_binary(&query_bonding_status(
-            deps, env, height, address,
-        )?)?),
-    }
-}
-
-fn get_voting_power(
-    deps: Deps,
-    config: &Config,
-    height: u64,
-    query_msg: &impl Serialize,
-) -> ContractResult<Uint128> {
-    let mut voting_power = Uint128::zero();
-    for (vesting_lp, cl_pool) in [
-        (
-            &config.atom_vesting_lp_contract,
-            &config.atom_cl_pool_contract,
-        ),
-        (
-            &config.usdc_vesting_lp_contract,
-            &config.usdc_cl_pool_contract,
-        ),
-    ] {
-        let vesting_base_config: VestingBaseConfig = deps
-            .querier
-            .query_wasm_smart(vesting_lp, &VestingLpQueryMsg::Config {})?;
-        let lp_token_address: AssetInfo = if vesting_base_config.vesting_token.is_some() {
-            vesting_base_config.vesting_token.unwrap()
-        } else {
-            return Err(ContractError::Std(StdError::generic_err(format!(
-                "vesting token is not set in {:?} contract",
-                vesting_lp
-            ))));
-        };
-
-        let lp_total_supply: Uint128 = deps.querier.query_wasm_smart(
-            lp_token_address.to_string(),
-            &astroport::xastro_token::QueryMsg::TotalSupplyAt { block: height },
-        )?;
-
-        voting_power = voting_power.checked_add(voting_power_from_lp_tokens(
-            deps,
-            deps.querier
-                .query_wasm_smart::<Option<Uint128>>(vesting_lp, &query_msg)?
-                .unwrap_or_default(),
-            lp_total_supply,
-            cl_pool,
-            height,
-        )?)?;
-    }
-    Ok(voting_power)
-}
-
-pub fn query_voting_power_at_height(
-    deps: Deps,
-    env: Env,
-    address: String,
-    height: Option<u64>,
-) -> ContractResult<VotingPowerAtHeightResponse> {
-    let config = CONFIG.load(deps.storage)?;
-    let height = height.unwrap_or(env.block.height);
-    let query_msg = VestingLpQueryMsg::HistoricalExtension {
-        msg: QueryMsgHistorical::UnclaimedAmountAtHeight { address, height },
-    };
-
-    Ok(VotingPowerAtHeightResponse {
-        power: get_voting_power(deps, &config, height, &query_msg)?,
-        height,
-    })
-}
-
-pub fn query_total_power_at_height(
-    deps: Deps,
-    env: Env,
-    height: Option<u64>,
-) -> ContractResult<TotalPowerAtHeightResponse> {
-    let config = CONFIG.load(deps.storage)?;
-    let height = height.unwrap_or(env.block.height);
-    let query_msg = VestingLpQueryMsg::HistoricalExtension {
-        msg: QueryMsgHistorical::UnclaimedTotalAmountAtHeight { height },
-    };
-
-    Ok(TotalPowerAtHeightResponse {
-        power: get_voting_power(deps, &config, height, &query_msg)?,
-        height,
-    })
-}
-
-pub fn query_info(deps: Deps) -> ContractResult<Binary> {
-    let info = cw2::get_contract_version(deps.storage)?;
-    Ok(to_binary(&cwd_interface::voting::InfoResponse { info })?)
-}
-
-pub fn query_dao(deps: Deps) -> ContractResult<Binary> {
-    let dao = DAO.load(deps.storage)?;
-    Ok(to_binary(&dao)?)
-}
-
-pub fn query_name(deps: Deps) -> ContractResult<Binary> {
-    let config = CONFIG.load(deps.storage)?;
-    Ok(to_binary(&config.name)?)
-}
-
-pub fn query_description(deps: Deps) -> ContractResult<Binary> {
-    let config = CONFIG.load(deps.storage)?;
-    Ok(to_binary(&config.description)?)
-}
-
-pub fn query_config(deps: Deps) -> ContractResult<Binary> {
-    let config = CONFIG.load(deps.storage)?;
-    Ok(to_binary(&config)?)
-}
-
-pub fn query_list_bonders(
-    _deps: Deps,
-    _start_after: Option<String>,
-    _limit: Option<u32>,
-) -> ContractResult<Binary> {
-    Err(ContractError::BondingDisabled {})
-}
-
-pub fn query_bonding_status(
-    _deps: Deps,
-    _env: Env,
-    _height: Option<u64>,
-    _address: String,
-) -> ContractResult<BondingStatusResponse> {
-    Err(ContractError::BondingDisabled {})
-}
-
-#[cfg_attr(not(feature = "library"), entry_point)]
-pub fn migrate(deps: DepsMut, _env: Env, _: MigrateMsg) -> ContractResult<Response> {
-    set_contract_version(deps.storage, CONTRACT_NAME, CONTRACT_VERSION)?;
-
-    Ok(Response::default())
-}
diff --git a/contracts/dao/voting/vesting-lp-vault-for-cl-pools/src/lib.rs b/contracts/dao/voting/vesting-lp-vault-for-cl-pools/src/lib.rs
deleted file mode 100644
index da3bbc25..00000000
--- a/contracts/dao/voting/vesting-lp-vault-for-cl-pools/src/lib.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-pub mod contract;
-pub mod state;
-
-#[cfg(test)]
-mod tests;
diff --git a/contracts/dao/voting/vesting-lp-vault-for-cl-pools/src/state.rs b/contracts/dao/voting/vesting-lp-vault-for-cl-pools/src/state.rs
deleted file mode 100644
index bfdb04be..00000000
--- a/contracts/dao/voting/vesting-lp-vault-for-cl-pools/src/state.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use cosmwasm_std::Addr;
-use cw_storage_plus::Item;
-use neutron_vesting_lp_vault_for_cl_pools::types::Config;
-
-pub const CONFIG: Item<Config> = Item::new("config");
-pub const DAO: Item<Addr> = Item::new("dao");
diff --git a/contracts/dao/voting/vesting-lp-vault-for-cl-pools/src/tests.rs b/contracts/dao/voting/vesting-lp-vault-for-cl-pools/src/tests.rs
deleted file mode 100644
index e519061a..00000000
--- a/contracts/dao/voting/vesting-lp-vault-for-cl-pools/src/tests.rs
+++ /dev/null
@@ -1,727 +0,0 @@
-use crate::contract::{migrate, CONTRACT_NAME, CONTRACT_VERSION};
-use astroport::asset::AssetInfo;
-use cosmwasm_std::testing::{mock_dependencies, mock_env};
-use cosmwasm_std::{coins, Addr, Coin, Empty, Uint128};
-use cw_multi_test::{custom_app, App, AppResponse, Contract, ContractWrapper, Executor};
-use cwd_interface::voting::{
-    InfoResponse, TotalPowerAtHeightResponse, VotingPowerAtHeightResponse,
-};
-use neutron_vesting_lp_vault_for_cl_pools::{
-    msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg},
-    types::Config,
-};
-
-const DAO_ADDR: &str = "dao";
-const NAME: &str = "name";
-const NEW_NAME: &str = "new_name";
-const DESCRIPTION: &str = "description";
-const NEW_DESCRIPTION: &str = "new description";
-const ATOM_VESTING_LP_ADDR: &str = "atom_vesting_lp";
-const USDC_VESTING_LP_ADDR: &str = "usdc_vesting_lp";
-const ATOM_CL_POOL_ADDR: &str = "atom_cl_pool";
-const USDC_CL_POOL_ADDR: &str = "usdc_cl_pool";
-const NEW_ATOM_VESTING_LP_ADDR: &str = "new_atom_vesting_lp";
-const NEW_USDC_VESTING_LP_ADDR: &str = "new_usdc_vesting_lp";
-const NEW_ATOM_CL_POOL_ADDR: &str = "new_atom_cl_pool";
-const NEW_USDC_CL_POOL_ADDR: &str = "new_usdc_cl_pool";
-const ADDR1: &str = "addr1";
-const ADDR2: &str = "addr2";
-const DENOM: &str = "ujuno";
-const INIT_BALANCE: Uint128 = Uint128::new(10000);
-
-fn vault_contract() -> Box<dyn Contract<Empty>> {
-    let contract = ContractWrapper::new(
-        crate::contract::execute,
-        crate::contract::instantiate,
-        crate::contract::query,
-    );
-    Box::new(contract)
-}
-
-fn lp_token_contract() -> Box<dyn Contract<Empty>> {
-    let contract = ContractWrapper::new(
-        astroport_xastro_token::contract::execute,
-        astroport_xastro_token::contract::instantiate,
-        astroport_xastro_token::contract::query,
-    );
-    Box::new(contract)
-}
-
-fn vesting_lp_contract() -> Box<dyn Contract<Empty>> {
-    let contract = ContractWrapper::new(
-        vesting_lp::contract::execute,
-        vesting_lp::contract::instantiate,
-        vesting_lp::contract::query,
-    );
-    Box::new(contract)
-}
-
-fn mock_app() -> App {
-    custom_app(|r, _a, s| {
-        r.bank
-            .init_balance(
-                s,
-                &Addr::unchecked(DAO_ADDR),
-                vec![Coin {
-                    denom: DENOM.to_string(),
-                    amount: INIT_BALANCE,
-                }],
-            )
-            .unwrap();
-        r.bank
-            .init_balance(
-                s,
-                &Addr::unchecked(ADDR1),
-                vec![Coin {
-                    denom: DENOM.to_string(),
-                    amount: INIT_BALANCE,
-                }],
-            )
-            .unwrap();
-        r.bank
-            .init_balance(
-                s,
-                &Addr::unchecked(ADDR2),
-                vec![Coin {
-                    denom: DENOM.to_string(),
-                    amount: INIT_BALANCE,
-                }],
-            )
-            .unwrap();
-    })
-}
-
-fn instantiate_vault(app: &mut App, id: u64, msg: InstantiateMsg) -> Addr {
-    app.instantiate_contract(id, Addr::unchecked(DAO_ADDR), &msg, &[], "vault", None)
-        .unwrap()
-}
-
-fn instantiate_lp_token(
-    app: &mut App,
-    id: u64,
-    msg: astroport_original::xastro_token::InstantiateMsg,
-) -> Addr {
-    app.instantiate_contract(id, Addr::unchecked(DAO_ADDR), &msg, &[], "lp-token", None)
-        .unwrap()
-}
-
-fn instantiate_vesting_lp(app: &mut App, id: u64, msg: vesting_lp::msg::InstantiateMsg) -> Addr {
-    app.instantiate_contract(id, Addr::unchecked(DAO_ADDR), &msg, &[], "vesting_lp", None)
-        .unwrap()
-}
-
-fn set_vesting_token(
-    app: &mut App,
-    sender: Addr,
-    vesting_contract: Addr,
-    vesting_token: AssetInfo,
-) {
-    app.execute_contract(
-        sender,
-        vesting_contract,
-        &vesting_base::msg::ExecuteMsg::SetVestingToken { vesting_token },
-        &[],
-    )
-    .unwrap();
-}
-
-fn bond_tokens(
-    app: &mut App,
-    contract_addr: Addr,
-    sender: &str,
-    amount: u128,
-    denom: &str,
-) -> anyhow::Result<AppResponse> {
-    app.execute_contract(
-        Addr::unchecked(sender),
-        contract_addr,
-        &ExecuteMsg::Bond {},
-        &coins(amount, denom),
-    )
-}
-
-fn unbond_tokens(
-    app: &mut App,
-    contract_addr: Addr,
-    sender: &str,
-    amount: u128,
-) -> anyhow::Result<AppResponse> {
-    app.execute_contract(
-        Addr::unchecked(sender),
-        contract_addr,
-        &ExecuteMsg::Unbond {
-            amount: Uint128::new(amount),
-        },
-        &[],
-    )
-}
-
-#[allow(clippy::too_many_arguments)]
-fn update_config(
-    app: &mut App,
-    contract_addr: Addr,
-    sender: &str,
-    owner: String,
-    atom_vesting_lp_contract: String,
-    atom_cl_pool_contract: String,
-    usdc_vesting_lp_contract: String,
-    usdc_cl_pool_contract: String,
-    name: String,
-    description: String,
-) -> anyhow::Result<AppResponse> {
-    app.execute_contract(
-        Addr::unchecked(sender),
-        contract_addr,
-        &ExecuteMsg::UpdateConfig {
-            owner,
-            atom_vesting_lp_contract,
-            atom_cl_pool_contract,
-            usdc_vesting_lp_contract,
-            usdc_cl_pool_contract,
-            name,
-            description,
-        },
-        &[],
-    )
-}
-
-fn get_voting_power_at_height(
-    app: &mut App,
-    contract_addr: Addr,
-    address: String,
-    height: Option<u64>,
-) -> VotingPowerAtHeightResponse {
-    app.wrap()
-        .query_wasm_smart(
-            contract_addr,
-            &QueryMsg::VotingPowerAtHeight { address, height },
-        )
-        .unwrap()
-}
-
-fn get_total_power_at_height(
-    app: &mut App,
-    contract_addr: Addr,
-    height: Option<u64>,
-) -> TotalPowerAtHeightResponse {
-    app.wrap()
-        .query_wasm_smart(contract_addr, &QueryMsg::TotalPowerAtHeight { height })
-        .unwrap()
-}
-
-fn get_config(app: &mut App, contract_addr: Addr) -> Config {
-    app.wrap()
-        .query_wasm_smart(contract_addr, &QueryMsg::Config {})
-        .unwrap()
-}
-
-fn get_dao(app: &App, contract_addr: &Addr) -> String {
-    app.wrap()
-        .query_wasm_smart(contract_addr, &QueryMsg::Dao {})
-        .unwrap()
-}
-
-#[test]
-fn test_instantiate() {
-    let mut app = mock_app();
-    let vault_id = app.store_code(vault_contract());
-    // Populated fields
-    let addr = instantiate_vault(
-        &mut app,
-        vault_id,
-        InstantiateMsg {
-            name: NAME.to_string(),
-            description: DESCRIPTION.to_string(),
-            owner: DAO_ADDR.to_string(),
-            atom_vesting_lp_contract: ATOM_VESTING_LP_ADDR.to_string(),
-            atom_cl_pool_contract: ATOM_CL_POOL_ADDR.to_string(),
-            usdc_vesting_lp_contract: USDC_VESTING_LP_ADDR.to_string(),
-            usdc_cl_pool_contract: USDC_CL_POOL_ADDR.to_string(),
-        },
-    );
-    assert_eq!(get_dao(&app, &addr), String::from(DAO_ADDR));
-
-    // Non populated fields
-    let addr = instantiate_vault(
-        &mut app,
-        vault_id,
-        InstantiateMsg {
-            name: NAME.to_string(),
-            description: DESCRIPTION.to_string(),
-            owner: DAO_ADDR.to_string(),
-            atom_vesting_lp_contract: ATOM_VESTING_LP_ADDR.to_string(),
-            atom_cl_pool_contract: ATOM_CL_POOL_ADDR.to_string(),
-            usdc_vesting_lp_contract: USDC_VESTING_LP_ADDR.to_string(),
-            usdc_cl_pool_contract: USDC_CL_POOL_ADDR.to_string(),
-        },
-    );
-    assert_eq!(get_dao(&app, &addr), String::from(DAO_ADDR));
-}
-
-#[test]
-#[should_panic(expected = "Bonding is not available for this contract")]
-fn test_bond() {
-    let mut app = mock_app();
-    let vault_id = app.store_code(vault_contract());
-    let addr = instantiate_vault(
-        &mut app,
-        vault_id,
-        InstantiateMsg {
-            name: NAME.to_string(),
-            description: DESCRIPTION.to_string(),
-            owner: DAO_ADDR.to_string(),
-            atom_vesting_lp_contract: ATOM_VESTING_LP_ADDR.to_string(),
-            atom_cl_pool_contract: ATOM_CL_POOL_ADDR.to_string(),
-            usdc_vesting_lp_contract: USDC_VESTING_LP_ADDR.to_string(),
-            usdc_cl_pool_contract: USDC_CL_POOL_ADDR.to_string(),
-        },
-    );
-
-    // Try and bond an invalid denom
-    bond_tokens(&mut app, addr, ADDR1, 100, DENOM).unwrap();
-}
-
-#[test]
-#[should_panic(expected = "Direct unbonding is not available for this contract")]
-fn test_unbond() {
-    let mut app = mock_app();
-    let vault_id = app.store_code(vault_contract());
-    let addr = instantiate_vault(
-        &mut app,
-        vault_id,
-        InstantiateMsg {
-            name: NAME.to_string(),
-            description: DESCRIPTION.to_string(),
-            owner: DAO_ADDR.to_string(),
-            atom_vesting_lp_contract: ATOM_VESTING_LP_ADDR.to_string(),
-            atom_cl_pool_contract: ATOM_CL_POOL_ADDR.to_string(),
-            usdc_vesting_lp_contract: USDC_VESTING_LP_ADDR.to_string(),
-            usdc_cl_pool_contract: USDC_CL_POOL_ADDR.to_string(),
-        },
-    );
-
-    unbond_tokens(&mut app, addr, ADDR1, 100).unwrap();
-}
-
-#[test]
-#[should_panic(expected = "Unauthorized")]
-fn test_update_config_unauthorized() {
-    let mut app = mock_app();
-    let vault_id = app.store_code(vault_contract());
-    let addr = instantiate_vault(
-        &mut app,
-        vault_id,
-        InstantiateMsg {
-            name: NAME.to_string(),
-            description: DESCRIPTION.to_string(),
-            owner: DAO_ADDR.to_string(),
-            atom_vesting_lp_contract: ATOM_VESTING_LP_ADDR.to_string(),
-            atom_cl_pool_contract: ATOM_CL_POOL_ADDR.to_string(),
-            usdc_vesting_lp_contract: USDC_VESTING_LP_ADDR.to_string(),
-            usdc_cl_pool_contract: USDC_CL_POOL_ADDR.to_string(),
-        },
-    );
-
-    // From ADDR2, so not owner
-    update_config(
-        &mut app,
-        addr,
-        ADDR2,
-        ADDR1.to_string(),
-        NEW_ATOM_VESTING_LP_ADDR.to_string(),
-        NEW_ATOM_CL_POOL_ADDR.to_string(),
-        NEW_USDC_VESTING_LP_ADDR.to_string(),
-        NEW_USDC_CL_POOL_ADDR.to_string(),
-        NEW_NAME.to_string(),
-        NEW_DESCRIPTION.to_string(),
-    )
-    .unwrap();
-}
-
-#[test]
-fn test_update_config() {
-    let mut app = mock_app();
-    let vault_id = app.store_code(vault_contract());
-    let addr = instantiate_vault(
-        &mut app,
-        vault_id,
-        InstantiateMsg {
-            name: NAME.to_string(),
-            description: DESCRIPTION.to_string(),
-            owner: DAO_ADDR.to_string(),
-            atom_vesting_lp_contract: ATOM_VESTING_LP_ADDR.to_string(),
-            atom_cl_pool_contract: ATOM_CL_POOL_ADDR.to_string(),
-            usdc_vesting_lp_contract: USDC_VESTING_LP_ADDR.to_string(),
-            usdc_cl_pool_contract: USDC_CL_POOL_ADDR.to_string(),
-        },
-    );
-
-    // Change owner, description, name, lp-vesting and cl pool contracts
-    update_config(
-        &mut app,
-        addr.clone(),
-        DAO_ADDR,
-        ADDR1.to_string(),
-        NEW_ATOM_VESTING_LP_ADDR.to_string(),
-        NEW_ATOM_CL_POOL_ADDR.to_string(),
-        NEW_USDC_VESTING_LP_ADDR.to_string(),
-        NEW_USDC_CL_POOL_ADDR.to_string(),
-        NEW_NAME.to_string(),
-        NEW_DESCRIPTION.to_string(),
-    )
-    .unwrap();
-
-    let config = get_config(&mut app, addr);
-    assert_eq!(
-        Config {
-            name: NEW_NAME.to_string(),
-            description: NEW_DESCRIPTION.to_string(),
-            owner: Addr::unchecked(ADDR1),
-            atom_vesting_lp_contract: Addr::unchecked(NEW_ATOM_VESTING_LP_ADDR),
-            atom_cl_pool_contract: Addr::unchecked(NEW_ATOM_CL_POOL_ADDR),
-            usdc_vesting_lp_contract: Addr::unchecked(NEW_USDC_VESTING_LP_ADDR),
-            usdc_cl_pool_contract: Addr::unchecked(NEW_USDC_CL_POOL_ADDR),
-        },
-        config
-    );
-}
-
-#[test]
-#[should_panic(expected = "config description cannot be empty.")]
-fn test_update_config_invalid_description() {
-    let mut app = mock_app();
-    let vault_id = app.store_code(vault_contract());
-    let addr = instantiate_vault(
-        &mut app,
-        vault_id,
-        InstantiateMsg {
-            name: NAME.to_string(),
-            description: DESCRIPTION.to_string(),
-            owner: DAO_ADDR.to_string(),
-            atom_vesting_lp_contract: ATOM_VESTING_LP_ADDR.to_string(),
-            atom_cl_pool_contract: ATOM_CL_POOL_ADDR.to_string(),
-            usdc_vesting_lp_contract: USDC_VESTING_LP_ADDR.to_string(),
-            usdc_cl_pool_contract: USDC_CL_POOL_ADDR.to_string(),
-        },
-    );
-
-    // Change name
-    update_config(
-        &mut app,
-        addr,
-        DAO_ADDR,
-        DAO_ADDR.to_string(),
-        ATOM_VESTING_LP_ADDR.to_string(),
-        ATOM_CL_POOL_ADDR.to_string(),
-        USDC_VESTING_LP_ADDR.to_string(),
-        USDC_CL_POOL_ADDR.to_string(),
-        NEW_NAME.to_string(),
-        String::from(""),
-    )
-    .unwrap();
-}
-
-#[test]
-#[should_panic(expected = "config name cannot be empty.")]
-fn test_update_config_invalid_name() {
-    let mut app = mock_app();
-    let vault_id = app.store_code(vault_contract());
-    let addr = instantiate_vault(
-        &mut app,
-        vault_id,
-        InstantiateMsg {
-            name: NAME.to_string(),
-            description: DESCRIPTION.to_string(),
-            owner: DAO_ADDR.to_string(),
-            atom_vesting_lp_contract: ATOM_VESTING_LP_ADDR.to_string(),
-            atom_cl_pool_contract: ATOM_CL_POOL_ADDR.to_string(),
-            usdc_vesting_lp_contract: USDC_VESTING_LP_ADDR.to_string(),
-            usdc_cl_pool_contract: USDC_CL_POOL_ADDR.to_string(),
-        },
-    );
-
-    // Change description
-    update_config(
-        &mut app,
-        addr,
-        DAO_ADDR,
-        DAO_ADDR.to_string(),
-        ATOM_VESTING_LP_ADDR.to_string(),
-        ATOM_CL_POOL_ADDR.to_string(),
-        USDC_VESTING_LP_ADDR.to_string(),
-        USDC_CL_POOL_ADDR.to_string(),
-        String::from(""),
-        NEW_DESCRIPTION.to_string(),
-    )
-    .unwrap();
-}
-
-#[test]
-fn test_query_dao() {
-    let mut app = mock_app();
-    let vault_id = app.store_code(vault_contract());
-    let addr = instantiate_vault(
-        &mut app,
-        vault_id,
-        InstantiateMsg {
-            name: NAME.to_string(),
-            description: DESCRIPTION.to_string(),
-            owner: DAO_ADDR.to_string(),
-            atom_vesting_lp_contract: ATOM_VESTING_LP_ADDR.to_string(),
-            atom_cl_pool_contract: ATOM_CL_POOL_ADDR.to_string(),
-            usdc_vesting_lp_contract: USDC_VESTING_LP_ADDR.to_string(),
-            usdc_cl_pool_contract: USDC_CL_POOL_ADDR.to_string(),
-        },
-    );
-
-    let msg = QueryMsg::Dao {};
-    let dao: Addr = app.wrap().query_wasm_smart(addr, &msg).unwrap();
-    assert_eq!(dao, Addr::unchecked(DAO_ADDR));
-}
-
-#[test]
-fn test_query_info() {
-    let mut app = mock_app();
-    let vault_id = app.store_code(vault_contract());
-    let addr = instantiate_vault(
-        &mut app,
-        vault_id,
-        InstantiateMsg {
-            name: NAME.to_string(),
-            description: DESCRIPTION.to_string(),
-            owner: DAO_ADDR.to_string(),
-            atom_vesting_lp_contract: ATOM_VESTING_LP_ADDR.to_string(),
-            atom_cl_pool_contract: ATOM_CL_POOL_ADDR.to_string(),
-            usdc_vesting_lp_contract: USDC_VESTING_LP_ADDR.to_string(),
-            usdc_cl_pool_contract: USDC_CL_POOL_ADDR.to_string(),
-        },
-    );
-
-    let msg = QueryMsg::Info {};
-    let resp: InfoResponse = app.wrap().query_wasm_smart(addr, &msg).unwrap();
-    assert_eq!(
-        resp.info.contract,
-        "crates.io:neutron-vesting-lp-vault-for-cl-pools"
-    );
-}
-
-#[test]
-fn test_query_get_config() {
-    let mut app = mock_app();
-    let vault_id = app.store_code(vault_contract());
-    let addr = instantiate_vault(
-        &mut app,
-        vault_id,
-        InstantiateMsg {
-            name: NAME.to_string(),
-            description: DESCRIPTION.to_string(),
-            owner: DAO_ADDR.to_string(),
-            atom_vesting_lp_contract: ATOM_VESTING_LP_ADDR.to_string(),
-            atom_cl_pool_contract: ATOM_CL_POOL_ADDR.to_string(),
-            usdc_vesting_lp_contract: USDC_VESTING_LP_ADDR.to_string(),
-            usdc_cl_pool_contract: USDC_CL_POOL_ADDR.to_string(),
-        },
-    );
-
-    let config = get_config(&mut app, addr);
-    assert_eq!(
-        config,
-        Config {
-            name: NAME.to_string(),
-            description: DESCRIPTION.to_string(),
-            owner: Addr::unchecked(DAO_ADDR),
-            atom_vesting_lp_contract: Addr::unchecked(ATOM_VESTING_LP_ADDR),
-            atom_cl_pool_contract: Addr::unchecked(ATOM_CL_POOL_ADDR),
-            usdc_vesting_lp_contract: Addr::unchecked(USDC_VESTING_LP_ADDR),
-            usdc_cl_pool_contract: Addr::unchecked(USDC_CL_POOL_ADDR),
-        }
-    )
-}
-
-#[test]
-fn test_voting_power_at_height() {
-    let mut app = mock_app();
-
-    let vesting_lp_id = app.store_code(vesting_lp_contract());
-    let lp_token_id = app.store_code(lp_token_contract());
-
-    let atom_lp_token_address = instantiate_lp_token(
-        &mut app,
-        lp_token_id,
-        astroport_original::xastro_token::InstantiateMsg {
-            name: "atom".to_string(),
-            symbol: "atom-lp".to_string(),
-            decimals: 6,
-            initial_balances: vec![],
-            mint: None,
-            marketing: None,
-        },
-    );
-    let usdc_lp_token_address = instantiate_lp_token(
-        &mut app,
-        lp_token_id,
-        astroport_original::xastro_token::InstantiateMsg {
-            name: "usdc".to_string(),
-            symbol: "usdc-lp".to_string(),
-            decimals: 6,
-            initial_balances: vec![],
-            mint: None,
-            marketing: None,
-        },
-    );
-
-    let atom_vesting_lp_addr = instantiate_vesting_lp(
-        &mut app,
-        vesting_lp_id,
-        vesting_lp::msg::InstantiateMsg {
-            owner: DAO_ADDR.to_string(),
-            vesting_managers: vec![],
-            token_info_manager: "manager".to_string(),
-        },
-    );
-    let usdc_vesting_lp_addr = instantiate_vesting_lp(
-        &mut app,
-        vesting_lp_id,
-        vesting_lp::msg::InstantiateMsg {
-            owner: DAO_ADDR.to_string(),
-            vesting_managers: vec![],
-            token_info_manager: "manager".to_string(),
-        },
-    );
-
-    set_vesting_token(
-        &mut app,
-        Addr::unchecked("manager".to_string()),
-        usdc_vesting_lp_addr.clone(),
-        AssetInfo::Token {
-            contract_addr: usdc_lp_token_address,
-        },
-    );
-    set_vesting_token(
-        &mut app,
-        Addr::unchecked("manager".to_string()),
-        atom_vesting_lp_addr.clone(),
-        AssetInfo::Token {
-            contract_addr: atom_lp_token_address,
-        },
-    );
-
-    let vault_id = app.store_code(vault_contract());
-    let addr = instantiate_vault(
-        &mut app,
-        vault_id,
-        InstantiateMsg {
-            name: NAME.to_string(),
-            description: DESCRIPTION.to_string(),
-            owner: DAO_ADDR.to_string(),
-            atom_vesting_lp_contract: atom_vesting_lp_addr.to_string(),
-            atom_cl_pool_contract: ATOM_CL_POOL_ADDR.to_string(),
-            usdc_vesting_lp_contract: usdc_vesting_lp_addr.to_string(),
-            usdc_cl_pool_contract: USDC_CL_POOL_ADDR.to_string(),
-        },
-    );
-
-    // describe test when lockdrop contract is implemented. use neutron vault tests as template.
-    let resp = get_voting_power_at_height(&mut app, addr, ADDR1.to_string(), None);
-    assert!(resp.power.is_zero());
-}
-
-#[test]
-fn test_total_power_at_height() {
-    let mut app = mock_app();
-
-    let vesting_lp_id = app.store_code(vesting_lp_contract());
-    let lp_token_id = app.store_code(lp_token_contract());
-
-    let atom_lp_token_address = instantiate_lp_token(
-        &mut app,
-        lp_token_id,
-        astroport_original::xastro_token::InstantiateMsg {
-            name: "atom".to_string(),
-            symbol: "atom-lp".to_string(),
-            decimals: 6,
-            initial_balances: vec![],
-            mint: None,
-            marketing: None,
-        },
-    );
-    let usdc_lp_token_address = instantiate_lp_token(
-        &mut app,
-        lp_token_id,
-        astroport_original::xastro_token::InstantiateMsg {
-            name: "usdc".to_string(),
-            symbol: "usdc-lp".to_string(),
-            decimals: 6,
-            initial_balances: vec![],
-            mint: None,
-            marketing: None,
-        },
-    );
-
-    let atom_vesting_lp_addr = instantiate_vesting_lp(
-        &mut app,
-        vesting_lp_id,
-        vesting_lp::msg::InstantiateMsg {
-            owner: DAO_ADDR.to_string(),
-            vesting_managers: vec![],
-            token_info_manager: "manager".to_string(),
-        },
-    );
-    let usdc_vesting_lp_addr = instantiate_vesting_lp(
-        &mut app,
-        vesting_lp_id,
-        vesting_lp::msg::InstantiateMsg {
-            owner: DAO_ADDR.to_string(),
-            vesting_managers: vec![],
-            token_info_manager: "manager".to_string(),
-        },
-    );
-
-    set_vesting_token(
-        &mut app,
-        Addr::unchecked("manager".to_string()),
-        usdc_vesting_lp_addr.clone(),
-        AssetInfo::Token {
-            contract_addr: usdc_lp_token_address,
-        },
-    );
-    set_vesting_token(
-        &mut app,
-        Addr::unchecked("manager".to_string()),
-        atom_vesting_lp_addr.clone(),
-        AssetInfo::Token {
-            contract_addr: atom_lp_token_address,
-        },
-    );
-
-    let vault_id = app.store_code(vault_contract());
-    let addr = instantiate_vault(
-        &mut app,
-        vault_id,
-        InstantiateMsg {
-            name: NAME.to_string(),
-            description: DESCRIPTION.to_string(),
-            owner: DAO_ADDR.to_string(),
-            atom_vesting_lp_contract: atom_vesting_lp_addr.to_string(),
-            atom_cl_pool_contract: ATOM_CL_POOL_ADDR.to_string(),
-            usdc_vesting_lp_contract: usdc_vesting_lp_addr.to_string(),
-            usdc_cl_pool_contract: USDC_CL_POOL_ADDR.to_string(),
-        },
-    );
-
-    // describe test when lockdrop contract is implemented. use neutron vault tests as template.
-    let resp = get_total_power_at_height(&mut app, addr, None);
-    assert!(resp.power.is_zero());
-}
-
-#[test]
-pub fn test_migrate_update_version() {
-    let mut deps = mock_dependencies();
-    cw2::set_contract_version(&mut deps.storage, "my-contract", "old-version").unwrap();
-
-    migrate(deps.as_mut(), mock_env(), MigrateMsg {}).unwrap();
-    let version = cw2::get_contract_version(&deps.storage).unwrap();
-
-    assert_eq!(version.version, CONTRACT_VERSION);
-    assert_eq!(version.contract, CONTRACT_NAME);
-}
diff --git a/packages/neutron-lockdrop-vault-for-cl-pools/Cargo.toml b/packages/neutron-lockdrop-vault-for-cl-pools/Cargo.toml
deleted file mode 100644
index 4a386738..00000000
--- a/packages/neutron-lockdrop-vault-for-cl-pools/Cargo.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-[package]
-name = "neutron-lockdrop-vault-for-cl-pools"
-version = "0.1.0"
-authors = ["Sergei Sotnikov <sergei.s@p2p.org>"]
-edition = "2021"
-license = "Apache-2.0"
-repository = "https://github.com/neutron/neutron-dao"
-
-[dependencies]
-cosmwasm-schema = {version = "1.3.0"}
-cwd-interface = {path = "../cwd-interface"}
-cosmwasm-std = { version = "1.3.0" }
-cwd-macros = { path = "../cwd-macros" }
-schemars = "0.8.8"
-serde = { version = "1.0.175", default-features = false, features = ["derive"] }
-thiserror = { version = "1.0" }
-astroport-periphery = { package="astroport-periphery", git = "https://github.com/neutron-org/neutron-tge-contracts.git", rev = "e306308dd23d567399c15d899f295a910ede945b" }
-neutron-voting-power = { path = "../neutron-voting-power" }
-astroport = { package="astroport", git = "https://github.com/neutron-org/neutron-tge-contracts.git", rev = "e306308dd23d567399c15d899f295a910ede945b" }
diff --git a/packages/neutron-lockdrop-vault-for-cl-pools/src/error.rs b/packages/neutron-lockdrop-vault-for-cl-pools/src/error.rs
deleted file mode 100644
index 2f42b205..00000000
--- a/packages/neutron-lockdrop-vault-for-cl-pools/src/error.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-use cosmwasm_std::StdError;
-use thiserror::Error;
-
-#[derive(Error, Debug, PartialEq)]
-pub enum ContractError {
-    #[error("{0}")]
-    Std(#[from] StdError),
-
-    #[error("Unauthorized")]
-    Unauthorized {},
-
-    #[error("Bonding is not available for this contract")]
-    BondingDisabled {},
-
-    #[error("Direct unbonding is not available for this contract")]
-    DirectUnbondingDisabled {},
-
-    #[error("config name cannot be empty.")]
-    NameIsEmpty {},
-
-    #[error("config description cannot be empty.")]
-    DescriptionIsEmpty {},
-}
-
-pub type ContractResult<T> = Result<T, ContractError>;
diff --git a/packages/neutron-lockdrop-vault-for-cl-pools/src/lib.rs b/packages/neutron-lockdrop-vault-for-cl-pools/src/lib.rs
deleted file mode 100644
index 428eca92..00000000
--- a/packages/neutron-lockdrop-vault-for-cl-pools/src/lib.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-pub mod error;
-pub mod msg;
-pub mod types;
-pub mod voting_power;
diff --git a/packages/neutron-lockdrop-vault-for-cl-pools/src/msg.rs b/packages/neutron-lockdrop-vault-for-cl-pools/src/msg.rs
deleted file mode 100644
index 4c4b787b..00000000
--- a/packages/neutron-lockdrop-vault-for-cl-pools/src/msg.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use cosmwasm_schema::{cw_serde, QueryResponses};
-use cosmwasm_std::{Addr, Uint128};
-use cwd_interface::voting::{
-    BondingStatusResponse, InfoResponse, TotalPowerAtHeightResponse, VotingPowerAtHeightResponse,
-};
-use cwd_macros::{info_query, voting_query, voting_vault, voting_vault_query};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-
-#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone)]
-pub struct InstantiateMsg {
-    /// Name contains the vault name which is used to ease the vault's recognition.
-    pub name: String,
-    /// Description contains information that characterizes the vault.
-    pub description: String,
-    /// The lockdrop contract behind the vault.
-    pub lockdrop_contract: String,
-    /// The USDC/NTRN CL pool contract.
-    pub usdc_cl_pool_contract: String,
-    /// The ATOM/NTRN CL pool oracle contract.
-    pub atom_cl_pool_contract: String,
-    /// Owner can update all configs including changing the owner. This will generally be a DAO.
-    pub owner: String,
-}
-
-#[voting_vault]
-#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone)]
-#[serde(rename_all = "snake_case")]
-pub enum ExecuteMsg {
-    UpdateConfig {
-        owner: Option<String>,
-        lockdrop_contract: Option<String>,
-        usdc_cl_pool_contract: Option<String>,
-        atom_cl_pool_contract: Option<String>,
-        name: Option<String>,
-        description: Option<String>,
-    },
-}
-
-#[voting_query]
-#[voting_vault_query]
-#[info_query]
-#[cw_serde]
-#[derive(QueryResponses)]
-pub enum QueryMsg {
-    #[returns(crate::types::Config)]
-    Config {},
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
-pub struct MigrateMsg {}
diff --git a/packages/neutron-lockdrop-vault-for-cl-pools/src/types.rs b/packages/neutron-lockdrop-vault-for-cl-pools/src/types.rs
deleted file mode 100644
index e6c48440..00000000
--- a/packages/neutron-lockdrop-vault-for-cl-pools/src/types.rs
+++ /dev/null
@@ -1,73 +0,0 @@
-use crate::error::ContractError;
-use cosmwasm_std::Addr;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-
-#[derive(Serialize, Deserialize, Clone, PartialEq, Eq, JsonSchema, Debug)]
-pub struct Config {
-    pub name: String,
-    pub description: String,
-    pub lockdrop_contract: Addr,
-    pub usdc_cl_pool_contract: Addr,
-    pub atom_cl_pool_contract: Addr,
-    pub owner: Addr,
-}
-
-impl Config {
-    /// checks whether the config fields are valid.
-    pub fn validate(&self) -> Result<(), ContractError> {
-        if self.name.is_empty() {
-            return Err(ContractError::NameIsEmpty {});
-        };
-        if self.description.is_empty() {
-            return Err(ContractError::DescriptionIsEmpty {});
-        };
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Config;
-    use crate::error::ContractError;
-    use cosmwasm_std::Addr;
-
-    #[test]
-    fn test_config_validate() {
-        let cfg_ok = Config {
-            name: String::from("name"),
-            description: String::from("description"),
-            lockdrop_contract: Addr::unchecked("lockdrop_contract"),
-            usdc_cl_pool_contract: Addr::unchecked("cl_pool_usdc_contract"),
-            atom_cl_pool_contract: Addr::unchecked("cl_pool_atom_contract"),
-            owner: Addr::unchecked("owner"),
-        };
-        assert_eq!(cfg_ok.validate(), Ok(()));
-
-        let cfg_empty_name = Config {
-            name: String::from(""),
-            description: String::from("description"),
-            lockdrop_contract: Addr::unchecked("lockdrop_contract"),
-            usdc_cl_pool_contract: Addr::unchecked("cl_pool_usdc_contract"),
-            atom_cl_pool_contract: Addr::unchecked("cl_pool_atom_contract"),
-            owner: Addr::unchecked("owner"),
-        };
-        assert_eq!(
-            cfg_empty_name.validate(),
-            Err(ContractError::NameIsEmpty {})
-        );
-
-        let cfg_empty_description = Config {
-            name: String::from("name"),
-            description: String::from(""),
-            lockdrop_contract: Addr::unchecked("lockdrop_contract"),
-            usdc_cl_pool_contract: Addr::unchecked("cl_pool_usdc_contract"),
-            atom_cl_pool_contract: Addr::unchecked("cl_pool_atom_contract"),
-            owner: Addr::unchecked("owner"),
-        };
-        assert_eq!(
-            cfg_empty_description.validate(),
-            Err(ContractError::DescriptionIsEmpty {})
-        );
-    }
-}
diff --git a/packages/neutron-lockdrop-vault-for-cl-pools/src/voting_power.rs b/packages/neutron-lockdrop-vault-for-cl-pools/src/voting_power.rs
deleted file mode 100644
index 7ddcb919..00000000
--- a/packages/neutron-lockdrop-vault-for-cl-pools/src/voting_power.rs
+++ /dev/null
@@ -1,69 +0,0 @@
-use astroport_periphery::lockdrop::{PoolType, QueryMsg as LockdropQueryMsg};
-use cosmwasm_std::{Addr, Deps, StdResult, Uint128};
-use neutron_voting_power::voting_power::voting_power_from_lp_tokens;
-use serde::Serialize;
-
-pub fn get_voting_power_for_address(
-    deps: Deps,
-    lockdrop_contract: &Addr,
-    pool_contract: &Addr,
-    pool_type: PoolType,
-    address: String,
-    height: u64,
-) -> StdResult<Uint128> {
-    get_voting_power(
-        deps,
-        lockdrop_contract,
-        pool_contract,
-        &LockdropQueryMsg::QueryUserLockupTotalAtHeight {
-            pool_type,
-            user_address: address,
-            height,
-        },
-        height,
-    )
-}
-
-pub fn get_voting_power_total(
-    deps: Deps,
-    lp_contract: &Addr,
-    pool_contract: &Addr,
-    pool_type: PoolType,
-    height: u64,
-) -> StdResult<Uint128> {
-    get_voting_power(
-        deps,
-        lp_contract,
-        pool_contract,
-        &LockdropQueryMsg::QueryLockupTotalAtHeight { pool_type, height },
-        height,
-    )
-}
-
-pub fn get_voting_power(
-    deps: Deps,
-    lockdrop_contract: &Addr,
-    pool_contract: &Addr,
-    msg: &impl Serialize,
-    height: u64,
-) -> StdResult<Uint128> {
-    let lp_tokens: Option<Uint128> = deps.querier.query_wasm_smart(lockdrop_contract, msg)?;
-
-    let pair_info: astroport::asset::PairInfo = deps.querier.query_wasm_smart(
-        pool_contract,
-        &astroport::pair_concentrated::QueryMsg::Pair {},
-    )?;
-
-    let lp_total_supply: Uint128 = deps.querier.query_wasm_smart(
-        pair_info.liquidity_token,
-        &astroport::xastro_token::QueryMsg::TotalSupplyAt { block: height },
-    )?;
-
-    voting_power_from_lp_tokens(
-        deps,
-        lp_tokens.unwrap_or_default(),
-        lp_total_supply,
-        pool_contract,
-        height,
-    )
-}
diff --git a/packages/neutron-vesting-lp-vault-for-cl-pools/Cargo.toml b/packages/neutron-vesting-lp-vault-for-cl-pools/Cargo.toml
deleted file mode 100644
index 705e8812..00000000
--- a/packages/neutron-vesting-lp-vault-for-cl-pools/Cargo.toml
+++ /dev/null
@@ -1,16 +0,0 @@
-[package]
-name = "neutron-vesting-lp-vault-for-cl-pools"
-version = "0.1.0"
-authors = ["Sergei Sotnikov <sergei.s@p2p.org>", "Murad Karammaev <karammaev.murad@p2p.org>"]
-edition = "2021"
-license = "Apache-2.0"
-repository = "https://github.com/neutron/neutron-dao"
-
-[dependencies]
-cosmwasm-schema = {version = "1.3.0"}
-cwd-interface = {path = "../cwd-interface"}
-serde = { version = "1.0.175", default-features = false, features = ["derive"] }
-schemars = "0.8.8"
-cwd-macros = {path = "../cwd-macros"}
-cosmwasm-std = { version = "1.3.0" }
-thiserror = { version = "1.0" }
diff --git a/packages/neutron-vesting-lp-vault-for-cl-pools/src/error.rs b/packages/neutron-vesting-lp-vault-for-cl-pools/src/error.rs
deleted file mode 100644
index 3d0bd284..00000000
--- a/packages/neutron-vesting-lp-vault-for-cl-pools/src/error.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-use cosmwasm_std::{OverflowError, StdError};
-use thiserror::Error;
-
-#[derive(Error, Debug, PartialEq)]
-pub enum ContractError {
-    #[error("{0}")]
-    Std(#[from] StdError),
-
-    #[error("Unauthorized")]
-    Unauthorized {},
-
-    #[error("Bonding is not available for this contract")]
-    BondingDisabled {},
-
-    #[error("Direct unbonding is not available for this contract")]
-    DirectUnbondingDisabled {},
-
-    #[error("config name cannot be empty.")]
-    NameIsEmpty {},
-
-    #[error("config description cannot be empty.")]
-    DescriptionIsEmpty {},
-
-    #[error("{0}")]
-    OverflowError(#[from] OverflowError),
-}
-
-pub type ContractResult<T> = Result<T, ContractError>;
diff --git a/packages/neutron-vesting-lp-vault-for-cl-pools/src/lib.rs b/packages/neutron-vesting-lp-vault-for-cl-pools/src/lib.rs
deleted file mode 100644
index 691626ce..00000000
--- a/packages/neutron-vesting-lp-vault-for-cl-pools/src/lib.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-pub mod error;
-pub mod msg;
-pub mod types;
diff --git a/packages/neutron-vesting-lp-vault-for-cl-pools/src/msg.rs b/packages/neutron-vesting-lp-vault-for-cl-pools/src/msg.rs
deleted file mode 100644
index b9a79c4e..00000000
--- a/packages/neutron-vesting-lp-vault-for-cl-pools/src/msg.rs
+++ /dev/null
@@ -1,54 +0,0 @@
-use cosmwasm_schema::{cw_serde, QueryResponses};
-use cosmwasm_std::{Addr, Uint128};
-use cwd_interface::voting::{
-    BondingStatusResponse, InfoResponse, TotalPowerAtHeightResponse, VotingPowerAtHeightResponse,
-};
-use cwd_macros::{info_query, voting_query, voting_vault, voting_vault_query};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-
-#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone)]
-pub struct InstantiateMsg {
-    /// Name contains the vault name which is used to ease the vault's recognition.
-    pub name: String,
-    /// Description contains information that characterizes the vault.
-    pub description: String,
-    /// The ATOM Vesting LP contract behind the vault.
-    pub atom_vesting_lp_contract: String,
-    /// The ATOM/NTRN CL pool contract.
-    pub atom_cl_pool_contract: String,
-    /// The USDC Vesting LP contract behind the vault.
-    pub usdc_vesting_lp_contract: String,
-    /// The USDC/NTRN CL pool oracle contract.
-    pub usdc_cl_pool_contract: String,
-    /// Owner can update all configs including changing the owner. This will generally be a DAO.
-    pub owner: String,
-}
-
-#[voting_vault]
-#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone)]
-#[serde(rename_all = "snake_case")]
-pub enum ExecuteMsg {
-    UpdateConfig {
-        owner: String,
-        atom_vesting_lp_contract: String,
-        atom_cl_pool_contract: String,
-        usdc_vesting_lp_contract: String,
-        usdc_cl_pool_contract: String,
-        name: String,
-        description: String,
-    },
-}
-
-#[voting_query]
-#[voting_vault_query]
-#[info_query]
-#[cw_serde]
-#[derive(QueryResponses)]
-pub enum QueryMsg {
-    #[returns(crate::types::Config)]
-    Config {},
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
-pub struct MigrateMsg {}
diff --git a/packages/neutron-vesting-lp-vault-for-cl-pools/src/types.rs b/packages/neutron-vesting-lp-vault-for-cl-pools/src/types.rs
deleted file mode 100644
index 46fe9972..00000000
--- a/packages/neutron-vesting-lp-vault-for-cl-pools/src/types.rs
+++ /dev/null
@@ -1,76 +0,0 @@
-use crate::error::{ContractError, ContractResult};
-use cosmwasm_std::Addr;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-
-#[derive(Serialize, Deserialize, Clone, PartialEq, Eq, JsonSchema, Debug)]
-pub struct Config {
-    pub name: String,
-    pub description: String,
-    pub atom_vesting_lp_contract: Addr,
-    pub atom_cl_pool_contract: Addr,
-    pub usdc_vesting_lp_contract: Addr,
-    pub usdc_cl_pool_contract: Addr,
-    pub owner: Addr,
-}
-
-impl Config {
-    /// checks whether the config fields are valid.
-    pub fn validate(&self) -> ContractResult<()> {
-        if self.name.is_empty() {
-            return Err(ContractError::NameIsEmpty {});
-        }
-        if self.description.is_empty() {
-            return Err(ContractError::DescriptionIsEmpty {});
-        }
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::{error::ContractError, types::Config};
-    use cosmwasm_std::Addr;
-
-    #[test]
-    fn valid_config() {
-        let cfg = Config {
-            name: String::from("name"),
-            description: String::from("description"),
-            atom_vesting_lp_contract: Addr::unchecked("atom_vesting_lp_contract"),
-            atom_cl_pool_contract: Addr::unchecked("atom_cl_pool_contract"),
-            usdc_vesting_lp_contract: Addr::unchecked("usdc_vesting_lp_contract"),
-            usdc_cl_pool_contract: Addr::unchecked("usdc_cl_pool_contract"),
-            owner: Addr::unchecked("owner"),
-        };
-        assert!(cfg.validate().is_ok());
-    }
-
-    #[test]
-    fn empty_name() {
-        let cfg = Config {
-            name: String::from(""),
-            description: String::from("description"),
-            atom_vesting_lp_contract: Addr::unchecked("atom_vesting_lp_contract"),
-            atom_cl_pool_contract: Addr::unchecked("atom_cl_pool_contract"),
-            usdc_vesting_lp_contract: Addr::unchecked("usdc_vesting_lp_contract"),
-            usdc_cl_pool_contract: Addr::unchecked("usdc_cl_pool_contract"),
-            owner: Addr::unchecked("owner"),
-        };
-        assert_eq!(cfg.validate(), Err(ContractError::NameIsEmpty {}));
-    }
-
-    #[test]
-    fn empty_description() {
-        let cfg = Config {
-            name: String::from("name"),
-            description: String::from(""),
-            atom_vesting_lp_contract: Addr::unchecked("atom_vesting_lp_contract"),
-            atom_cl_pool_contract: Addr::unchecked("atom_cl_pool_contract"),
-            usdc_vesting_lp_contract: Addr::unchecked("usdc_vesting_lp_contract"),
-            usdc_cl_pool_contract: Addr::unchecked("usdc_cl_pool_contract"),
-            owner: Addr::unchecked("owner"),
-        };
-        assert_eq!(cfg.validate(), Err(ContractError::DescriptionIsEmpty {}));
-    }
-}
diff --git a/packages/neutron-voting-power/Cargo.toml b/packages/neutron-voting-power/Cargo.toml
deleted file mode 100644
index de4f5172..00000000
--- a/packages/neutron-voting-power/Cargo.toml
+++ /dev/null
@@ -1,11 +0,0 @@
-[package]
-name = "neutron-voting-power"
-version = "0.1.0"
-authors = ["Murad Karammaev <karammaev.murad@p2p.org>"]
-edition = "2021"
-license = "Apache-2.0"
-repository = "https://github.com/neutron/neutron-dao"
-
-[dependencies]
-astroport = { git = "https://github.com/astroport-fi/astroport-core.git", tag = "v2.8.0" }
-cosmwasm-std = { version = "1.3.0" }
\ No newline at end of file
diff --git a/packages/neutron-voting-power/src/lib.rs b/packages/neutron-voting-power/src/lib.rs
deleted file mode 100644
index 2febfaf6..00000000
--- a/packages/neutron-voting-power/src/lib.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub mod voting_power;
diff --git a/packages/neutron-voting-power/src/voting_power.rs b/packages/neutron-voting-power/src/voting_power.rs
deleted file mode 100644
index 6fb019c3..00000000
--- a/packages/neutron-voting-power/src/voting_power.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-use cosmwasm_std::{Addr, Deps, StdResult, Uint128, Uint64};
-
-pub fn voting_power_from_lp_tokens(
-    deps: Deps,
-    lp_tokens: Uint128,
-    total_lp_tokens: Uint128,
-    cl_pool: &Addr,
-    height: u64,
-) -> StdResult<Uint128> {
-    if lp_tokens.is_zero() {
-        Ok(Uint128::zero())
-    } else {
-        let balance_resp: Option<Uint128> = deps.querier.query_wasm_smart(
-            cl_pool,
-            &astroport::pair_concentrated::QueryMsg::AssetBalanceAt {
-                asset_info: astroport::asset::AssetInfo::NativeToken {
-                    denom: "untrn".to_string(),
-                },
-                block_height: Uint64::from(height),
-            },
-        )?;
-        let ntrn_balance_in_pool = if let Some(ntrn_balance) = balance_resp {
-            ntrn_balance
-        } else {
-            return Ok(Uint128::zero());
-        };
-
-        if ntrn_balance_in_pool.is_zero() {
-            return Ok(Uint128::zero());
-        }
-
-        Ok(lp_tokens.multiply_ratio(ntrn_balance_in_pool, total_lp_tokens))
-    }
-}