diff --git a/tools.go b/tools.go
index 605e0bb..2564ea3 100644
--- a/tools.go
+++ b/tools.go
@@ -2,7 +2,6 @@ package jess
 
 import (
 	"github.com/safing/jess/tools"
-
 	// Import all tools.
 	_ "github.com/safing/jess/tools/all"
 )
diff --git a/tools/all/all.go b/tools/all/all.go
index 8d59fb8..b1d0080 100644
--- a/tools/all/all.go
+++ b/tools/all/all.go
@@ -1,6 +1,4 @@
 // Package all imports all tool subpackages
-//
-//nolint:gci
 package all
 
 import (
diff --git a/tools/gostdlib/poly1305.go b/tools/gostdlib/poly1305.go
index e1640f3..ef4153b 100644
--- a/tools/gostdlib/poly1305.go
+++ b/tools/gostdlib/poly1305.go
@@ -3,7 +3,7 @@ package gostdlib
 import (
 	"errors"
 
-	"golang.org/x/crypto/poly1305" //nolint:staticcheck,gci
+	"golang.org/x/crypto/poly1305" //nolint:staticcheck // TODO: replace with newer package
 
 	"github.com/safing/jess/tools"
 )