diff --git a/core/jreleaser-engine/src/main/java/org/jreleaser/engine/upload/ProjectUploader.java b/core/jreleaser-engine/src/main/java/org/jreleaser/engine/upload/ProjectUploader.java
index ca883d68..aacf97a9 100644
--- a/core/jreleaser-engine/src/main/java/org/jreleaser/engine/upload/ProjectUploader.java
+++ b/core/jreleaser-engine/src/main/java/org/jreleaser/engine/upload/ProjectUploader.java
@@ -17,8 +17,8 @@
  */
 package org.jreleaser.engine.upload;
 
-import org.jreleaser.model.Uploader;
 import org.jreleaser.model.JReleaserContext;
+import org.jreleaser.model.Uploader;
 import org.jreleaser.model.uploader.spi.ArtifactUploader;
 import org.jreleaser.model.uploader.spi.UploadException;
 
diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/AbstractAssembler.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/AbstractAssembler.java
index 53d2de8c..daa0cb2f 100644
--- a/core/jreleaser-model/src/main/java/org/jreleaser/model/AbstractAssembler.java
+++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/AbstractAssembler.java
@@ -18,7 +18,6 @@
 package org.jreleaser.model;
 
 import org.jreleaser.util.Constants;
-import org.jreleaser.util.PlatformUtils;
 import org.jreleaser.util.Version;
 
 import java.util.Collections;
diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/Distribution.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/Distribution.java
index c4e0afb0..c8a1604c 100644
--- a/core/jreleaser-model/src/main/java/org/jreleaser/model/Distribution.java
+++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/Distribution.java
@@ -18,7 +18,6 @@
 package org.jreleaser.model;
 
 import org.jreleaser.util.Constants;
-import org.jreleaser.util.PlatformUtils;
 import org.jreleaser.util.Version;
 
 import java.util.ArrayList;
diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/JReleaserContext.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/JReleaserContext.java
index 21c4fbeb..96a744ba 100644
--- a/core/jreleaser-model/src/main/java/org/jreleaser/model/JReleaserContext.java
+++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/JReleaserContext.java
@@ -21,7 +21,6 @@ import org.bouncycastle.openpgp.PGPException;
 import org.jreleaser.util.Constants;
 import org.jreleaser.util.Errors;
 import org.jreleaser.util.JReleaserLogger;
-import org.jreleaser.util.PlatformUtils;
 import org.jreleaser.util.Version;
 import org.jreleaser.util.signing.FilesKeyring;
 import org.jreleaser.util.signing.InMemoryKeyring;
diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/uploader/spi/ArtifactUploaderFactory.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/uploader/spi/ArtifactUploaderFactory.java
index 04886980..e9fc3991 100644
--- a/core/jreleaser-model/src/main/java/org/jreleaser/model/uploader/spi/ArtifactUploaderFactory.java
+++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/uploader/spi/ArtifactUploaderFactory.java
@@ -17,8 +17,8 @@
  */
 package org.jreleaser.model.uploader.spi;
 
-import org.jreleaser.model.Uploader;
 import org.jreleaser.model.JReleaserContext;
+import org.jreleaser.model.Uploader;
 
 /**
  * @author Andres Almiray
diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/CodebergValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/CodebergValidator.java
index c400b8c7..697d4e57 100644
--- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/CodebergValidator.java
+++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/CodebergValidator.java
@@ -23,7 +23,6 @@ import org.jreleaser.util.Errors;
 
 import static org.jreleaser.model.GitService.DRAFT;
 import static org.jreleaser.model.GitService.PRERELEASE;
-import static org.jreleaser.util.StringUtils.isBlank;
 
 /**
  * @author Andres Almiray
diff --git a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/PackagersValidator.java b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/PackagersValidator.java
index a57cb452..1da49c70 100644
--- a/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/PackagersValidator.java
+++ b/core/jreleaser-model/src/main/java/org/jreleaser/model/validation/PackagersValidator.java
@@ -21,7 +21,6 @@ import org.jreleaser.model.AbstractRepositoryTool;
 import org.jreleaser.model.GitService;
 import org.jreleaser.model.JReleaserContext;
 import org.jreleaser.model.JReleaserModel;
-import org.jreleaser.model.OwnerAware;
 import org.jreleaser.model.Packagers;
 import org.jreleaser.model.RepositoryTap;
 import org.jreleaser.util.Env;
diff --git a/core/jreleaser-utils/src/main/java/org/jreleaser/util/signing/FilesKeyring.java b/core/jreleaser-utils/src/main/java/org/jreleaser/util/signing/FilesKeyring.java
index d779687c..f8a6bd9e 100644
--- a/core/jreleaser-utils/src/main/java/org/jreleaser/util/signing/FilesKeyring.java
+++ b/core/jreleaser-utils/src/main/java/org/jreleaser/util/signing/FilesKeyring.java
@@ -19,7 +19,6 @@ package org.jreleaser.util.signing;
 
 import org.bouncycastle.openpgp.PGPException;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
diff --git a/core/jreleaser-utils/src/main/java/org/jreleaser/util/signing/Keyring.java b/core/jreleaser-utils/src/main/java/org/jreleaser/util/signing/Keyring.java
index 339a6daa..a332adbe 100644
--- a/core/jreleaser-utils/src/main/java/org/jreleaser/util/signing/Keyring.java
+++ b/core/jreleaser-utils/src/main/java/org/jreleaser/util/signing/Keyring.java
@@ -17,10 +17,6 @@
  */
 package org.jreleaser.util.signing;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Collections;
