diff --git a/go.mod b/go.mod
index 45f32a549ce..307b1c630c9 100644
--- a/go.mod
+++ b/go.mod
@@ -26,14 +26,14 @@ require (
 	github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef
 	github.com/beevik/etree v1.1.0 // indirect
 	github.com/c2h5oh/datasize v0.0.0-20200825124411-48ed595a09d2
-	github.com/client9/misspell v0.3.4
+	github.com/client9/misspell v0.3.4 // indirect
 	github.com/coreos/go-oidc v2.2.1+incompatible
 	github.com/cweill/gotests v1.6.0
 	github.com/d4l3k/messagediff v1.2.1
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/disintegration/imaging v1.6.2
 	github.com/dustinkirkland/golang-petname v0.0.0-20191129215211-8e5a1ed0cff0
-	github.com/fzipp/gocyclo v0.3.1
+	github.com/fzipp/gocyclo v0.3.1 // indirect
 	github.com/gabriel-vasile/mimetype v1.2.0
 	github.com/getsentry/sentry-go v0.10.0
 	github.com/go-errors/errors v1.1.1 // indirect
@@ -42,10 +42,10 @@ require (
 	github.com/go-testfixtures/testfixtures/v3 v3.5.0
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
 	github.com/golang/snappy v0.0.2 // indirect
-	github.com/gordonklaus/ineffassign v0.0.0-20210225214923-2e10b2664254
+	github.com/gordonklaus/ineffassign v0.0.0-20210225214923-2e10b2664254 // indirect
 	github.com/iancoleman/strcase v0.1.3
 	github.com/imdario/mergo v0.3.12
-	github.com/jgautheron/goconst v1.4.0
+	github.com/jgautheron/goconst v1.4.0 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/labstack/echo/v4 v4.2.1
 	github.com/labstack/gommon v0.3.0
@@ -66,7 +66,7 @@ require (
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/samedi/caldav-go v3.0.0+incompatible
 	github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect
-	github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546
+	github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546 // indirect
 	github.com/spf13/afero v1.6.0
 	github.com/spf13/cast v1.3.1 // indirect
 	github.com/spf13/cobra v1.1.3
@@ -77,7 +77,7 @@ require (
 	github.com/ulule/limiter/v3 v3.8.0
 	golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
 	golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb
-	golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5
+	golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 // indirect
 	golang.org/x/oauth2 v0.0.0-20210323180902-22b0adad7558
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 	golang.org/x/term v0.0.0-20210317153231-de623e64d2a6
@@ -89,7 +89,7 @@ require (
 	gopkg.in/ini.v1 v1.57.0 // indirect
 	gopkg.in/square/go-jose.v2 v2.5.1 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c
-	honnef.co/go/tools v0.0.1-2020.1.5
+	honnef.co/go/tools v0.0.1-2020.1.5 // indirect
 	src.techknowlogick.com/xgo v1.4.1-0.20210311222705-d25c33fcd864
 	src.techknowlogick.com/xormigrate v1.4.0
 	xorm.io/builder v0.3.8
diff --git a/magefile.go b/magefile.go
index aee52b05328..b3437047237 100644
--- a/magefile.go
+++ b/magefile.go
@@ -410,7 +410,7 @@ func (Check) GolangciFix() {
 	runAndStreamOutput("golangci-lint", "run", "--fix")
 }
 
-// Runs fmt-check, lint, got-swag, misspell-check, ineffasign-check, gocyclo-check, static-check, gosec-check, goconst-check all in parallel
+// Runs golangci and the swagger test in parralel
 func (Check) All() {
 	mg.Deps(initVars)
 	mg.Deps(
diff --git a/tools.go b/tools.go
index a19ed27e1f5..77775b14900 100644
--- a/tools.go
+++ b/tools.go
@@ -21,18 +21,9 @@ package tools
 // This file is needed for go mod to recognize the tools we use.
 
 import (
-	_ "github.com/client9/misspell/cmd/misspell"
 	_ "github.com/cweill/gotests"
-	_ "github.com/fzipp/gocyclo"
-	_ "github.com/gordonklaus/ineffassign"
 	_ "github.com/swaggo/swag/cmd/swag"
-	_ "golang.org/x/lint/golint"
 	_ "src.techknowlogick.com/xgo"
 
-	_ "github.com/jgautheron/goconst/cmd/goconst"
-	_ "honnef.co/go/tools/cmd/staticcheck"
-
-	_ "github.com/shurcooL/vfsgen"
-
 	_ "github.com/magefile/mage"
 )