diff --git a/dependencies/osmosis b/dependencies/osmosis
index a55bbb90..ff18d824 160000
--- a/dependencies/osmosis
+++ b/dependencies/osmosis
@@ -1 +1 @@
-Subproject commit a55bbb90bb79e302358b66c6901a4f4e7504a258
+Subproject commit ff18d8244fcda7313ec951fb1b3bee8369b8316b
diff --git a/packages/osmosis-std/src/types/OSMOSIS_COMMIT b/packages/osmosis-std/src/types/OSMOSIS_COMMIT
index 1a99750f..72219d95 100644
--- a/packages/osmosis-std/src/types/OSMOSIS_COMMIT
+++ b/packages/osmosis-std/src/types/OSMOSIS_COMMIT
@@ -1 +1 @@
-origin/main
\ No newline at end of file
+v15.0.0
\ No newline at end of file
diff --git a/packages/osmosis-std/src/types/osmosis/concentratedliquidity/mod.rs b/packages/osmosis-std/src/types/osmosis/concentratedliquidity/mod.rs
deleted file mode 100644
index 8da56098..00000000
--- a/packages/osmosis-std/src/types/osmosis/concentratedliquidity/mod.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-pub mod v1beta1;
-use osmosis_std_derive::CosmwasmExt;
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.concentratedliquidity.Params")]
-pub struct Params {
-    /// authorized_tick_spacing is an array of uint64s that represents the tick
-    /// spacing values concentrated-liquidity pools can be created with. For
-    /// example, an authorized_tick_spacing of [1, 10, 30] allows for pools
-    /// to be created with tick spacing of 1, 10, or 30.
-    #[prost(uint64, repeated, packed = "false", tag = "1")]
-    pub authorized_tick_spacing: ::prost::alloc::vec::Vec<u64>,
-    #[prost(string, repeated, tag = "2")]
-    pub authorized_swap_fees: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
-}
diff --git a/packages/osmosis-std/src/types/osmosis/concentratedliquidity/v1beta1.rs b/packages/osmosis-std/src/types/osmosis/concentratedliquidity/v1beta1.rs
deleted file mode 100644
index 63729db5..00000000
--- a/packages/osmosis-std/src/types/osmosis/concentratedliquidity/v1beta1.rs
+++ /dev/null
@@ -1,967 +0,0 @@
-use osmosis_std_derive::CosmwasmExt;
-/// Position contains position's id, address, pool id, lower tick, upper tick
-/// join time, freeze duration, and liquidity.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.concentratedliquidity.v1beta1.Position")]
-pub struct Position {
-    #[prost(uint64, tag = "1")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub position_id: u64,
-    #[prost(string, tag = "2")]
-    pub address: ::prost::alloc::string::String,
-    #[prost(uint64, tag = "3")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub pool_id: u64,
-    #[prost(int64, tag = "4")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub lower_tick: i64,
-    #[prost(int64, tag = "5")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub upper_tick: i64,
-    #[prost(message, optional, tag = "6")]
-    pub join_time: ::core::option::Option<crate::shim::Timestamp>,
-    #[prost(message, optional, tag = "7")]
-    pub freeze_duration: ::core::option::Option<crate::shim::Duration>,
-    #[prost(string, tag = "8")]
-    pub liquidity: ::prost::alloc::string::String,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(
-    type_url = "/osmosis.concentratedliquidity.v1beta1.PositionWithUnderlyingAssetBreakdown"
-)]
-pub struct PositionWithUnderlyingAssetBreakdown {
-    #[prost(message, optional, tag = "1")]
-    pub position: ::core::option::Option<Position>,
-    #[prost(string, tag = "2")]
-    pub asset0: ::prost::alloc::string::String,
-    #[prost(string, tag = "3")]
-    pub asset1: ::prost::alloc::string::String,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.concentratedliquidity.v1beta1.TickInfo")]
-pub struct TickInfo {
-    #[prost(string, tag = "1")]
-    pub liquidity_gross: ::prost::alloc::string::String,
-    #[prost(string, tag = "2")]
-    pub liquidity_net: ::prost::alloc::string::String,
-    #[prost(message, repeated, tag = "3")]
-    pub fee_growth_outside:
-        ::prost::alloc::vec::Vec<super::super::super::cosmos::base::v1beta1::DecCoin>,
-    #[prost(message, repeated, tag = "4")]
-    pub uptime_trackers: ::prost::alloc::vec::Vec<UptimeTracker>,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.concentratedliquidity.v1beta1.UptimeTracker")]
-pub struct UptimeTracker {
-    #[prost(message, repeated, tag = "1")]
-    pub uptime_growth_outside:
-        ::prost::alloc::vec::Vec<super::super::super::cosmos::base::v1beta1::DecCoin>,
-}
-/// FullTick contains tick index and pool id along with other tick model
-/// information.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.concentratedliquidity.v1beta1.FullTick")]
-pub struct FullTick {
-    /// pool id associated with the tick.
-    #[prost(uint64, tag = "1")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub pool_id: u64,
-    /// tick's index.
-    #[prost(int64, tag = "2")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub tick_index: i64,
-    /// tick's info.
-    #[prost(message, optional, tag = "3")]
-    pub info: ::core::option::Option<TickInfo>,
-}
-/// PoolData represents a serialized pool along with its ticks
-/// for genesis state.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.concentratedliquidity.v1beta1.PoolData")]
-pub struct PoolData {
-    /// pool struct
-    #[prost(message, optional, tag = "1")]
-    pub pool: ::core::option::Option<crate::shim::Any>,
-    /// pool's ticks
-    #[prost(message, repeated, tag = "2")]
-    pub ticks: ::prost::alloc::vec::Vec<FullTick>,
-}
-/// GenesisState defines the concentrated liquidity module's genesis state.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.concentratedliquidity.v1beta1.GenesisState")]
-pub struct GenesisState {
-    /// params are all the parameters of the module
-    #[prost(message, optional, tag = "1")]
-    pub params: ::core::option::Option<super::Params>,
-    /// pool data containining serialized pool struct and ticks.
-    #[prost(message, repeated, tag = "2")]
-    pub pool_data: ::prost::alloc::vec::Vec<PoolData>,
-    #[prost(message, repeated, tag = "3")]
-    pub positions: ::prost::alloc::vec::Vec<Position>,
-    #[prost(uint64, tag = "4")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub next_position_id: u64,
-}
-/// IncentiveRecordBody represents an active perpetual incentive gauge for a pool
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.concentratedliquidity.v1beta1.IncentiveRecordBody")]
-pub struct IncentiveRecordBody {
-    /// remaining_amount is the total amount of incentives to be distributed
-    #[prost(string, tag = "1")]
-    pub remaining_amount: ::prost::alloc::string::String,
-    /// emission_rate is the incentive emission rate per second
-    #[prost(string, tag = "2")]
-    pub emission_rate: ::prost::alloc::string::String,
-    /// start_time is the time when the incentive starts distributing
-    #[prost(message, optional, tag = "3")]
-    pub start_time: ::core::option::Option<crate::shim::Timestamp>,
-}
-/// =============================== UserPositions
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.concentratedliquidity.v1beta1.QueryUserPositionsRequest")]
-#[proto_query(
-    path = "/osmosis.concentratedliquidity.v1beta1.Query/UserPositions",
-    response_type = QueryUserPositionsResponse
-)]
-pub struct QueryUserPositionsRequest {
-    #[prost(string, tag = "1")]
-    pub address: ::prost::alloc::string::String,
-    #[prost(uint64, tag = "2")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub pool_id: u64,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.concentratedliquidity.v1beta1.QueryUserPositionsResponse")]
-pub struct QueryUserPositionsResponse {
-    #[prost(message, repeated, tag = "1")]
-    pub positions: ::prost::alloc::vec::Vec<PositionWithUnderlyingAssetBreakdown>,
-}
-/// =============================== PositionById
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.concentratedliquidity.v1beta1.QueryPositionByIdRequest")]
-#[proto_query(
-    path = "/osmosis.concentratedliquidity.v1beta1.Query/PositionById",
-    response_type = QueryPositionByIdResponse
-)]
-pub struct QueryPositionByIdRequest {
-    #[prost(uint64, tag = "1")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub position_id: u64,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.concentratedliquidity.v1beta1.QueryPositionByIdResponse")]
-pub struct QueryPositionByIdResponse {
-    #[prost(message, optional, tag = "1")]
-    pub position: ::core::option::Option<PositionWithUnderlyingAssetBreakdown>,
-}
-/// =============================== Pools
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.concentratedliquidity.v1beta1.QueryPoolsRequest")]
-#[proto_query(
-    path = "/osmosis.concentratedliquidity.v1beta1.Query/Pools",
-    response_type = QueryPoolsResponse
-)]
-pub struct QueryPoolsRequest {
-    /// pagination defines an optional pagination for the request.
-    #[prost(message, optional, tag = "2")]
-    pub pagination:
-        ::core::option::Option<super::super::super::cosmos::base::query::v1beta1::PageRequest>,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.concentratedliquidity.v1beta1.QueryPoolsResponse")]
-pub struct QueryPoolsResponse {
-    #[prost(message, repeated, tag = "1")]
-    pub pools: ::prost::alloc::vec::Vec<crate::shim::Any>,
-    /// pagination defines the pagination in the response.
-    #[prost(message, optional, tag = "2")]
-    pub pagination:
-        ::core::option::Option<super::super::super::cosmos::base::query::v1beta1::PageResponse>,
-}
-/// =============================== ModuleParams
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.concentratedliquidity.v1beta1.QueryParamsRequest")]
-#[proto_query(
-    path = "/osmosis.concentratedliquidity.v1beta1.Query/Params",
-    response_type = QueryParamsResponse
-)]
-pub struct QueryParamsRequest {}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.concentratedliquidity.v1beta1.QueryParamsResponse")]
-pub struct QueryParamsResponse {
-    #[prost(message, optional, tag = "1")]
-    pub params: ::core::option::Option<super::Params>,
-}
-/// =============================== LiquidityDepthsForRange
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(
-    type_url = "/osmosis.concentratedliquidity.v1beta1.QueryLiquidityDepthsForRangeRequest"
-)]
-#[proto_query(
-    path = "/osmosis.concentratedliquidity.v1beta1.Query/LiquidityDepthsForRange",
-    response_type = QueryLiquidityDepthsForRangeResponse
-)]
-pub struct QueryLiquidityDepthsForRangeRequest {
-    #[prost(uint64, tag = "1")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub pool_id: u64,
-    #[prost(string, tag = "2")]
-    pub lower_tick: ::prost::alloc::string::String,
-    #[prost(string, tag = "3")]
-    pub upper_tick: ::prost::alloc::string::String,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(
-    type_url = "/osmosis.concentratedliquidity.v1beta1.QueryLiquidityDepthsForRangeResponse"
-)]
-pub struct QueryLiquidityDepthsForRangeResponse {
-    #[prost(message, repeated, tag = "1")]
-    pub liquidity_depths: ::prost::alloc::vec::Vec<LiquidityDepth>,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.concentratedliquidity.v1beta1.LiquidityDepth")]
-pub struct LiquidityDepth {
-    #[prost(string, tag = "1")]
-    pub liquidity_net: ::prost::alloc::string::String,
-    #[prost(string, tag = "2")]
-    pub tick_index: ::prost::alloc::string::String,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.concentratedliquidity.v1beta1.LiquidityDepthWithRange")]
-pub struct LiquidityDepthWithRange {
-    #[prost(string, tag = "1")]
-    pub liquidity_amount: ::prost::alloc::string::String,
-    #[prost(string, tag = "2")]
-    pub lower_tick: ::prost::alloc::string::String,
-    #[prost(string, tag = "3")]
-    pub upper_tick: ::prost::alloc::string::String,
-}
-/// =============================== TickLiquidityInBatches
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(
-    type_url = "/osmosis.concentratedliquidity.v1beta1.QueryTotalLiquidityForRangeRequest"
-)]
-#[proto_query(
-    path = "/osmosis.concentratedliquidity.v1beta1.Query/TotalLiquidityForRange",
-    response_type = QueryTotalLiquidityForRangeResponse
-)]
-pub struct QueryTotalLiquidityForRangeRequest {
-    #[prost(uint64, tag = "1")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub pool_id: u64,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(
-    type_url = "/osmosis.concentratedliquidity.v1beta1.QueryTotalLiquidityForRangeResponse"
-)]
-pub struct QueryTotalLiquidityForRangeResponse {
-    #[prost(message, repeated, tag = "1")]
-    pub liquidity: ::prost::alloc::vec::Vec<LiquidityDepthWithRange>,
-}
-/// ===================== MsgQueryClaimableFees
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.concentratedliquidity.v1beta1.QueryClaimableFeesRequest")]
-#[proto_query(
-    path = "/osmosis.concentratedliquidity.v1beta1.Query/ClaimableFees",
-    response_type = QueryClaimableFeesResponse
-)]
-pub struct QueryClaimableFeesRequest {
-    #[prost(uint64, tag = "1")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub position_id: u64,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.concentratedliquidity.v1beta1.QueryClaimableFeesResponse")]
-pub struct QueryClaimableFeesResponse {
-    #[prost(message, repeated, tag = "1")]
-    pub claimable_fees: ::prost::alloc::vec::Vec<super::super::super::cosmos::base::v1beta1::Coin>,
-}
-/// ===================== MsgCreateConcentratedPool
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.concentratedliquidity.v1beta1.MsgCreateConcentratedPool")]
-pub struct MsgCreateConcentratedPool {
-    #[prost(string, tag = "1")]
-    pub sender: ::prost::alloc::string::String,
-    #[prost(string, tag = "2")]
-    pub denom0: ::prost::alloc::string::String,
-    #[prost(string, tag = "3")]
-    pub denom1: ::prost::alloc::string::String,
-    #[prost(uint64, tag = "4")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub tick_spacing: u64,
-    #[prost(string, tag = "5")]
-    pub precision_factor_at_price_one: ::prost::alloc::string::String,
-    #[prost(string, tag = "9")]
-    pub swap_fee: ::prost::alloc::string::String,
-}
-/// Returns a unique poolID to identify the pool with.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(
-    type_url = "/osmosis.concentratedliquidity.v1beta1.MsgCreateConcentratedPoolResponse"
-)]
-pub struct MsgCreateConcentratedPoolResponse {
-    #[prost(uint64, tag = "1")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub pool_id: u64,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.concentratedliquidity.v1beta1.Pool")]
-pub struct Pool {
-    #[prost(string, tag = "1")]
-    pub address: ::prost::alloc::string::String,
-    #[prost(uint64, tag = "2")]
-    #[serde(alias = "ID")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub id: u64,
-    /// Amount of total liquidity
-    #[prost(string, tag = "3")]
-    pub current_tick_liquidity: ::prost::alloc::string::String,
-    #[prost(string, tag = "4")]
-    pub token0: ::prost::alloc::string::String,
-    #[prost(string, tag = "5")]
-    pub token1: ::prost::alloc::string::String,
-    #[prost(string, tag = "6")]
-    pub current_sqrt_price: ::prost::alloc::string::String,
-    #[prost(string, tag = "7")]
-    pub current_tick: ::prost::alloc::string::String,
-    /// tick_spacing must be one of the authorized_tick_spacing values set in the
-    /// concentrated-liquidity parameters
-    #[prost(uint64, tag = "8")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub tick_spacing: u64,
-    #[prost(string, tag = "9")]
-    pub precision_factor_at_price_one: ::prost::alloc::string::String,
-    /// swap_fee is the ratio that is charged on the amount of token in.
-    #[prost(string, tag = "10")]
-    pub swap_fee: ::prost::alloc::string::String,
-    /// last_liquidity_update is the last time either the pool liquidity or the
-    /// active tick changed
-    #[prost(message, optional, tag = "11")]
-    pub last_liquidity_update: ::core::option::Option<crate::shim::Timestamp>,
-}
-/// ===================== MsgCreatePosition
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.concentratedliquidity.v1beta1.MsgCreatePosition")]
-pub struct MsgCreatePosition {
-    #[prost(uint64, tag = "1")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub pool_id: u64,
-    #[prost(string, tag = "2")]
-    pub sender: ::prost::alloc::string::String,
-    #[prost(int64, tag = "3")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub lower_tick: i64,
-    #[prost(int64, tag = "4")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub upper_tick: i64,
-    #[prost(message, optional, tag = "5")]
-    pub token_desired0: ::core::option::Option<super::super::super::cosmos::base::v1beta1::Coin>,
-    #[prost(message, optional, tag = "6")]
-    pub token_desired1: ::core::option::Option<super::super::super::cosmos::base::v1beta1::Coin>,
-    #[prost(string, tag = "7")]
-    pub token_min_amount0: ::prost::alloc::string::String,
-    #[prost(string, tag = "8")]
-    pub token_min_amount1: ::prost::alloc::string::String,
-    #[prost(message, optional, tag = "9")]
-    pub freeze_duration: ::core::option::Option<crate::shim::Duration>,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.concentratedliquidity.v1beta1.MsgCreatePositionResponse")]
-pub struct MsgCreatePositionResponse {
-    #[prost(uint64, tag = "1")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub position_id: u64,
-    #[prost(string, tag = "2")]
-    pub amount0: ::prost::alloc::string::String,
-    #[prost(string, tag = "3")]
-    pub amount1: ::prost::alloc::string::String,
-    #[prost(message, optional, tag = "4")]
-    pub join_time: ::core::option::Option<crate::shim::Timestamp>,
-    #[prost(string, tag = "5")]
-    pub liquidity_created: ::prost::alloc::string::String,
-}
-/// ===================== MsgWithdrawPosition
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.concentratedliquidity.v1beta1.MsgWithdrawPosition")]
-pub struct MsgWithdrawPosition {
-    #[prost(uint64, tag = "1")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub position_id: u64,
-    #[prost(string, tag = "2")]
-    pub sender: ::prost::alloc::string::String,
-    #[prost(string, tag = "3")]
-    pub liquidity_amount: ::prost::alloc::string::String,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.concentratedliquidity.v1beta1.MsgWithdrawPositionResponse")]
-pub struct MsgWithdrawPositionResponse {
-    #[prost(string, tag = "1")]
-    pub amount0: ::prost::alloc::string::String,
-    #[prost(string, tag = "2")]
-    pub amount1: ::prost::alloc::string::String,
-}
-/// ===================== MsgCollectFees
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.concentratedliquidity.v1beta1.MsgCollectFees")]
-pub struct MsgCollectFees {
-    #[prost(uint64, tag = "1")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub position_id: u64,
-    #[prost(string, tag = "2")]
-    pub sender: ::prost::alloc::string::String,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.concentratedliquidity.v1beta1.MsgCollectFeesResponse")]
-pub struct MsgCollectFeesResponse {
-    #[prost(message, repeated, tag = "1")]
-    pub collected_fees: ::prost::alloc::vec::Vec<super::super::super::cosmos::base::v1beta1::Coin>,
-}
-/// ===================== MsgCollectIncentives
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.concentratedliquidity.v1beta1.MsgCollectIncentives")]
-pub struct MsgCollectIncentives {
-    #[prost(uint64, tag = "1")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub position_id: u64,
-    #[prost(string, tag = "2")]
-    pub sender: ::prost::alloc::string::String,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.concentratedliquidity.v1beta1.MsgCollectIncentivesResponse")]
-pub struct MsgCollectIncentivesResponse {
-    #[prost(message, repeated, tag = "1")]
-    pub collected_incentives:
-        ::prost::alloc::vec::Vec<super::super::super::cosmos::base::v1beta1::Coin>,
-}
-/// ===================== MsgCreateIncentive
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.concentratedliquidity.v1beta1.MsgCreateIncentive")]
-pub struct MsgCreateIncentive {
-    #[prost(uint64, tag = "1")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub pool_id: u64,
-    #[prost(string, tag = "2")]
-    pub sender: ::prost::alloc::string::String,
-    #[prost(string, tag = "3")]
-    pub incentive_denom: ::prost::alloc::string::String,
-    #[prost(string, tag = "4")]
-    pub incentive_amount: ::prost::alloc::string::String,
-    #[prost(string, tag = "5")]
-    pub emission_rate: ::prost::alloc::string::String,
-    #[prost(message, optional, tag = "6")]
-    pub start_time: ::core::option::Option<crate::shim::Timestamp>,
-    #[prost(message, optional, tag = "7")]
-    pub min_uptime: ::core::option::Option<crate::shim::Duration>,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.concentratedliquidity.v1beta1.MsgCreateIncentiveResponse")]
-pub struct MsgCreateIncentiveResponse {
-    #[prost(string, tag = "1")]
-    pub incentive_denom: ::prost::alloc::string::String,
-    #[prost(string, tag = "2")]
-    pub incentive_amount: ::prost::alloc::string::String,
-    #[prost(string, tag = "3")]
-    pub emission_rate: ::prost::alloc::string::String,
-    #[prost(message, optional, tag = "4")]
-    pub start_time: ::core::option::Option<crate::shim::Timestamp>,
-    #[prost(message, optional, tag = "5")]
-    pub min_uptime: ::core::option::Option<crate::shim::Duration>,
-}
-pub struct ConcentratedliquidityQuerier<'a, Q: cosmwasm_std::CustomQuery> {
-    querier: &'a cosmwasm_std::QuerierWrapper<'a, Q>,
-}
-impl<'a, Q: cosmwasm_std::CustomQuery> ConcentratedliquidityQuerier<'a, Q> {
-    pub fn new(querier: &'a cosmwasm_std::QuerierWrapper<'a, Q>) -> Self {
-        Self { querier }
-    }
-    pub fn pools(
-        &self,
-        pagination: ::core::option::Option<
-            super::super::super::cosmos::base::query::v1beta1::PageRequest,
-        >,
-    ) -> Result<QueryPoolsResponse, cosmwasm_std::StdError> {
-        QueryPoolsRequest { pagination }.query(self.querier)
-    }
-    pub fn params(&self) -> Result<QueryParamsResponse, cosmwasm_std::StdError> {
-        QueryParamsRequest {}.query(self.querier)
-    }
-    pub fn liquidity_depths_for_range(
-        &self,
-        pool_id: u64,
-        lower_tick: ::prost::alloc::string::String,
-        upper_tick: ::prost::alloc::string::String,
-    ) -> Result<QueryLiquidityDepthsForRangeResponse, cosmwasm_std::StdError> {
-        QueryLiquidityDepthsForRangeRequest {
-            pool_id,
-            lower_tick,
-            upper_tick,
-        }
-        .query(self.querier)
-    }
-    pub fn user_positions(
-        &self,
-        address: ::prost::alloc::string::String,
-        pool_id: u64,
-    ) -> Result<QueryUserPositionsResponse, cosmwasm_std::StdError> {
-        QueryUserPositionsRequest { address, pool_id }.query(self.querier)
-    }
-    pub fn total_liquidity_for_range(
-        &self,
-        pool_id: u64,
-    ) -> Result<QueryTotalLiquidityForRangeResponse, cosmwasm_std::StdError> {
-        QueryTotalLiquidityForRangeRequest { pool_id }.query(self.querier)
-    }
-    pub fn claimable_fees(
-        &self,
-        position_id: u64,
-    ) -> Result<QueryClaimableFeesResponse, cosmwasm_std::StdError> {
-        QueryClaimableFeesRequest { position_id }.query(self.querier)
-    }
-    pub fn position_by_id(
-        &self,
-        position_id: u64,
-    ) -> Result<QueryPositionByIdResponse, cosmwasm_std::StdError> {
-        QueryPositionByIdRequest { position_id }.query(self.querier)
-    }
-}
diff --git a/packages/osmosis-std/src/types/osmosis/gamm/poolmodels/balancer/v1beta1.rs b/packages/osmosis-std/src/types/osmosis/gamm/poolmodels/balancer/v1beta1.rs
index 8bbfdd79..89247c63 100644
--- a/packages/osmosis-std/src/types/osmosis/gamm/poolmodels/balancer/v1beta1.rs
+++ b/packages/osmosis-std/src/types/osmosis/gamm/poolmodels/balancer/v1beta1.rs
@@ -45,49 +45,3 @@ pub struct MsgCreateBalancerPoolResponse {
     )]
     pub pool_id: u64,
 }
-/// ===================== MsgMigrateSharesToFullRangeConcentratedPosition
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(
-    type_url = "/osmosis.gamm.poolmodels.balancer.v1beta1.MsgMigrateSharesToFullRangeConcentratedPosition"
-)]
-pub struct MsgMigrateSharesToFullRangeConcentratedPosition {
-    #[prost(string, tag = "1")]
-    pub sender: ::prost::alloc::string::String,
-    #[prost(message, optional, tag = "2")]
-    pub shares_to_migrate:
-        ::core::option::Option<super::super::super::super::super::cosmos::base::v1beta1::Coin>,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(
-    type_url = "/osmosis.gamm.poolmodels.balancer.v1beta1.MsgMigrateSharesToFullRangeConcentratedPositionResponse"
-)]
-pub struct MsgMigrateSharesToFullRangeConcentratedPositionResponse {
-    #[prost(string, tag = "1")]
-    pub amount0: ::prost::alloc::string::String,
-    #[prost(string, tag = "2")]
-    pub amount1: ::prost::alloc::string::String,
-    #[prost(string, tag = "3")]
-    pub liquidity_created: ::prost::alloc::string::String,
-    #[prost(message, optional, tag = "4")]
-    pub join_time: ::core::option::Option<crate::shim::Timestamp>,
-}
diff --git a/packages/osmosis-std/src/types/osmosis/gamm/v1beta1.rs b/packages/osmosis-std/src/types/osmosis/gamm/v1beta1.rs
index ddb4e5f3..bdac75ac 100644
--- a/packages/osmosis-std/src/types/osmosis/gamm/v1beta1.rs
+++ b/packages/osmosis-std/src/types/osmosis/gamm/v1beta1.rs
@@ -191,112 +191,6 @@ pub struct GenesisState {
     pub next_pool_number: u64,
     #[prost(message, optional, tag = "3")]
     pub params: ::core::option::Option<Params>,
-    #[prost(message, optional, tag = "4")]
-    pub migration_records: ::core::option::Option<MigrationRecords>,
-}
-/// MigrationRecords contains all the links between balancer and concentrated
-/// pools
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.gamm.v1beta1.MigrationRecords")]
-pub struct MigrationRecords {
-    #[prost(message, repeated, tag = "1")]
-    pub balancer_to_concentrated_pool_links:
-        ::prost::alloc::vec::Vec<BalancerToConcentratedPoolLink>,
-}
-/// BalancerToConcentratedPoolLink defines a single link between a single
-/// balancer pool and a single concentrated liquidity pool. This link is used to
-/// allow a balancer pool to migrate to a single canonical full range
-/// concentrated liquidity pool position
-/// A balancer pool can be linked to a maximum of one cl pool, and a cl pool can
-/// be linked to a maximum of one balancer pool.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.gamm.v1beta1.BalancerToConcentratedPoolLink")]
-pub struct BalancerToConcentratedPoolLink {
-    #[prost(uint64, tag = "1")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub balancer_pool_id: u64,
-    #[prost(uint64, tag = "2")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub cl_pool_id: u64,
-}
-/// ReplaceMigrationRecordsProposal is a gov Content type for updating the
-/// migration records. If a ReplaceMigrationRecordsProposal passes, the
-/// proposal’s records override the existing MigrationRecords set in the module.
-/// Each record specifies a single connection between a single balancer pool and
-/// a single concentrated pool.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.gamm.v1beta1.ReplaceMigrationRecordsProposal")]
-pub struct ReplaceMigrationRecordsProposal {
-    #[prost(string, tag = "1")]
-    pub title: ::prost::alloc::string::String,
-    #[prost(string, tag = "2")]
-    pub description: ::prost::alloc::string::String,
-    #[prost(message, repeated, tag = "3")]
-    pub records: ::prost::alloc::vec::Vec<BalancerToConcentratedPoolLink>,
-}
-/// For example: if the existing DistrRecords were:
-/// [(Balancer 1, CL 5), (Balancer 2, CL 6), (Balancer 3, CL 7)]
-/// And an UpdateMigrationRecordsProposal includes
-/// [(Balancer 2, CL 0), (Balancer 3, CL 4), (Balancer 4, CL 10)]
-/// This would leave Balancer 1 record, delete Balancer 2 record,
-/// Edit Balancer 3 record, and Add Balancer 4 record
-/// The result MigrationRecords in state would be:
-/// [(Balancer 1, CL 5), (Balancer 3, CL 4), (Balancer 4, CL 10)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.gamm.v1beta1.UpdateMigrationRecordsProposal")]
-pub struct UpdateMigrationRecordsProposal {
-    #[prost(string, tag = "1")]
-    pub title: ::prost::alloc::string::String,
-    #[prost(string, tag = "2")]
-    pub description: ::prost::alloc::string::String,
-    #[prost(message, repeated, tag = "3")]
-    pub records: ::prost::alloc::vec::Vec<BalancerToConcentratedPoolLink>,
 }
 /// ===================== MsgJoinPool
 /// This is really MsgJoinPoolNoSwap
@@ -646,7 +540,6 @@ pub struct MsgExitSwapExternAmountOutResponse {
     pub share_in_amount: ::prost::alloc::string::String,
 }
 /// =============================== Pool
-/// Deprecated: please use the alternative in x/poolmanager
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(
     Clone,
@@ -663,7 +556,6 @@ pub struct MsgExitSwapExternAmountOutResponse {
     path = "/osmosis.gamm.v1beta1.Query/Pool",
     response_type = QueryPoolResponse
 )]
-#[deprecated]
 pub struct QueryPoolRequest {
     #[prost(uint64, tag = "1")]
     #[serde(
@@ -672,7 +564,6 @@ pub struct QueryPoolRequest {
     )]
     pub pool_id: u64,
 }
-/// Deprecated: please use the alternative in x/poolmanager
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(
     Clone,
@@ -685,7 +576,6 @@ pub struct QueryPoolRequest {
     CosmwasmExt,
 )]
 #[proto_message(type_url = "/osmosis.gamm.v1beta1.QueryPoolResponse")]
-#[deprecated]
 pub struct QueryPoolResponse {
     #[prost(message, optional, tag = "1")]
     pub pool: ::core::option::Option<crate::shim::Any>,
@@ -1336,7 +1226,6 @@ impl<'a, Q: cosmwasm_std::CustomQuery> GammQuerier<'a, Q> {
         }
         .query(self.querier)
     }
-    #[deprecated]
     pub fn pool(&self, pool_id: u64) -> Result<QueryPoolResponse, cosmwasm_std::StdError> {
         QueryPoolRequest { pool_id }.query(self.querier)
     }
diff --git a/packages/osmosis-std/src/types/osmosis/gamm/v2.rs b/packages/osmosis-std/src/types/osmosis/gamm/v2.rs
index 1722d385..0bfe94aa 100644
--- a/packages/osmosis-std/src/types/osmosis/gamm/v2.rs
+++ b/packages/osmosis-std/src/types/osmosis/gamm/v2.rs
@@ -1,5 +1,6 @@
 use osmosis_std_derive::CosmwasmExt;
-/// Deprecated: please use alternate in x/poolmanager
+/// QuerySpotPriceRequest defines the gRPC request structure for a SpotPrice
+/// query.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(
     Clone,
@@ -16,7 +17,6 @@ use osmosis_std_derive::CosmwasmExt;
     path = "/osmosis.gamm.v2.Query/SpotPrice",
     response_type = QuerySpotPriceResponse
 )]
