diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommand.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommand.java
index 77dacf58..b50cec31 100644
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommand.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommand.java
@@ -54,23 +54,22 @@ public class CosmeticCommand implements CommandExecutor {
         }
         if (args[0].equalsIgnoreCase("unapply")) {
             Player player = null;
-            Cosmetic cosmetic;
+            CosmeticSlot cosmeticSlot;
 
             if (sender instanceof Player) player = ((Player) sender).getPlayer();
             if (args.length >= 3) player = Bukkit.getPlayer(args[2]);
 
-            cosmetic = Cosmetics.getCosmetic(args[1]);
+            cosmeticSlot = CosmeticSlot.valueOf(args[1]);
 
-            if (player == null || cosmetic == null) {
+            if (player == null || cosmeticSlot == null) {
                 sender.sendMessage("Something was null");
                 return true;
             }
 
             CosmeticUser user = CosmeticUsers.getUser(player);
 
-            CosmeticSlot slot = cosmetic.getSlot();
-            user.removeCosmeticSlot(cosmetic);
-            user.updateCosmetic(slot);
+            user.removeCosmeticSlot(cosmeticSlot);
+            user.updateCosmetic(cosmeticSlot);
             return true;
         }
         if (args[0].equalsIgnoreCase("wardrobe")) {
diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommandTabComplete.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommandTabComplete.java
index f7f2cf77..f9067efb 100644
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommandTabComplete.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommandTabComplete.java
@@ -1,7 +1,9 @@
 package com.hibiscusmc.hmccosmetics.command;
 
+import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetics;
 import com.hibiscusmc.hmccosmetics.gui.Menus;
+import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -29,9 +31,14 @@ public class CosmeticCommandTabComplete implements TabCompleter {
             completions.add("dataclear");
         }
 
+        // This needs to be redone.
         if (args.length >= 2) {
-            if (args[0].equalsIgnoreCase("apply") || args[0].equalsIgnoreCase("unapply")) {
+            if (args[0].equalsIgnoreCase("apply")) {
                 completions.addAll(applyCommandComplete(args));
+            } else if (args[0].equalsIgnoreCase("unapply")) {
+                for (CosmeticSlot slot : CosmeticSlot.values()) {
+                    completions.add(slot.name());
+                }
             } else if (args[0].equalsIgnoreCase("menu")) {
                 completions.addAll(Menus.getMenuNames());
             } else if (args[0].equalsIgnoreCase("dataclear")) {