diff --git a/api/src/main/java/com/discordsrv/api/module/Module.java b/api/src/main/java/com/discordsrv/api/module/Module.java
index 346485fd..e23c6262 100644
--- a/api/src/main/java/com/discordsrv/api/module/Module.java
+++ b/api/src/main/java/com/discordsrv/api/module/Module.java
@@ -34,7 +34,9 @@ import net.dv8tion.jda.api.events.guild.member.GenericGuildMemberEvent;
 import net.dv8tion.jda.api.requests.GatewayIntent;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumSet;
 import java.util.function.Consumer;
 
 public interface Module {
diff --git a/common/src/main/java/com/discordsrv/common/component/EnhancedTextBuilderImpl.java b/common/src/main/java/com/discordsrv/common/component/EnhancedTextBuilderImpl.java
index 1dcf6f74..c31f32b2 100644
--- a/common/src/main/java/com/discordsrv/common/component/EnhancedTextBuilderImpl.java
+++ b/common/src/main/java/com/discordsrv/common/component/EnhancedTextBuilderImpl.java
@@ -30,7 +30,10 @@ import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.TextColor;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.*;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
 import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/common/src/main/java/com/discordsrv/common/component/renderer/DiscordSRVMinecraftRenderer.java b/common/src/main/java/com/discordsrv/common/component/renderer/DiscordSRVMinecraftRenderer.java
index ecc3f18b..4773ccc3 100644
--- a/common/src/main/java/com/discordsrv/common/component/renderer/DiscordSRVMinecraftRenderer.java
+++ b/common/src/main/java/com/discordsrv/common/component/renderer/DiscordSRVMinecraftRenderer.java
@@ -18,7 +18,6 @@
 
 package com.discordsrv.common.component.renderer;
 
-import com.discordsrv.api.component.GameTextBuilder;
 import com.discordsrv.api.discord.entity.DiscordUser;
 import com.discordsrv.api.discord.entity.guild.DiscordCustomEmoji;
 import com.discordsrv.api.discord.entity.guild.DiscordGuild;
diff --git a/common/src/main/java/com/discordsrv/common/discord/api/DiscordAPIImpl.java b/common/src/main/java/com/discordsrv/common/discord/api/DiscordAPIImpl.java
index ccdd3d31..adec1314 100644
--- a/common/src/main/java/com/discordsrv/common/discord/api/DiscordAPIImpl.java
+++ b/common/src/main/java/com/discordsrv/common/discord/api/DiscordAPIImpl.java
@@ -20,7 +20,6 @@ package com.discordsrv.common.discord.api;
 
 import com.discordsrv.api.discord.DiscordAPI;
 import com.discordsrv.api.discord.connection.details.DiscordGatewayIntent;
-import com.discordsrv.api.discord.connection.jda.errorresponse.ErrorCallbackContext;
 import com.discordsrv.api.discord.entity.DiscordUser;
 import com.discordsrv.api.discord.entity.channel.*;
 import com.discordsrv.api.discord.entity.guild.DiscordCustomEmoji;
@@ -28,7 +27,6 @@ import com.discordsrv.api.discord.entity.guild.DiscordGuild;
 import com.discordsrv.api.discord.entity.guild.DiscordRole;
 import com.discordsrv.api.discord.entity.interaction.command.CommandType;
 import com.discordsrv.api.discord.entity.interaction.command.DiscordCommand;
-import com.discordsrv.api.discord.entity.message.SendableDiscordMessage;
 import com.discordsrv.api.discord.exception.NotReadyException;
 import com.discordsrv.api.discord.exception.RestErrorResponseException;
 import com.discordsrv.common.DiscordSRV;
@@ -62,10 +60,11 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 
 public class DiscordAPIImpl implements DiscordAPI {
diff --git a/common/src/main/java/com/discordsrv/common/messageforwarding/game/LeaveMessageModule.java b/common/src/main/java/com/discordsrv/common/messageforwarding/game/LeaveMessageModule.java
index bfb68d72..0f6b6b79 100644
--- a/common/src/main/java/com/discordsrv/common/messageforwarding/game/LeaveMessageModule.java
+++ b/common/src/main/java/com/discordsrv/common/messageforwarding/game/LeaveMessageModule.java
@@ -38,7 +38,8 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.time.Duration;
-import java.util.*;
+import java.util.Map;
+import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Future;