diff --git a/accounts/keystore/watch.go b/accounts/keystore/watch.go
index 43ceef5d1e..26b07cc871 100644
--- a/accounts/keystore/watch.go
+++ b/accounts/keystore/watch.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build (darwin && !ios && cgo) || freebsd || (linux && !arm64) || netbsd || solaris
-// +build darwin,!ios,cgo freebsd linux,!arm64 netbsd solaris
 
 package keystore
 
diff --git a/accounts/keystore/watch_fallback.go b/accounts/keystore/watch_fallback.go
index 50239ab979..edeb7661d4 100644
--- a/accounts/keystore/watch_fallback.go
+++ b/accounts/keystore/watch_fallback.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build (darwin && !cgo) || ios || (linux && arm64) || windows || (!darwin && !freebsd && !linux && !netbsd && !solaris)
-// +build darwin,!cgo ios linux,arm64 windows !darwin,!freebsd,!linux,!netbsd,!solaris
 
 // This is the fallback implementation of directory watching.
 // It is used on unsupported platforms.
diff --git a/common/bitutil/compress_fuzz.go b/common/bitutil/compress_fuzz.go
index bd8388e344..e327d27f29 100644
--- a/common/bitutil/compress_fuzz.go
+++ b/common/bitutil/compress_fuzz.go
@@ -15,7 +15,6 @@
 // along with the CortexFoundation library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build gofuzz
-// +build gofuzz
 
 package bitutil
 
diff --git a/common/fdlimit/fdlimit_bsd.go b/common/fdlimit/fdlimit_bsd.go
index c39bfaf611..2fcb3d970e 100644
--- a/common/fdlimit/fdlimit_bsd.go
+++ b/common/fdlimit/fdlimit_bsd.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build freebsd || dragonfly
-// +build freebsd dragonfly
 
 package fdlimit
 
diff --git a/common/fdlimit/fdlimit_unix.go b/common/fdlimit/fdlimit_unix.go
index 4ef5a41a8b..652469935b 100644
--- a/common/fdlimit/fdlimit_unix.go
+++ b/common/fdlimit/fdlimit_unix.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build linux || netbsd || openbsd || solaris
-// +build linux netbsd openbsd solaris
 
 package fdlimit
 
diff --git a/core/mkalloc.go b/core/mkalloc.go
index 5f761a382f..e6ebb8e78b 100644
--- a/core/mkalloc.go
+++ b/core/mkalloc.go
@@ -15,7 +15,6 @@
 // along with the CortexFoundation library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build none
