diff --git a/Makefile b/Makefile
index 628df93d..1c9f2f77 100644
--- a/Makefile
+++ b/Makefile
@@ -97,7 +97,7 @@ metalinter_test: ensure_tools
 	   	--enable=varcheck \
 		./...
 
-		#--enable=aligncheck \
+		#--enable=maligned \
 		#--enable=dupl \
 		#--enable=errcheck \
 		#--enable=goconst \
diff --git a/consensus/wal.go b/consensus/wal.go
index 1d2c74e3..109f5f3f 100644
--- a/consensus/wal.go
+++ b/consensus/wal.go
@@ -272,7 +272,7 @@ func (dec *WALDecoder) Decode() (*TimedWALMessage, error) {
 	}
 
 	var nn int
-	var res *TimedWALMessage
+	var res *TimedWALMessage // nolint: gosimple
 	res = wire.ReadBinary(&TimedWALMessage{}, bytes.NewBuffer(data), int(length), &nn, &err).(*TimedWALMessage)
 	if err != nil {
 		return nil, fmt.Errorf("failed to decode data: %v", err)
diff --git a/lite/files/provider.go b/lite/files/provider.go
index c2f570a7..faa68dd9 100644
--- a/lite/files/provider.go
+++ b/lite/files/provider.go
@@ -34,7 +34,7 @@ const (
 	ValDir   = "validators"
 	CheckDir = "checkpoints"
 	dirPerm  = os.FileMode(0755)
-	filePerm = os.FileMode(0644)
+	//filePerm = os.FileMode(0644)
 )
 
 type provider struct {
diff --git a/rpc/lib/rpc_test.go b/rpc/lib/rpc_test.go
index b5af0e43..d931e7b2 100644
--- a/rpc/lib/rpc_test.go
+++ b/rpc/lib/rpc_test.go
@@ -216,19 +216,17 @@ func echoViaWS(cl *client.WSClient, val string) (string, error) {
 		return "", err
 	}
 
-	select {
-	case msg := <-cl.ResponsesCh:
-		if msg.Error != nil {
-			return "", err
+	msg := <-cl.ResponsesCh
+	if msg.Error != nil {
+		return "", err
 
-		}
-		result := new(ResultEcho)
-		err = json.Unmarshal(msg.Result, result)
-		if err != nil {
-			return "", nil
-		}
-		return result.Value, nil
 	}
+	result := new(ResultEcho)
+	err = json.Unmarshal(msg.Result, result)
+	if err != nil {
+		return "", nil
+	}
+	return result.Value, nil
 }
 
 func echoBytesViaWS(cl *client.WSClient, bytes []byte) ([]byte, error) {
@@ -240,19 +238,17 @@ func echoBytesViaWS(cl *client.WSClient, bytes []byte) ([]byte, error) {
 		return []byte{}, err
 	}
 
-	select {
-	case msg := <-cl.ResponsesCh:
-		if msg.Error != nil {
-			return []byte{}, msg.Error
+	msg := <-cl.ResponsesCh
+	if msg.Error != nil {
+		return []byte{}, msg.Error
 
-		}
-		result := new(ResultEchoBytes)
-		err = json.Unmarshal(msg.Result, result)
-		if err != nil {
-			return []byte{}, nil
-		}
-		return result.Value, nil
 	}
+	result := new(ResultEchoBytes)
+	err = json.Unmarshal(msg.Result, result)
+	if err != nil {
+		return []byte{}, nil
+	}
+	return result.Value, nil
 }
 
 func testWithWSClient(t *testing.T, cl *client.WSClient) {
@@ -333,6 +329,11 @@ func TestWSNewWSRPCFunc(t *testing.T) {
 		got := result.Value
 		assert.Equal(t, got, val)
 	}
+	result := new(ResultEcho)
+	err = json.Unmarshal(*msg.Result, result)
+	require.Nil(t, err)
+	got := result.Value
+	assert.Equal(t, got, val)
 }
 
 func TestWSHandlesArrayParams(t *testing.T) {
@@ -358,6 +359,11 @@ func TestWSHandlesArrayParams(t *testing.T) {
 		got := result.Value
 		assert.Equal(t, got, val)
 	}
+	result := new(ResultEcho)
+	err = json.Unmarshal(*msg.Result, result)
+	require.Nil(t, err)
+	got := result.Value
+	assert.Equal(t, got, val)
 }
 
 // TestWSClientPingPong checks that a client & server exchange pings
diff --git a/state/txindex/indexer.go b/state/txindex/indexer.go
index 66897905..039460a1 100644
--- a/state/txindex/indexer.go
+++ b/state/txindex/indexer.go
@@ -11,7 +11,7 @@ type TxIndexer interface {
 
 	// AddBatch analyzes, indexes or stores a batch of transactions.
 	// NOTE: We do not specify Index method for analyzing a single transaction
-	// here because it bears heavy perfomance loses. Almost all advanced indexers
+	// here because it bears heavy performance losses. Almost all advanced indexers
 	// support batching.
 	AddBatch(b *Batch) error
 
diff --git a/state/txindex/kv/kv.go b/state/txindex/kv/kv.go
index 3d4f93a4..db075e54 100644
--- a/state/txindex/kv/kv.go
+++ b/state/txindex/kv/kv.go
@@ -10,7 +10,6 @@ import (
 
 	"github.com/tendermint/tendermint/state/txindex"
 	"github.com/tendermint/tendermint/types"
-	db "github.com/tendermint/tmlibs/db"
 )
 
 // TxIndex is the simplest possible indexer, backed by Key-Value storage (levelDB).