diff --git a/core/status.go b/core/status.go
index c362c8694..d2e440dc6 100644
--- a/core/status.go
+++ b/core/status.go
@@ -47,7 +47,7 @@ type (
 	}
 
 	// StatusService sends the commit status to an external
-	// external source code management service (e.g. GitHub).
+	// source code management service (e.g. GitHub).
 	StatusService interface {
 		Send(ctx context.Context, user *User, req *StatusInput) error
 	}
diff --git a/handler/api/repos/builds/find.go b/handler/api/repos/builds/find.go
index 6e115d7a1..508603a29 100644
--- a/handler/api/repos/builds/find.go
+++ b/handler/api/repos/builds/find.go
@@ -25,7 +25,7 @@ import (
 )
 
 // HandleFind returns an http.HandlerFunc that writes json-encoded
-// build details to the the response body.
+// build details to the response body.
 func HandleFind(
 	repos core.RepositoryStore,
 	builds core.BuildStore,
diff --git a/handler/api/repos/crons/find.go b/handler/api/repos/crons/find.go
index 45292c861..c98cc37f7 100644
--- a/handler/api/repos/crons/find.go
+++ b/handler/api/repos/crons/find.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by the Drone Non-Commercial License
 // that can be found in the LICENSE file.
 
+//go:build !oss
 // +build !oss
 
 package crons
@@ -16,7 +17,7 @@ import (
 )
 
 // HandleFind returns an http.HandlerFunc that writes json-encoded
-// cronjob details to the the response body.
+// cronjob details to the response body.
 func HandleFind(
 	repos core.RepositoryStore,
 	crons core.CronStore,
diff --git a/handler/api/repos/enable.go b/handler/api/repos/enable.go
index 084e64022..2564414aa 100644
--- a/handler/api/repos/enable.go
+++ b/handler/api/repos/enable.go
@@ -29,7 +29,7 @@ import (
 
 // FEATURE FLAG enables a static secret value used to sign
 // incoming requests routed through a proxy. This was implemented
-// based on feedback from @chiraggadasc and and should not be
+// based on feedback from @chiraggadasc and should not be
 // removed until we have a permanent solution in place.
 var staticSigner = os.Getenv("DRONE_FEATURE_SERVER_PROXY_SECRET")
 
diff --git a/handler/api/repos/secrets/find.go b/handler/api/repos/secrets/find.go
index 67ae98bb6..dab6f1ebb 100644
--- a/handler/api/repos/secrets/find.go
+++ b/handler/api/repos/secrets/find.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by the Drone Non-Commercial License
 // that can be found in the LICENSE file.
 
+//go:build !oss
 // +build !oss
 
 package secrets
@@ -16,7 +17,7 @@ import (
 )
 
 // HandleFind returns an http.HandlerFunc that writes json-encoded
-// secret details to the the response body.
+// secret details to the response body.
 func HandleFind(
 	repos core.RepositoryStore,
 	secrets core.SecretStore,
diff --git a/handler/api/secrets/find.go b/handler/api/secrets/find.go
index feb806679..b44af80eb 100644
--- a/handler/api/secrets/find.go
+++ b/handler/api/secrets/find.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by the Drone Non-Commercial License
 // that can be found in the LICENSE file.
 
+//go:build !oss
 // +build !oss
 
 package secrets
@@ -16,7 +17,7 @@ import (
 )
 
 // HandleFind returns an http.HandlerFunc that writes json-encoded
-// secret details to the the response body.
+// secret details to the response body.
 func HandleFind(secrets core.GlobalSecretStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var (
diff --git a/handler/api/template/find.go b/handler/api/template/find.go
index bab68e127..b843e4e2b 100644
--- a/handler/api/template/find.go
+++ b/handler/api/template/find.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by the Drone Non-Commercial License
 // that can be found in the LICENSE file.
 
+//go:build !oss
 // +build !oss
 
 package template
@@ -16,7 +17,7 @@ import (
 )
 
 // HandleFind returns an http.HandlerFunc that writes json-encoded
-// template details to the the response body.
+// template details to the response body.
 func HandleFind(templateStore core.TemplateStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var (
diff --git a/handler/api/users/find.go b/handler/api/users/find.go
index 491bda8ee..dcff1a0aa 100644
--- a/handler/api/users/find.go
+++ b/handler/api/users/find.go
@@ -26,7 +26,7 @@ import (
 )
 
 // HandleFind returns an http.HandlerFunc that writes json-encoded
-// user account information to the the response body.
+// user account information to the response body.
 func HandleFind(users core.UserStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		login := chi.URLParam(r, "user")