diff --git a/src/main/java/creator/loki/core/ListenerAggregator.java b/src/main/java/creator/loki/core/ListenerAggregator.java
index 8cb8b77..448c805 100644
--- a/src/main/java/creator/loki/core/ListenerAggregator.java
+++ b/src/main/java/creator/loki/core/ListenerAggregator.java
@@ -26,72 +26,56 @@ import creator.loki.feature.welcome.WelcomeListener;
 
 @Singleton
 public class ListenerAggregator {
-  public record VoiceListeners(
-      VoiceTracker voiceTracker,
-      VoiceChannelListener voiceChannelListener,
-      VoiceButtonHandler voiceButtonHandler,
-      VoiceModalHandler voiceModalHandler,
-      VoiceSyncListener voiceSyncListener) {}
-
-  public record LevelListeners(
-      MessageListener messageListener,
-      ResetLevelsButtonHandler resetLevelsButtonHandler,
-      LeaderboardButtonListener leaderboardButtonListener) {}
-
-  public record MusicListeners(
-      MusicSlashCommands musicSlashCommands, PlaySelectHandler playSelectHandler) {}
-
-  public record ModerationListeners(
-      ModerationLogger moderationLogger, ClearSlashCommands clearSlashCommands) {}
-
-  public record ReadyListeners(
-      ReadyListener readyListener,
-      MemberCounterListener memberCounterListener,
-      WelcomeListener welcomeListener,
-      HelpMenuHandler helpMenuHandler,
-      MessageCache messageCache) {}
-
-  public record MiscUIListeners(
-      ImageNavigationHandler imageNavigationHandler,
-      SetupSlashHandler setupSlashHandler,
-      TicketListener ticketListener,
-      ReactionRoleListener reactionRoleListener,
-      FishMessageListener fishMessageListener) {}
-
   private final Object[] listeners;
 
   @Inject
   public ListenerAggregator(
-      final VoiceListeners voice,
-      final LevelListeners level,
-      final MusicListeners music,
-      final ModerationListeners moderation,
-      final ReadyListeners ready,
-      final MiscUIListeners misc) {
+      final ReadyListener readyListener,
+      final MessageListener messageListener,
+      final VoiceTracker voiceTracker,
+      final VoiceChannelListener voiceChannelListener,
+      final MemberCounterListener memberCounterListener,
+      final VoiceButtonHandler voiceButtonHandler,
+      final VoiceModalHandler voiceModalHandler,
+      final VoiceSyncListener voiceSyncListener,
+      final WelcomeListener welcomeListener,
+      final ModerationLogger moderationLogger,
+      final HelpMenuHandler helpMenuHandler,
+      final ResetLevelsButtonHandler resetLevelsButtonHandler,
+      final LeaderboardButtonListener leaderboardButtonListener,
+      final MessageCache messageCache,
+      final MusicSlashCommands musicSlashCommands,
+      final PlaySelectHandler playSelectHandler,
+      final FishMessageListener fishMessageListener,
+      final ClearSlashCommands clearSlashCommands,
+      final ImageNavigationHandler imageNavigationHandler,
+      final SetupSlashHandler setupSlashHandler,
+      final TicketListener ticketListener,
+      final ReactionRoleListener reactionRoleListener) {
     this.listeners =
         new Object[] {
-          ready.readyListener,
-          level.messageListener,
-          voice.voiceTracker,
-          voice.voiceChannelListener,
-          ready.memberCounterListener,
-          voice.voiceButtonHandler,
-          voice.voiceModalHandler,
-          voice.voiceSyncListener,
-          ready.welcomeListener,
-          moderation.moderationLogger,
-          ready.helpMenuHandler,
-          level.resetLevelsButtonHandler,
-          level.leaderboardButtonListener,
-          ready.messageCache,
-          music.musicSlashCommands,
-          music.playSelectHandler,
-          misc.fishMessageListener,
-          moderation.clearSlashCommands,
-          misc.imageNavigationHandler,
-          misc.setupSlashHandler,
-          misc.ticketListener,
-          misc.reactionRoleListener
+          readyListener,
+          messageListener,
+          voiceTracker,
+          voiceChannelListener,
+          memberCounterListener,
+          voiceButtonHandler,
+          voiceModalHandler,
+          voiceSyncListener,
+          welcomeListener,
+          moderationLogger,
+          helpMenuHandler,
+          resetLevelsButtonHandler,
+          leaderboardButtonListener,
+          messageCache,
+          musicSlashCommands,
+          playSelectHandler,
+          fishMessageListener,
+          clearSlashCommands,
+          imageNavigationHandler,
+          setupSlashHandler,
+          ticketListener,
+          reactionRoleListener
         };
   }