diff --git a/app/vmctl/terminal/unix.go b/app/vmctl/terminal/unix.go
index ad8e64b07..1b3417d98 100644
--- a/app/vmctl/terminal/unix.go
+++ b/app/vmctl/terminal/unix.go
@@ -1,5 +1,4 @@
 //go:build aix || linux || solaris || zos
-// +build aix linux solaris zos
 
 package terminal
 
diff --git a/app/vmctl/terminal/unix_bsd.go b/app/vmctl/terminal/unix_bsd.go
index d46146ca8..1b65edd1f 100644
--- a/app/vmctl/terminal/unix_bsd.go
+++ b/app/vmctl/terminal/unix_bsd.go
@@ -1,5 +1,4 @@
 //go:build darwin || freebsd || openbsd
-// +build darwin freebsd openbsd
 
 package terminal
 
diff --git a/app/vmctl/terminal/windows..go b/app/vmctl/terminal/windows..go
index c3af23e40..5e9c8c4d0 100644
--- a/app/vmctl/terminal/windows..go
+++ b/app/vmctl/terminal/windows..go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package terminal
 
diff --git a/app/vmselect/promql/tzdata.go b/app/vmselect/promql/tzdata.go
index f2e2b4804..f64b3472d 100644
--- a/app/vmselect/promql/tzdata.go
+++ b/app/vmselect/promql/tzdata.go
@@ -1,5 +1,4 @@
 //go:build go1.15
-// +build go1.15
 
 package promql
 
diff --git a/lib/encoding/encoding_cgo_test.go b/lib/encoding/encoding_cgo_test.go
index b6f0f6d89..738c3206a 100644
--- a/lib/encoding/encoding_cgo_test.go
+++ b/lib/encoding/encoding_cgo_test.go
@@ -1,5 +1,4 @@
 //go:build cgo
-// +build cgo
 
 package encoding
 
diff --git a/lib/encoding/encoding_pure_test.go b/lib/encoding/encoding_pure_test.go
index ba3e40f13..befd6db06 100644
--- a/lib/encoding/encoding_pure_test.go
+++ b/lib/encoding/encoding_pure_test.go
@@ -1,5 +1,4 @@
 //go:build !cgo
-// +build !cgo
 
 package encoding
 
diff --git a/lib/encoding/zstd/stream_cgo.go b/lib/encoding/zstd/stream_cgo.go
index f5308c657..bf472b9ed 100644
--- a/lib/encoding/zstd/stream_cgo.go
+++ b/lib/encoding/zstd/stream_cgo.go
@@ -1,5 +1,4 @@
 //go:build cgo
-// +build cgo
 
 package zstd
 
diff --git a/lib/encoding/zstd/stream_pure.go b/lib/encoding/zstd/stream_pure.go
index faab7dfb4..5101c1cbc 100644
--- a/lib/encoding/zstd/stream_pure.go
+++ b/lib/encoding/zstd/stream_pure.go
@@ -1,5 +1,4 @@
 //go:build !cgo
-// +build !cgo
 
 package zstd
 
diff --git a/lib/encoding/zstd/zstd_cgo.go b/lib/encoding/zstd/zstd_cgo.go
index b38a48e42..0917f0e21 100644
--- a/lib/encoding/zstd/zstd_cgo.go
+++ b/lib/encoding/zstd/zstd_cgo.go
@@ -1,5 +1,4 @@
 //go:build cgo
-// +build cgo
 
 package zstd
 
diff --git a/lib/encoding/zstd/zstd_pure.go b/lib/encoding/zstd/zstd_pure.go
index a6aa98056..93c73b156 100644
--- a/lib/encoding/zstd/zstd_pure.go
+++ b/lib/encoding/zstd/zstd_pure.go
@@ -1,5 +1,4 @@
 //go:build !cgo
-// +build !cgo
 
 package zstd
 
diff --git a/lib/encoding/zstd/zstd_test.go b/lib/encoding/zstd/zstd_test.go
index 124b60e1a..17f2a9101 100644
--- a/lib/encoding/zstd/zstd_test.go
+++ b/lib/encoding/zstd/zstd_test.go
@@ -1,5 +1,4 @@
 //go:build cgo
-// +build cgo
 
 package zstd
 
diff --git a/lib/fs/fadvise_unix.go b/lib/fs/fadvise_unix.go
index b0d4bdf71..2f61615fb 100644
--- a/lib/fs/fadvise_unix.go
+++ b/lib/fs/fadvise_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package fs
 
diff --git a/lib/fs/fs_nix.go b/lib/fs/fs_nix.go
index 8e6694373..fed424edb 100644
--- a/lib/fs/fs_nix.go
+++ b/lib/fs/fs_nix.go
@@ -1,5 +1,4 @@
 //go:build linux || darwin || freebsd
-// +build linux darwin freebsd
 
 package fs
 
diff --git a/lib/fs/fs_unix.go b/lib/fs/fs_unix.go
index daa746e6a..c7308fa37 100644
--- a/lib/fs/fs_unix.go
+++ b/lib/fs/fs_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || darwin || freebsd || openbsd
-// +build linux darwin freebsd openbsd
 
 package fs
 
diff --git a/lib/logger/tzdata.go b/lib/logger/tzdata.go
index d2efe9f0d..7788e60d1 100644
--- a/lib/logger/tzdata.go
+++ b/lib/logger/tzdata.go
@@ -1,5 +1,4 @@
 //go:build go1.15
-// +build go1.15
 
 package logger
 
diff --git a/lib/memory/memory_bsd.go b/lib/memory/memory_bsd.go
index 4955ef6e9..d78534600 100644
--- a/lib/memory/memory_bsd.go
+++ b/lib/memory/memory_bsd.go
@@ -1,5 +1,4 @@
 //go:build freebsd || openbsd || dragonfly || netbsd
-// +build freebsd openbsd dragonfly netbsd
 
 package memory
 
diff --git a/lib/memory/sysctl.go b/lib/memory/sysctl.go
index 1c31e0978..d9934312b 100644
--- a/lib/memory/sysctl.go
+++ b/lib/memory/sysctl.go
@@ -1,5 +1,4 @@
 //go:build darwin || freebsd || openbsd || dragonfly || netbsd
-// +build darwin freebsd openbsd dragonfly netbsd
 
 package memory
 
diff --git a/lib/netutil/tcpdialer_default.go b/lib/netutil/tcpdialer_default.go
index cc338cf7b..d778bd713 100644
--- a/lib/netutil/tcpdialer_default.go
+++ b/lib/netutil/tcpdialer_default.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package netutil
 
diff --git a/lib/procutil/signal.go b/lib/procutil/signal.go
index 97439850e..d9469bd4e 100644
--- a/lib/procutil/signal.go
+++ b/lib/procutil/signal.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package procutil
 
diff --git a/lib/procutil/signal_windows.go b/lib/procutil/signal_windows.go
index 1a1d32e0a..9c83af3f0 100644
--- a/lib/procutil/signal_windows.go
+++ b/lib/procutil/signal_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package procutil