diff --git a/app/app.go b/app/app.go
index 3274cff..3eff391 100644
--- a/app/app.go
+++ b/app/app.go
@@ -66,7 +66,6 @@ import (
 	govclient "github.com/cosmos/cosmos-sdk/x/gov/client"
 	govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
-	govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
 	govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
 	"github.com/cosmos/cosmos-sdk/x/group"
 	groupkeeper "github.com/cosmos/cosmos-sdk/x/group/keeper"
@@ -922,7 +921,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
 	paramsKeeper.Subspace(minttypes.ModuleName)
 	paramsKeeper.Subspace(distrtypes.ModuleName)
 	paramsKeeper.Subspace(slashingtypes.ModuleName)
-	paramsKeeper.Subspace(govtypes.ModuleName).WithKeyTable(govv1.ParamKeyTable()) //nolint:staticcheck
+	paramsKeeper.Subspace(govtypes.ModuleName)
 	paramsKeeper.Subspace(crisistypes.ModuleName)
 	paramsKeeper.Subspace(ibctransfertypes.ModuleName)
 	paramsKeeper.Subspace(ibcexported.ModuleName)
diff --git a/x/asset/client/cli/tx.go b/x/asset/client/cli/tx.go
index 2d938ea..cd65396 100644
--- a/x/asset/client/cli/tx.go
+++ b/x/asset/client/cli/tx.go
@@ -15,11 +15,6 @@ var (
 	DefaultRelativePacketTimeoutTimestamp = uint64((time.Duration(10) * time.Minute).Nanoseconds())
 )
 
-const (
-	flagPacketTimeoutTimestamp = "packet-timeout-timestamp"
-	listSeparator              = ","
-)
-
 // GetTxCmd returns the transaction commands for this module
 func GetTxCmd() *cobra.Command {
 	cmd := &cobra.Command{
diff --git a/x/asset/module_simulation.go b/x/asset/module_simulation.go
index 334188b..04a1171 100644
--- a/x/asset/module_simulation.go
+++ b/x/asset/module_simulation.go
@@ -49,7 +49,7 @@ func (am AppModule) RegisterStoreDecoder(_ sdk.StoreDecoderRegistry) {
 }
 
 // ProposalContents doesn't return any content functions for governance proposals.
-func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedProposalContent {
+func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedProposalMsg {
 	return nil
 }
 
diff --git a/x/asset/types/errors.go b/x/asset/types/errors.go
index 2ea5ed2..e7e60ff 100644
--- a/x/asset/types/errors.go
+++ b/x/asset/types/errors.go
@@ -3,10 +3,10 @@ package types
 // DONTCOVER
 
 import (
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+	errorsmod "cosmossdk.io/errors"
 )
 
 // x/asset module sentinel errors
 var (
-	ErrSample = sdkerrors.Register(ModuleName, 1100, "sample error")
+	ErrSample = errorsmod.Register(ModuleName, 1100, "sample error")
 )
diff --git a/x/asset/types/message_notarize_asset.go b/x/asset/types/message_notarize_asset.go
index 162c61d..255c976 100644
--- a/x/asset/types/message_notarize_asset.go
+++ b/x/asset/types/message_notarize_asset.go
@@ -1,6 +1,7 @@
 package types
 
 import (
+	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
@@ -42,7 +43,7 @@ func (msg *MsgNotarizeAsset) GetSignBytes() []byte {
 func (msg *MsgNotarizeAsset) ValidateBasic() error {
 	_, err := sdk.AccAddressFromBech32(msg.Creator)
 	if err != nil {
-		return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err)
+		return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err)
 	}
 	return nil
 }
diff --git a/x/asset/types/query.pb.gw.go b/x/asset/types/query.pb.gw.go
index affeb2c..fcd4762 100644
--- a/x/asset/types/query.pb.gw.go
+++ b/x/asset/types/query.pb.gw.go
@@ -13,7 +13,9 @@ import (
 	"io"
 	"net/http"
 
+	//lint:ignore SA1019 file is generated
 	"github.com/golang/protobuf/descriptor"
+	//lint:ignore SA1019 file is generated
 	"github.com/golang/protobuf/proto"
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/grpc-ecosystem/grpc-gateway/utilities"
@@ -30,6 +32,8 @@ var _ io.Reader
 var _ status.Status
 var _ = runtime.String
 var _ = utilities.NewDoubleArray
+
+//lint:ignore SA1019 file is generated
 var _ = descriptor.ForMessage
 var _ = metadata.Join
 
diff --git a/x/machine/client/cli/tx.go b/x/machine/client/cli/tx.go
index 9fea377..c7a068c 100644
--- a/x/machine/client/cli/tx.go
+++ b/x/machine/client/cli/tx.go
@@ -15,11 +15,6 @@ var (
 	DefaultRelativePacketTimeoutTimestamp = uint64((time.Duration(10) * time.Minute).Nanoseconds())
 )
 
-const (
-	flagPacketTimeoutTimestamp = "packet-timeout-timestamp"
-	listSeparator              = ","
-)
-
 // GetTxCmd returns the transaction commands for this module
 func GetTxCmd() *cobra.Command {
 	cmd := &cobra.Command{
diff --git a/x/machine/module_simulation.go b/x/machine/module_simulation.go
index d85eac5..21f839d 100644
--- a/x/machine/module_simulation.go
+++ b/x/machine/module_simulation.go
@@ -49,7 +49,7 @@ func (am AppModule) RegisterStoreDecoder(_ sdk.StoreDecoderRegistry) {
 }
 
 // ProposalContents doesn't return any content functions for governance proposals.
-func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedProposalContent {
+func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedProposalMsg {
 	return nil
 }
 
diff --git a/x/machine/types/errors.go b/x/machine/types/errors.go
index 7bd539b..dcec871 100644
--- a/x/machine/types/errors.go
+++ b/x/machine/types/errors.go
@@ -3,10 +3,10 @@ package types
 // DONTCOVER
 
 import (
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+	errorsmod "cosmossdk.io/errors"
 )
 
 // x/machine module sentinel errors
 var (
-	ErrSample = sdkerrors.Register(ModuleName, 1100, "sample error")
+	ErrSample = errorsmod.Register(ModuleName, 1100, "sample error")
 )
diff --git a/x/machine/types/message_attest_machine.go b/x/machine/types/message_attest_machine.go
index e1f4ef0..1cb31cd 100644
--- a/x/machine/types/message_attest_machine.go
+++ b/x/machine/types/message_attest_machine.go
@@ -1,6 +1,7 @@
 package types
 
 import (
+	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
@@ -40,7 +41,7 @@ func (msg *MsgAttestMachine) GetSignBytes() []byte {
 func (msg *MsgAttestMachine) ValidateBasic() error {
 	_, err := sdk.AccAddressFromBech32(msg.Creator)
 	if err != nil {
-		return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err)
+		return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err)
 	}
 	return nil
 }
diff --git a/x/machine/types/query.pb.gw.go b/x/machine/types/query.pb.gw.go
index 91257f3..99fa801 100644
--- a/x/machine/types/query.pb.gw.go
+++ b/x/machine/types/query.pb.gw.go
@@ -13,7 +13,9 @@ import (
 	"io"
 	"net/http"
 
+	//lint:ignore SA1019 file is generated
 	"github.com/golang/protobuf/descriptor"
+	//lint:ignore SA1019 file is generated
 	"github.com/golang/protobuf/proto"
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/grpc-ecosystem/grpc-gateway/utilities"
@@ -30,6 +32,8 @@ var _ io.Reader
 var _ status.Status
 var _ = runtime.String
 var _ = utilities.NewDoubleArray
+
+//lint:ignore SA1019 file is generated
 var _ = descriptor.ForMessage
 var _ = metadata.Join