-#[deprecated]
 pub struct QuerySpotPriceRequest {
     #[prost(uint64, tag = "1")]
     #[serde(
@@ -29,7 +29,8 @@ pub struct QuerySpotPriceRequest {
     #[prost(string, tag = "3")]
     pub quote_asset_denom: ::prost::alloc::string::String,
 }
-/// Depreacted: please use alternate in x/poolmanager
+/// QuerySpotPriceResponse defines the gRPC response structure for a SpotPrice
+/// query.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(
     Clone,
@@ -42,7 +43,6 @@ pub struct QuerySpotPriceRequest {
     CosmwasmExt,
 )]
 #[proto_message(type_url = "/osmosis.gamm.v2.QuerySpotPriceResponse")]
-#[deprecated]
 pub struct QuerySpotPriceResponse {
     /// String of the Dec. Ex) 10.203uatom
     #[prost(string, tag = "1")]
@@ -55,7 +55,6 @@ impl<'a, Q: cosmwasm_std::CustomQuery> GammQuerier<'a, Q> {
     pub fn new(querier: &'a cosmwasm_std::QuerierWrapper<'a, Q>) -> Self {
         Self { querier }
     }
-    #[deprecated]
     pub fn spot_price(
         &self,
         pool_id: u64,
diff --git a/packages/osmosis-std/src/types/osmosis/mod.rs b/packages/osmosis-std/src/types/osmosis/mod.rs
index 57d3576c..12becca8 100644
--- a/packages/osmosis-std/src/types/osmosis/mod.rs
+++ b/packages/osmosis-std/src/types/osmosis/mod.rs
@@ -1,5 +1,4 @@
 pub mod accum;
-pub mod concentratedliquidity;
 pub mod downtimedetector;
 pub mod epochs;
 pub mod gamm;
diff --git a/packages/osmosis-std/src/types/osmosis/poolmanager/v1beta1.rs b/packages/osmosis-std/src/types/osmosis/poolmanager/v1beta1.rs
index 2a104414..0da6c949 100644
--- a/packages/osmosis-std/src/types/osmosis/poolmanager/v1beta1.rs
+++ b/packages/osmosis-std/src/types/osmosis/poolmanager/v1beta1.rs
@@ -84,9 +84,6 @@ pub enum PoolType {
     /// Stableswap is the Solidly cfmm stable swap curve. Its pool model is defined
     /// in x/gamm.
     Stableswap = 1,
-    /// Concentrated is the pool model specific to concentrated liquidity. It is
-    /// defined in x/concentrated-liquidity.
-    Concentrated = 2,
 }
 impl PoolType {
     /// String value of the enum field names used in the ProtoBuf definition.
@@ -97,7 +94,6 @@ impl PoolType {
         match self {
             PoolType::Balancer => "Balancer",
             PoolType::Stableswap => "Stableswap",
-            PoolType::Concentrated => "Concentrated",
         }
     }
     /// Creates an enum from field names used in the ProtoBuf definition.
@@ -105,7 +101,6 @@ impl PoolType {
         match value {
             "Balancer" => Some(Self::Balancer),
             "Stableswap" => Some(Self::Stableswap),
-            "Concentrated" => Some(Self::Concentrated),
             _ => None,
         }
     }
@@ -286,6 +281,9 @@ pub struct ParamsResponse {
     response_type = EstimateSwapExactAmountInResponse
 )]
 pub struct EstimateSwapExactAmountInRequest {
+    /// TODO: CHANGE THIS TO RESERVED IN A PATCH RELEASE
+    #[prost(string, tag = "1")]
+    pub sender: ::prost::alloc::string::String,
     #[prost(uint64, tag = "2")]
     #[serde(
         serialize_with = "crate::serde::as_str::serialize",
@@ -308,36 +306,6 @@ pub struct EstimateSwapExactAmountInRequest {
     ::schemars::JsonSchema,
     CosmwasmExt,
 )]
-#[proto_message(
-    type_url = "/osmosis.poolmanager.v1beta1.EstimateSinglePoolSwapExactAmountInRequest"
-)]
-#[proto_query(
-    path = "/osmosis.poolmanager.v1beta1.Query/EstimateSinglePoolSwapExactAmountIn",
-    response_type = EstimateSwapExactAmountInResponse
-)]
-pub struct EstimateSinglePoolSwapExactAmountInRequest {
-    #[prost(uint64, tag = "1")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub pool_id: u64,
-    #[prost(string, tag = "2")]
-    pub token_in: ::prost::alloc::string::String,
-    #[prost(string, tag = "3")]
-    pub token_out_denom: ::prost::alloc::string::String,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
 #[proto_message(type_url = "/osmosis.poolmanager.v1beta1.EstimateSwapExactAmountInResponse")]
 pub struct EstimateSwapExactAmountInResponse {
     #[prost(string, tag = "1")]
@@ -361,6 +329,9 @@ pub struct EstimateSwapExactAmountInResponse {
     response_type = EstimateSwapExactAmountOutResponse
 )]
 pub struct EstimateSwapExactAmountOutRequest {
+    /// TODO: CHANGE THIS TO RESERVED IN A PATCH RELEASE
+    #[prost(string, tag = "1")]
+    pub sender: ::prost::alloc::string::String,
     #[prost(uint64, tag = "2")]
     #[serde(
         serialize_with = "crate::serde::as_str::serialize",
@@ -383,36 +354,6 @@ pub struct EstimateSwapExactAmountOutRequest {
     ::schemars::JsonSchema,
     CosmwasmExt,
 )]
-#[proto_message(
-    type_url = "/osmosis.poolmanager.v1beta1.EstimateSinglePoolSwapExactAmountOutRequest"
-)]
-#[proto_query(
-    path = "/osmosis.poolmanager.v1beta1.Query/EstimateSinglePoolSwapExactAmountOut",
-    response_type = EstimateSwapExactAmountOutResponse
-)]
-pub struct EstimateSinglePoolSwapExactAmountOutRequest {
-    #[prost(uint64, tag = "1")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub pool_id: u64,
-    #[prost(string, tag = "2")]
-    pub token_in_denom: ::prost::alloc::string::String,
-    #[prost(string, tag = "3")]
-    pub token_out: ::prost::alloc::string::String,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
 #[proto_message(type_url = "/osmosis.poolmanager.v1beta1.EstimateSwapExactAmountOutResponse")]
 pub struct EstimateSwapExactAmountOutResponse {
     #[prost(string, tag = "1")]
@@ -456,137 +397,6 @@ pub struct NumPoolsResponse {
     )]
     pub num_pools: u64,
 }
