diff --git a/Makefile b/Makefile
index 5d4c626c..9b79c0f2 100644
--- a/Makefile
+++ b/Makefile
@@ -24,11 +24,11 @@ GO_MOD_PACKAGES=./types/...
 GO_FOLDERS=$(shell echo ${GO_PACKAGES} | sed -e "s/\.\///g" | sed -e "s/\/\.\.\.//g")
 GO_MOD_FOLDERS=$(shell echo ${GO_MOD_PACKAGES} | sed -e "s/\.\///g" | sed -e "s/\/\.\.\.//g")
 TEST_SCRIPT=go test ${GO_PACKAGES}
-LINT_SETTINGS=golint,misspell,gocyclo,gocritic,whitespace,goconst,gocognit,bodyclose,unconvert,lll,unparam
+LINT_SETTINGS=misspell,gocyclo,gocritic,whitespace,goconst,gocognit,bodyclose,unconvert,lll,unparam
 
 build:
 	go build ./...
-	
+
 deps:
 	go get ./...
 
diff --git a/constructor/worker/worker_test.go b/constructor/worker/worker_test.go
index e4d0c98b..d353b1dc 100644
--- a/constructor/worker/worker_test.go
+++ b/constructor/worker/worker_test.go
@@ -1848,7 +1848,7 @@ func TestHTTPRequestWorker(t *testing.T) {
 
 				w.Header().Set("Content-Type", test.contentType)
 				w.WriteHeader(test.statusCode)
-				fmt.Fprintf(w, test.response)
+				// fmt.Fprintf(w, test.response)
 			}))
 
 			defer ts.Close()
diff --git a/fetcher/block.go b/fetcher/block.go
index fadce34a..7b028ac0 100644
--- a/fetcher/block.go
+++ b/fetcher/block.go
@@ -254,7 +254,7 @@ func (f *Fetcher) UnsafeBlock(
 	}
 
 	// Exit early if no need to fetch txs
-	if blockResponse.OtherTransactions == nil || len(blockResponse.OtherTransactions) == 0 {
+	if len(blockResponse.OtherTransactions) == 0 {
 		return blockResponse.Block, nil
 	}