-// +build none
 
 /*
 The mkalloc tool creates the genesis allocation constants in genesis_alloc.go
diff --git a/core/vm/runtime/fuzz.go b/core/vm/runtime/fuzz.go
index cdc18b2cc8..9655e857f3 100644
--- a/core/vm/runtime/fuzz.go
+++ b/core/vm/runtime/fuzz.go
@@ -15,7 +15,6 @@
 // along with the CortexFoundation library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build gofuzz
-// +build gofuzz
 
 package runtime
 
diff --git a/crypto/blake2b/blake2bAVX2_amd64.go b/crypto/blake2b/blake2bAVX2_amd64.go
index 3a85d0e73a..bfeee2be9e 100644
--- a/crypto/blake2b/blake2bAVX2_amd64.go
+++ b/crypto/blake2b/blake2bAVX2_amd64.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build go1.7 && amd64 && !gccgo && !appengine
-// +build go1.7,amd64,!gccgo,!appengine
 
 package blake2b
 
diff --git a/crypto/blake2b/blake2b_amd64.go b/crypto/blake2b/blake2b_amd64.go
index a318b2b617..7f933ecb92 100644
--- a/crypto/blake2b/blake2b_amd64.go
+++ b/crypto/blake2b/blake2b_amd64.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !go1.7 && amd64 && !gccgo && !appengine
-// +build !go1.7,amd64,!gccgo,!appengine
 
 package blake2b
 
diff --git a/crypto/blake2b/blake2b_f_fuzz.go b/crypto/blake2b/blake2b_f_fuzz.go
index b2f4057074..5b7eb678d3 100644
--- a/crypto/blake2b/blake2b_f_fuzz.go
+++ b/crypto/blake2b/blake2b_f_fuzz.go
@@ -1,5 +1,4 @@
 //go:build gofuzz
-// +build gofuzz
 
 package blake2b
 
diff --git a/crypto/blake2b/blake2b_f_fuzz_test.go b/crypto/blake2b/blake2b_f_fuzz_test.go
index 1de9a62de9..1913ede34d 100644
--- a/crypto/blake2b/blake2b_f_fuzz_test.go
+++ b/crypto/blake2b/blake2b_f_fuzz_test.go
@@ -1,6 +1,5 @@
 // Only enable fuzzer on platforms with AVX enabled
 //go:build go1.7 && amd64 && !gccgo && !appengine
-// +build go1.7,amd64,!gccgo,!appengine
 
 package blake2b
 
diff --git a/crypto/blake2b/blake2b_ref.go b/crypto/blake2b/blake2b_ref.go
index 095c71a648..682544100f 100644
--- a/crypto/blake2b/blake2b_ref.go
+++ b/crypto/blake2b/blake2b_ref.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !amd64 || appengine || gccgo
-// +build !amd64 appengine gccgo
 
 package blake2b
 
diff --git a/crypto/blake2b/register.go b/crypto/blake2b/register.go
index 9d8633963c..d9fcac3a4d 100644
--- a/crypto/blake2b/register.go
+++ b/crypto/blake2b/register.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build go1.9
-// +build go1.9
 
 package blake2b
 
diff --git a/crypto/bls12381/arithmetic_decl.go b/crypto/bls12381/arithmetic_decl.go
index 7d99e93dab..9dc4050e6d 100644
--- a/crypto/bls12381/arithmetic_decl.go
+++ b/crypto/bls12381/arithmetic_decl.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build (amd64 && blsasm) || (amd64 && blsadx)
-// +build amd64,blsasm amd64,blsadx
 
 package bls12381
 
diff --git a/crypto/bls12381/arithmetic_fallback.go b/crypto/bls12381/arithmetic_fallback.go
index 4d3556f644..a29ac99eca 100644
--- a/crypto/bls12381/arithmetic_fallback.go
+++ b/crypto/bls12381/arithmetic_fallback.go
@@ -32,7 +32,6 @@
 // Package bls (generated by goff) contains field arithmetics operations
 
 //go:build !amd64 || (!blsasm && !blsadx)
-// +build !amd64 !blsasm,!blsadx
 
 package bls12381
 
diff --git a/crypto/bls12381/arithmetic_x86_adx.go b/crypto/bls12381/arithmetic_x86_adx.go
index 94bace6315..3399f738b8 100644
--- a/crypto/bls12381/arithmetic_x86_adx.go
+++ b/crypto/bls12381/arithmetic_x86_adx.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build amd64 && blsadx
-// +build amd64,blsadx
 
 package bls12381
 
diff --git a/crypto/bls12381/arithmetic_x86_noadx.go b/crypto/bls12381/arithmetic_x86_noadx.go
index dacbbd3e75..f7e4f66bf7 100644
--- a/crypto/bls12381/arithmetic_x86_noadx.go
+++ b/crypto/bls12381/arithmetic_x86_noadx.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build amd64 && blsasm
-// +build amd64,blsasm
 
 package bls12381
 
diff --git a/crypto/bn256/bn256_fast.go b/crypto/bn256/bn256_fast.go
index b2d312dd8e..f3c34a761d 100644
--- a/crypto/bn256/bn256_fast.go
+++ b/crypto/bn256/bn256_fast.go
@@ -3,7 +3,6 @@
 // in the LICENSE file.
 
 //go:build amd64 || arm64
-// +build amd64 arm64
 
 // Package bn256 implements the Optimal Ate pairing over a 256-bit Barreto-Naehrig curve.
 package bn256
diff --git a/crypto/bn256/bn256_fuzz.go b/crypto/bn256/bn256_fuzz.go
index 4366ebe5ff..f837c7d421 100644
--- a/crypto/bn256/bn256_fuzz.go
+++ b/crypto/bn256/bn256_fuzz.go
@@ -3,7 +3,6 @@
 // in the LICENSE file.
 
 //go:build gofuzz
-// +build gofuzz
 
 package bn256
 
diff --git a/crypto/bn256/bn256_slow.go b/crypto/bn256/bn256_slow.go
index 993f0eb36b..df9a251635 100644
--- a/crypto/bn256/bn256_slow.go
+++ b/crypto/bn256/bn256_slow.go
@@ -3,7 +3,6 @@
 // in the LICENSE file.
 
 //go:build !amd64 && !arm64
-// +build !amd64,!arm64
 
 // Package bn256 implements the Optimal Ate pairing over a 256-bit Barreto-Naehrig curve.
 package bn256
diff --git a/crypto/bn256/cloudflare/gfp_decl.go b/crypto/bn256/cloudflare/gfp_decl.go
index 33afe86440..5498d36d88 100644
--- a/crypto/bn256/cloudflare/gfp_decl.go
+++ b/crypto/bn256/cloudflare/gfp_decl.go
@@ -1,5 +1,4 @@
 //go:build (amd64 && !generic) || (arm64 && !generic)
-// +build amd64,!generic arm64,!generic
 
 package bn256
 
diff --git a/crypto/bn256/cloudflare/gfp_generic.go b/crypto/bn256/cloudflare/gfp_generic.go
index 7742dda4c9..944208c67b 100644
--- a/crypto/bn256/cloudflare/gfp_generic.go
+++ b/crypto/bn256/cloudflare/gfp_generic.go
@@ -1,5 +1,4 @@
 //go:build (!amd64 && !arm64) || generic
-// +build !amd64,!arm64 generic
 
 package bn256
 
diff --git a/crypto/secp256k1/dummy.go b/crypto/secp256k1/dummy.go
index 11f2fd1521..f4ac2682c2 100644
--- a/crypto/secp256k1/dummy.go
+++ b/crypto/secp256k1/dummy.go
@@ -1,5 +1,4 @@
 //go:build dummy
-// +build dummy
 
 // This file is part of a workaround for `go mod vendor` which won't vendor
 // C files if there's no Go file in the same directory.
diff --git a/crypto/secp256k1/scalar_mult_nocgo.go b/crypto/secp256k1/scalar_mult_nocgo.go
index feb13a8dfd..f26aecc068 100644
--- a/crypto/secp256k1/scalar_mult_nocgo.go
+++ b/crypto/secp256k1/scalar_mult_nocgo.go
@@ -3,7 +3,6 @@
 // the LICENSE file.
 
 //go:build gofuzz || !cgo
-// +build gofuzz !cgo
 
 package secp256k1
 
diff --git a/crypto/secp256k1/secp256_test.go b/crypto/secp256k1/secp256_test.go
index 4827cc5b25..109872b1e9 100644
--- a/crypto/secp256k1/secp256_test.go
+++ b/crypto/secp256k1/secp256_test.go
@@ -3,7 +3,6 @@
 // the LICENSE file.
 
 //go:build !gofuzz && cgo
-// +build !gofuzz,cgo
 
 package secp256k1
 
diff --git a/crypto/signature_cgo.go b/crypto/signature_cgo.go
index 1932d6e51b..3b3600072a 100644
--- a/crypto/signature_cgo.go
+++ b/crypto/signature_cgo.go
@@ -15,7 +15,6 @@
 // along with the CortexFoundation library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build !nacl && !js && !wasip1 && cgo && !gofuzz && !tinygo
-// +build !nacl,!js,!wasip1,cgo,!gofuzz,!tinygo
 
 package crypto
 
diff --git a/crypto/signature_nocgo.go b/crypto/signature_nocgo.go
index 067cf88ee0..91ff726557 100644
--- a/crypto/signature_nocgo.go
+++ b/crypto/signature_nocgo.go
@@ -15,7 +15,6 @@
 // along with the CortexFoundation library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build nacl || js || wasip1 || !cgo || gofuzz || tinygo
-// +build nacl js wasip1 !cgo gofuzz tinygo
 
 package crypto
 
diff --git a/crypto/signify/signify_fuzz.go b/crypto/signify/signify_fuzz.go
index b264860472..1fe035e2a0 100644
--- a/crypto/signify/signify_fuzz.go
+++ b/crypto/signify/signify_fuzz.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build gofuzz
-// +build gofuzz
 
 package signify
 
diff --git a/ctxcdb/leveldb/leveldb.go b/ctxcdb/leveldb/leveldb.go
index f88e590633..482f77c915 100644
--- a/ctxcdb/leveldb/leveldb.go
+++ b/ctxcdb/leveldb/leveldb.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build !js && !wasip1
-// +build !js,!wasip1
 
 // Package leveldb implements the key-value database layer based on LevelDB.
 package leveldb
diff --git a/event/feedof.go b/event/feedof.go
index fafc041320..1b0db88ba0 100644
--- a/event/feedof.go
+++ b/event/feedof.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build go1.18
-// +build go1.18
 
 package event
 
diff --git a/event/feedof_test.go b/event/feedof_test.go
index f686c6eacd..bef3eef88d 100644
--- a/event/feedof_test.go
+++ b/event/feedof_test.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build go1.18
-// +build go1.18
 
 package event
 
diff --git a/metrics/cpu_disabled.go b/metrics/cpu_disabled.go
index 7575670a65..8009f11525 100644
--- a/metrics/cpu_disabled.go
+++ b/metrics/cpu_disabled.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build ios || js || wasip1 || tinygo
-// +build ios js wasip1 tinygo
 
 package metrics
 
diff --git a/metrics/cpu_enabled.go b/metrics/cpu_enabled.go
index b696b68ba4..87018b7332 100644
--- a/metrics/cpu_enabled.go
+++ b/metrics/cpu_enabled.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build !ios && !js && !wasip1 && !tinygo
-// +build !ios,!js,!wasip1,!tinygo
 
 package metrics
 
diff --git a/metrics/cputime_nop.go b/metrics/cputime_nop.go
index 629c9d7af9..2217aa8fd0 100644
--- a/metrics/cputime_nop.go
+++ b/metrics/cputime_nop.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build windows || js || tinygo
-// +build windows js tinygo
 
 package metrics
 
diff --git a/metrics/cputime_unix.go b/metrics/cputime_unix.go
index ef85dce237..178678c5c4 100644
--- a/metrics/cputime_unix.go
+++ b/metrics/cputime_unix.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build !windows && !js && !wasip1 && !tinygo
-// +build !windows,!js,!wasip1,!tinygo
 
 package metrics
 
diff --git a/metrics/disk_nop.go b/metrics/disk_nop.go
index 9ef0a2641d..80c70ecc5b 100644
--- a/metrics/disk_nop.go
+++ b/metrics/disk_nop.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build !linux
-// +build !linux
 
 package metrics
 
diff --git a/metrics/syslog.go b/metrics/syslog.go
index 972139e2c7..ccd5cc7ee9 100644
--- a/metrics/syslog.go
+++ b/metrics/syslog.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package metrics
 
diff --git a/p2p/netutil/toobig_notwindows.go b/p2p/netutil/toobig_notwindows.go
index 7ca91f18e5..a12f134f73 100644
--- a/p2p/netutil/toobig_notwindows.go
+++ b/p2p/netutil/toobig_notwindows.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build !windows
-// +build !windows
 
 package netutil
 
diff --git a/p2p/netutil/toobig_windows.go b/p2p/netutil/toobig_windows.go
index 41fcdae383..44fc065175 100644
--- a/p2p/netutil/toobig_windows.go
+++ b/p2p/netutil/toobig_windows.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build windows
-// +build windows
 
 package netutil
 
diff --git a/rlp/safe.go b/rlp/safe.go
index e9de43209f..da634a1319 100644
--- a/rlp/safe.go
+++ b/rlp/safe.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build nacl || js || !cgo
-// +build nacl js !cgo
 
 package rlp
 
diff --git a/rlp/unsafe.go b/rlp/unsafe.go
index 0772eb752e..3dd9af2c63 100644
--- a/rlp/unsafe.go
+++ b/rlp/unsafe.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build !nacl && !js && cgo
-// +build !nacl,!js,cgo
 
 package rlp
 
diff --git a/rpc/ipc_js.go b/rpc/ipc_js.go
index 453a20bc1a..ce0779b656 100644
--- a/rpc/ipc_js.go
+++ b/rpc/ipc_js.go
@@ -15,7 +15,6 @@
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build js
-// +build js
 
 package rpc
 
diff --git a/rpc/ipc_unix.go b/rpc/ipc_unix.go
index 8f3af434b6..f3f385cb08 100644
--- a/rpc/ipc_unix.go
+++ b/rpc/ipc_unix.go
@@ -15,7 +15,6 @@
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build darwin || dragonfly || freebsd || linux || nacl || netbsd || openbsd || solaris
-// +build darwin dragonfly freebsd linux nacl netbsd openbsd solaris
 
 package rpc
 
diff --git a/rpc/ipc_wasip1.go b/rpc/ipc_wasip1.go
index 2608e29222..ceced01d12 100644
--- a/rpc/ipc_wasip1.go
+++ b/rpc/ipc_wasip1.go
@@ -15,7 +15,6 @@
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build wasip1
-// +build wasip1
 
 package rpc
 
diff --git a/rpc/ipc_windows.go b/rpc/ipc_windows.go
index efec38cf37..62a6d4b84e 100644
--- a/rpc/ipc_windows.go
+++ b/rpc/ipc_windows.go
@@ -15,7 +15,6 @@
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build windows
-// +build windows
 
 package rpc