diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java
index fd95ab21..838c2897 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java
@@ -775,32 +775,4 @@ public class TFM_PlayerListener implements Listener
     {
         TFM_ServerInterface.handlePlayerLogin(event);
     }
-    
-    // Player Tab and auto Tags
-    
-    @EventHandler(priority = EventPriority.HIGH)
-    public static void onPlayerJoinEvent(PlayerJoinEvent event)
-    {
-        Player player = event.getPlayer();
-        if (TFM_Util.DEVELOPERS.contains(player.getName()))
-        {
-            player.setPlayerListName(ChatColor.DARK_PURPLE + player.getName());
-            TFM_PlayerData.getPlayerData(player).setTag("&8[&5Developer&8]");
-        }
-        else if (TFM_AdminList.isSeniorAdmin(player))
-        {
-            player.setPlayerListName(ChatColor.LIGHT_PURPLE + player.getName());
-            TFM_PlayerData.getPlayerData(player).setTag("&8[&dSenior Admin&8]");
-        }
-        else if (TFM_AdminList.isTelnetAdmin(player, true))
-        {
-            player.setPlayerListName(ChatColor.GREEN + player.getName());
-            TFM_PlayerData.getPlayerData(player).setTag("&8[&2Telnet Admin&8]");
-        }
-        else if (TFM_AdminList.isSuperAdmin(player))
-        {
-            player.setPlayerListName(ChatColor.AQUA + player.getName());
-            TFM_PlayerData.getPlayerData(player).setTag("&8[&BSuper Admin&8]");
-        }
-    }
 }
diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_AdminList.java b/src/me/StevenLawson/TotalFreedomMod/TFM_AdminList.java
index 3b6b14a8..4ecf720e 100644
--- a/src/me/StevenLawson/TotalFreedomMod/TFM_AdminList.java
+++ b/src/me/StevenLawson/TotalFreedomMod/TFM_AdminList.java
@@ -405,25 +405,6 @@ public class TFM_AdminList
         return false;
     }
 
-    public static boolean isTelnetAdmin(CommandSender sender, boolean verifySuperadmin)
-    {
-        if (verifySuperadmin)
-        {
-            if (!isSuperAdmin(sender))
-            {
-                return false;
-            }
-        }
-
-        final TFM_Admin entry = getEntry((Player) sender);
-        if (entry != null)
-        {
-            return entry.isTelnetAdmin();
-        }
-
-        return false;
-    }
-    
     public static boolean isIdentityMatched(Player player)
     {
         if (!isSuperAdmin(player))