diff --git a/build.go b/build.go
index aa56141340..d379745c6d 100644
--- a/build.go
+++ b/build.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build vendor
-// +build vendor
 
 package main
 
diff --git a/build/code-batch-process.go b/build/code-batch-process.go
index b2290af771..0f8dbd40fe 100644
--- a/build/code-batch-process.go
+++ b/build/code-batch-process.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 package main
 
diff --git a/build/generate-bindata.go b/build/generate-bindata.go
index 7fdf9d7616..ab81dd8938 100644
--- a/build/generate-bindata.go
+++ b/build/generate-bindata.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 package main
 
diff --git a/build/generate-emoji.go b/build/generate-emoji.go
index 2f3536342d..a22f2a4571 100644
--- a/build/generate-emoji.go
+++ b/build/generate-emoji.go
@@ -4,7 +4,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 package main
 
diff --git a/build/generate-gitignores.go b/build/generate-gitignores.go
index 0f7d719d40..1e09c83a6a 100644
--- a/build/generate-gitignores.go
+++ b/build/generate-gitignores.go
@@ -1,5 +1,4 @@
 //go:build ignore
-// +build ignore
 
 package main
 
diff --git a/build/generate-licenses.go b/build/generate-licenses.go
index 0f9b9f369f..02b41a229a 100644
--- a/build/generate-licenses.go
+++ b/build/generate-licenses.go
@@ -1,5 +1,4 @@
 //go:build ignore
-// +build ignore
 
 package main
 
diff --git a/build/gitea-format-imports.go b/build/gitea-format-imports.go
index 67c8397b2d..c685ae68ee 100644
--- a/build/gitea-format-imports.go
+++ b/build/gitea-format-imports.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 package main
 
diff --git a/build/gocovmerge.go b/build/gocovmerge.go
index 1d2652129f..dfe70efdad 100644
--- a/build/gocovmerge.go
+++ b/build/gocovmerge.go
@@ -7,7 +7,6 @@
 // merges them into one profile
 
 //go:build ignore
-// +build ignore
 
 package main
 
diff --git a/cmd/embedded.go b/cmd/embedded.go
index 2930e5d307..30fc7103d8 100644
--- a/cmd/embedded.go
+++ b/cmd/embedded.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build bindata
-// +build bindata
 
 package cmd
 
diff --git a/cmd/embedded_stub.go b/cmd/embedded_stub.go
index 0e9e3e6ec3..26228256f2 100644
--- a/cmd/embedded_stub.go
+++ b/cmd/embedded_stub.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !bindata
-// +build !bindata
 
 package cmd
 
diff --git a/modules/auth/pam/pam.go b/modules/auth/pam/pam.go
index 1acd0b112c..39e93d7162 100644
--- a/modules/auth/pam/pam.go
+++ b/modules/auth/pam/pam.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build pam
-// +build pam
 
 package pam
 
diff --git a/modules/auth/pam/pam_stub.go b/modules/auth/pam/pam_stub.go
index 815ccf2b0e..414d7631b5 100644
--- a/modules/auth/pam/pam_stub.go
+++ b/modules/auth/pam/pam_stub.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !pam
-// +build !pam
 
 package pam
 
diff --git a/modules/auth/pam/pam_test.go b/modules/auth/pam/pam_test.go
index d6d78a748b..08565d2f31 100644
--- a/modules/auth/pam/pam_test.go
+++ b/modules/auth/pam/pam_test.go
@@ -1,5 +1,4 @@
 //go:build pam
-// +build pam
 
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // Use of this source code is governed by a MIT-style
diff --git a/modules/avatar/identicon/identicon_test.go b/modules/avatar/identicon/identicon_test.go
index ee44c95139..44635fbb3b 100644
--- a/modules/avatar/identicon/identicon_test.go
+++ b/modules/avatar/identicon/identicon_test.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build test_avatar_identicon
-// +build test_avatar_identicon
 
 package identicon
 
diff --git a/modules/git/blob_gogit.go b/modules/git/blob_gogit.go
index ef7a90c3f4..2a2b51e422 100644
--- a/modules/git/blob_gogit.go
+++ b/modules/git/blob_gogit.go
@@ -4,7 +4,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gogit
-// +build gogit
 
 package git
 
diff --git a/modules/git/blob_nogogit.go b/modules/git/blob_nogogit.go
index aabf1b34ad..211c188559 100644
--- a/modules/git/blob_nogogit.go
+++ b/modules/git/blob_nogogit.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !gogit
-// +build !gogit
 
 package git
 
