diff --git a/cmd/ethermintd/root.go b/cmd/ethermintd/root.go
index c79abc9010..a06f4e573f 100644
--- a/cmd/ethermintd/root.go
+++ b/cmd/ethermintd/root.go
@@ -102,9 +102,8 @@ func NewRootCmd() (*cobra.Command, ethermint.EncodingConfig) {
 			// sets the RPC client needed for SIGN_MODE_TEXTUAL. This sign mode
 			// is only available if the client is online.
 			if !initClientCtx.Offline {
-				enabledSignModes := append(tx.DefaultSignModes, signing.SignMode_SIGN_MODE_TEXTUAL)
 				txConfigOpts := tx.ConfigOptions{
-					EnabledSignModes:           enabledSignModes,
+					EnabledSignModes:           append(tx.DefaultSignModes, signing.SignMode_SIGN_MODE_TEXTUAL),
 					TextualCoinMetadataQueryFn: txmodule.NewGRPCCoinMetadataQueryFn(initClientCtx),
 				}
 				txConfig, err := tx.NewTxConfigWithOptions(
diff --git a/rpc/stream/rpc.go b/rpc/stream/rpc.go
index a6a5279e01..a9b58d2bae 100644
--- a/rpc/stream/rpc.go
+++ b/rpc/stream/rpc.go
@@ -36,7 +36,6 @@ var (
 		tmtypes.EventTx,
 		sdk.EventTypeMessage,
 		sdk.AttributeKeyModule, evmtypes.ModuleName)).String()
-	headerEvents = tmtypes.QueryForEvent(tmtypes.EventNewBlockHeader).String()
 	blockEvents  = tmtypes.QueryForEvent(tmtypes.EventNewBlock).String()
 	evmTxHashKey = fmt.Sprintf("%s.%s", evmtypes.TypeMsgEthereumTx, evmtypes.AttributeKeyEthereumTxHash)
 )
diff --git a/server/start.go b/server/start.go
index eb1b3ad4ad..9342874eee 100644
--- a/server/start.go
+++ b/server/start.go
@@ -455,10 +455,7 @@ func startInProcess(svrCtx *server.Context, clientCtx client.Context, opts Start
 		defer grpcSrv.GracefulStop()
 	}
 
-	apiSrv, err := startAPIServer(ctx, svrCtx, clientCtx, g, config.Config, app, grpcSrv, metrics)
-	if err != nil {
-		return err
-	}
+	apiSrv := startAPIServer(ctx, svrCtx, clientCtx, g, config.Config, app, grpcSrv, metrics)
 	if apiSrv != nil {
 		defer apiSrv.Close()
 	}
@@ -630,9 +627,9 @@ func startAPIServer(
 	app types.Application,
 	grpcSrv *grpc.Server,
 	metrics *telemetry.Metrics,
-) (*api.Server, error) {
+) *api.Server {
 	if !svrCfg.API.Enable {
-		return nil, nil
+		return nil
 	}
 
 	apiSrv := api.New(clientCtx, svrCtx.Logger.With("server", "api"), grpcSrv)
@@ -645,7 +642,7 @@ func startAPIServer(
 	g.Go(func() error {
 		return apiSrv.Start(ctx, svrCfg)
 	})
-	return apiSrv, nil
+	return apiSrv
 }
 
 func startJSONRPCServer(
@@ -718,9 +715,7 @@ func startRosettaServer(
 		return err
 	}
 
-	g.Go(func() error {
-		return rosettaSrv.Start()
-	})
+	g.Go(rosettaSrv.Start)
 	return nil
 }