diff --git a/suggestions/cogs/blacklist_cog.py b/suggestions/cogs/blacklist_cog.py
index 64f3f19..8c7c408 100644
--- a/suggestions/cogs/blacklist_cog.py
+++ b/suggestions/cogs/blacklist_cog.py
@@ -4,7 +4,7 @@
 from typing import TYPE_CHECKING
 
 import disnake
-from bot_base import NonExistentEntry
+from commons.caching import NonExistentEntry
 from disnake.ext import commands
 
 from suggestions.objects import GuildConfig, Suggestion
diff --git a/suggestions/cogs/help_guild_cog.py b/suggestions/cogs/help_guild_cog.py
index a81f595..a65bba6 100644
--- a/suggestions/cogs/help_guild_cog.py
+++ b/suggestions/cogs/help_guild_cog.py
@@ -3,11 +3,8 @@
 import datetime
 import io
 import logging
-import os
-import typing
 from typing import TYPE_CHECKING, Optional
 
-import aiohttp
 import disnake
 from alaric import AQ
 from alaric.comparison import EQ
diff --git a/suggestions/cogs/suggestion_cog.py b/suggestions/cogs/suggestion_cog.py
index 5bef9f0..190185d 100644
--- a/suggestions/cogs/suggestion_cog.py
+++ b/suggestions/cogs/suggestion_cog.py
@@ -5,7 +5,7 @@
 
 import cooldowns
 import disnake
-from bot_base import NonExistentEntry
+from commons.caching import NonExistentEntry
 from bot_base.wraps import WrappedChannel
 from disnake import Guild, Localized
 from disnake.ext import commands, components
diff --git a/suggestions/cogs/view_voters_cog.py b/suggestions/cogs/view_voters_cog.py
index 36b970b..7ec3f38 100644
--- a/suggestions/cogs/view_voters_cog.py
+++ b/suggestions/cogs/view_voters_cog.py
@@ -5,7 +5,7 @@
 
 import cooldowns
 import disnake
-from bot_base import NonExistentEntry
+from commons.caching import NonExistentEntry
 from disnake.ext import commands
 from bot_base.paginators.disnake_paginator import DisnakePaginator
 
diff --git a/suggestions/objects/guild_config.py b/suggestions/objects/guild_config.py
index 389386d..1f1b803 100644
--- a/suggestions/objects/guild_config.py
+++ b/suggestions/objects/guild_config.py
@@ -5,7 +5,7 @@
 
 from alaric import AQ
 from alaric.comparison import EQ
-from bot_base import NonExistentEntry
+from commons.caching import NonExistentEntry
 
 if TYPE_CHECKING:
     from suggestions import State
diff --git a/suggestions/objects/stats/member_stats.py b/suggestions/objects/stats/member_stats.py
index f20cd6b..fed9334 100644
--- a/suggestions/objects/stats/member_stats.py
+++ b/suggestions/objects/stats/member_stats.py
@@ -7,7 +7,7 @@
 from alaric import AQ
 from alaric.comparison import EQ
 from alaric.logical import AND
-from bot_base import NonExistentEntry
+from commons.caching import NonExistentEntry
 
 from .member_command_stats import MemberCommandStats
 
diff --git a/suggestions/objects/user_config.py b/suggestions/objects/user_config.py
index 78c885d..580f556 100644
--- a/suggestions/objects/user_config.py
+++ b/suggestions/objects/user_config.py
@@ -5,7 +5,7 @@
 
 from alaric import AQ
 from alaric.comparison import EQ
-from bot_base import NonExistentEntry
+from commons.caching import NonExistentEntry
 
 if TYPE_CHECKING:
     from suggestions import State