diff --git a/modules/git/command_race_test.go b/modules/git/command_race_test.go
index 9eb29fcfab..ae2acc3a5a 100644
--- a/modules/git/command_race_test.go
+++ b/modules/git/command_race_test.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build race
-// +build race
 
 package git
 
diff --git a/modules/git/commit_convert_gogit.go b/modules/git/commit_convert_gogit.go
index b328b3c0ed..bb9d3bf8ce 100644
--- a/modules/git/commit_convert_gogit.go
+++ b/modules/git/commit_convert_gogit.go
@@ -4,7 +4,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gogit
-// +build gogit
 
 package git
 
diff --git a/modules/git/commit_info_gogit.go b/modules/git/commit_info_gogit.go
index ab6e738103..91a1804db5 100644
--- a/modules/git/commit_info_gogit.go
+++ b/modules/git/commit_info_gogit.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gogit
-// +build gogit
 
 package git
 
diff --git a/modules/git/commit_info_nogogit.go b/modules/git/commit_info_nogogit.go
index 347ad7d059..f430c672f8 100644
--- a/modules/git/commit_info_nogogit.go
+++ b/modules/git/commit_info_nogogit.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !gogit
-// +build !gogit
 
 package git
 
diff --git a/modules/git/last_commit_cache_gogit.go b/modules/git/last_commit_cache_gogit.go
index 06e85a6db2..8897000350 100644
--- a/modules/git/last_commit_cache_gogit.go
+++ b/modules/git/last_commit_cache_gogit.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gogit
-// +build gogit
 
 package git
 
diff --git a/modules/git/last_commit_cache_nogogit.go b/modules/git/last_commit_cache_nogogit.go
index 5315c0a152..030d5486b6 100644
--- a/modules/git/last_commit_cache_nogogit.go
+++ b/modules/git/last_commit_cache_nogogit.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !gogit
-// +build !gogit
 
 package git
 
diff --git a/modules/git/notes_gogit.go b/modules/git/notes_gogit.go
index b1e5e453e4..76bc828957 100644
--- a/modules/git/notes_gogit.go
+++ b/modules/git/notes_gogit.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gogit
-// +build gogit
 
 package git
 
diff --git a/modules/git/notes_nogogit.go b/modules/git/notes_nogogit.go
index bbc8ee1371..e3f0a3fee9 100644
--- a/modules/git/notes_nogogit.go
+++ b/modules/git/notes_nogogit.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !gogit
-// +build !gogit
 
 package git
 
diff --git a/modules/git/parse_gogit.go b/modules/git/parse_gogit.go
index c42e32929e..409432c5d6 100644
--- a/modules/git/parse_gogit.go
+++ b/modules/git/parse_gogit.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gogit
-// +build gogit
 
 package git
 
diff --git a/modules/git/parse_gogit_test.go b/modules/git/parse_gogit_test.go
index c27f5172d5..075de6d25d 100644
--- a/modules/git/parse_gogit_test.go
+++ b/modules/git/parse_gogit_test.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gogit
-// +build gogit
 
 package git
 
diff --git a/modules/git/parse_nogogit.go b/modules/git/parse_nogogit.go
index dd5554b5dd..6dc4900992 100644
--- a/modules/git/parse_nogogit.go
+++ b/modules/git/parse_nogogit.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !gogit
-// +build !gogit
 
 package git
 
diff --git a/modules/git/parse_nogogit_test.go b/modules/git/parse_nogogit_test.go
index d6d6f3868c..483f96e9a7 100644
--- a/modules/git/parse_nogogit_test.go
+++ b/modules/git/parse_nogogit_test.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !gogit
-// +build !gogit
 
 package git
 
diff --git a/modules/git/pipeline/lfs.go b/modules/git/pipeline/lfs.go
index 1b64b672e4..18cce34289 100644
--- a/modules/git/pipeline/lfs.go
+++ b/modules/git/pipeline/lfs.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gogit
-// +build gogit
 
 package pipeline
 
diff --git a/modules/git/pipeline/lfs_nogogit.go b/modules/git/pipeline/lfs_nogogit.go
index 31c10c6002..a2b5dd0c96 100644
--- a/modules/git/pipeline/lfs_nogogit.go
+++ b/modules/git/pipeline/lfs_nogogit.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !gogit
-// +build !gogit
 
 package pipeline
 