-import java.util.Iterator;
 import org.bouncycastle.bcpg.PublicKeyAlgorithmTags;
 import org.bouncycastle.openpgp.PGPException;
 import org.bouncycastle.openpgp.PGPPublicKey;
@@ -32,6 +28,11 @@ import org.bouncycastle.openpgp.PGPSecretKeyRingCollection;
 import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator;
 import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Collections;
+import java.util.Iterator;
+
 /**
  * Adapted from {@code name.neuhalfen.projects.crypto.bouncycastle.openpgp.keys.keyrings.InMemoryKeyring}
  * Original author: Jens Neuhalfen
diff --git a/plugins/jreleaser-gradle-plugin/src/main/groovy/org/jreleaser/gradle/plugin/internal/dsl/AbstractRepositoryTool.groovy b/plugins/jreleaser-gradle-plugin/src/main/groovy/org/jreleaser/gradle/plugin/internal/dsl/AbstractRepositoryTool.groovy
index f2d05142..85d322ef 100644
--- a/plugins/jreleaser-gradle-plugin/src/main/groovy/org/jreleaser/gradle/plugin/internal/dsl/AbstractRepositoryTool.groovy
+++ b/plugins/jreleaser-gradle-plugin/src/main/groovy/org/jreleaser/gradle/plugin/internal/dsl/AbstractRepositoryTool.groovy
@@ -18,9 +18,7 @@
 package org.jreleaser.gradle.plugin.internal.dsl
 
 import groovy.transform.CompileStatic
-import org.gradle.api.file.Directory
 import org.gradle.api.model.ObjectFactory
-import org.gradle.api.provider.Provider
 import org.jreleaser.gradle.plugin.dsl.RepositoryTool
 
 import javax.inject.Inject
diff --git a/plugins/jreleaser-gradle-plugin/src/main/groovy/org/jreleaser/gradle/plugin/internal/dsl/CaskImpl.groovy b/plugins/jreleaser-gradle-plugin/src/main/groovy/org/jreleaser/gradle/plugin/internal/dsl/CaskImpl.groovy
index 99e02e76..d89799e8 100644
--- a/plugins/jreleaser-gradle-plugin/src/main/groovy/org/jreleaser/gradle/plugin/internal/dsl/CaskImpl.groovy
+++ b/plugins/jreleaser-gradle-plugin/src/main/groovy/org/jreleaser/gradle/plugin/internal/dsl/CaskImpl.groovy
@@ -24,6 +24,7 @@ import org.gradle.api.provider.MapProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.Internal
 import org.jreleaser.gradle.plugin.dsl.Cask
+
 import javax.inject.Inject
 
 /**
diff --git a/sdks/mastodon-java-sdk/src/main/java/org/jreleaser/sdk/mastodon/MastodonAnnouncer.java b/sdks/mastodon-java-sdk/src/main/java/org/jreleaser/sdk/mastodon/MastodonAnnouncer.java
index dc6a0403..52cd499b 100644
--- a/sdks/mastodon-java-sdk/src/main/java/org/jreleaser/sdk/mastodon/MastodonAnnouncer.java
+++ b/sdks/mastodon-java-sdk/src/main/java/org/jreleaser/sdk/mastodon/MastodonAnnouncer.java
@@ -35,7 +35,7 @@ public class MastodonAnnouncer implements Announcer {
 
     @Override
     public String getName() {
-        return org.jreleaser.model.Mastodon.NAME;
+        return Mastodon.NAME;
     }
 
     @Override
diff --git a/sdks/mattermost-java-sdk/src/main/java/org/jreleaser/sdk/mattermost/MattermostAnnouncer.java b/sdks/mattermost-java-sdk/src/main/java/org/jreleaser/sdk/mattermost/MattermostAnnouncer.java
index 0ec73f20..a775e0ca 100644
--- a/sdks/mattermost-java-sdk/src/main/java/org/jreleaser/sdk/mattermost/MattermostAnnouncer.java
+++ b/sdks/mattermost-java-sdk/src/main/java/org/jreleaser/sdk/mattermost/MattermostAnnouncer.java
@@ -17,8 +17,8 @@
  */
 package org.jreleaser.sdk.mattermost;
 
-import org.jreleaser.model.Mattermost;
 import org.jreleaser.model.JReleaserContext;
+import org.jreleaser.model.Mattermost;
 import org.jreleaser.model.announcer.spi.AnnounceException;
 import org.jreleaser.model.announcer.spi.Announcer;
 import org.jreleaser.sdk.commons.ClientUtils;