-/// =============================== Pool
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.poolmanager.v1beta1.PoolRequest")]
-#[proto_query(
-    path = "/osmosis.poolmanager.v1beta1.Query/Pool",
-    response_type = PoolResponse
-)]
-pub struct PoolRequest {
-    #[prost(uint64, tag = "1")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub pool_id: u64,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.poolmanager.v1beta1.PoolResponse")]
-pub struct PoolResponse {
-    #[prost(message, optional, tag = "1")]
-    pub pool: ::core::option::Option<crate::shim::Any>,
-}
-/// =============================== AllPools
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.poolmanager.v1beta1.AllPoolsRequest")]
-#[proto_query(
-    path = "/osmosis.poolmanager.v1beta1.Query/AllPools",
-    response_type = AllPoolsResponse
-)]
-pub struct AllPoolsRequest {
-    #[prost(uint64, tag = "1")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub pool_id: u64,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.poolmanager.v1beta1.AllPoolsResponse")]
-pub struct AllPoolsResponse {
-    #[prost(message, repeated, tag = "1")]
-    pub pools: ::prost::alloc::vec::Vec<crate::shim::Any>,
-}
-/// SpotPriceRequest defines the gRPC request structure for a SpotPrice
-/// query.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.poolmanager.v1beta1.SpotPriceRequest")]
-#[proto_query(
-    path = "/osmosis.poolmanager.v1beta1.Query/SpotPrice",
-    response_type = SpotPriceResponse
-)]
-pub struct SpotPriceRequest {
-    #[prost(uint64, tag = "1")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub pool_id: u64,
-    #[prost(string, tag = "2")]
-    pub base_asset_denom: ::prost::alloc::string::String,
-    #[prost(string, tag = "3")]
-    pub quote_asset_denom: ::prost::alloc::string::String,
-}
-/// SpotPriceResponse defines the gRPC response structure for a SpotPrice
-/// query.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.poolmanager.v1beta1.SpotPriceResponse")]
-pub struct SpotPriceResponse {
-    /// String of the Dec. Ex) 10.203uatom
-    #[prost(string, tag = "1")]
-    pub spot_price: ::prost::alloc::string::String,
-}
 pub struct PoolmanagerQuerier<'a, Q: cosmwasm_std::CustomQuery> {
     querier: &'a cosmwasm_std::QuerierWrapper<'a, Q>,
 }