diff --git a/modules/git/repo_base_gogit.go b/modules/git/repo_base_gogit.go
index 059f75fb3c..cd2ca25dfb 100644
--- a/modules/git/repo_base_gogit.go
+++ b/modules/git/repo_base_gogit.go
@@ -4,7 +4,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gogit
-// +build gogit
 
 package git
 
diff --git a/modules/git/repo_base_nogogit.go b/modules/git/repo_base_nogogit.go
index c4a0e82c89..df24d952a8 100644
--- a/modules/git/repo_base_nogogit.go
+++ b/modules/git/repo_base_nogogit.go
@@ -4,7 +4,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !gogit
-// +build !gogit
 
 package git
 
diff --git a/modules/git/repo_blob_gogit.go b/modules/git/repo_blob_gogit.go
index b11e9f58fe..5640011f4a 100644
--- a/modules/git/repo_blob_gogit.go
+++ b/modules/git/repo_blob_gogit.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gogit
-// +build gogit
 
 package git
 
diff --git a/modules/git/repo_blob_nogogit.go b/modules/git/repo_blob_nogogit.go
index 775b3835dd..44ba0a36b1 100644
--- a/modules/git/repo_blob_nogogit.go
+++ b/modules/git/repo_blob_nogogit.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !gogit
-// +build !gogit
 
 package git
 
diff --git a/modules/git/repo_branch_gogit.go b/modules/git/repo_branch_gogit.go
index bf3eb857b9..ecedb56686 100644
--- a/modules/git/repo_branch_gogit.go
+++ b/modules/git/repo_branch_gogit.go
@@ -4,7 +4,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gogit
-// +build gogit
 
 package git
 
diff --git a/modules/git/repo_branch_nogogit.go b/modules/git/repo_branch_nogogit.go
index 4393db10f9..3aed4abdf3 100644
--- a/modules/git/repo_branch_nogogit.go
+++ b/modules/git/repo_branch_nogogit.go
@@ -4,7 +4,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !gogit
-// +build !gogit
 
 package git
 
diff --git a/modules/git/repo_commit_gogit.go b/modules/git/repo_commit_gogit.go
index f3504f25d8..9333b0d7b7 100644
--- a/modules/git/repo_commit_gogit.go
+++ b/modules/git/repo_commit_gogit.go
@@ -4,7 +4,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gogit
-// +build gogit
 
 package git
 
diff --git a/modules/git/repo_commit_nogogit.go b/modules/git/repo_commit_nogogit.go
index c9afe35b1a..e528af0ffb 100644
--- a/modules/git/repo_commit_nogogit.go
+++ b/modules/git/repo_commit_nogogit.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !gogit
-// +build !gogit
 
 package git
 
diff --git a/modules/git/repo_commitgraph_gogit.go b/modules/git/repo_commitgraph_gogit.go
index 84a2edb664..6b00a4fdc4 100644
--- a/modules/git/repo_commitgraph_gogit.go
+++ b/modules/git/repo_commitgraph_gogit.go
@@ -4,7 +4,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gogit
-// +build gogit
 
 package git
 
diff --git a/modules/git/repo_language_stats_gogit.go b/modules/git/repo_language_stats_gogit.go
index 037ec41ec6..3c9f026b7a 100644
--- a/modules/git/repo_language_stats_gogit.go
+++ b/modules/git/repo_language_stats_gogit.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gogit
-// +build gogit
 
 package git
 
diff --git a/modules/git/repo_language_stats_nogogit.go b/modules/git/repo_language_stats_nogogit.go
index adb11dd8fa..41b176f816 100644
--- a/modules/git/repo_language_stats_nogogit.go
+++ b/modules/git/repo_language_stats_nogogit.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !gogit
-// +build !gogit
 
 package git
 
diff --git a/modules/git/repo_language_stats_test.go b/modules/git/repo_language_stats_test.go
index 6a4e23f99b..0234c77c0b 100644
--- a/modules/git/repo_language_stats_test.go
+++ b/modules/git/repo_language_stats_test.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !gogit
-// +build !gogit
 
 package git
 
diff --git a/modules/git/repo_ref_gogit.go b/modules/git/repo_ref_gogit.go
index 9f0e11366f..d11c58e005 100644
--- a/modules/git/repo_ref_gogit.go
+++ b/modules/git/repo_ref_gogit.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gogit
-// +build gogit
 
 package git
 
diff --git a/modules/git/repo_ref_nogogit.go b/modules/git/repo_ref_nogogit.go
index 40e8a247c7..d766a8cac3 100644
--- a/modules/git/repo_ref_nogogit.go
+++ b/modules/git/repo_ref_nogogit.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !gogit
-// +build !gogit
 
 package git
 
