Merge pull request #6574 from mattfarina/cruft-cleanup

Removing some duplicate go module stuff not needed

Makefile

@@ -120,13 +120,13 @@ format: $(GOIMPORTS)
 # when downloading the following dependencies
 
 $(GOX):
-	(cd /; GO111MODULE=on GO111MODULE=on go get -u github.com/mitchellh/gox)
+	(cd /; GO111MODULE=on go get -u github.com/mitchellh/gox)
 
 $(GOLANGCI_LINT):
 	(cd /; GO111MODULE=on go get -u github.com/golangci/golangci-lint/cmd/golangci-lint)
 
 $(GOIMPORTS):
-	(cd /; GO111MODULE=on GO111MODULE=on go get -u golang.org/x/tools/cmd/goimports)
+	(cd /; GO111MODULE=on go get -u golang.org/x/tools/cmd/goimports)
 
 # ------------------------------------------------------------------------------
 #  release

go.mod

@@ -10,9 +10,7 @@ require (
 	github.com/BurntSushi/toml v0.3.1
 	github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e
 	github.com/Masterminds/goutils v1.1.0
-	github.com/Masterminds/semver v1.5.0 // indirect
 	github.com/Masterminds/semver/v3 v3.0.1
-	github.com/Masterminds/sprig v2.22.0+incompatible // indirect
 	github.com/Masterminds/sprig/v3 v3.0.0
 	github.com/Masterminds/vcs v1.13.0
 	github.com/Microsoft/go-winio v0.4.12