@@ -599,76 +409,35 @@ impl<'a, Q: cosmwasm_std::CustomQuery> PoolmanagerQuerier<'a, Q> {
     }
     pub fn estimate_swap_exact_amount_in(
         &self,
+        sender: ::prost::alloc::string::String,
         pool_id: u64,
         token_in: ::prost::alloc::string::String,
         routes: ::prost::alloc::vec::Vec<SwapAmountInRoute>,
     ) -> Result<EstimateSwapExactAmountInResponse, cosmwasm_std::StdError> {
         EstimateSwapExactAmountInRequest {
+            sender,
             pool_id,
             token_in,
             routes,
         }
         .query(self.querier)
     }
-    pub fn estimate_single_pool_swap_exact_amount_in(
-        &self,
-        pool_id: u64,
-        token_in: ::prost::alloc::string::String,
-        token_out_denom: ::prost::alloc::string::String,
-    ) -> Result<EstimateSwapExactAmountInResponse, cosmwasm_std::StdError> {
-        EstimateSinglePoolSwapExactAmountInRequest {
-            pool_id,
-            token_in,
-            token_out_denom,
-        }
-        .query(self.querier)
-    }
     pub fn estimate_swap_exact_amount_out(
         &self,
+        sender: ::prost::alloc::string::String,
         pool_id: u64,
         routes: ::prost::alloc::vec::Vec<SwapAmountOutRoute>,
         token_out: ::prost::alloc::string::String,
     ) -> Result<EstimateSwapExactAmountOutResponse, cosmwasm_std::StdError> {
         EstimateSwapExactAmountOutRequest {
+            sender,
             pool_id,
             routes,
             token_out,
         }
         .query(self.querier)
     }
