diff --git a/cmd/coordinator/builders.go b/cmd/coordinator/builders.go
index 16f6dfd..2e5972b 100644
--- a/cmd/coordinator/builders.go
+++ b/cmd/coordinator/builders.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.16 && (linux || darwin)
+//go:build linux || darwin
 
 package main
 
diff --git a/cmd/coordinator/builders_test.go b/cmd/coordinator/builders_test.go
index 03ca12e..e294301 100644
--- a/cmd/coordinator/builders_test.go
+++ b/cmd/coordinator/builders_test.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.16 && (linux || darwin)
+//go:build linux || darwin
 
 package main
 
diff --git a/cmd/coordinator/buildstatus_test.go b/cmd/coordinator/buildstatus_test.go
index 814a34a..0846005 100644
--- a/cmd/coordinator/buildstatus_test.go
+++ b/cmd/coordinator/buildstatus_test.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.16 && (linux || darwin)
+//go:build linux || darwin
 
 package main
 
diff --git a/cmd/coordinator/coordinator_test.go b/cmd/coordinator/coordinator_test.go
index 4ebebb9..4b6361a 100644
--- a/cmd/coordinator/coordinator_test.go
+++ b/cmd/coordinator/coordinator_test.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.16 && (linux || darwin)
+//go:build linux || darwin
 
 package main
 
diff --git a/cmd/coordinator/dash.go b/cmd/coordinator/dash.go
index 7d5f336..e5daffa 100644
--- a/cmd/coordinator/dash.go
+++ b/cmd/coordinator/dash.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.16 && (linux || darwin)
+//go:build linux || darwin
 
 // Code interacting with build.golang.org ("the dashboard").
 
diff --git a/cmd/coordinator/debug.go b/cmd/coordinator/debug.go
index 1b00f10..177df8d 100644
--- a/cmd/coordinator/debug.go
+++ b/cmd/coordinator/debug.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.16 && (linux || darwin)
+//go:build linux || darwin
 
 package main
 
