diff --git a/charger/nrgble.go b/charger/nrgble.go
index 5fe508994..bb93c12fd 100644
--- a/charger/nrgble.go
+++ b/charger/nrgble.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package charger
 
diff --git a/cmd/demoport.go b/cmd/demoport.go
index 9c4356762..f6994770a 100644
--- a/cmd/demoport.go
+++ b/cmd/demoport.go
@@ -1,5 +1,4 @@
 //go:build !gokrazy
-// +build !gokrazy
 
 package cmd
 
diff --git a/cmd/demoport_gokrazy.go b/cmd/demoport_gokrazy.go
index b90c53cda..3ae82ea4a 100644
--- a/cmd/demoport_gokrazy.go
+++ b/cmd/demoport_gokrazy.go
@@ -1,5 +1,4 @@
 //go:build gokrazy
-// +build gokrazy
 
 package cmd
 
diff --git a/cmd/gokrazy.go b/cmd/gokrazy.go
index 85d5890b6..c84a7207b 100644
--- a/cmd/gokrazy.go
+++ b/cmd/gokrazy.go
@@ -1,5 +1,4 @@
 //go:build gokrazy
-// +build gokrazy
 
 package cmd
 
diff --git a/cmd/health.go b/cmd/health.go
index 68dffdc90..3d9ca2e0c 100644
--- a/cmd/health.go
+++ b/cmd/health.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package cmd
 
diff --git a/server/http_live.go b/server/http_live.go
index 7ca18755c..6d9fc478a 100644
--- a/server/http_live.go
+++ b/server/http_live.go
@@ -1,5 +1,4 @@
 //go:build !release
-// +build !release
 
 package server
 
diff --git a/server/uds.go b/server/uds.go
index f775057af..dc8190382 100644
--- a/server/uds.go
+++ b/server/uds.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package server
 
diff --git a/server/uds_windows.go b/server/uds_windows.go
index f4c490932..c05a969da 100644
--- a/server/uds_windows.go
+++ b/server/uds_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package server
 
diff --git a/server/updater/gokrazy.go b/server/updater/gokrazy.go
index 7eb33f258..62b16df7f 100644
--- a/server/updater/gokrazy.go
+++ b/server/updater/gokrazy.go
@@ -1,5 +1,4 @@
 //go:build gokrazy
-// +build gokrazy
 
 package updater
 
diff --git a/server/updater/run.go b/server/updater/run.go
index da464c992..df4ea71fb 100644
--- a/server/updater/run.go
+++ b/server/updater/run.go
@@ -1,5 +1,4 @@
 //go:build !gokrazy
-// +build !gokrazy
 
 package updater
 
diff --git a/server/updater/run_gokrazy.go b/server/updater/run_gokrazy.go
index cf0760e65..49ea3b219 100644
--- a/server/updater/run_gokrazy.go
+++ b/server/updater/run_gokrazy.go
@@ -1,5 +1,4 @@
 //go:build gokrazy
-// +build gokrazy
 
 package updater
 
diff --git a/tools.go b/tools.go
index c1d143b89..e8726aaf5 100644
--- a/tools.go
+++ b/tools.go
@@ -1,5 +1,4 @@
 //go:build tools
-// +build tools
 
 package main
 
diff --git a/util/goversion/version.go b/util/goversion/version.go
index 637a80298..281aafc50 100644
--- a/util/goversion/version.go
+++ b/util/goversion/version.go
@@ -1,5 +1,4 @@
 //go:build go1.17
-// +build go1.17
 
 package goversion