-    pub fn estimate_single_pool_swap_exact_amount_out(
-        &self,
-        pool_id: u64,
-        token_in_denom: ::prost::alloc::string::String,
-        token_out: ::prost::alloc::string::String,
-    ) -> Result<EstimateSwapExactAmountOutResponse, cosmwasm_std::StdError> {
-        EstimateSinglePoolSwapExactAmountOutRequest {
-            pool_id,
-            token_in_denom,
-            token_out,
-        }
-        .query(self.querier)
-    }
     pub fn num_pools(&self) -> Result<NumPoolsResponse, cosmwasm_std::StdError> {
         NumPoolsRequest {}.query(self.querier)
     }
-    pub fn pool(&self, pool_id: u64) -> Result<PoolResponse, cosmwasm_std::StdError> {
-        PoolRequest { pool_id }.query(self.querier)
-    }
-    pub fn all_pools(&self, pool_id: u64) -> Result<AllPoolsResponse, cosmwasm_std::StdError> {
-        AllPoolsRequest { pool_id }.query(self.querier)
-    }
-    pub fn spot_price(
-        &self,
-        pool_id: u64,
-        base_asset_denom: ::prost::alloc::string::String,
-        quote_asset_denom: ::prost::alloc::string::String,
-    ) -> Result<SpotPriceResponse, cosmwasm_std::StdError> {
-        SpotPriceRequest {
-            pool_id,
-            base_asset_denom,
-            quote_asset_denom,
-        }
-        .query(self.querier)
-    }
 }
