diff --git a/src/config.yml b/src/config.yml
index 9edbc33..185aefc 100644
--- a/src/config.yml
+++ b/src/config.yml
@@ -76,15 +76,6 @@ mysql:
   host: localhost
   database: Database
 
-# Login and logout messages
-# Use Default for the vanilla login and logout messages
-login:
-  enabled: true
-  message: Default
-logout:
-  enabled: true
-  message: Default
-
 # Loglevel feature is still in the works for adding of debug messages
 # Valid loglevels:
 # Info: Regular logging
diff --git a/src/example_config_always_up_to_date!.yml b/src/example_config_always_up_to_date!.yml
index 9edbc33..185aefc 100644
--- a/src/example_config_always_up_to_date!.yml
+++ b/src/example_config_always_up_to_date!.yml
@@ -76,15 +76,6 @@ mysql:
   host: localhost
   database: Database
 
-# Login and logout messages
-# Use Default for the vanilla login and logout messages
-login:
-  enabled: true
-  message: Default
-logout:
-  enabled: true
-  message: Default
-
 # Loglevel feature is still in the works for adding of debug messages
 # Valid loglevels:
 # Info: Regular logging
diff --git a/src/mineverse/Aust1n46/chat/listeners/LoginListener.java b/src/mineverse/Aust1n46/chat/listeners/LoginListener.java
index eb589e0..5bc75fe 100644
--- a/src/mineverse/Aust1n46/chat/listeners/LoginListener.java
+++ b/src/mineverse/Aust1n46/chat/listeners/LoginListener.java
@@ -25,18 +25,8 @@ public class LoginListener implements Listener {
 	private MineverseChat plugin = MineverseChat.getInstance();
 
 	@EventHandler(priority = EventPriority.LOW)
-	public void onPlayerQuit(PlayerQuitEvent plog) {
-		if(!plugin.getConfig().getConfigurationSection("logout").getString("message", "Default").equalsIgnoreCase("Default")) {
-			plog.setQuitMessage(Format.FormatStringAll(plugin.getConfig().getConfigurationSection("logout").getString("message", "Default").replace("{player}", plog.getPlayer().getName())));
-		}
-		if(!plugin.getConfig().getConfigurationSection("logout").getBoolean("enabled", true)) {
-			plog.setQuitMessage("");
-		}
-		playerLeaving(plog.getPlayer());
-	}
-	
-	private void playerLeaving(Player player) {
-		MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer(player);
+	public void onPlayerQuit(PlayerQuitEvent playerQuitEvent) {
+		MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer(playerQuitEvent.getPlayer());
 		PlayerData.savePlayerData(mcp);
 		mcp.clearMessages();
 		mcp.setOnline(false);