diff --git a/src/main/java/netneutrality/MusicBot.java b/src/main/java/netneutrality/MusicBot.java
index 48d2223..ab30ea3 100644
--- a/src/main/java/netneutrality/MusicBot.java
+++ b/src/main/java/netneutrality/MusicBot.java
@@ -38,32 +38,32 @@ public class MusicBot {
 		jda.getPresence().setGame(Game.watching("me load..."));
 		jda.addEventListener(new NewCommandListener(), new EditHandler());
 
-		Settings.setCreator(jda.getUserById("194270171727265792"));
-		Settings.setOwnerGuild(jda.getGuildById("195386426400047105"));
-
-		WebApi webserver = new WebApi();
+		// WebApi webserver = new WebApi();
 
 		jda.getPresence().setGame(Game.watching("rape"));
-		Thread status = new Thread(new StatusThread(jda.getPresence()));
-		// status.start();
+
 		
 		ConsoleHandler consoleInput = new ConsoleHandler();
 
 		switch (consoleInput.init()) {
 
         case "quit":
-            System.out.println("Shutting down...");
-            MusicManager.disconnectPlayers();
-            jda.shutdown();
-            DBController.shutdown();
-            ThreadManager.shutdownExecutor();
-            System.out.println("Shutdown complete");
+            shutdown();
             System.exit(0);
             break;
 
         }
 
 	}
+
+	public static void shutdown() {
+		System.out.println("Shutting down...");
+		MusicManager.disconnectPlayers();
+		disconnect();
+		DBController.shutdown();
+		ThreadManager.shutdownExecutor();
+		System.out.println("Shutdown complete");
+	}
 	
 	public static JDA getJDA() {
 		return jda;