diff --git a/mempool/v0/clist_mempool.go b/mempool/v0/clist_mempool.go
index 47b7a85ed..605b553f4 100644
--- a/mempool/v0/clist_mempool.go
+++ b/mempool/v0/clist_mempool.go
@@ -259,6 +259,10 @@ func (mem *CListMempool) CheckTx(
 
 	mem.addNewTransaction(tx, txInfo.SenderID, txInfo.SenderP2PID, cb, resp)
 
+	if cb != nil {
+		cb(resp)
+	}
+
 	return nil
 }
 
diff --git a/rpc/client/event_test.go b/rpc/client/event_test.go
index 5734d6c1b..0905dc7a8 100644
--- a/rpc/client/event_test.go
+++ b/rpc/client/event_test.go
@@ -156,12 +156,6 @@ func testTxEventsSent(t *testing.T, broadcastMethod string) {
 	}
 }
 
-// Test HTTPClient resubscribes upon disconnect && subscription error.
-// Test Local client resubscribes upon subscription error.
-func TestClientsResubscribe(t *testing.T) {
-	// TODO(melekes)
-}
-
 func TestHTTPReturnsErrorIfClientIsNotRunning(t *testing.T) {
 	c := getHTTPClient()
 
diff --git a/rpc/grpc/types.pb.go b/rpc/grpc/types.pb.go
index bf5b74402..4496379b9 100644
--- a/rpc/grpc/types.pb.go
+++ b/rpc/grpc/types.pb.go
@@ -6,7 +6,8 @@ package coregrpc
 import (
 	context "context"
 	fmt "fmt"
-	proto "github.com/gogo/protobuf/proto"
+	grpc1 "github.com/cosmos/gogoproto/grpc"
+	proto "github.com/cosmos/gogoproto/proto"
 	types "github.com/tendermint/tendermint/abci/types"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
@@ -245,10 +246,10 @@ type BroadcastAPIClient interface {
 }
 
 type broadcastAPIClient struct {
-	cc *grpc.ClientConn
+	cc grpc1.ClientConn
 }
 
-func NewBroadcastAPIClient(cc *grpc.ClientConn) BroadcastAPIClient {
+func NewBroadcastAPIClient(cc grpc1.ClientConn) BroadcastAPIClient {
 	return &broadcastAPIClient{cc}
 }
 
@@ -287,7 +288,7 @@ func (*UnimplementedBroadcastAPIServer) BroadcastTx(ctx context.Context, req *Re
 	return nil, status.Errorf(codes.Unimplemented, "method BroadcastTx not implemented")
 }
 
-func RegisterBroadcastAPIServer(s *grpc.Server, srv BroadcastAPIServer) {
+func RegisterBroadcastAPIServer(s grpc1.Server, srv BroadcastAPIServer) {
 	s.RegisterService(&_BroadcastAPI_serviceDesc, srv)
 }
 
diff --git a/state/execution.go b/state/execution.go
index ae9501baa..2b56a79d5 100644
--- a/state/execution.go
+++ b/state/execution.go
@@ -295,8 +295,6 @@ func (blockExec *BlockExecutor) Commit(
 	blockExec.logger.Info(
 		"committed state",
 		"height", block.Height,
-		"num_txs", len(block.Txs),
-		"agreed_data", fmt.Sprintf("%X", abciResponse.AgreedAppData),
 	)
 
 	// Update mempool.
@@ -344,7 +342,7 @@ func execBlockOnProxyApp(
 		return nil, fmt.Errorf("expected tx results length to match size of transactions in block. Expected %d, got %d", len(block.Data.Txs), len(resp.TxResults))
 	}
 
-	logger.Info("executed block", "height", block.Height, "agreed_data", resp.AgreedAppData)
+	logger.Info("executed block", "height", block.Height, "agreed__app_data", resp.AgreedAppData)
 	return resp, nil
 }
 
diff --git a/state/store.go b/state/store.go
index e3d768409..53a40e8c9 100644
--- a/state/store.go
+++ b/state/store.go
@@ -467,7 +467,6 @@ func (store dbStore) SaveFinalizeBlockResponse(height int64, resp *abci.Response
 	// If the flag is false then we save the ABCIResponse. This can be used for the /BlockResults
 	// query or to reindex an event using the command line.
 	if !store.DiscardFinalizeBlockResponses {
-		fmt.Printf("saving response at height %d\n", height)
 		bz, err := resp.Marshal()
 		if err != nil {
 			return err