diff --git a/Makefile b/Makefile
index f6529d5..9a642e9 100644
--- a/Makefile
+++ b/Makefile
@@ -49,12 +49,14 @@
 setup_tools: $(GO_TOOLS_BIN)
 
 $(GO_TOOLS_BIN): $(GO_TOOLS_VENDOR)
-	GO111MODULE=on GOBIN="$(PWD)/$(TOOLS_BIN)" go install -mod=vendor $(GO_TOOLS)
+	GO111MODULE=on GOBIN="$(PWD)/$(TOOLS_BIN)" go install $(GO_TOOLS)
 
 protos: setup_tools api/bbsim/bbsim.pb.go api/bbsim/bbsim.pb.gw.go api/legacy/bbsim.pb.go api/legacy/bbsim.pb.gw.go # @HELP Build proto files
 
-dep: # @HELP Download the dependencies to the vendor folder
+dep: protos # @HELP Download the dependencies to the vendor folder
 	GO111MODULE=on go mod vendor
+	GO111MODULE=on go mod tidy
+	GO111MODULE=on go mod verify
 
 _build: dep protos fmt build-bbsim build-bbsimctl build-bbr
 
@@ -63,7 +65,7 @@
 	docker build -t ${DOCKER_REGISTRY}${DOCKER_REPOSITORY}bbsim-builder:${DOCKER_TAG} -f build/ci/Dockerfile.builder .
 	docker run --rm -v $(shell pwd):/bbsim ${DOCKER_REGISTRY}${DOCKER_REPOSITORY}bbsim-builder:${DOCKER_TAG} /bin/sh -c "cd /bbsim; make _build"
 
-test: clean dep protos fmt # @HELP Execute unit tests
+test: clean dep fmt # @HELP Execute unit tests
 	GO111MODULE=on go test -v -mod vendor $(TEST_PACKAGES) -covermode count -coverprofile ./tests/results/go-test-coverage.out 2>&1 | tee ./tests/results/go-test-results.out
 	go-junit-report < ./tests/results/go-test-results.out > ./tests/results/go-test-results.xml
 	gocover-cobertura < ./tests/results/go-test-coverage.out > ./tests/results/go-test-coverage.xml
@@ -139,13 +141,10 @@
 # Internals
 
 clean:
-	rm -f api/bbsim/*.go
-	rm -f api/legacy/*.go
 	rm -f bbsim
 	rm -f bbsimctl
 	rm -f bbr
 	rm -rf tools/bin
-	rm -rf vendor
 
 build-bbr:
 	GO111MODULE=on go build -i -v -mod vendor \