diff --git a/modules/core/03-connection/keeper/keeper.go b/modules/core/03-connection/keeper/keeper.go
index 916e685a337..f032e1fad81 100644
--- a/modules/core/03-connection/keeper/keeper.go
+++ b/modules/core/03-connection/keeper/keeper.go
@@ -23,12 +23,10 @@ import (
 // Keeper defines the IBC connection keeper
 type Keeper struct {
 	appmodule.Environment
-	// implements gRPC QueryServer interface
-	types.QueryServer
 
-	legacySubspace types.ParamSubspace
 	cdc            codec.BinaryCodec
 	clientKeeper   types.ClientKeeper
+	legacySubspace types.ParamSubspace
 }
 
 // NewKeeper creates a new IBC connection Keeper instance
diff --git a/modules/core/04-channel/keeper/keeper.go b/modules/core/04-channel/keeper/keeper.go
index f0889bd0d2b..c14f6aa49c8 100644
--- a/modules/core/04-channel/keeper/keeper.go
+++ b/modules/core/04-channel/keeper/keeper.go
@@ -30,8 +30,6 @@ var _ porttypes.ICS4Wrapper = (*Keeper)(nil)
 // Keeper defines the IBC channel keeper
 type Keeper struct {
 	appmodule.Environment
-	// implements gRPC QueryServer interface
-	types.QueryServer
 
 	cdc              codec.BinaryCodec
 	clientKeeper     types.ClientKeeper
diff --git a/modules/core/05-port/keeper/keeper.go b/modules/core/05-port/keeper/keeper.go
index a35288a48c1..cbf94750856 100644
--- a/modules/core/05-port/keeper/keeper.go
+++ b/modules/core/05-port/keeper/keeper.go
@@ -1,15 +1,9 @@
 package keeper
 
 import (
-	"context"
 	"strings"
 
-	"cosmossdk.io/log"
-
-	sdk "github.com/cosmos/cosmos-sdk/types"
-
 	"github.com/cosmos/ibc-go/v9/modules/core/05-port/types"
-	"github.com/cosmos/ibc-go/v9/modules/core/exported"
 )
 
 // Keeper defines the IBC connection keeper
@@ -22,12 +16,6 @@ func NewKeeper() *Keeper {
 	return &Keeper{}
 }
 
-// Logger returns a module-specific logger.
-func (Keeper) Logger(ctx context.Context) log.Logger {
-	sdkCtx := sdk.UnwrapSDKContext(ctx) // TODO: https://github.com/cosmos/ibc-go/issues/5917
-	return sdkCtx.Logger().With("module", "x/"+exported.ModuleName+"/"+types.SubModuleName)
-}
-
 // Route returns a IBCModule for a given module, and a boolean indicating
 // whether or not the route is present.
 func (k *Keeper) Route(module string) (types.IBCModule, bool) {