diff --git a/modules/activitypub/client.go b/modules/activitypub/client.go
index 3007c681b5..575f904dea 100644
--- a/modules/activitypub/client.go
+++ b/modules/activitypub/client.go
@@ -17,10 +17,10 @@ import (
 	"strings"
 	"time"
 
+	user_model "forgejo.org/models/user"
 	"forgejo.org/modules/httplib"
 	"forgejo.org/modules/log"
 	"forgejo.org/modules/setting"
-	user_model "forgejo.org/modules/user"
 
 	"github.com/42wim/httpsig"
 )
diff --git a/services/migrations/github.go b/services/migrations/github.go
index 81b9582241..138d8f3b61 100644
--- a/services/migrations/github.go
+++ b/services/migrations/github.go
@@ -145,7 +145,7 @@ func NewGithubDownloaderV3(ctx context.Context, baseURL, userName, password, tok
 		}
 		downloader.addClient(client, baseURL)
 	}
-	return &downloader
+	return downloader
 }
 
 // String implements Stringer
diff --git a/services/migrations/onedev.go b/services/migrations/onedev.go
index 440e2c85f4..7522b2c758 100644
--- a/services/migrations/onedev.go
+++ b/services/migrations/onedev.go
@@ -14,7 +14,6 @@ import (
 	"time"
 
 	"forgejo.org/modules/httplib"
-	"forgejo.org/modules/json"
 	"forgejo.org/modules/log"
 	base "forgejo.org/modules/migration"
 	"forgejo.org/modules/structs"
diff --git a/tests/integration/api_packages_generic_test.go b/tests/integration/api_packages_generic_test.go
index 9cecca1ca7..2a26af7904 100644
--- a/tests/integration/api_packages_generic_test.go
+++ b/tests/integration/api_packages_generic_test.go
@@ -15,7 +15,6 @@ import (
 	"forgejo.org/models/unittest"
 	user_model "forgejo.org/models/user"
 	"forgejo.org/modules/httplib"
-	"forgejo.org/modules/packages"
 	"forgejo.org/modules/setting"
 	"forgejo.org/tests"