diff --git a/src/commands/admin/refresh.ts b/src/commands/admin/refresh.ts
index a6ac3f3..777e44c 100644
--- a/src/commands/admin/refresh.ts
+++ b/src/commands/admin/refresh.ts
@@ -1,7 +1,7 @@
 import { createCommand } from "@lib/utils";
 import { AuroraClient } from "@/lib/BotClient";
-import { SlashCommandBuilder, EmbedBuilder, PermissionFlagsBits, MessageFlags } from "discord.js";
-import { createErrorEmbed, createSuccessEmbed, createWarningEmbed } from "@lib/embeds";
+import { SlashCommandBuilder, PermissionFlagsBits, MessageFlags } from "discord.js";
+import { createErrorEmbed, createSuccessEmbed } from "@lib/embeds";
 
 export const refresh = createCommand({
     data: new SlashCommandBuilder()
diff --git a/src/commands/admin/update.ts b/src/commands/admin/update.ts
index 779334c..c0a2b33 100644
--- a/src/commands/admin/update.ts
+++ b/src/commands/admin/update.ts
@@ -1,5 +1,5 @@
 import { createCommand } from "@lib/utils";
-import { SlashCommandBuilder, EmbedBuilder, PermissionFlagsBits, MessageFlags, ButtonBuilder, ButtonStyle, ActionRowBuilder, ComponentType } from "discord.js";
+import { SlashCommandBuilder, PermissionFlagsBits, MessageFlags, ButtonBuilder, ButtonStyle, ActionRowBuilder, ComponentType } from "discord.js";
 import { createErrorEmbed, createSuccessEmbed, createWarningEmbed, createInfoEmbed } from "@lib/embeds";
 
 export const update = createCommand({
diff --git a/src/commands/admin/webhook.ts b/src/commands/admin/webhook.ts
index eb8eefe..2e8b6d8 100644
--- a/src/commands/admin/webhook.ts
+++ b/src/commands/admin/webhook.ts
@@ -1,5 +1,5 @@
 import { createCommand } from "@/lib/utils";
-import { SlashCommandBuilder, PermissionFlagsBits, TextChannel, NewsChannel, VoiceChannel, MessageFlags } from "discord.js";
+import { SlashCommandBuilder, PermissionFlagsBits, MessageFlags } from "discord.js";
 import { createErrorEmbed } from "@/lib/embeds";
 import { sendWebhookMessage } from "@/lib/webhookUtils";
 
diff --git a/src/commands/economy/balance.ts b/src/commands/economy/balance.ts
index d55df8d..3785e57 100644
--- a/src/commands/economy/balance.ts
+++ b/src/commands/economy/balance.ts
@@ -17,7 +17,7 @@ export const balance = createCommand({
         const targetUser = interaction.options.getUser("user") || interaction.user;
 
         if (targetUser.bot) {
-            return; // Wait, I need to send the reply inside the if.
+            return;
         }
 
         const user = await userService.getOrCreateUser(targetUser.id, targetUser.username);
diff --git a/src/commands/economy/daily.ts b/src/commands/economy/daily.ts
index b90219b..54db74f 100644
--- a/src/commands/economy/daily.ts
+++ b/src/commands/economy/daily.ts
@@ -1,8 +1,8 @@
 
 import { createCommand } from "@/lib/utils";
-import { SlashCommandBuilder, EmbedBuilder, MessageFlags } from "discord.js";
+import { SlashCommandBuilder, EmbedBuilder } from "discord.js";
 import { economyService } from "@/modules/economy/economy.service";
-import { createSuccessEmbed, createErrorEmbed } from "@lib/embeds";
+import { createErrorEmbed } from "@lib/embeds";
 import { UserError } from "@/lib/errors";
 
 export const daily = createCommand({
diff --git a/src/commands/economy/pay.ts b/src/commands/economy/pay.ts
index b8a143a..56a1d7d 100644
--- a/src/commands/economy/pay.ts
+++ b/src/commands/economy/pay.ts
@@ -4,7 +4,7 @@ import { SlashCommandBuilder, EmbedBuilder, MessageFlags } from "discord.js";
 import { economyService } from "@/modules/economy/economy.service";
 import { userService } from "@/modules/user/user.service";
 import { config } from "@/lib/config";
-import { createSuccessEmbed, createErrorEmbed } from "@lib/embeds";
+import { createErrorEmbed } from "@lib/embeds";
 import { UserError } from "@/lib/errors";
 
 export const pay = createCommand({
diff --git a/src/commands/inventory/use.ts b/src/commands/inventory/use.ts
index 136d324..cc9497e 100644
--- a/src/commands/inventory/use.ts
+++ b/src/commands/inventory/use.ts
@@ -1,5 +1,5 @@
 import { createCommand } from "@/lib/utils";
-import { SlashCommandBuilder, EmbedBuilder, MessageFlags } from "discord.js";
+import { SlashCommandBuilder } from "discord.js";
 import { inventoryService } from "@/modules/inventory/inventory.service";
 import { userService } from "@/modules/user/user.service";
 import { createErrorEmbed, createSuccessEmbed } from "@lib/embeds";
diff --git a/src/events/messageCreate.ts b/src/events/messageCreate.ts
index e838b2a..f9adc8a 100644
--- a/src/events/messageCreate.ts
+++ b/src/events/messageCreate.ts
@@ -15,8 +15,6 @@ const event: Event<Events.MessageCreate> = {
         levelingService.processChatXp(message.author.id);
 
         // Activity Tracking for Lootdrops
-        // We do dynamic import to avoid circular dependency issues if any, though likely not needed here.
-        // But better safe for modules. Actually direct import is fine if structure is clean.
         import("@/modules/economy/lootdrop.service").then(m => m.lootdropService.processMessage(message));
     },
 };
diff --git a/src/events/ready.ts b/src/events/ready.ts
index 87c647c..b5f23ce 100644
--- a/src/events/ready.ts
+++ b/src/events/ready.ts
@@ -32,7 +32,6 @@ const event: Event<Events.ClientReady> = {
                             const execAsync = promisify(exec);
 
                             // Send intermediate update if possible, though ready event should be fast.
-                            // Maybe just run it and report result.
                             const { stdout: dbOut } = await execAsync("bun run db:push:local");
                             migrationOutput = dbOut;
                         } catch (dbErr: any) {
diff --git a/src/lib/configManager.ts b/src/lib/configManager.ts
index 5bde242..8ea5ca7 100644
--- a/src/lib/configManager.ts
+++ b/src/lib/configManager.ts
@@ -1,6 +1,5 @@
 import { readFileSync, writeFileSync } from 'fs';
 import { join } from 'path';
-import { AuroraClient } from '@/lib/BotClient';
 
 const configPath = join(process.cwd(), 'config', 'config.json');
 
diff --git a/src/lib/webhookUtils.ts b/src/lib/webhookUtils.ts
index 97bee43..45ecda4 100644
--- a/src/lib/webhookUtils.ts
+++ b/src/lib/webhookUtils.ts
@@ -1,4 +1,4 @@
-import { type TextBasedChannel, User, Client } from 'discord.js';
+import { type TextBasedChannel, User } from 'discord.js';
 
 /**
  * Sends a message to a channel using a temporary webhook (imitating the bot or custom persona).
diff --git a/src/modules/admin/item_wizard.test.ts b/src/modules/admin/item_wizard.test.ts
index f6e4783..5b86c7e 100644
--- a/src/modules/admin/item_wizard.test.ts
+++ b/src/modules/admin/item_wizard.test.ts
@@ -1,6 +1,5 @@
 import { describe, test, expect, spyOn, beforeEach, mock } from "bun:test";
 import { handleItemWizardInteraction, renderWizard } from "./item_wizard";
-import { DrizzleClient } from "@/lib/DrizzleClient";
 import { ButtonInteraction, ModalSubmitInteraction, StringSelectMenuInteraction } from "discord.js";
 
 // Mock Setup
diff --git a/src/modules/class/class.service.test.ts b/src/modules/class/class.service.test.ts
index 4e0e591..82dfe8d 100644
--- a/src/modules/class/class.service.test.ts
+++ b/src/modules/class/class.service.test.ts
@@ -1,7 +1,6 @@
 import { describe, it, expect, mock, beforeEach } from "bun:test";
 import { classService } from "./class.service";
 import { classes, users } from "@/db/schema";
-import { eq, sql } from "drizzle-orm";
 
 // Define mock functions
 const mockFindMany = mock();
diff --git a/src/modules/economy/lootdrop.service.test.ts b/src/modules/economy/lootdrop.service.test.ts
index cc7418f..2594fbe 100644
--- a/src/modules/economy/lootdrop.service.test.ts
+++ b/src/modules/economy/lootdrop.service.test.ts
@@ -1,7 +1,6 @@
 import { describe, it, expect, mock, beforeEach, afterEach, spyOn } from "bun:test";
 import { lootdropService } from "./lootdrop.service";
 import { lootdrops } from "@/db/schema";
-import { eq, and, isNull } from "drizzle-orm";
 import { economyService } from "./economy.service";
 
 // Mock dependencies BEFORE using service functionality
diff --git a/src/modules/inventory/inventory.service.test.ts b/src/modules/inventory/inventory.service.test.ts
index 487b878..e42e8d7 100644
--- a/src/modules/inventory/inventory.service.test.ts
+++ b/src/modules/inventory/inventory.service.test.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect, mock, beforeEach, afterEach, spyOn } from "bun:test";
 import { inventoryService } from "./inventory.service";
-import { inventory, items, userTimers } from "@/db/schema";
+import { inventory, userTimers } from "@/db/schema";
 // Helper to mock resolved value for spyOn
 import { economyService } from "@/modules/economy/economy.service";
 import { levelingService } from "@/modules/leveling/leveling.service";
diff --git a/src/modules/leveling/leveling.service.test.ts b/src/modules/leveling/leveling.service.test.ts
index 08e896f..8d07300 100644
--- a/src/modules/leveling/leveling.service.test.ts
+++ b/src/modules/leveling/leveling.service.test.ts
@@ -1,7 +1,6 @@
 import { describe, it, expect, mock, beforeEach, afterEach, setSystemTime } from "bun:test";
 import { levelingService } from "./leveling.service";
 import { users, userTimers } from "@/db/schema";
-import { eq, and } from "drizzle-orm";
 
 // Mock dependencies
 const mockFindFirst = mock();
diff --git a/src/modules/quest/quest.service.ts b/src/modules/quest/quest.service.ts
index b032621..490ed15 100644
--- a/src/modules/quest/quest.service.ts
+++ b/src/modules/quest/quest.service.ts
@@ -1,5 +1,5 @@
-import { quests, userQuests, users } from "@/db/schema";
-import { eq, and, sql } from "drizzle-orm";
+import { userQuests } from "@/db/schema";
+import { eq, and } from "drizzle-orm";
 import { UserError } from "@/lib/errors";
 import { DrizzleClient } from "@/lib/DrizzleClient";
 import { economyService } from "@/modules/economy/economy.service";
diff --git a/src/modules/trade/trade.service.ts b/src/modules/trade/trade.service.ts
index 78e4d1b..33b4f89 100644
--- a/src/modules/trade/trade.service.ts
+++ b/src/modules/trade/trade.service.ts
@@ -1,7 +1,5 @@
 import type { TradeSession, TradeParticipant } from "./trade.types";
 import { DrizzleClient } from "@/lib/DrizzleClient";
-import { withTransaction } from "@/lib/db";
-import { UserError } from "@/lib/errors";
 import { economyService } from "@/modules/economy/economy.service";
 import { inventoryService } from "@/modules/inventory/inventory.service";
 import { itemTransactions } from "@/db/schema";
diff --git a/src/modules/user/user.service.test.ts b/src/modules/user/user.service.test.ts
index 8419895..d1d8b46 100644
--- a/src/modules/user/user.service.test.ts
+++ b/src/modules/user/user.service.test.ts
@@ -1,5 +1,5 @@
 
-import { describe, it, expect, mock, beforeEach, afterEach } from "bun:test";
+import { describe, it, expect, mock, beforeEach } from "bun:test";
 import { userService } from "./user.service";
 
 // Define mock functions outside so we can control them in tests
diff --git a/src/modules/user/user.service.ts b/src/modules/user/user.service.ts
index 4d4e1b2..29eb2f7 100644
--- a/src/modules/user/user.service.ts
+++ b/src/modules/user/user.service.ts
@@ -1,5 +1,5 @@
 import { users } from "@/db/schema";
-import { eq, sql } from "drizzle-orm";
+import { eq } from "drizzle-orm";
 import { DrizzleClient } from "@/lib/DrizzleClient";
 
 export const userService = {
diff --git a/src/modules/user/user.timers.ts b/src/modules/user/user.timers.ts
index a587804..e016fbe 100644
--- a/src/modules/user/user.timers.ts
+++ b/src/modules/user/user.timers.ts
@@ -1,5 +1,5 @@
 import { userTimers } from "@/db/schema";
-import { eq, and, lt } from "drizzle-orm";
+import { eq, and } from "drizzle-orm";
 import { DrizzleClient } from "@/lib/DrizzleClient";
 
 export type TimerType = 'COOLDOWN' | 'EFFECT' | 'ACCESS';