diff --git a/x/upgrade/keeper/msg_server.go b/x/upgrade/keeper/msg_server.go
index 7c8cc8a48c35..e4f93473b7db 100644
--- a/x/upgrade/keeper/msg_server.go
+++ b/x/upgrade/keeper/msg_server.go
@@ -22,7 +22,10 @@ func NewMsgServerImpl(k *Keeper) types.MsgServer {
 	}
 }
 
-var _ types.MsgServer = msgServer{}
+var (
+	_    types.MsgServer = msgServer{}
+	_, _ sdk.Msg         = &types.MsgSoftwareUpgrade{}, &types.MsgCancelUpgrade{}
+)
 
 // SoftwareUpgrade implements the Msg/SoftwareUpgrade Msg service.
 func (k msgServer) SoftwareUpgrade(goCtx context.Context, msg *types.MsgSoftwareUpgrade) (*types.MsgSoftwareUpgradeResponse, error) {
@@ -49,8 +52,7 @@ func (k msgServer) CancelUpgrade(ctx context.Context, msg *types.MsgCancelUpgrad
 		return nil, errors.Wrapf(gov.ErrInvalidSigner, "expected %s got %s", k.authority, msg.Authority)
 	}
 
-	sdkCtx := sdk.UnwrapSDKContext(ctx)
-	err := k.ClearUpgradePlan(sdkCtx)
+	err := k.ClearUpgradePlan(ctx)
 	if err != nil {
 		return nil, err
 	}
diff --git a/x/upgrade/types/msgs.go b/x/upgrade/types/msgs.go
deleted file mode 100644
index 84ff4f6c926b..000000000000
--- a/x/upgrade/types/msgs.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package types
-
-import (
-	sdk "github.com/cosmos/cosmos-sdk/types"
-)
-
-var _, _ sdk.Msg = &MsgSoftwareUpgrade{}, &MsgCancelUpgrade{}
-
-// GetSigners returns the expected signers for MsgSoftwareUpgrade.
-func (m *MsgSoftwareUpgrade) GetSigners() []sdk.AccAddress {
-	addr, _ := sdk.AccAddressFromBech32(m.Authority)
-	return []sdk.AccAddress{addr}
-}
-
-// GetSigners returns the expected signers for MsgCancelUpgrade.
-func (m *MsgCancelUpgrade) GetSigners() []sdk.AccAddress {
-	addr, _ := sdk.AccAddressFromBech32(m.Authority)
-	return []sdk.AccAddress{addr}
-}