diff --git a/modules/git/repo_tag_gogit.go b/modules/git/repo_tag_gogit.go
index 5c87e914c0..c6dec28987 100644
--- a/modules/git/repo_tag_gogit.go
+++ b/modules/git/repo_tag_gogit.go
@@ -4,7 +4,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gogit
-// +build gogit
 
 package git
 
diff --git a/modules/git/repo_tag_nogogit.go b/modules/git/repo_tag_nogogit.go
index f2da7d8857..8d44db0a2e 100644
--- a/modules/git/repo_tag_nogogit.go
+++ b/modules/git/repo_tag_nogogit.go
@@ -4,7 +4,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !gogit
-// +build !gogit
 
 package git
 
diff --git a/modules/git/repo_tree_gogit.go b/modules/git/repo_tree_gogit.go
index cc156ea916..eef09cddd6 100644
--- a/modules/git/repo_tree_gogit.go
+++ b/modules/git/repo_tree_gogit.go
@@ -4,7 +4,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gogit
-// +build gogit
 
 package git
 
diff --git a/modules/git/repo_tree_nogogit.go b/modules/git/repo_tree_nogogit.go
index 00009c997d..dc4a5becb9 100644
--- a/modules/git/repo_tree_nogogit.go
+++ b/modules/git/repo_tree_nogogit.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !gogit
-// +build !gogit
 
 package git
 
diff --git a/modules/git/sha1_gogit.go b/modules/git/sha1_gogit.go
index 30290f14b7..16501efb43 100644
--- a/modules/git/sha1_gogit.go
+++ b/modules/git/sha1_gogit.go
@@ -4,7 +4,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gogit
-// +build gogit
 
 package git
 
diff --git a/modules/git/sha1_nogogit.go b/modules/git/sha1_nogogit.go
index 53665fc921..1835c68f5a 100644
--- a/modules/git/sha1_nogogit.go
+++ b/modules/git/sha1_nogogit.go
@@ -4,7 +4,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !gogit
-// +build !gogit
 
 package git
 
diff --git a/modules/git/signature_gogit.go b/modules/git/signature_gogit.go
index 903a48133f..fe81cd97df 100644
--- a/modules/git/signature_gogit.go
+++ b/modules/git/signature_gogit.go
@@ -4,7 +4,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gogit
-// +build gogit
 
 package git
 
diff --git a/modules/git/signature_nogogit.go b/modules/git/signature_nogogit.go
index c6fe8e6d1a..81da739a5b 100644
--- a/modules/git/signature_nogogit.go
+++ b/modules/git/signature_nogogit.go
@@ -4,7 +4,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !gogit
-// +build !gogit
 
 package git
 
diff --git a/modules/git/tree_blob_gogit.go b/modules/git/tree_blob_gogit.go
index be7cb33d35..bb010b5883 100644
--- a/modules/git/tree_blob_gogit.go
+++ b/modules/git/tree_blob_gogit.go
@@ -4,7 +4,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gogit
-// +build gogit
 
 package git
 
diff --git a/modules/git/tree_blob_nogogit.go b/modules/git/tree_blob_nogogit.go
index df23ff01b4..3770004d6d 100644
--- a/modules/git/tree_blob_nogogit.go
+++ b/modules/git/tree_blob_nogogit.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !gogit
-// +build !gogit
 
 package git
 
diff --git a/modules/git/tree_entry_gogit.go b/modules/git/tree_entry_gogit.go
index 20e767eea1..2b2992c32a 100644
--- a/modules/git/tree_entry_gogit.go
+++ b/modules/git/tree_entry_gogit.go
@@ -4,7 +4,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gogit
-// +build gogit
 
 package git
 
diff --git a/modules/git/tree_entry_nogogit.go b/modules/git/tree_entry_nogogit.go
index 076062e1d6..aff67a3b22 100644
--- a/modules/git/tree_entry_nogogit.go
+++ b/modules/git/tree_entry_nogogit.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !gogit
-// +build !gogit
 
 package git
 
diff --git a/modules/git/tree_entry_test.go b/modules/git/tree_entry_test.go
index 9347e10b1b..c512c7348e 100644
--- a/modules/git/tree_entry_test.go
+++ b/modules/git/tree_entry_test.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gogit
-// +build gogit
 
 package git
 
