diff --git a/src/main/java/client/creator/CharacterFactory.java b/src/main/java/client/creator/CharacterFactory.java
index 197d0a9e51..920fc891a9 100644
--- a/src/main/java/client/creator/CharacterFactory.java
+++ b/src/main/java/client/creator/CharacterFactory.java
@@ -88,7 +88,7 @@ public abstract class CharacterFactory {
             equipped.addItemFromDB(eq_weapon.copy());
         }
 
-        if (!MakeCharInfoHandler.isNewCharacterValid(newCharacter)) {
+        if (!MakeCharInfoValidator.isNewCharacterValid(newCharacter)) {
             log.warn("Owner from account {} tried to packet edit in character creation", c.getAccountName());
             return -2;
         }
diff --git a/src/main/java/client/creator/MakeCharInfo.java b/src/main/java/client/creator/MakeCharInfo.java
index 40956103f1..5447c958ea 100644
--- a/src/main/java/client/creator/MakeCharInfo.java
+++ b/src/main/java/client/creator/MakeCharInfo.java
@@ -8,8 +8,8 @@ import org.slf4j.LoggerFactory;
 import provider.Data;
 import provider.DataTool;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
 
 public class MakeCharInfo {
     private static final Logger log = LoggerFactory.getLogger(MakeCharInfo.class);
@@ -22,14 +22,14 @@ public class MakeCharInfo {
     private static final String SHOE_ID = "6";
     private static final String WEAPON_ID = "7";
 
-    private final List<Integer> charFaces = new ArrayList<>();
-    private final List<Integer> charHairs = new ArrayList<>();
-    private final List<Integer> charHairColors = new ArrayList<>();
-    private final List<Integer> charSkins = new ArrayList<>();
-    private final List<Integer> charTops = new ArrayList<>();
-    private final List<Integer> charBottoms = new ArrayList<>();
-    private final List<Integer> charShoes = new ArrayList<>();
-    private final List<Integer> charWeapons = new ArrayList<>();
+    private final Set<Integer> charFaces = new HashSet<>();
+    private final Set<Integer> charHairs = new HashSet<>();
+    private final Set<Integer> charHairColors = new HashSet<>();
+    private final Set<Integer> charSkins = new HashSet<>();
+    private final Set<Integer> charTops = new HashSet<>();
+    private final Set<Integer> charBottoms = new HashSet<>();
+    private final Set<Integer> charShoes = new HashSet<>();
+    private final Set<Integer> charWeapons = new HashSet<>();
 
     public MakeCharInfo(Data charInfoData) {
         for (Data data : charInfoData.getChildren()) {
diff --git a/src/main/java/client/creator/MakeCharInfoHandler.java b/src/main/java/client/creator/MakeCharInfoValidator.java
similarity index 97%
rename from src/main/java/client/creator/MakeCharInfoHandler.java
rename to src/main/java/client/creator/MakeCharInfoValidator.java
index 1393018299..4ae333e8a3 100644
--- a/src/main/java/client/creator/MakeCharInfoHandler.java
+++ b/src/main/java/client/creator/MakeCharInfoValidator.java
@@ -5,7 +5,7 @@ import provider.Data;
 import provider.DataProviderFactory;
 import provider.wz.WZFiles;
 
-public class MakeCharInfoHandler {
+public class MakeCharInfoValidator {
     private static final MakeCharInfo charFemale;
     private static final MakeCharInfo charMale;
     private static final MakeCharInfo orientCharFemale;
diff --git a/src/main/java/constants/id/ItemId.java b/src/main/java/constants/id/ItemId.java
index 95ad8f2ec7..2624966f0b 100644
--- a/src/main/java/constants/id/ItemId.java
+++ b/src/main/java/constants/id/ItemId.java
@@ -95,46 +95,6 @@ public class ItemId {
     public static final int BEGINNERS_GUIDE = 4161001;
     public static final int LEGENDS_GUIDE = 4161048;
     public static final int NOBLESSE_GUIDE = 4161047;
-    public static final int SWORD = 1302000; // Weapon
-    public static final int HAND_AXE = 1312004;
-    public static final int WOODEN_CLUB = 1322005;
-    public static final int BASIC_POLEARM = 1442079;
-    public static final int WHITE_UNDERSHIRT = 1040002; // Top
-    public static final int UNDERSHIRT = 1040006;
-    public static final int GREY_TSHIRT = 1040010;
-    public static final int WHITE_TUBETOP = 1041002;
-    public static final int YELLOW_TSHIRT = 1041006;
-    public static final int GREEN_TSHIRT = 1041010;
-    public static final int RED_STRIPED_TOP = 1041011;
-    public static final int SIMPLE_WARRIOR_TOP = 1042167;
-    public static final int BLUE_JEAN_SHORTS = 1060002; // Bottom
-    public static final int BROWN_COTTON_SHORTS = 1060006;
-    public static final int RED_MINISKIRT = 1061002;
-    public static final int INDIGO_MINISKIRT = 1061008;
-    public static final int SIMPLE_WARRIOR_PANTS = 1062115;
-    public static final int RED_RUBBER_BOOTS = 1072001;
-    public static final int LEATHER_SANDALS = 1072005;
-    public static final int YELLOW_RUBBER_BOOTS = 1072037;
-    public static final int BLUE_RUBBER_BOOTS = 1072038;
-    public static final int AVERAGE_MUSASHI_SHOES = 1072383;
-    public static final int BLACK_TOBEN = 30000; // Hair
-    public static final int ZETA = 30010;
-    public static final int BLACK_REBEL = 30020;
-    public static final int BLACK_BUZZ = 30030;
-    public static final int BLACK_SAMMY = 31000;
-    public static final int BLACK_EDGY = 31040;
-    public static final int BLACK_CONNIE = 31050;
-    public static final int MOTIVATED_LOOK_M = 20000; // Face
-    public static final int PERPLEXED_STARE = 20001;
-    public static final int LEISURE_LOOK_M = 20002;
-    public static final int MOTIVATED_LOOK_F = 21000;
-    public static final int FEARFUL_STARE_M = 21001;
-    public static final int LEISURE_LOOK_F = 21002;
-    public static final int FEARFUL_STARE_F = 21201;
-    public static final int PERPLEXED_STARE_HAZEL = 20401;
-    public static final int LEISURE_LOOK_HAZEL = 20402;
-    public static final int MOTIVATED_LOOK_AMETHYST = 21700;
-    public static final int MOTIVATED_LOOK_BLUE = 20100;
 
     // Warrior
     public static final int RED_HWARANG_SHIRT = 1040021;