diff --git a/Makefile b/Makefile
index cc40654..8ff84ca 100644
--- a/Makefile
+++ b/Makefile
@@ -4,17 +4,18 @@ LINT_PKG := github.com/golangci/golangci-lint/cmd/golangci-lint
 GOACC_PKG := github.com/ory/go-acc
 GOIMPORTS_PKG := golang.org/x/tools/cmd/goimports
 
+GOPATH ?= ${HOME}/go
 GO_BIN := ${GOPATH}/bin
-LINT_BIN := $(GO_BIN)/golangci-lint
+LINT_BIN := ${GO_BIN}/golangci-lint
 GOACC_BIN := $(GO_BIN)/go-acc
 
-LINT_COMMIT := v1.18.0
-GOACC_COMMIT := 80342ae2e0fcf265e99e76bcc4efd022c7c3811b
+LINT_COMMIT := v1.42.1
+GOACC_COMMIT := v0.2.6
 
-DEPGET := cd /tmp && GO111MODULE=on go get -v
-GOBUILD := GO111MODULE=on go build -v
-GOINSTALL := GO111MODULE=on go install -v
-GOTEST := GO111MODULE=on go test
+DEPGET := go install
+GOBUILD := go build -v
+GOINSTALL := go install -v
+GOTEST := go test
 
 GOLIST := go list -deps $(PKG)/... | grep '$(PKG)'
 GOLIST_COVER := $$(go list -deps $(PKG)/... | grep '$(PKG)')
diff --git a/goclean.sh b/goclean.sh
deleted file mode 100755
index cbbe2d6..0000000
--- a/goclean.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-# The script does automatic checking on a Go package and its sub-packages, including:
-# 1. go fmt        (http://golang.org/cmd/gofmt/)
-# 2. golint        (https://github.com/golang/lint)
-# 3. go vet        (http://golang.org/cmd/vet)
-# 4. race detector (http://blog.golang.org/race-detector)
-
-set -ex
-
-test_targets=$(go list -deps ./... | grep 'lbcwallet')
-
-# Automatic checks
-test -z "$(go fmt $test_targets | tee /dev/stderr)"
-
-# test -z "$(goimports -l -w . | tee /dev/stderr)"
-test -z "$(for package in $test_targets; do golint $package; done | grep -v 'ALL_CAPS\|OP_\|NewFieldVal\|RpcCommand\|RpcRawCommand\|RpcSend\|Dns\|api.pb.go\|StartConsensusRpc\|factory_test.go\|legacy\|UnstableAPI' | tee /dev/stderr)"
-
-test -z "$(go vet $test_targets 2>&1 | grep -v '^exit status \|Example\|newestSha\| not a string in call to Errorf$' | tee /dev/stderr)"
-
-env GORACE="history_size=7 halt_on_errors=1" go test -v -race $test_targets
-
-# Run test coverage on each subdirectories and merge the coverage profile.
-
-#set +x
-#echo "mode: count" > profile.cov
-
-# Standard go tooling behavior is to ignore dirs with leading underscores.
-#for dir in $(find . -maxdepth 10 -not -path '.' -not -path './.git*' \
-#    -not -path '*/_*' -not -path './cmd*' -not -path './release*' -type d)
-#do
-#if ls $dir/*.go &> /dev/null; then
-#  go test -covermode=count -coverprofile=$dir/profile.tmp $dir
-#  if [ -f $dir/profile.tmp ]; then
-#    cat $dir/profile.tmp | tail -n +2 >> profile.cov
-#    rm $dir/profile.tmp
-#  fi
-#fi
-#done
-
-# To submit the test coverage result to coveralls.io,
-# use goveralls (https://github.com/mattn/goveralls)
-# goveralls -coverprofile=profile.cov -service=travis-ci