diff --git a/cmd/coordinator/internal/legacydash/build.go b/cmd/coordinator/internal/legacydash/build.go
index 5e31063..605f163 100644
--- a/cmd/coordinator/internal/legacydash/build.go
+++ b/cmd/coordinator/internal/legacydash/build.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build linux || darwin
+
 package legacydash
 
 import (
diff --git a/cmd/coordinator/internal/legacydash/dash.go b/cmd/coordinator/internal/legacydash/dash.go
index 4af4aee..a2e0c48 100644
--- a/cmd/coordinator/internal/legacydash/dash.go
+++ b/cmd/coordinator/internal/legacydash/dash.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build linux || darwin
+
 // Package legacydash holds the serving code for the build dashboard
 // (build.golang.org) and its remaining HTTP API endpoints.
 //
diff --git a/cmd/coordinator/internal/legacydash/handler.go b/cmd/coordinator/internal/legacydash/handler.go
index c9603ae..429d3de 100644
--- a/cmd/coordinator/internal/legacydash/handler.go
+++ b/cmd/coordinator/internal/legacydash/handler.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build linux || darwin
+
 package legacydash
 
 import (
diff --git a/cmd/coordinator/internal/legacydash/ui.go b/cmd/coordinator/internal/legacydash/ui.go
index fe3983d..82eb2a4 100644
--- a/cmd/coordinator/internal/legacydash/ui.go
+++ b/cmd/coordinator/internal/legacydash/ui.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build linux || darwin
+
 package legacydash
 
 import (
diff --git a/cmd/coordinator/internal/legacydash/ui_test.go b/cmd/coordinator/internal/legacydash/ui_test.go
index 518fc8e..380cd41 100644
--- a/cmd/coordinator/internal/legacydash/ui_test.go
+++ b/cmd/coordinator/internal/legacydash/ui_test.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build linux || darwin
+
 package legacydash
 
 import (
diff --git a/cmd/coordinator/metrics.go b/cmd/coordinator/metrics.go
index 2b5ceec..35aad9e 100644
--- a/cmd/coordinator/metrics.go
+++ b/cmd/coordinator/metrics.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.16 && (linux || darwin)
+//go:build linux || darwin
 
 package main
 
diff --git a/cmd/coordinator/modproxy.go b/cmd/coordinator/modproxy.go
index 88f0530..abd122d 100644
--- a/cmd/coordinator/modproxy.go
+++ b/cmd/coordinator/modproxy.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.16 && (linux || darwin)
+//go:build linux || darwin
 
 package main
 
diff --git a/cmd/coordinator/modproxy_test.go b/cmd/coordinator/modproxy_test.go
index e05640b..1241861 100644
--- a/cmd/coordinator/modproxy_test.go
+++ b/cmd/coordinator/modproxy_test.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.16 && (linux || darwin)
+//go:build linux || darwin
 
 package main
 
diff --git a/cmd/coordinator/queues.go b/cmd/coordinator/queues.go
index f9c9150..0d02b0f 100644
--- a/cmd/coordinator/queues.go
+++ b/cmd/coordinator/queues.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.16 && (linux || darwin)
+//go:build linux || darwin
 
 package main
 
diff --git a/cmd/coordinator/queues_test.go b/cmd/coordinator/queues_test.go
index 72d32e2..2fc0a9d 100644
--- a/cmd/coordinator/queues_test.go
+++ b/cmd/coordinator/queues_test.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.16 && (linux || darwin)
+//go:build linux || darwin
 
 package main
 
diff --git a/cmd/coordinator/results.go b/cmd/coordinator/results.go
index 66a77d7..cda0b7b 100644
--- a/cmd/coordinator/results.go
+++ b/cmd/coordinator/results.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.16 && (linux || darwin)
+//go:build linux || darwin
 
 // Code related to the Build Results API.
 
diff --git a/cmd/coordinator/results_test.go b/cmd/coordinator/results_test.go
index 2a2ea95..bf1b3b7 100644
--- a/cmd/coordinator/results_test.go
+++ b/cmd/coordinator/results_test.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.16 && (linux || darwin)
+//go:build linux || darwin
 
 package main
 
diff --git a/cmd/coordinator/status.go b/cmd/coordinator/status.go
index 06fb48f..4d07e6d 100644
--- a/cmd/coordinator/status.go
+++ b/cmd/coordinator/status.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.16 && (linux || darwin)
+//go:build linux || darwin
 
 package main
 
diff --git a/cmd/coordinator/status_test.go b/cmd/coordinator/status_test.go
index 4ccd665..3b276d1 100644
--- a/cmd/coordinator/status_test.go
+++ b/cmd/coordinator/status_test.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.16 && (linux || darwin)
+//go:build linux || darwin
 
 package main
 
diff --git a/cmd/gomoteserver/gomoteserver.go b/cmd/gomoteserver/gomoteserver.go
index fa88d52..bb0add5 100644
--- a/cmd/gomoteserver/gomoteserver.go
+++ b/cmd/gomoteserver/gomoteserver.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.20 && (linux || darwin)
+//go:build linux || darwin
 
 package main
 
diff --git a/cmd/relnote/generate.go b/cmd/relnote/generate.go
index fe76f5d..c899224 100644
--- a/cmd/relnote/generate.go
+++ b/cmd/relnote/generate.go
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.21
-
 package main
 
 import (
diff --git a/cmd/relnote/relnote.go b/cmd/relnote/relnote.go
index 9196391..d2c3b60 100644
--- a/cmd/relnote/relnote.go
+++ b/cmd/relnote/relnote.go
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.21
-
 // The relnote command works with release notes.
 // It can be used to look for unfinished notes and to generate the
 // final markdown file.
diff --git a/cmd/relnote/todo.go b/cmd/relnote/todo.go
index 908ba8b..d5b0cb1 100644
--- a/cmd/relnote/todo.go
+++ b/cmd/relnote/todo.go
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.21
-
 package main
 
 import (
diff --git a/cmd/relnote/todo_test.go b/cmd/relnote/todo_test.go
index 6b899d2..cfa1323 100644
--- a/cmd/relnote/todo_test.go
+++ b/cmd/relnote/todo_test.go
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.21
-
 package main
 
 import (
diff --git a/cmd/runqemubuildlet/darwin.go b/cmd/runqemubuildlet/darwin.go
index bf6aff4..8c4dac2 100644
--- a/cmd/runqemubuildlet/darwin.go
+++ b/cmd/runqemubuildlet/darwin.go
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.16
-
 package main
 
 import (
diff --git a/cmd/runqemubuildlet/heartbeat.go b/cmd/runqemubuildlet/heartbeat.go
index a5be6da..c79d617 100644
--- a/cmd/runqemubuildlet/heartbeat.go
+++ b/cmd/runqemubuildlet/heartbeat.go
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.16
-
 package main
 
 import (
diff --git a/cmd/runqemubuildlet/heartbeat_test.go b/cmd/runqemubuildlet/heartbeat_test.go
index 6481ba7..37a390f 100644
--- a/cmd/runqemubuildlet/heartbeat_test.go
+++ b/cmd/runqemubuildlet/heartbeat_test.go
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.16
-
 package main
 
 import (
diff --git a/cmd/runqemubuildlet/main.go b/cmd/runqemubuildlet/main.go
index f250a23..5fcb584 100644
--- a/cmd/runqemubuildlet/main.go
+++ b/cmd/runqemubuildlet/main.go
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.16
-
 // Binary runqemubuildlet runs a single VM-based buildlet in a loop.
 package main
 
diff --git a/cmd/runqemubuildlet/windows.go b/cmd/runqemubuildlet/windows.go
index 7f877b2..2aaada5 100644
--- a/cmd/runqemubuildlet/windows.go
+++ b/cmd/runqemubuildlet/windows.go
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.16
-
 package main
 
 import (
diff --git a/env/corellium/ios/files/arwrap.go b/env/corellium/ios/files/arwrap.go
index 95f1e36..7676ddd 100755
--- a/env/corellium/ios/files/arwrap.go
+++ b/env/corellium/ios/files/arwrap.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 // The arhost binary is a wrapper for llvm-ar, designed to be called by
 // cmd/link. The -extar flag is not enough because llvm-ar and ar don't
diff --git a/env/corellium/ios/files/clangwrap.go b/env/corellium/ios/files/clangwrap.go
index 2c33d37..3eb9230 100755
--- a/env/corellium/ios/files/clangwrap.go
+++ b/env/corellium/ios/files/clangwrap.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 // The clanghost binary is like clangwrap.sh but for self-hosted iOS.
 //
diff --git a/internal/coordinator/pool/queue/item.go b/internal/coordinator/pool/queue/item.go
index 8f88fb1..7d8aa1f 100644
--- a/internal/coordinator/pool/queue/item.go
+++ b/internal/coordinator/pool/queue/item.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build linux || darwin
+
 package queue
 
 import (
diff --git a/internal/coordinator/pool/queue/item_test.go b/internal/coordinator/pool/queue/item_test.go
index 6325dfa..0d44f82 100644
--- a/internal/coordinator/pool/queue/item_test.go
+++ b/internal/coordinator/pool/queue/item_test.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build linux || darwin
+
 package queue
 
 import (
diff --git a/internal/coordinator/pool/queue/quota.go b/internal/coordinator/pool/queue/quota.go
index 30d08a9..d525e03 100644
--- a/internal/coordinator/pool/queue/quota.go
+++ b/internal/coordinator/pool/queue/quota.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build linux || darwin
+
 package queue
 
 import (
diff --git a/internal/coordinator/pool/queue/quota_test.go b/internal/coordinator/pool/queue/quota_test.go
index 1307086..66f89ca 100644
--- a/internal/coordinator/pool/queue/quota_test.go
+++ b/internal/coordinator/pool/queue/quota_test.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build linux || darwin
+
 package queue
 
 import (
diff --git a/internal/coordinator/remote/doc.go b/internal/coordinator/remote/doc.go
index 2d26e74..d0cfa43 100644
--- a/internal/coordinator/remote/doc.go
+++ b/internal/coordinator/remote/doc.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build linux || darwin
+
 // Package remote provides remote access to resources in the build
 // infrastructure.
 package remote
diff --git a/internal/coordinator/remote/legacy.go b/internal/coordinator/remote/legacy.go
index 8db61ee..7ba2b0f 100644
--- a/internal/coordinator/remote/legacy.go
+++ b/internal/coordinator/remote/legacy.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build linux || darwin
+
 package remote
 
 import (
diff --git a/internal/coordinator/remote/remote.go b/internal/coordinator/remote/remote.go
index f449947..76f8986 100644
--- a/internal/coordinator/remote/remote.go
+++ b/internal/coordinator/remote/remote.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build linux || darwin
+
 package remote
 
 import (
diff --git a/internal/coordinator/remote/remote_test.go b/internal/coordinator/remote/remote_test.go
index 5ad7778..2c61cec 100644
--- a/internal/coordinator/remote/remote_test.go
+++ b/internal/coordinator/remote/remote_test.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build linux || darwin
+
 package remote
 
 import (
diff --git a/internal/coordinator/remote/ssh.go b/internal/coordinator/remote/ssh.go
index c8a3963..6757003 100644
--- a/internal/coordinator/remote/ssh.go
+++ b/internal/coordinator/remote/ssh.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.16 && (linux || darwin)
+//go:build linux || darwin
 
 package remote
 
diff --git a/internal/coordinator/remote/ssh_test.go b/internal/coordinator/remote/ssh_test.go
index f404d07..97c66df 100644
--- a/internal/coordinator/remote/ssh_test.go
+++ b/internal/coordinator/remote/ssh_test.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.16 && (linux || darwin)
+//go:build linux || darwin
 
 package remote
 
diff --git a/internal/gomote/doc.go b/internal/gomote/doc.go
index 3d932bd..9c26275 100644
--- a/internal/gomote/doc.go
+++ b/internal/gomote/doc.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build linux || darwin
+
 // Package gomote contains all of the necessary components to implement
 // and use the gomote functionality. Gomotes are instances which are dedicated
 // to an individual user or service.
diff --git a/internal/gomoteserver/ui/ui.go b/internal/gomoteserver/ui/ui.go
index 49f8735..47a3448 100644
--- a/internal/gomoteserver/ui/ui.go
+++ b/internal/gomoteserver/ui/ui.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build linux || darwin
+
 package ui
 
 import (
diff --git a/internal/releasetargets/releasetargets_test.go b/internal/releasetargets/releasetargets_test.go
index bb75050..f53516c 100644
--- a/internal/releasetargets/releasetargets_test.go
+++ b/internal/releasetargets/releasetargets_test.go
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build linux || darwin
-
 package releasetargets
 
 import (
diff --git a/perfdata/cmd/reindex/reindex.go b/perfdata/cmd/reindex/reindex.go
index cf69f6d..7154e80 100644
--- a/perfdata/cmd/reindex/reindex.go
+++ b/perfdata/cmd/reindex/reindex.go
@@ -11,7 +11,6 @@
 // Reindex reindexes all the uploads with IDs starting with the given prefixes.
 
 //go:build cloud
-// +build cloud
 
 package main