diff --git a/packages/osmosis-std/src/types/osmosis/superfluid/mod.rs b/packages/osmosis-std/src/types/osmosis/superfluid/mod.rs
index ef781094..a7a0a4ef 100644
--- a/packages/osmosis-std/src/types/osmosis/superfluid/mod.rs
+++ b/packages/osmosis-std/src/types/osmosis/superfluid/mod.rs
@@ -1087,58 +1087,6 @@ pub struct MsgUnPoolWhitelistedPoolResponse {
     #[prost(uint64, repeated, tag = "1")]
     pub exited_lock_ids: ::prost::alloc::vec::Vec<u64>,
 }
-/// =====================
-/// MsgUnlockAndMigrateSharesToFullRangeConcentratedPosition
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(
-    type_url = "/osmosis.superfluid.MsgUnlockAndMigrateSharesToFullRangeConcentratedPosition"
-)]
-pub struct MsgUnlockAndMigrateSharesToFullRangeConcentratedPosition {
-    #[prost(string, tag = "1")]
-    pub sender: ::prost::alloc::string::String,
-    #[prost(uint64, tag = "2")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub lock_id: u64,
-    #[prost(message, optional, tag = "3")]
-    pub shares_to_migrate: ::core::option::Option<super::super::cosmos::base::v1beta1::Coin>,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(
-    type_url = "/osmosis.superfluid.MsgUnlockAndMigrateSharesToFullRangeConcentratedPositionResponse"
-)]
-pub struct MsgUnlockAndMigrateSharesToFullRangeConcentratedPositionResponse {
-    #[prost(string, tag = "1")]
-    pub amount0: ::prost::alloc::string::String,
-    #[prost(string, tag = "2")]
-    pub amount1: ::prost::alloc::string::String,
-    #[prost(string, tag = "3")]
-    pub liquidity_created: ::prost::alloc::string::String,
-    #[prost(message, optional, tag = "4")]
-    pub join_time: ::core::option::Option<crate::shim::Timestamp>,
-}
 pub struct SuperfluidQuerier<'a, Q: cosmwasm_std::CustomQuery> {
     querier: &'a cosmwasm_std::QuerierWrapper<'a, Q>,
 }
