diff --git a/src/main/java/net/krakatoaapi/KrakatoaAPI.java b/src/main/java/net/krakatoaapi/KrakatoaAPI.java
index e66557e..19a434a 100644
--- a/src/main/java/net/krakatoaapi/KrakatoaAPI.java
+++ b/src/main/java/net/krakatoaapi/KrakatoaAPI.java
@@ -12,6 +12,7 @@ import java.util.List;
 import lombok.Getter;
 import net.krakatoaapi.config.ConfigHandler;
 import net.krakatoaapi.listener.PlayerJoinListener;
+import net.krakatoaapi.listener.PlayerQuitListener;
 import net.krakatoaapi.listener.SocketClientMessageListener;
 import net.krakatoaapi.mongo.MongoManager;
 import org.bukkit.Bukkit;
@@ -27,7 +28,7 @@ public class KrakatoaAPI extends JavaPlugin {
 
   private ConfigHandler configHandler;
   private MongoManager mongoManager;
-  private KraSocketClientProtocol kraProtocol;
+  private KraSocketClientProtocol kraSocketClientProtocol;
   private KraSocketClient kraSocketClient;
   private KraSocketClientEventInitiater kraSocketClientEventInitiater;
   private KraSocketClientEventInterface kraSocketClientEventInterface;
@@ -45,7 +46,7 @@ public class KrakatoaAPI extends JavaPlugin {
       e.printStackTrace();
     }
 
-    this.kraProtocol = new KraSocketClientProtocol();
+    this.kraSocketClientProtocol = new KraSocketClientProtocol();
 
     KraSocketClientConfig kraSocketClientConfig = new KraSocketClientConfig(
         this.configHandler.getWebSocketProtocol(), this.configHandler.getWebSocketHost(),
@@ -57,7 +58,7 @@ public class KrakatoaAPI extends JavaPlugin {
 
     try {
       this.kraSocketClient = new KraSocketClient(kraSocketClientConfig,
-          this.kraSocketClientEventInterface, this.kraProtocol);
+          this.kraSocketClientEventInterface, this.kraSocketClientProtocol);
 
       this.kraSocketClient.getSocketClient().connect();
     } catch (URISyntaxException e) {
@@ -84,7 +85,7 @@ public class KrakatoaAPI extends JavaPlugin {
 
   public void loadListeners() {
     PluginManager pluginManager = Bukkit.getPluginManager();
-    List.of(new PlayerJoinListener()).forEach(listener -> {
+    List.of(new PlayerJoinListener(), new PlayerQuitListener()).forEach(listener -> {
       pluginManager.registerEvents(listener, this);
     });
   }
diff --git a/src/main/java/net/krakatoaapi/listener/PlayerQuitListener.java b/src/main/java/net/krakatoaapi/listener/PlayerQuitListener.java
new file mode 100644
index 0000000..8b1ade3
--- /dev/null
+++ b/src/main/java/net/krakatoaapi/listener/PlayerQuitListener.java
@@ -0,0 +1,14 @@
+package net.krakatoaapi.listener;
+
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerQuitEvent;
+
+public class PlayerQuitListener implements Listener {
+
+  @EventHandler
+  public void onQuit(PlayerQuitEvent event) {
+    event.setQuitMessage(null);
+  }
+
+}
diff --git a/src/main/java/net/krakatoaapi/mongo/MongoManager.java b/src/main/java/net/krakatoaapi/mongo/MongoManager.java
index f3c36c9..a452223 100644
--- a/src/main/java/net/krakatoaapi/mongo/MongoManager.java
+++ b/src/main/java/net/krakatoaapi/mongo/MongoManager.java
@@ -12,6 +12,8 @@ public class MongoManager {
   private final String username;
   private final String password;
 
+  // TODO: look - deprecated
+
   @Getter
   private MongoDatabase mongoDatabase;
   @Getter