diff --git a/src/main/java/net/sacredlabyrinth/phaed/simpleclans/managers/ClanManager.java b/src/main/java/net/sacredlabyrinth/phaed/simpleclans/managers/ClanManager.java
index 75f5f174..6b80632f 100644
--- a/src/main/java/net/sacredlabyrinth/phaed/simpleclans/managers/ClanManager.java
+++ b/src/main/java/net/sacredlabyrinth/phaed/simpleclans/managers/ClanManager.java
@@ -349,6 +349,7 @@ public ClanPlayer getAnyClanPlayer(String playerName) {
     /**
      * Gets the ClanPlayer object for the player, creates one if not found
      */
+    @Deprecated
     public @Nullable ClanPlayer getCreateClanPlayerUUID(String playerName) {
         UUID playerUniqueId = UUIDMigration.getForcedPlayerUUID(playerName);
         if (playerUniqueId != null) {
diff --git a/src/main/java/net/sacredlabyrinth/phaed/simpleclans/managers/RequestManager.java b/src/main/java/net/sacredlabyrinth/phaed/simpleclans/managers/RequestManager.java
index 382e27c1..0bbfdd89 100644
--- a/src/main/java/net/sacredlabyrinth/phaed/simpleclans/managers/RequestManager.java
+++ b/src/main/java/net/sacredlabyrinth/phaed/simpleclans/managers/RequestManager.java
@@ -5,7 +5,6 @@
 import net.sacredlabyrinth.phaed.simpleclans.events.RequestFinishedEvent;
 import net.sacredlabyrinth.phaed.simpleclans.events.WarEndEvent;
 import net.sacredlabyrinth.phaed.simpleclans.utils.ChatUtils;
-import net.sacredlabyrinth.phaed.simpleclans.uuid.UUIDMigration;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
@@ -45,7 +44,7 @@ public void addDemoteRequest(ClanPlayer requester, String demotedName, Clan clan
         }
         String msg = MessageFormat.format(lang("asking.for.the.demotion"), requester.getName(), demotedName);
 
-        ClanPlayer demotedTp = plugin.getClanManager().getClanPlayer(UUIDMigration.getForcedPlayerUUID(demotedName));
+        ClanPlayer demotedTp = plugin.getClanManager().getAnyClanPlayer(demotedName);
 
         List<ClanPlayer> acceptors = Helper.stripOffLinePlayers(clan.getLeaders());
         acceptors.remove(demotedTp);
@@ -250,8 +249,9 @@ public void processResults(Request req) {
         @Nullable
         Clan targetClan = plugin.getClanManager().getClan(target);
 
+        ClanPlayer targetCp = plugin.getClanManager().getAnyClanPlayer(target);
         @Nullable
-        UUID targetPlayer = UUIDMigration.getForcedPlayerUUID(target);
+        UUID targetUuid = targetCp != null ? targetCp.getUniqueId() : null;
 
         List<String> accepts = req.getAccepts();
         List<String> denies = req.getDenies();
@@ -271,16 +271,16 @@ public void processResults(Request req) {
                 break;
             case DEMOTE:
             case PROMOTE:
-                if (!req.votingFinished() || targetPlayer == null) {
+                if (!req.votingFinished() || targetUuid == null) {
                     return;
                 }
                 target = requestClan.getTag();
 
                 if (req.getType() == ClanRequest.DEMOTE) {
-                    processDemote(req, requestClan, targetPlayer, denies);
+                    processDemote(req, requestClan, targetUuid, denies);
                 }
                 if (req.getType() == ClanRequest.PROMOTE) {
-                    processPromote(req, requestClan, targetPlayer, denies);
+                    processPromote(req, requestClan, targetUuid, denies);
                 }
                 break;
             case DISBAND:
diff --git a/src/main/java/net/sacredlabyrinth/phaed/simpleclans/managers/StorageManager.java b/src/main/java/net/sacredlabyrinth/phaed/simpleclans/managers/StorageManager.java
index dba21b7a..5f1abd3c 100644
--- a/src/main/java/net/sacredlabyrinth/phaed/simpleclans/managers/StorageManager.java
+++ b/src/main/java/net/sacredlabyrinth/phaed/simpleclans/managers/StorageManager.java
@@ -11,7 +11,6 @@
 import net.sacredlabyrinth.phaed.simpleclans.utils.ChatUtils;
 import net.sacredlabyrinth.phaed.simpleclans.utils.YAMLSerializer;
 import net.sacredlabyrinth.phaed.simpleclans.uuid.UUIDFetcher;
-import net.sacredlabyrinth.phaed.simpleclans.uuid.UUIDMigration;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -60,7 +59,7 @@ public StorageManager() {
      * @return the ChatBlock
      */
     public ChatBlock getChatBlock(Player player) {
-    	return chatBlocks.get(player.getUniqueId().toString());
+    	return chatBlocks.get(player.getName());
     }
 
     /**
@@ -68,13 +67,7 @@ public ChatBlock getChatBlock(Player player) {
      *
      */
     public void addChatBlock(CommandSender player, ChatBlock cb) {
-		UUID uuid = UUIDMigration.getForcedPlayerUUID(player.getName());
-
-		if (uuid == null) {
-			return;
-		}
-
-		chatBlocks.put(uuid.toString(), cb);
+		chatBlocks.put(player.getName(), cb);
     }
 
     /**
diff --git a/src/main/java/net/sacredlabyrinth/phaed/simpleclans/uuid/UUIDMigration.java b/src/main/java/net/sacredlabyrinth/phaed/simpleclans/uuid/UUIDMigration.java
index 3630cc59..805c43e1 100644
--- a/src/main/java/net/sacredlabyrinth/phaed/simpleclans/uuid/UUIDMigration.java
+++ b/src/main/java/net/sacredlabyrinth/phaed/simpleclans/uuid/UUIDMigration.java
@@ -25,6 +25,7 @@ public static boolean canReturnUUID() {
         }
     }
 
+    @Deprecated
     public static UUID getForcedPlayerUUID(String playerName) {
         Player player = Bukkit.getPlayerExact(playerName);