diff --git a/packages/osmosis-std/src/types/osmosis/tokenfactory/v1beta1.rs b/packages/osmosis-std/src/types/osmosis/tokenfactory/v1beta1.rs
index ee842904..52e8eef8 100644
--- a/packages/osmosis-std/src/types/osmosis/tokenfactory/v1beta1.rs
+++ b/packages/osmosis-std/src/types/osmosis/tokenfactory/v1beta1.rs
@@ -194,44 +194,6 @@ pub struct QueryDenomsFromCreatorResponse {
     #[prost(string, repeated, tag = "1")]
     pub denoms: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.tokenfactory.v1beta1.QueryBeforeSendHookAddressRequest")]
-#[proto_query(
-    path = "/osmosis.tokenfactory.v1beta1.Query/BeforeSendHookAddress",
-    response_type = QueryBeforeSendHookAddressResponse
-)]
-pub struct QueryBeforeSendHookAddressRequest {
-    #[prost(string, tag = "1")]
-    pub denom: ::prost::alloc::string::String,
-}
-/// QueryBeforeSendHookAddressResponse defines the response structure for the
-/// DenomBeforeSendHook gRPC query.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.tokenfactory.v1beta1.QueryBeforeSendHookAddressResponse")]
-pub struct QueryBeforeSendHookAddressResponse {
-    #[prost(string, tag = "1")]
-    pub cosmwasm_address: ::prost::alloc::string::String,
-}
 /// MsgCreateDenom defines the message structure for the CreateDenom gRPC service
 /// method. It allows an account to create a new denom. It requires a sender
 /// address and a sub denomination. The (sender_address, sub_denomination) tuple