diff --git a/modules/git/tree_gogit.go b/modules/git/tree_gogit.go
index bc02088366..54f8e140fb 100644
--- a/modules/git/tree_gogit.go
+++ b/modules/git/tree_gogit.go
@@ -4,7 +4,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gogit
-// +build gogit
 
 package git
 
diff --git a/modules/git/tree_nogogit.go b/modules/git/tree_nogogit.go
index f852c5a51e..7defb064a4 100644
--- a/modules/git/tree_nogogit.go
+++ b/modules/git/tree_nogogit.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !gogit
-// +build !gogit
 
 package git
 
diff --git a/modules/graceful/manager_unix.go b/modules/graceful/manager_unix.go
index b22b7b5860..9d3816e9c2 100644
--- a/modules/graceful/manager_unix.go
+++ b/modules/graceful/manager_unix.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !windows
-// +build !windows
 
 package graceful
 
diff --git a/modules/graceful/manager_windows.go b/modules/graceful/manager_windows.go
index 66baddfa38..e7e619f53f 100644
--- a/modules/graceful/manager_windows.go
+++ b/modules/graceful/manager_windows.go
@@ -4,7 +4,6 @@
 // This code is heavily inspired by the archived gofacebook/gracenet/net.go handler
 
 //go:build windows
-// +build windows
 
 package graceful
 
diff --git a/modules/graceful/net_unix.go b/modules/graceful/net_unix.go
index 6ffa8150cc..680ff529af 100644
--- a/modules/graceful/net_unix.go
+++ b/modules/graceful/net_unix.go
@@ -4,7 +4,6 @@
 // This code is heavily inspired by the archived gofacebook/gracenet/net.go handler
 
 //go:build !windows
-// +build !windows
 
 package graceful
 
diff --git a/modules/graceful/net_windows.go b/modules/graceful/net_windows.go
index 35b7a9d1fe..07ae51b8dd 100644
--- a/modules/graceful/net_windows.go
+++ b/modules/graceful/net_windows.go
@@ -4,7 +4,6 @@
 // This code is heavily inspired by the archived gofacebook/gracenet/net.go handler
 
 //go:build windows
-// +build windows
 
 package graceful
 
diff --git a/modules/graceful/restart_unix.go b/modules/graceful/restart_unix.go
index 9969e007c3..2654ddfb94 100644
--- a/modules/graceful/restart_unix.go
+++ b/modules/graceful/restart_unix.go
@@ -4,7 +4,6 @@
 // This code is heavily inspired by the archived gofacebook/gracenet/net.go handler
 
 //go:build !windows
-// +build !windows
 
 package graceful
 
diff --git a/modules/lfs/pointer_scanner_gogit.go b/modules/lfs/pointer_scanner_gogit.go
index b4ba6fc133..ed27cb1f55 100644
--- a/modules/lfs/pointer_scanner_gogit.go
+++ b/modules/lfs/pointer_scanner_gogit.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gogit
-// +build gogit
 
 package lfs
 
diff --git a/modules/lfs/pointer_scanner_nogogit.go b/modules/lfs/pointer_scanner_nogogit.go
index cdf88c51b0..d17f1f7b98 100644
--- a/modules/lfs/pointer_scanner_nogogit.go
+++ b/modules/lfs/pointer_scanner_nogogit.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !gogit
-// +build !gogit
 
 package lfs
 
diff --git a/modules/migration/schemas_bindata.go b/modules/migration/schemas_bindata.go
index d0fef698b4..febe0f75c0 100644
--- a/modules/migration/schemas_bindata.go
+++ b/modules/migration/schemas_bindata.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build bindata
-// +build bindata
 
 package migration
 
diff --git a/modules/migration/schemas_dynamic.go b/modules/migration/schemas_dynamic.go
index c883fafe98..1b767b2e72 100644
--- a/modules/migration/schemas_dynamic.go
+++ b/modules/migration/schemas_dynamic.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !bindata
-// +build !bindata
 
 package migration
 
diff --git a/modules/migration/schemas_static.go b/modules/migration/schemas_static.go
index 10c83b313a..02957fc4ed 100644
--- a/modules/migration/schemas_static.go
+++ b/modules/migration/schemas_static.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build bindata
-// +build bindata
 
 package migration
 
diff --git a/modules/options/dynamic.go b/modules/options/dynamic.go
index e1b9353c33..5fea337e42 100644
--- a/modules/options/dynamic.go
+++ b/modules/options/dynamic.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !bindata
-// +build !bindata
 
 package options
 
