diff --git a/Chroma-Core/src/main/java/buttondevteam/core/PlayerListener.java b/Chroma-Core/src/main/java/buttondevteam/core/PlayerListener.java
index 4c13204..d75d34f 100755
--- a/Chroma-Core/src/main/java/buttondevteam/core/PlayerListener.java
+++ b/Chroma-Core/src/main/java/buttondevteam/core/PlayerListener.java
@@ -1,6 +1,5 @@
 package buttondevteam.core;
 
-import buttondevteam.core.component.towny.TownyComponent;
 import buttondevteam.lib.*;
 import buttondevteam.lib.architecture.ButtonPlugin;
 import buttondevteam.lib.chat.ChatMessage;
@@ -36,7 +35,6 @@ public class PlayerListener implements Listener {
 			player.PlayerName.set(p.getName());
 			MainPlugin.Instance.getLogger().info("Player name saved: " + player.PlayerName.get());
 		} else if (!p.getName().equals(pname)) {
-			TownyComponent.renameInTowny(pname, p.getName());
 			MainPlugin.Instance.getLogger().info(pname + " renamed to " + p.getName());
 			player.PlayerName.set(p.getName());
 		}
diff --git a/Chroma-Core/src/main/java/buttondevteam/core/component/towny/TownyComponent.java b/Chroma-Core/src/main/java/buttondevteam/core/component/towny/TownyComponent.java
index d23b197..814fd1f 100644
--- a/Chroma-Core/src/main/java/buttondevteam/core/component/towny/TownyComponent.java
+++ b/Chroma-Core/src/main/java/buttondevteam/core/component/towny/TownyComponent.java
@@ -1,16 +1,10 @@
 package buttondevteam.core.component.towny;
 
-import buttondevteam.core.ComponentManager;
 import buttondevteam.core.MainPlugin;
-import buttondevteam.lib.TBMCCoreAPI;
 import buttondevteam.lib.architecture.Component;
-import com.palmergames.bukkit.towny.TownyUniverse;
-import com.palmergames.bukkit.towny.exceptions.AlreadyRegisteredException;
-import com.palmergames.bukkit.towny.exceptions.NotRegisteredException;
-import com.palmergames.bukkit.towny.object.Resident;
 
 /**
- * Automatically renames Towny players if they changed their Minecraft name
+ * Provides a command to remove invalid Towny residents.
  */
 public class TownyComponent extends Component<MainPlugin> {
 	@Override
@@ -21,35 +15,4 @@ public class TownyComponent extends Component<MainPlugin> {
 	@Override
 	protected void disable() {
 	}
-
-	/**
-	 * Only renames the resident if this component is enabled. Used to handle name changes.
-	 *
-	 * @param oldName The player's old name as known by us
-	 * @param newName The player's new name
-	 */
-	public static void renameInTowny(String oldName, String newName) {
-		var component = ComponentManager.getIfEnabled(TownyComponent.class);
-		if (component == null)
-			return;
-		component.log("Renaming " + oldName + " in Towny to " + newName);
-		TownyUniverse tu = TownyUniverse.getInstance();
-		try {
-			Resident resident = tu.getDataSource().getResident(oldName);
-			if (resident == null) {
-				component.logWarn("Resident not found - couldn't rename in Towny.");
-				TBMCCoreAPI.sendDebugMessage("Resident not found - couldn't rename in Towny.");
-			} else if (tu.getDataSource().hasResident(newName)) {
-				component.logWarn("Target resident name is already in use.");
-				TBMCCoreAPI.sendDebugMessage("Target resident name is already in use. (" + oldName + " -> " + newName + ")");
-			} else {
-				tu.getDataSource().renamePlayer(resident, newName); //Fixed in Towny 0.91.1.2
-				component.log("Renaming done.");
-			}
-		} catch (AlreadyRegisteredException e) {
-			TBMCCoreAPI.SendException("Failed to rename resident, there's already one with this name.", e, component);
-		} catch (NotRegisteredException e) {
-			TBMCCoreAPI.SendException("Failed to rename resident, the resident isn't registered.", e, component);
-		}
-	}
 }