@@ -297,8 +259,6 @@ pub struct MsgMint {
     pub sender: ::prost::alloc::string::String,
     #[prost(message, optional, tag = "2")]
     pub amount: ::core::option::Option<super::super::super::cosmos::base::v1beta1::Coin>,
-    #[prost(string, tag = "3")]
-    pub mint_to_address: ::prost::alloc::string::String,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(
@@ -332,8 +292,6 @@ pub struct MsgBurn {
     pub sender: ::prost::alloc::string::String,
     #[prost(message, optional, tag = "2")]
     pub amount: ::core::option::Option<super::super::super::cosmos::base::v1beta1::Coin>,
-    #[prost(string, tag = "3")]
-    pub burn_from_address: ::prost::alloc::string::String,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(
@@ -385,43 +343,6 @@ pub struct MsgChangeAdmin {
 )]
 #[proto_message(type_url = "/osmosis.tokenfactory.v1beta1.MsgChangeAdminResponse")]
 pub struct MsgChangeAdminResponse {}
-/// MsgSetBeforeSendHook is the sdk.Msg type for allowing an admin account to
-/// assign a CosmWasm contract to call with a BeforeSend hook
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.tokenfactory.v1beta1.MsgSetBeforeSendHook")]
-pub struct MsgSetBeforeSendHook {
-    #[prost(string, tag = "1")]
-    pub sender: ::prost::alloc::string::String,
-    #[prost(string, tag = "2")]
-    pub denom: ::prost::alloc::string::String,
-    #[prost(string, tag = "3")]
-    pub cosmwasm_address: ::prost::alloc::string::String,
-}
-/// MsgSetBeforeSendHookResponse defines the response structure for an executed
-/// MsgSetBeforeSendHook message.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.tokenfactory.v1beta1.MsgSetBeforeSendHookResponse")]
-pub struct MsgSetBeforeSendHookResponse {}
 /// MsgSetDenomMetadata is the sdk.Msg type for allowing an admin account to set
 /// the denom's bank metadata
 #[allow(clippy::derive_partial_eq_without_eq)]
@@ -457,41 +378,6 @@ pub struct MsgSetDenomMetadata {
 )]
 #[proto_message(type_url = "/osmosis.tokenfactory.v1beta1.MsgSetDenomMetadataResponse")]
 pub struct MsgSetDenomMetadataResponse {}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.tokenfactory.v1beta1.MsgForceTransfer")]
-pub struct MsgForceTransfer {
-    #[prost(string, tag = "1")]
-    pub sender: ::prost::alloc::string::String,
-    #[prost(message, optional, tag = "2")]
-    pub amount: ::core::option::Option<super::super::super::cosmos::base::v1beta1::Coin>,
-    #[prost(string, tag = "3")]
-    pub transfer_from_address: ::prost::alloc::string::String,
-    #[prost(string, tag = "4")]
-    pub transfer_to_address: ::prost::alloc::string::String,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.tokenfactory.v1beta1.MsgForceTransferResponse")]
-pub struct MsgForceTransferResponse {}
 pub struct TokenfactoryQuerier<'a, Q: cosmwasm_std::CustomQuery> {
     querier: &'a cosmwasm_std::QuerierWrapper<'a, Q>,
 }
@@ -514,10 +400,4 @@ impl<'a, Q: cosmwasm_std::CustomQuery> TokenfactoryQuerier<'a, Q> {
     ) -> Result<QueryDenomsFromCreatorResponse, cosmwasm_std::StdError> {
         QueryDenomsFromCreatorRequest { creator }.query(self.querier)
     }
-    pub fn before_send_hook_address(
-        &self,
-        denom: ::prost::alloc::string::String,
-    ) -> Result<QueryBeforeSendHookAddressResponse, cosmwasm_std::StdError> {
-        QueryBeforeSendHookAddressRequest { denom }.query(self.querier)
-    }
 }
diff --git a/packages/proto-build/src/main.rs b/packages/proto-build/src/main.rs
index 38ca186d..24c10a60 100644
--- a/packages/proto-build/src/main.rs
+++ b/packages/proto-build/src/main.rs
@@ -14,7 +14,7 @@ use proto_build::{
 const COSMOS_SDK_REV: &str = "origin/osmosis-main";
 
 /// The osmosis commit or tag to be cloned and used to build the proto files
-const OSMOSIS_REV: &str = "origin/main";
+const OSMOSIS_REV: &str = "v15.0.0";
 
 // All paths must end with a / and either be absolute or include a ./ to reference the current
 // working directory.