diff --git a/modules/options/options_bindata.go b/modules/options/options_bindata.go
index 921e15ab38..77b7a7ef41 100644
--- a/modules/options/options_bindata.go
+++ b/modules/options/options_bindata.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build bindata
-// +build bindata
 
 package options
 
diff --git a/modules/options/static.go b/modules/options/static.go
index 5b61e58f8f..6cad88cb61 100644
--- a/modules/options/static.go
+++ b/modules/options/static.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build bindata
-// +build bindata
 
 package options
 
diff --git a/modules/public/public_bindata.go b/modules/public/public_bindata.go
index 25c3c0d2a1..fe250c6454 100644
--- a/modules/public/public_bindata.go
+++ b/modules/public/public_bindata.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build bindata
-// +build bindata
 
 package public
 
diff --git a/modules/public/serve_dynamic.go b/modules/public/serve_dynamic.go
index 955c01e510..672924a636 100644
--- a/modules/public/serve_dynamic.go
+++ b/modules/public/serve_dynamic.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !bindata
-// +build !bindata
 
 package public
 
diff --git a/modules/public/serve_static.go b/modules/public/serve_static.go
index 8e82175e39..9666880adf 100644
--- a/modules/public/serve_static.go
+++ b/modules/public/serve_static.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build bindata
-// +build bindata
 
 package public
 
diff --git a/modules/setting/database_sqlite.go b/modules/setting/database_sqlite.go
index 12c60cc86c..1f18868d8e 100644
--- a/modules/setting/database_sqlite.go
+++ b/modules/setting/database_sqlite.go
@@ -1,5 +1,4 @@
 //go:build sqlite
-// +build sqlite
 
 // Copyright 2014 The Gogs Authors. All rights reserved.
 // Use of this source code is governed by a MIT-style
diff --git a/modules/svg/discover_bindata.go b/modules/svg/discover_bindata.go
index e11951ff7e..cca1de76a7 100644
--- a/modules/svg/discover_bindata.go
+++ b/modules/svg/discover_bindata.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build bindata
-// +build bindata
 
 package svg
 
diff --git a/modules/svg/discover_nobindata.go b/modules/svg/discover_nobindata.go
index e3f13ddf6c..ef01fbcc3e 100644
--- a/modules/svg/discover_nobindata.go
+++ b/modules/svg/discover_nobindata.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !bindata
-// +build !bindata
 
 package svg
 
diff --git a/modules/templates/dynamic.go b/modules/templates/dynamic.go
index c6c47a6c88..de6968c314 100644
--- a/modules/templates/dynamic.go
+++ b/modules/templates/dynamic.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !bindata
-// +build !bindata
 
 package templates
 
diff --git a/modules/templates/static.go b/modules/templates/static.go
index cb2978c2ef..351e48b4da 100644
--- a/modules/templates/static.go
+++ b/modules/templates/static.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build bindata
-// +build bindata
 
 package templates
 
diff --git a/modules/templates/templates_bindata.go b/modules/templates/templates_bindata.go
index 5b59e4447e..bcb2cbaf3f 100644
--- a/modules/templates/templates_bindata.go
+++ b/modules/templates/templates_bindata.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build bindata
-// +build bindata
 
 package templates
 
diff --git a/routers/api/v1/auth.go b/routers/api/v1/auth.go
index 359c9ec56b..becf45f643 100644
--- a/routers/api/v1/auth.go
+++ b/routers/api/v1/auth.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !windows
-// +build !windows
 
 package v1
 
diff --git a/routers/private/manager_unix.go b/routers/private/manager_unix.go
index 402bade5d4..43cbdec01c 100644
--- a/routers/private/manager_unix.go
+++ b/routers/private/manager_unix.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !windows
-// +build !windows
 
 package private
 
diff --git a/routers/private/manager_windows.go b/routers/private/manager_windows.go
index 014018a539..2b72ee952d 100644
--- a/routers/private/manager_windows.go
+++ b/routers/private/manager_windows.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build windows
-// +build windows
 
 package private
 
diff --git a/routers/web/auth.go b/routers/web/auth.go
index 4a7fb856be..a771643b66 100644
--- a/routers/web/auth.go
+++ b/routers/web/auth.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !windows
-// +build !windows
 
 package web
 
diff --git a/tools/fuzz.go b/tools/fuzz.go
index 64fda17b5d..8098868d5e 100644
--- a/tools/fuzz.go
+++ b/tools/fuzz.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gofuzz
-// +build gofuzz
 
 package fuzz