diff --git a/src/main/java/com/bbn/hadder/listener/GuildJoinListener.java b/src/main/java/com/bbn/hadder/listener/GuildJoinListener.java
deleted file mode 100644
index cdea693..0000000
--- a/src/main/java/com/bbn/hadder/listener/GuildJoinListener.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.bbn.hadder.listener;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import com.bbn.hadder.Rethink;
-import net.dv8tion.jda.api.events.guild.GuildJoinEvent;
-import net.dv8tion.jda.api.hooks.ListenerAdapter;
-import org.jetbrains.annotations.NotNull;
-
-public class GuildJoinListener extends ListenerAdapter {
-    public void onGuildJoin(@NotNull GuildJoinEvent event) {
-        Rethink.insertServer(event.getGuild().getId());
-    }
-}
diff --git a/src/main/java/com/bbn/hadder/listener/GuildLeaveListener.java b/src/main/java/com/bbn/hadder/listener/GuildLeaveListener.java
deleted file mode 100644
index fc65d2e..0000000
--- a/src/main/java/com/bbn/hadder/listener/GuildLeaveListener.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.bbn.hadder.listener;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import net.dv8tion.jda.api.events.guild.GuildLeaveEvent;
-import net.dv8tion.jda.api.hooks.ListenerAdapter;
-import org.jetbrains.annotations.NotNull;
-
-public class GuildLeaveListener extends ListenerAdapter {
-    public void onGuildLeave(@NotNull GuildLeaveEvent event) {
-
-
-    }
-}
diff --git a/src/main/java/com/bbn/hadder/listener/BotListListener.java b/src/main/java/com/bbn/hadder/listener/GuildListener.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/listener/BotListListener.java
rename to src/main/java/com/bbn/hadder/listener/GuildListener.java