diff --git a/x/leverage/keeper/grpc_query.go b/x/leverage/keeper/grpc_query.go
index 6e41db0da1..f8a0994126 100644
--- a/x/leverage/keeper/grpc_query.go
+++ b/x/leverage/keeper/grpc_query.go
@@ -294,7 +294,7 @@ func (q Querier) MaxWithdraw(
 
 	if req.Denom != "" {
 		// Denom specified
-		denoms = []string{req.GetDenom()}
+		denoms = []string{req.Denom}
 	} else {
 		// Denom not specified
 		for _, t := range q.Keeper.GetAllRegisteredTokens(ctx) {
@@ -355,7 +355,7 @@ func (q Querier) MaxBorrow(
 
 	if req.Denom != "" {
 		// Denom specified
-		denoms = []string{req.GetDenom()}
+		denoms = []string{req.Denom}
 	} else {
 		// Denom not specified
 		for _, t := range q.Keeper.GetAllRegisteredTokens(ctx) {
diff --git a/x/leverage/keeper/grpc_query_test.go b/x/leverage/keeper/grpc_query_test.go
index 438e51b03a..ac9de8455a 100644
--- a/x/leverage/keeper/grpc_query_test.go
+++ b/x/leverage/keeper/grpc_query_test.go
@@ -212,7 +212,7 @@ func (s *IntegrationTestSuite) TestQuerier_MaxBorrow() {
 
 	resp, err := s.queryClient.MaxBorrow(ctx.Context(), &types.QueryMaxBorrow{
 		Address: addr.String(),
-		XDenom:  &types.QueryMaxBorrow_Denom{Denom: umeeDenom},
+		Denom:   umeeDenom,
 	})
 	require.NoError(err)
 
@@ -237,7 +237,7 @@ func (s *IntegrationTestSuite) TestQuerier_MaxBorrow() {
 
 	resp, err = s.queryClient.MaxBorrow(ctx.Context(), &types.QueryMaxBorrow{
 		Address: addr.String(),
-		XDenom:  &types.QueryMaxBorrow_Denom{Denom: umeeDenom},
+		Denom:   umeeDenom,
 	})
 	require.NoError(err)
 
diff --git a/x/leverage/types/query.pb.go b/x/leverage/types/query.pb.go
index d1d4f5277c..1457b8a844 100644
--- a/x/leverage/types/query.pb.go
+++ b/x/leverage/types/query.pb.go
@@ -618,9 +618,9 @@ var xxx_messageInfo_QueryBadDebtsResponse proto.InternalMessageInfo
 // QueryMaxWithdraw defines the request structure for the MaxWithdraw gRPC service handler.
 type QueryMaxWithdraw struct {
 	Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"`
-	// Types that are valid to be assigned to XDenom:
-	//	*QueryMaxWithdraw_Denom
-	XDenom isQueryMaxWithdraw_XDenom `protobuf_oneof:"_denom"`
+	// denom is the base token denom associated with the uToken to withdraw.
+	// empty denom will query all registered tokens.
+	Denom string `protobuf:"bytes,2,opt,name=denom,proto3" json:"denom,omitempty"`
 }
 
 func (m *QueryMaxWithdraw) Reset()         { *m = QueryMaxWithdraw{} }
@@ -656,39 +656,6 @@ func (m *QueryMaxWithdraw) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_QueryMaxWithdraw proto.InternalMessageInfo
 
-type isQueryMaxWithdraw_XDenom interface {
-	isQueryMaxWithdraw_XDenom()
-	MarshalTo([]byte) (int, error)
-	Size() int
-}
-
-type QueryMaxWithdraw_Denom struct {
-	Denom string `protobuf:"bytes,2,opt,name=denom,proto3,oneof" json:"denom,omitempty"`
-}
-
-func (*QueryMaxWithdraw_Denom) isQueryMaxWithdraw_XDenom() {}
-
-func (m *QueryMaxWithdraw) GetXDenom() isQueryMaxWithdraw_XDenom {
-	if m != nil {
-		return m.XDenom
-	}
-	return nil
-}
-
-func (m *QueryMaxWithdraw) GetDenom() string {
-	if x, ok := m.GetXDenom().(*QueryMaxWithdraw_Denom); ok {
-		return x.Denom
-	}
-	return ""
-}
-
-// XXX_OneofWrappers is for the internal use of the proto package.
-func (*QueryMaxWithdraw) XXX_OneofWrappers() []interface{} {
-	return []interface{}{
-		(*QueryMaxWithdraw_Denom)(nil),
-	}
-}
-
 // QueryMaxWithdrawResponse defines the response structure for the MaxWithdraw gRPC service handler.
 type QueryMaxWithdrawResponse struct {
 	// uTokens is the maximum amount of uTokens that can be withdrawn
@@ -733,9 +700,9 @@ var xxx_messageInfo_QueryMaxWithdrawResponse proto.InternalMessageInfo
 // QueryMaxBorrow defines the request structure for the MaxBorrow gRPC service handler.
 type QueryMaxBorrow struct {
 	Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"`
-	// Types that are valid to be assigned to XDenom:
-	//	*QueryMaxBorrow_Denom
-	XDenom isQueryMaxBorrow_XDenom `protobuf_oneof:"_denom"`
+	// denom is the base token denom to borrow.
+	// empty denom will query all registered tokens.
+	Denom string `protobuf:"bytes,2,opt,name=denom,proto3" json:"denom,omitempty"`
 }
 
 func (m *QueryMaxBorrow) Reset()         { *m = QueryMaxBorrow{} }
@@ -771,39 +738,6 @@ func (m *QueryMaxBorrow) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_QueryMaxBorrow proto.InternalMessageInfo
 
-type isQueryMaxBorrow_XDenom interface {
-	isQueryMaxBorrow_XDenom()
-	MarshalTo([]byte) (int, error)
-	Size() int
-}
-
-type QueryMaxBorrow_Denom struct {
-	Denom string `protobuf:"bytes,2,opt,name=denom,proto3,oneof" json:"denom,omitempty"`
-}
-
-func (*QueryMaxBorrow_Denom) isQueryMaxBorrow_XDenom() {}
-
-func (m *QueryMaxBorrow) GetXDenom() isQueryMaxBorrow_XDenom {
-	if m != nil {
-		return m.XDenom
-	}
-	return nil
-}
-
-func (m *QueryMaxBorrow) GetDenom() string {
-	if x, ok := m.GetXDenom().(*QueryMaxBorrow_Denom); ok {
-		return x.Denom
-	}
-	return ""
-}
-
-// XXX_OneofWrappers is for the internal use of the proto package.
-func (*QueryMaxBorrow) XXX_OneofWrappers() []interface{} {
-	return []interface{}{
-		(*QueryMaxBorrow_Denom)(nil),
-	}
-}
-
 // QueryMaxBorrowResponse defines the response structure for the MaxBorrow gRPC service handler.
 type QueryMaxBorrowResponse struct {
 	// Tokens is the maximum amount of tokens that can be borrowed
@@ -867,96 +801,95 @@ func init() {
 func init() { proto.RegisterFile("umee/leverage/v1/query.proto", fileDescriptor_1e8137dcabb0ccc7) }
 
 var fileDescriptor_1e8137dcabb0ccc7 = []byte{
-	// 1417 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x98, 0x5d, 0x6f, 0x1b, 0x45,
-	0x17, 0xc7, 0xb3, 0x49, 0x9b, 0xc4, 0xc7, 0x71, 0x92, 0xce, 0x93, 0x36, 0x5b, 0x37, 0xb5, 0xdd,
-	0x6d, 0xd3, 0xa6, 0x7d, 0x88, 0xb7, 0x69, 0x25, 0x24, 0x04, 0x12, 0xaa, 0x5b, 0x10, 0xa0, 0xb4,
-	0x24, 0x6e, 0x0b, 0x6a, 0x2b, 0x64, 0x8d, 0x77, 0x47, 0x9b, 0x55, 0xf6, 0xc5, 0xdd, 0x5d, 0x3b,
-	0x36, 0x52, 0x25, 0x84, 0x84, 0xc4, 0x0d, 0x12, 0x08, 0x71, 0xc1, 0x25, 0xb7, 0x7c, 0x92, 0x5c,
-	0x56, 0xe2, 0x06, 0x21, 0x11, 0xa0, 0x45, 0x5c, 0xf4, 0x0b, 0x70, 0x8b, 0x76, 0xde, 0xbc, 0xf1,
-	0xc6, 0xad, 0xb3, 0x90, 0xab, 0x78, 0x77, 0xce, 0xf9, 0x9d, 0xff, 0x9c, 0x99, 0x3d, 0x73, 0x26,
-	0xb0, 0xd4, 0x76, 0x09, 0xd1, 0x1d, 0xd2, 0x21, 0x01, 0xb6, 0x88, 0xde, 0x59, 0xd3, 0x1f, 0xb7,
-	0x49, 0xd0, 0xab, 0xb6, 0x02, 0x3f, 0xf2, 0xd1, 0x7c, 0x3c, 0x5a, 0x15, 0xa3, 0xd5, 0xce, 0x5a,
-	0x71, 0xc9, 0xf2, 0x7d, 0xcb, 0x21, 0x3a, 0x6e, 0xd9, 0x3a, 0xf6, 0x3c, 0x3f, 0xc2, 0x91, 0xed,
-	0x7b, 0x21, 0xb3, 0x2f, 0x96, 0x52, 0x34, 0x8b, 0x78, 0x24, 0xb4, 0xc5, 0x78, 0x39, 0x35, 0x2e,
-	0xd9, 0xcc, 0x60, 0xc1, 0xf2, 0x2d, 0x9f, 0xfe, 0xd4, 0xe3, 0x5f, 0x02, 0x6b, 0xf8, 0xa1, 0xeb,
-	0x87, 0x7a, 0x13, 0x87, 0xb1, 0x53, 0x93, 0x44, 0x78, 0x4d, 0x37, 0x7c, 0xdb, 0x63, 0xe3, 0x5a,
-	0x01, 0xf2, 0x9b, 0xb1, 0xea, 0x0d, 0x1c, 0x60, 0x37, 0xd4, 0x6e, 0xc3, 0xff, 0x12, 0x8f, 0x75,
-	0x12, 0xb6, 0x7c, 0x2f, 0x24, 0xe8, 0x75, 0x98, 0x6c, 0xd1, 0x37, 0xaa, 0x52, 0x51, 0x56, 0xf2,
-	0xd7, 0xd4, 0xea, 0xe0, 0xec, 0xaa, 0xcc, 0xa3, 0x76, 0x6c, 0x77, 0xaf, 0x3c, 0x56, 0xe7, 0xd6,
-	0xda, 0x22, 0x9c, 0xa4, 0xb8, 0x3a, 0xb1, 0xec, 0x30, 0x22, 0x01, 0x31, 0xef, 0xf9, 0xdb, 0xc4,
-	0x0b, 0xb5, 0x87, 0x70, 0xf6, 0xc0, 0x01, 0x19, 0xf1, 0x0d, 0x98, 0x0e, 0xe8, 0x58, 0xd0, 0x53,
-	0x95, 0xca, 0xc4, 0x4a, 0xfe, 0xda, 0x62, 0x3a, 0x26, 0xf5, 0xe1, 0x21, 0xa5, 0xb9, 0x76, 0x05,
-	0x10, 0x65, 0xdf, 0xc6, 0xc1, 0x36, 0x89, 0xee, 0xb6, 0x5d, 0x17, 0x07, 0x3d, 0xb4, 0x00, 0xc7,
-	0x4d, 0xe2, 0xf9, 0x2e, 0x9d, 0x41, 0xae, 0xce, 0x1e, 0xb4, 0xcf, 0x66, 0xa0, 0x98, 0x36, 0x96,
-	0x2a, 0xce, 0xc1, 0x4c, 0xd8, 0x73, 0x9b, 0xbe, 0xd3, 0x48, 0xfa, 0xe6, 0xd9, 0xbb, 0x5b, 0xf1,
-	0x2b, 0x54, 0x84, 0x69, 0xd2, 0x6d, 0xf9, 0x1e, 0xf1, 0x22, 0x75, 0xbc, 0xa2, 0xac, 0x14, 0xea,
-	0xf2, 0x19, 0x6d, 0xc2, 0x8c, 0x1f, 0x60, 0xc3, 0x21, 0x8d, 0x56, 0x60, 0x1b, 0x44, 0x9d, 0x88,
-	0xdd, 0x6b, 0xd5, 0xdd, 0xbd, 0xb2, 0xf2, 0xcb, 0x5e, 0xf9, 0xa2, 0x65, 0x47, 0x5b, 0xed, 0x66,
-	0xd5, 0xf0, 0x5d, 0x9d, 0xaf, 0x12, 0xfb, 0xb3, 0x1a, 0x9a, 0xdb, 0x7a, 0xd4, 0x6b, 0x91, 0xb0,
-	0x7a, 0x8b, 0x18, 0xf5, 0x3c, 0x63, 0x6c, 0xc4, 0x08, 0xd4, 0x85, 0x85, 0x36, 0x9d, 0x76, 0x83,
-	0x74, 0x8d, 0x2d, 0xec, 0x59, 0xa4, 0x11, 0xe0, 0x88, 0xa8, 0xc7, 0x28, 0xfa, 0xdd, 0x38, 0x15,
-	0xa3, 0xa3, 0x5f, 0xec, 0x95, 0x17, 0xda, 0x51, 0x9a, 0x56, 0x47, 0x2c, 0xc6, 0x3b, 0xfc, 0x65,
-	0x1d, 0x47, 0x04, 0x3d, 0x02, 0x08, 0xdb, 0xad, 0x96, 0xd3, 0x6b, 0xdc, 0xd8, 0x78, 0xa0, 0x1e,
-	0xa7, 0xf1, 0xde, 0x3a, 0x74, 0x3c, 0xc1, 0xc0, 0xad, 0x5e, 0x3d, 0xc7, 0x7e, 0xdf, 0xd8, 0x78,
-	0x10, 0xc3, 0x9b, 0x7e, 0x10, 0xf8, 0x3b, 0x14, 0x3e, 0x99, 0x15, 0xce, 0x19, 0x14, 0xce, 0x7e,
-	0xc7, 0xf0, 0x0f, 0x60, 0x9a, 0x46, 0xb2, 0x89, 0xa9, 0x4e, 0xc9, 0x25, 0x18, 0x15, 0xfd, 0xbe,
-	0x17, 0xd5, 0xa5, 0x7f, 0xcc, 0x0a, 0x48, 0x48, 0x82, 0x0e, 0x31, 0xd5, 0xe9, 0x6c, 0x2c, 0xe1,
-	0x8f, 0xee, 0x00, 0x18, 0xbe, 0xe3, 0xe0, 0x88, 0x04, 0xd8, 0x51, 0x73, 0x99, 0x68, 0x09, 0x42,
-	0xac, 0x8d, 0x4d, 0x9a, 0x98, 0x2a, 0x64, 0xd3, 0x26, 0xfc, 0xd1, 0x3a, 0xe4, 0x1c, 0xfb, 0x71,
-	0xdb, 0x36, 0xed, 0xa8, 0xa7, 0xe6, 0x33, 0xc1, 0xfa, 0x00, 0x74, 0x1f, 0x66, 0x5d, 0xdc, 0xb5,
-	0xdd, 0xb6, 0xdb, 0x60, 0x11, 0xd4, 0x99, 0x4c, 0xc8, 0x02, 0xa7, 0xd4, 0x28, 0x04, 0x7d, 0x02,
-	0x48, 0x60, 0x13, 0x89, 0x2c, 0x64, 0x42, 0x9f, 0xe0, 0xa4, 0x9b, 0xfd, 0x7c, 0x3e, 0x82, 0x13,
-	0xae, 0xed, 0x51, 0x7c, 0x3f, 0x17, 0xb3, 0x99, 0xe8, 0xf3, 0x1c, 0xb4, 0x2e, 0x53, 0x62, 0x42,
-	0x81, 0x7f, 0xc8, 0xec, 0x2b, 0x50, 0xe7, 0x28, 0xf8, 0xed, 0xc3, 0x81, 0x5f, 0xec, 0x95, 0x0b,
-	0xfc, 0x0b, 0x66, 0x98, 0xfa, 0x0c, 0xa3, 0xde, 0xa5, 0x4f, 0xe8, 0x01, 0xcc, 0xe3, 0x0e, 0xb6,
-	0x1d, 0xdc, 0x74, 0x88, 0x48, 0xfd, 0x7c, 0xa6, 0x19, 0xcc, 0x49, 0x4e, 0x3f, 0xf9, 0x7d, 0xf4,
-	0x8e, 0x1d, 0x6d, 0x99, 0x01, 0xde, 0x51, 0x4f, 0x64, 0x4b, 0xbe, 0x24, 0x7d, 0xcc, 0x41, 0xc8,
-	0x82, 0xc5, 0x3e, 0xbe, 0xbf, 0xba, 0xf6, 0xa7, 0x44, 0x45, 0x99, 0x62, 0x9c, 0x92, 0xb8, 0x9b,
-	0x49, 0x9a, 0x76, 0x15, 0x16, 0xe8, 0x09, 0x70, 0xc3, 0x30, 0xfc, 0xb6, 0x17, 0xd5, 0xb0, 0x83,
-	0x3d, 0x83, 0x84, 0x48, 0x85, 0x29, 0x6c, 0x9a, 0x01, 0x09, 0x43, 0x5e, 0xf6, 0xc5, 0xa3, 0xf6,
-	0xeb, 0x38, 0x2c, 0x1d, 0xe4, 0x22, 0x8f, 0x0d, 0x2b, 0x51, 0x70, 0xd8, 0xe1, 0x75, 0xba, 0xca,
-	0x34, 0x55, 0xe3, 0x73, 0xb8, 0xca, 0xcf, 0xe1, 0xea, 0x4d, 0xdf, 0xf6, 0x6a, 0x57, 0xe3, 0x79,
-	0xfc, 0xf8, 0x5b, 0x79, 0x65, 0x84, 0x79, 0xc4, 0x0e, 0x61, 0xa2, 0x1a, 0x6d, 0xef, 0xab, 0x20,
-	0xe3, 0xff, 0x7d, 0xa8, 0x64, 0x79, 0xb1, 0x12, 0xe5, 0x65, 0xe2, 0x08, 0x66, 0x25, 0xe0, 0x9a,
-	0xce, 0x9b, 0x10, 0x9e, 0x5e, 0x71, 0x82, 0x0f, 0x5f, 0x90, 0xbd, 0x09, 0x38, 0x73, 0x80, 0x87,
-	0x5c, 0x8f, 0xfb, 0x30, 0x2b, 0x52, 0xd6, 0xe8, 0x60, 0xa7, 0x4d, 0x18, 0xe0, 0x50, 0x5b, 0x28,
-	0x3e, 0x89, 0x0b, 0x82, 0xf2, 0x51, 0x0c, 0x89, 0x3f, 0xae, 0x7e, 0x7a, 0x38, 0x78, 0x3c, 0x13,
-	0x78, 0xae, 0xcf, 0x61, 0xe8, 0xfb, 0x30, 0x2b, 0xd2, 0xc1, 0xc1, 0x13, 0xd9, 0x14, 0x0b, 0x0a,
-	0xc3, 0x6e, 0xc2, 0x0c, 0x3f, 0x22, 0x1d, 0xdb, 0xb5, 0x23, 0xde, 0x35, 0x1c, 0x16, 0x9a, 0x67,
-	0x8c, 0xf5, 0x18, 0x81, 0x0c, 0x38, 0xc9, 0x8a, 0x23, 0xed, 0x66, 0x1b, 0xd1, 0x56, 0x40, 0xc2,
-	0x2d, 0xdf, 0x31, 0x79, 0x87, 0x70, 0x58, 0xf6, 0x42, 0x02, 0x76, 0x4f, 0xb0, 0xb4, 0xd3, 0xb0,
-	0x48, 0xd7, 0x77, 0x3d, 0x31, 0x88, 0x03, 0x8b, 0x44, 0xa1, 0xf6, 0x26, 0x94, 0x87, 0x0c, 0xc9,
-	0xe5, 0x57, 0x61, 0x2a, 0x62, 0xaf, 0xe8, 0xd7, 0x98, 0xab, 0x8b, 0x47, 0x6d, 0x0e, 0x0a, 0xd4,
-	0xb9, 0x86, 0xcd, 0x5b, 0xa4, 0x19, 0x85, 0x5a, 0x9d, 0x37, 0xac, 0xe2, 0x45, 0xa2, 0x1f, 0xdd,
-	0xc7, 0x88, 0xf7, 0x7e, 0xaa, 0x1d, 0xe5, 0x4e, 0xbc, 0x21, 0x95, 0x41, 0x36, 0x61, 0x9e, 0xb7,
-	0x98, 0x5d, 0x59, 0xdd, 0x86, 0xee, 0x65, 0x74, 0x5a, 0xf4, 0xa9, 0x74, 0x27, 0xbd, 0x37, 0xc6,
-	0x3b, 0xd5, 0x2f, 0x15, 0xa5, 0x36, 0x0d, 0x93, 0xac, 0x0f, 0xd5, 0xfe, 0x52, 0x40, 0x1d, 0x64,
-	0x4a, 0xa9, 0x04, 0xa6, 0xd8, 0x19, 0x10, 0x1e, 0x45, 0xf1, 0x11, 0x6c, 0x64, 0xc0, 0x64, 0xc4,
-	0xa2, 0x1c, 0x41, 0xdd, 0xe1, 0x68, 0xed, 0x43, 0x98, 0x15, 0xf3, 0xe4, 0xc7, 0xce, 0xbf, 0xcc,
-	0xdc, 0x13, 0x38, 0xb5, 0x1f, 0x28, 0xd3, 0xd6, 0x9f, 0x8f, 0x72, 0x64, 0xf3, 0xb9, 0xf6, 0x77,
-	0x0e, 0x8e, 0xd3, 0xf8, 0xa8, 0x05, 0x93, 0xec, 0xca, 0x84, 0xce, 0xa6, 0x77, 0x52, 0xe2, 0x0e,
-	0x56, 0x5c, 0x7e, 0xe9, 0xb0, 0x90, 0xaf, 0x55, 0x3e, 0xff, 0xe9, 0xcf, 0x6f, 0xc7, 0x8b, 0x48,
-	0xd5, 0x53, 0x17, 0x45, 0x76, 0x19, 0x43, 0xdf, 0x2b, 0x30, 0x3f, 0x78, 0xdf, 0x42, 0x97, 0x86,
-	0xd0, 0x07, 0x0d, 0x8b, 0xfa, 0x88, 0x86, 0x52, 0xd0, 0xff, 0xa9, 0xa0, 0x65, 0x74, 0x3e, 0x2d,
-	0x28, 0x90, 0x3e, 0x0d, 0x96, 0x17, 0xf4, 0x95, 0x02, 0x85, 0xfd, 0xf7, 0xb5, 0x0b, 0x43, 0xe2,
-	0xed, 0xb3, 0x2a, 0xbe, 0x36, 0x8a, 0x95, 0x94, 0xb4, 0x42, 0x25, 0x69, 0xa8, 0x92, 0x96, 0xe4,
-	0x52, 0x87, 0x46, 0xc8, 0xa3, 0x7f, 0xa7, 0xc0, 0xdc, 0x60, 0x43, 0x70, 0x71, 0x48, 0xac, 0x01,
-	0xbb, 0x62, 0x75, 0x34, 0x3b, 0xa9, 0xea, 0x0a, 0x55, 0x75, 0x01, 0x69, 0x69, 0x55, 0x98, 0xb9,
-	0x34, 0x9a, 0x42, 0xc3, 0x37, 0x0a, 0xcc, 0x0e, 0x1c, 0x8b, 0xcb, 0x2f, 0x0f, 0x27, 0x32, 0xb5,
-	0x3a, 0x92, 0x99, 0x14, 0x75, 0x99, 0x8a, 0x3a, 0x8f, 0xce, 0x0d, 0x17, 0x25, 0x72, 0xf5, 0x83,
-	0x02, 0x28, 0x5d, 0x7d, 0xd1, 0xe5, 0x21, 0x01, 0xd3, 0xa6, 0xc5, 0xb5, 0x91, 0x4d, 0xa5, 0xbe,
-	0x55, 0xaa, 0xef, 0x12, 0x5a, 0x4e, 0xeb, 0xdb, 0x77, 0x1c, 0x71, 0x31, 0x3d, 0x98, 0x16, 0x25,
-	0x1d, 0x95, 0x87, 0x44, 0x13, 0x06, 0xc5, 0x4b, 0xaf, 0x30, 0x90, 0x22, 0xce, 0x53, 0x11, 0x67,
-	0xd1, 0x99, 0xb4, 0x88, 0x26, 0x36, 0x1b, 0x26, 0x0d, 0xf7, 0x85, 0x02, 0xf9, 0x64, 0xe9, 0xd7,
-	0x86, 0x6e, 0x59, 0x69, 0x53, 0xbc, 0xf2, 0x6a, 0x1b, 0x29, 0xe2, 0x22, 0x15, 0x51, 0x41, 0xa5,
-	0x83, 0x36, 0x75, 0x57, 0x76, 0xe6, 0xe8, 0x09, 0xe4, 0xfa, 0x55, 0xb4, 0x32, 0x3c, 0x00, 0xb3,
-	0x28, 0xae, 0xbc, 0xca, 0x42, 0x0a, 0xb8, 0x40, 0x05, 0x94, 0xd0, 0xd2, 0xc1, 0x02, 0x58, 0xb3,
-	0x50, 0xbb, 0xb3, 0xfb, 0x47, 0x69, 0x6c, 0xf7, 0x59, 0x49, 0x79, 0xfa, 0xac, 0xa4, 0xfc, 0xfe,
-	0xac, 0xa4, 0x7c, 0xfd, 0xbc, 0x34, 0xf6, 0xf4, 0x79, 0x69, 0xec, 0xe7, 0xe7, 0xa5, 0xb1, 0x87,
-	0x57, 0x13, 0x95, 0x34, 0xa6, 0xac, 0x7a, 0x24, 0xda, 0xf1, 0x83, 0x6d, 0x86, 0xec, 0x5c, 0xd7,
-	0xbb, 0x7d, 0x2e, 0xad, 0xab, 0xcd, 0x49, 0xfa, 0xff, 0xab, 0xeb, 0xff, 0x04, 0x00, 0x00, 0xff,
-	0xff, 0x7e, 0x24, 0x8f, 0xdf, 0x86, 0x13, 0x00, 0x00,
+	// 1399 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x98, 0xdf, 0x6f, 0xdb, 0x54,
+	0x14, 0xc7, 0xeb, 0x76, 0xeb, 0x8f, 0x93, 0xa6, 0xed, 0x2e, 0xdd, 0xea, 0x65, 0x5d, 0x92, 0x79,
+	0xeb, 0xd6, 0x0d, 0x1a, 0xaf, 0x9b, 0x84, 0x84, 0x40, 0x82, 0x65, 0x03, 0x09, 0xd4, 0x4d, 0x5d,
+	0xb6, 0x81, 0xb6, 0x09, 0x45, 0x37, 0xf6, 0x95, 0x6b, 0xd5, 0x3f, 0x32, 0xdb, 0x49, 0x13, 0xa4,
+	0x49, 0x08, 0x89, 0x47, 0x24, 0x10, 0xe2, 0x81, 0x47, 0x5e, 0xf9, 0x4b, 0xfa, 0x38, 0x89, 0x17,
+	0x84, 0x44, 0x81, 0x0d, 0xf1, 0xb0, 0x7f, 0x80, 0x57, 0xe4, 0xfb, 0xcb, 0x6e, 0xdc, 0x6c, 0xa9,
+	0x45, 0x9f, 0x1a, 0xfb, 0x9e, 0xf3, 0x39, 0xdf, 0x7b, 0xae, 0x7d, 0xce, 0x71, 0x61, 0xb9, 0xe3,
+	0x12, 0xa2, 0x3b, 0xa4, 0x4b, 0x02, 0x6c, 0x11, 0xbd, 0xbb, 0xae, 0x3f, 0xe9, 0x90, 0xa0, 0x5f,
+	0x6b, 0x07, 0x7e, 0xe4, 0xa3, 0x85, 0x78, 0xb5, 0x26, 0x56, 0x6b, 0xdd, 0xf5, 0xd2, 0xb2, 0xe5,
+	0xfb, 0x96, 0x43, 0x74, 0xdc, 0xb6, 0x75, 0xec, 0x79, 0x7e, 0x84, 0x23, 0xdb, 0xf7, 0x42, 0x66,
+	0x5f, 0x2a, 0x67, 0x68, 0x16, 0xf1, 0x48, 0x68, 0x8b, 0xf5, 0x4a, 0x66, 0x5d, 0xb2, 0x99, 0xc1,
+	0xa2, 0xe5, 0x5b, 0x3e, 0xfd, 0xa9, 0xc7, 0xbf, 0x04, 0xd6, 0xf0, 0x43, 0xd7, 0x0f, 0xf5, 0x16,
+	0x0e, 0x63, 0xa7, 0x16, 0x89, 0xf0, 0xba, 0x6e, 0xf8, 0xb6, 0xc7, 0xd6, 0xb5, 0x22, 0x14, 0xee,
+	0xc6, 0xaa, 0x37, 0x71, 0x80, 0xdd, 0x50, 0xbb, 0x0d, 0x6f, 0xa4, 0x2e, 0x1b, 0x24, 0x6c, 0xfb,
+	0x5e, 0x48, 0xd0, 0xdb, 0x30, 0xd9, 0xa6, 0x77, 0x54, 0xa5, 0xaa, 0xac, 0x16, 0xae, 0xa9, 0xb5,
+	0xc1, 0xdd, 0xd5, 0x98, 0x47, 0xfd, 0xd8, 0xee, 0x5e, 0x65, 0xac, 0xc1, 0xad, 0xb5, 0x25, 0x38,
+	0x49, 0x71, 0x0d, 0x62, 0xd9, 0x61, 0x44, 0x02, 0x62, 0xde, 0xf7, 0xb7, 0x89, 0x17, 0x6a, 0x8f,
+	0xe0, 0xec, 0x81, 0x0b, 0x32, 0xe2, 0x3b, 0x30, 0x1d, 0xd0, 0xb5, 0xa0, 0xaf, 0x2a, 0xd5, 0x89,
+	0xd5, 0xc2, 0xb5, 0xa5, 0x6c, 0x4c, 0xea, 0xc3, 0x43, 0x4a, 0x73, 0xed, 0x0a, 0x20, 0xca, 0xbe,
+	0x8d, 0x83, 0x6d, 0x12, 0xdd, 0xeb, 0xb8, 0x2e, 0x0e, 0xfa, 0x68, 0x11, 0x8e, 0x9b, 0xc4, 0xf3,
+	0x5d, 0xba, 0x83, 0x99, 0x06, 0xbb, 0xd0, 0xbe, 0x9c, 0x85, 0x52, 0xd6, 0x58, 0xaa, 0x38, 0x07,
+	0xb3, 0x61, 0xdf, 0x6d, 0xf9, 0x4e, 0x33, 0xed, 0x5b, 0x60, 0xf7, 0x6e, 0xc5, 0xb7, 0x50, 0x09,
+	0xa6, 0x49, 0xaf, 0xed, 0x7b, 0xc4, 0x8b, 0xd4, 0xf1, 0xaa, 0xb2, 0x5a, 0x6c, 0xc8, 0x6b, 0x74,
+	0x17, 0x66, 0xfd, 0x00, 0x1b, 0x0e, 0x69, 0xb6, 0x03, 0xdb, 0x20, 0xea, 0x44, 0xec, 0x5e, 0xaf,
+	0xed, 0xee, 0x55, 0x94, 0xdf, 0xf6, 0x2a, 0x17, 0x2d, 0x3b, 0xda, 0xea, 0xb4, 0x6a, 0x86, 0xef,
+	0xea, 0xfc, 0x94, 0xd8, 0x9f, 0xb5, 0xd0, 0xdc, 0xd6, 0xa3, 0x7e, 0x9b, 0x84, 0xb5, 0x5b, 0xc4,
+	0x68, 0x14, 0x18, 0x63, 0x33, 0x46, 0xa0, 0x1e, 0x2c, 0x76, 0xe8, 0xb6, 0x9b, 0xa4, 0x67, 0x6c,
+	0x61, 0xcf, 0x22, 0xcd, 0x00, 0x47, 0x44, 0x3d, 0x46, 0xd1, 0x1f, 0xc5, 0xa9, 0x18, 0x1d, 0xfd,
+	0x72, 0xaf, 0xb2, 0xd8, 0x89, 0xb2, 0xb4, 0x06, 0x62, 0x31, 0x3e, 0xe4, 0x37, 0x1b, 0x38, 0x22,
+	0xe8, 0x31, 0x40, 0xd8, 0x69, 0xb7, 0x9d, 0x7e, 0xf3, 0xc6, 0xe6, 0x43, 0xf5, 0x38, 0x8d, 0xf7,
+	0xde, 0xa1, 0xe3, 0x09, 0x06, 0x6e, 0xf7, 0x1b, 0x33, 0xec, 0xf7, 0x8d, 0xcd, 0x87, 0x31, 0xbc,
+	0xe5, 0x07, 0x81, 0xbf, 0x43, 0xe1, 0x93, 0x79, 0xe1, 0x9c, 0x41, 0xe1, 0xec, 0x77, 0x0c, 0xff,
+	0x04, 0xa6, 0x69, 0x24, 0x9b, 0x98, 0xea, 0x94, 0x3c, 0x82, 0x51, 0xd1, 0x1f, 0x7b, 0x51, 0x43,
+	0xfa, 0xc7, 0xac, 0x80, 0x84, 0x24, 0xe8, 0x12, 0x53, 0x9d, 0xce, 0xc7, 0x12, 0xfe, 0xe8, 0x0e,
+	0x80, 0xe1, 0x3b, 0x0e, 0x8e, 0x48, 0x80, 0x1d, 0x75, 0x26, 0x17, 0x2d, 0x45, 0x88, 0xb5, 0xb1,
+	0x4d, 0x13, 0x53, 0x85, 0x7c, 0xda, 0x84, 0x3f, 0xda, 0x80, 0x19, 0xc7, 0x7e, 0xd2, 0xb1, 0x4d,
+	0x3b, 0xea, 0xab, 0x85, 0x5c, 0xb0, 0x04, 0x80, 0x1e, 0xc0, 0x9c, 0x8b, 0x7b, 0xb6, 0xdb, 0x71,
+	0x9b, 0x2c, 0x82, 0x3a, 0x9b, 0x0b, 0x59, 0xe4, 0x94, 0x3a, 0x85, 0xa0, 0xcf, 0x01, 0x09, 0x6c,
+	0x2a, 0x91, 0xc5, 0x5c, 0xe8, 0x13, 0x9c, 0x74, 0x33, 0xc9, 0xe7, 0x63, 0x38, 0xe1, 0xda, 0x1e,
+	0xc5, 0x27, 0xb9, 0x98, 0xcb, 0x45, 0x5f, 0xe0, 0xa0, 0x0d, 0x99, 0x12, 0x13, 0x8a, 0xfc, 0x45,
+	0x66, 0x6f, 0x81, 0x3a, 0x4f, 0xc1, 0xef, 0x1f, 0x0e, 0xfc, 0x72, 0xaf, 0x52, 0xe4, 0x6f, 0x30,
+	0xc3, 0x34, 0x66, 0x19, 0xf5, 0x1e, 0xbd, 0x42, 0x0f, 0x61, 0x01, 0x77, 0xb1, 0xed, 0xe0, 0x96,
+	0x43, 0x44, 0xea, 0x17, 0x72, 0xed, 0x60, 0x5e, 0x72, 0x92, 0xe4, 0x27, 0xe8, 0x1d, 0x3b, 0xda,
+	0x32, 0x03, 0xbc, 0xa3, 0x9e, 0xc8, 0x97, 0x7c, 0x49, 0xfa, 0x8c, 0x83, 0x90, 0x05, 0x4b, 0x09,
+	0x3e, 0x39, 0x5d, 0xfb, 0x0b, 0xa2, 0xa2, 0x5c, 0x31, 0x4e, 0x49, 0xdc, 0xcd, 0x34, 0x4d, 0xbb,
+	0x0a, 0x8b, 0xb4, 0x03, 0xdc, 0x30, 0x0c, 0xbf, 0xe3, 0x45, 0x75, 0xec, 0x60, 0xcf, 0x20, 0x21,
+	0x52, 0x61, 0x0a, 0x9b, 0x66, 0x40, 0xc2, 0x90, 0x97, 0x7d, 0x71, 0xa9, 0xfd, 0x3e, 0x0e, 0xcb,
+	0x07, 0xb9, 0xc8, 0xb6, 0x61, 0xa5, 0x0a, 0x0e, 0x6b, 0x5e, 0xa7, 0x6b, 0x4c, 0x53, 0x2d, 0xee,
+	0xc3, 0x35, 0xde, 0x87, 0x6b, 0x37, 0x7d, 0xdb, 0xab, 0x5f, 0x8d, 0xf7, 0xf1, 0xf3, 0x1f, 0x95,
+	0xd5, 0x11, 0xf6, 0x11, 0x3b, 0x84, 0xa9, 0x6a, 0xb4, 0xbd, 0xaf, 0x82, 0x8c, 0xff, 0xff, 0xa1,
+	0xd2, 0xe5, 0xc5, 0x4a, 0x95, 0x97, 0x89, 0x23, 0xd8, 0x95, 0x80, 0x6b, 0x3a, 0x1f, 0x42, 0x78,
+	0x7a, 0x45, 0x07, 0x1f, 0x7e, 0x20, 0x7b, 0x13, 0x70, 0xe6, 0x00, 0x0f, 0x79, 0x1e, 0x0f, 0x60,
+	0x4e, 0xa4, 0xac, 0xd9, 0xc5, 0x4e, 0x87, 0x30, 0xc0, 0xa1, 0x1e, 0xa1, 0xb8, 0x13, 0x17, 0x05,
+	0xe5, 0xd3, 0x18, 0x12, 0xbf, 0x5c, 0x49, 0x7a, 0x38, 0x78, 0x3c, 0x17, 0x78, 0x3e, 0xe1, 0x30,
+	0xf4, 0x03, 0x98, 0x13, 0xe9, 0xe0, 0xe0, 0x89, 0x7c, 0x8a, 0x05, 0x85, 0x61, 0xef, 0xc2, 0x2c,
+	0x6f, 0x91, 0x8e, 0xed, 0xda, 0x11, 0x9f, 0x1a, 0x0e, 0x0b, 0x2d, 0x30, 0xc6, 0x46, 0x8c, 0x40,
+	0x06, 0x9c, 0x64, 0xc5, 0x91, 0x4e, 0xb3, 0xcd, 0x68, 0x2b, 0x20, 0xe1, 0x96, 0xef, 0x98, 0x7c,
+	0x42, 0x38, 0x2c, 0x7b, 0x31, 0x05, 0xbb, 0x2f, 0x58, 0xda, 0x69, 0x58, 0xa2, 0xe7, 0xbb, 0x91,
+	0x5a, 0xc4, 0x81, 0x45, 0xa2, 0x50, 0x7b, 0x17, 0x2a, 0x43, 0x96, 0xe4, 0xf1, 0xab, 0x30, 0x15,
+	0xb1, 0x5b, 0xf4, 0x6d, 0x9c, 0x69, 0x88, 0x4b, 0x6d, 0x1e, 0x8a, 0xd4, 0xb9, 0x8e, 0xcd, 0x5b,
+	0xa4, 0x15, 0x85, 0x5a, 0x83, 0x0f, 0xac, 0xe2, 0x46, 0x6a, 0x1e, 0xdd, 0xc7, 0x88, 0x9f, 0xfd,
+	0xcc, 0x38, 0xca, 0x9d, 0xf8, 0x40, 0x2a, 0x83, 0xd4, 0x61, 0x81, 0x8f, 0x98, 0x3d, 0x59, 0xdd,
+	0x86, 0x3e, 0xcb, 0xc9, 0x9c, 0x3a, 0x9e, 0x9e, 0x53, 0xff, 0x51, 0x40, 0x1d, 0x84, 0x48, 0x6d,
+	0x04, 0xa6, 0x58, 0xd1, 0x0f, 0x8f, 0xa2, 0xda, 0x08, 0x36, 0x32, 0x60, 0x32, 0x62, 0x51, 0x8e,
+	0xa0, 0xd0, 0x70, 0xb4, 0xf6, 0x01, 0xcc, 0x89, 0x7d, 0xf2, 0x3e, 0x73, 0xd8, 0x54, 0x3d, 0x85,
+	0x53, 0xfb, 0x09, 0x32, 0x4f, 0xc9, 0x06, 0x94, 0x23, 0xdb, 0xc0, 0xb5, 0x7f, 0x67, 0xe0, 0x38,
+	0x8d, 0x8f, 0xda, 0x30, 0xc9, 0x3e, 0x8a, 0xd0, 0xd9, 0xec, 0xb3, 0x92, 0xfa, 0xca, 0x2a, 0xad,
+	0xbc, 0x72, 0x59, 0xc8, 0xd7, 0xaa, 0x5f, 0xfd, 0xf2, 0xf7, 0xf7, 0xe3, 0x25, 0xa4, 0xea, 0x99,
+	0x4f, 0x41, 0xf6, 0xb9, 0x85, 0x7e, 0x54, 0x60, 0x61, 0xf0, 0x8b, 0x0a, 0x5d, 0x1a, 0x42, 0x1f,
+	0x34, 0x2c, 0xe9, 0x23, 0x1a, 0x4a, 0x41, 0x6f, 0x52, 0x41, 0x2b, 0xe8, 0x7c, 0x56, 0x50, 0x20,
+	0x7d, 0x9a, 0x2c, 0x2f, 0xe8, 0x1b, 0x05, 0x8a, 0xfb, 0xbf, 0xc8, 0x2e, 0x0c, 0x89, 0xb7, 0xcf,
+	0xaa, 0xf4, 0xd6, 0x28, 0x56, 0x52, 0xd2, 0x2a, 0x95, 0xa4, 0xa1, 0x6a, 0x56, 0x92, 0x4b, 0x1d,
+	0x9a, 0x21, 0x8f, 0xfe, 0x83, 0x02, 0xf3, 0x83, 0x2d, 0xff, 0xe2, 0x90, 0x58, 0x03, 0x76, 0xa5,
+	0xda, 0x68, 0x76, 0x52, 0xd5, 0x15, 0xaa, 0xea, 0x02, 0xd2, 0xb2, 0xaa, 0x30, 0x73, 0x69, 0xb6,
+	0x84, 0x86, 0xef, 0x14, 0x98, 0x1b, 0x68, 0x7c, 0x2b, 0xaf, 0x0e, 0x27, 0x32, 0xb5, 0x36, 0x92,
+	0x99, 0x14, 0x75, 0x99, 0x8a, 0x3a, 0x8f, 0xce, 0x0d, 0x17, 0x25, 0x72, 0xf5, 0x93, 0x02, 0x28,
+	0x5b, 0x5f, 0xd1, 0xe5, 0x21, 0x01, 0xb3, 0xa6, 0xa5, 0xf5, 0x91, 0x4d, 0xa5, 0xbe, 0x35, 0xaa,
+	0xef, 0x12, 0x5a, 0xc9, 0xea, 0xdb, 0xd7, 0x70, 0xb8, 0x98, 0x3e, 0x4c, 0x8b, 0xa2, 0x8d, 0x2a,
+	0x43, 0xa2, 0x09, 0x83, 0xd2, 0xa5, 0xd7, 0x18, 0x48, 0x11, 0xe7, 0xa9, 0x88, 0xb3, 0xe8, 0x4c,
+	0x56, 0x44, 0x0b, 0x9b, 0x4d, 0x93, 0x86, 0xfb, 0x5a, 0x81, 0x42, 0xba, 0xb8, 0x6b, 0x43, 0x1f,
+	0x59, 0x69, 0x53, 0xba, 0xf2, 0x7a, 0x1b, 0x29, 0xe2, 0x22, 0x15, 0x51, 0x45, 0xe5, 0x83, 0x1e,
+	0xea, 0x9e, 0x9c, 0xbd, 0xd1, 0x53, 0x98, 0x49, 0xca, 0x66, 0x75, 0x78, 0x00, 0x66, 0x51, 0x5a,
+	0x7d, 0x9d, 0x85, 0x14, 0x70, 0x81, 0x0a, 0x28, 0xa3, 0xe5, 0x83, 0x05, 0xb0, 0x71, 0xa0, 0x7e,
+	0x67, 0xf7, 0xaf, 0xf2, 0xd8, 0xee, 0xf3, 0xb2, 0xf2, 0xec, 0x79, 0x59, 0xf9, 0xf3, 0x79, 0x59,
+	0xf9, 0xf6, 0x45, 0x79, 0xec, 0xd9, 0x8b, 0xf2, 0xd8, 0xaf, 0x2f, 0xca, 0x63, 0x8f, 0xae, 0xa6,
+	0x2a, 0x69, 0x4c, 0x59, 0xf3, 0x48, 0xb4, 0xe3, 0x07, 0xdb, 0x0c, 0xd9, 0xbd, 0xae, 0xf7, 0x12,
+	0x2e, 0xad, 0xab, 0xad, 0x49, 0xfa, 0x1f, 0xaa, 0xeb, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x1e,
+	0xda, 0xfd, 0x2e, 0x68, 0x13, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -2027,14 +1960,12 @@ func (m *QueryMaxWithdraw) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
-	if m.XDenom != nil {
-		{
-			size := m.XDenom.Size()
-			i -= size
-			if _, err := m.XDenom.MarshalTo(dAtA[i:]); err != nil {
-				return 0, err
-			}
-		}
+	if len(m.Denom) > 0 {
+		i -= len(m.Denom)
+		copy(dAtA[i:], m.Denom)
+		i = encodeVarintQuery(dAtA, i, uint64(len(m.Denom)))
+		i--
+		dAtA[i] = 0x12
 	}
 	if len(m.Address) > 0 {
 		i -= len(m.Address)
@@ -2046,20 +1977,6 @@ func (m *QueryMaxWithdraw) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	return len(dAtA) - i, nil
 }
 
-func (m *QueryMaxWithdraw_Denom) MarshalTo(dAtA []byte) (int, error) {
-	size := m.Size()
-	return m.MarshalToSizedBuffer(dAtA[:size])
-}
-
-func (m *QueryMaxWithdraw_Denom) MarshalToSizedBuffer(dAtA []byte) (int, error) {
-	i := len(dAtA)
-	i -= len(m.Denom)
-	copy(dAtA[i:], m.Denom)
-	i = encodeVarintQuery(dAtA, i, uint64(len(m.Denom)))
-	i--
-	dAtA[i] = 0x12
-	return len(dAtA) - i, nil
-}
 func (m *QueryMaxWithdrawResponse) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
@@ -2131,14 +2048,12 @@ func (m *QueryMaxBorrow) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
-	if m.XDenom != nil {
-		{
-			size := m.XDenom.Size()
-			i -= size
-			if _, err := m.XDenom.MarshalTo(dAtA[i:]); err != nil {
-				return 0, err
-			}
-		}
+	if len(m.Denom) > 0 {
+		i -= len(m.Denom)
+		copy(dAtA[i:], m.Denom)
+		i = encodeVarintQuery(dAtA, i, uint64(len(m.Denom)))
+		i--
+		dAtA[i] = 0x12
 	}
 	if len(m.Address) > 0 {
 		i -= len(m.Address)
@@ -2150,20 +2065,6 @@ func (m *QueryMaxBorrow) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	return len(dAtA) - i, nil
 }
 
-func (m *QueryMaxBorrow_Denom) MarshalTo(dAtA []byte) (int, error) {
-	size := m.Size()
-	return m.MarshalToSizedBuffer(dAtA[:size])
-}
-
-func (m *QueryMaxBorrow_Denom) MarshalToSizedBuffer(dAtA []byte) (int, error) {
-	i := len(dAtA)
-	i -= len(m.Denom)
-	copy(dAtA[i:], m.Denom)
-	i = encodeVarintQuery(dAtA, i, uint64(len(m.Denom)))
-	i--
-	dAtA[i] = 0x12
-	return len(dAtA) - i, nil
-}
 func (m *QueryMaxBorrowResponse) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
@@ -2449,22 +2350,13 @@ func (m *QueryMaxWithdraw) Size() (n int) {
 	if l > 0 {
 		n += 1 + l + sovQuery(uint64(l))
 	}
-	if m.XDenom != nil {
-		n += m.XDenom.Size()
+	l = len(m.Denom)
+	if l > 0 {
+		n += 1 + l + sovQuery(uint64(l))
 	}
 	return n
 }
 
-func (m *QueryMaxWithdraw_Denom) Size() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	l = len(m.Denom)
-	n += 1 + l + sovQuery(uint64(l))
-	return n
-}
 func (m *QueryMaxWithdrawResponse) Size() (n int) {
 	if m == nil {
 		return 0
@@ -2496,22 +2388,13 @@ func (m *QueryMaxBorrow) Size() (n int) {
 	if l > 0 {
 		n += 1 + l + sovQuery(uint64(l))
 	}
-	if m.XDenom != nil {
-		n += m.XDenom.Size()
+	l = len(m.Denom)
+	if l > 0 {
+		n += 1 + l + sovQuery(uint64(l))
 	}
 	return n
 }
 
-func (m *QueryMaxBorrow_Denom) Size() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	l = len(m.Denom)
-	n += 1 + l + sovQuery(uint64(l))
-	return n
-}
 func (m *QueryMaxBorrowResponse) Size() (n int) {
 	if m == nil {
 		return 0
@@ -4422,7 +4305,7 @@ func (m *QueryMaxWithdraw) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.XDenom = &QueryMaxWithdraw_Denom{string(dAtA[iNdEx:postIndex])}
+			m.Denom = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
@@ -4654,7 +4537,7 @@ func (m *QueryMaxBorrow) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.XDenom = &QueryMaxBorrow_Denom{string(dAtA[iNdEx:postIndex])}
+			m.Denom = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
 		default:
 			iNdEx = preIndex