diff --git a/litecord/pubsub/channel.py b/litecord/pubsub/channel.py
index 15e4010..5b3cf55 100644
--- a/litecord/pubsub/channel.py
+++ b/litecord/pubsub/channel.py
@@ -48,7 +48,7 @@ def gdm_recipient_view(orig: dict, user_id: int) -> dict:
     return data
 
 
-class ChannelDispatcher(DispatcherWithState):
+class ChannelDispatcher(DispatcherWithFlags):
     """Main channel Pub/Sub logic."""
     KEY_TYPE = int
     VAL_TYPE = int
diff --git a/litecord/pubsub/guild.py b/litecord/pubsub/guild.py
index 20b3bd1..7b56fcf 100644
--- a/litecord/pubsub/guild.py
+++ b/litecord/pubsub/guild.py
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
 from typing import Any
-from collections import defaultdict
 
 from logbook import Logger