diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/MetadataFactory.java b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/MetadataFactory.java
index 4d8619a..bb6857d 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/MetadataFactory.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/MetadataFactory.java
@@ -2,8 +2,9 @@ package lol.pyr.znpcsplus.metadata;
 
 import com.github.retrooper.packetevents.protocol.entity.data.EntityData;
 import com.github.retrooper.packetevents.protocol.entity.pose.EntityPose;
-import lol.pyr.znpcsplus.util.*;
-import net.kyori.adventure.text.Component;
+import lol.pyr.znpcsplus.util.CatVariant;
+import lol.pyr.znpcsplus.util.CreeperState;
+import lol.pyr.znpcsplus.util.ParrotVariant;
 import org.bukkit.DyeColor;
 
 /**
@@ -22,10 +23,7 @@ import org.bukkit.DyeColor;
  */
 @Deprecated
 public interface MetadataFactory {
-    EntityData effects(boolean onFire, boolean glowing, boolean invisible, boolean usingElytra, boolean usingItemLegacy);
-    EntityData silent(boolean enabled);
-    EntityData name(Component name);
-    EntityData nameShown();
+
     EntityData noGravity();
     EntityData pose(EntityPose pose);
     EntityData shaking(boolean enabled);
@@ -33,20 +31,9 @@ public interface MetadataFactory {
     EntityData potionColor(int color);
     EntityData potionAmbient(boolean ambient);
 
-    // Player
-    EntityData skinLayers(boolean cape, boolean jacket, boolean leftSleeve, boolean rightSleeve, boolean leftLeg, boolean rightLeg, boolean hat);
     EntityData shoulderEntityLeft(ParrotVariant variant);
     EntityData shoulderEntityRight(ParrotVariant variant);
 
-    // Armor Stand
-    EntityData armorStandProperties(boolean small, boolean arms, boolean noBasePlate);
-    EntityData armorStandHeadRotation(Vector3f headRotation);
-    EntityData armorStandBodyRotation(Vector3f bodyRotation);
-    EntityData armorStandLeftArmRotation(Vector3f leftArmRotation);
-    EntityData armorStandRightArmRotation(Vector3f rightArmRotation);
-    EntityData armorStandLeftLegRotation(Vector3f leftLegRotation);
-    EntityData armorStandRightLegRotation(Vector3f rightLegRotation);
-
     // Axolotl
     EntityData axolotlVariant(int variant);
     EntityData playingDead(boolean playingDead);
diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_10MetadataFactory.java b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_10MetadataFactory.java
index 8c136c5..e6af8b5 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_10MetadataFactory.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_10MetadataFactory.java
@@ -3,14 +3,9 @@ package lol.pyr.znpcsplus.metadata;
 import com.github.retrooper.packetevents.protocol.entity.data.EntityData;
 import com.github.retrooper.packetevents.protocol.entity.data.EntityDataTypes;
 import lol.pyr.znpcsplus.util.CreeperState;
-import lol.pyr.znpcsplus.util.Vector3f;
 
 @Deprecated
 public class V1_10MetadataFactory extends V1_9MetadataFactory {
-    @Override
-    public EntityData skinLayers(boolean cape, boolean jacket, boolean leftSleeve, boolean rightSleeve, boolean leftLeg, boolean rightLeg, boolean hat) {
-        return createSkinLayers(13, cape, jacket, leftSleeve, rightSleeve, leftLeg, rightLeg, hat);
-    }
 
     @Override
     public EntityData noGravity() {
@@ -27,41 +22,6 @@ public class V1_10MetadataFactory extends V1_9MetadataFactory {
         return newEntityData(9, EntityDataTypes.BOOLEAN, ambient);
     }
 
-    @Override
-    public EntityData armorStandProperties(boolean small, boolean arms, boolean noBasePlate) {
-        return newEntityData(11, EntityDataTypes.BYTE, (byte) ((small ? 0x01 : 0) | (arms ? 0x04 : 0) | (noBasePlate ? 0x08 : 0)));
-    }
-
-    @Override
-    public EntityData armorStandHeadRotation(Vector3f headRotation) {
-        return createRotations(12, headRotation);
-    }
-
-    @Override
-    public EntityData armorStandBodyRotation(Vector3f bodyRotation) {
-        return createRotations(13, bodyRotation);
-    }
-
-    @Override
-    public EntityData armorStandLeftArmRotation(Vector3f leftArmRotation) {
-        return createRotations(14, leftArmRotation);
-    }
-
-    @Override
-    public EntityData armorStandRightArmRotation(Vector3f rightArmRotation) {
-        return createRotations(15, rightArmRotation);
-    }
-
-    @Override
-    public EntityData armorStandLeftLegRotation(Vector3f leftLegRotation) {
-        return createRotations(16, leftLegRotation);
-    }
-
-    @Override
-    public EntityData armorStandRightLegRotation(Vector3f rightLegRotation) {
-        return createRotations(17, rightLegRotation);
-    }
-
     @Override
     public EntityData batHanging(boolean hanging) {
         return newEntityData(12, EntityDataTypes.BYTE, (byte) (hanging ? 0x01 : 0));
diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_13MetadataFactory.java b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_13MetadataFactory.java
index 7d3b266..6f127a6 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_13MetadataFactory.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_13MetadataFactory.java
@@ -2,17 +2,9 @@ package lol.pyr.znpcsplus.metadata;
 
 import com.github.retrooper.packetevents.protocol.entity.data.EntityData;
 import com.github.retrooper.packetevents.protocol.entity.data.EntityDataTypes;
-import com.github.retrooper.packetevents.util.adventure.AdventureSerializer;
-import net.kyori.adventure.text.Component;
-
-import java.util.Optional;
 
 @Deprecated
 public class V1_13MetadataFactory extends V1_12MetadataFactory {
-    @Override
-    public EntityData name(Component name) {
-        return newEntityData(2, EntityDataTypes.OPTIONAL_COMPONENT, Optional.of(AdventureSerializer.getGsonSerializer().serialize(name)));
-    }
 
     @Override
     public EntityData usingItem(boolean usingItem, boolean offHand, boolean riptide) {
diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_14MetadataFactory.java b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_14MetadataFactory.java
index ac7bf09..b2626b5 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_14MetadataFactory.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_14MetadataFactory.java
@@ -7,15 +7,10 @@ import com.github.retrooper.packetevents.protocol.entity.villager.VillagerData;
 import lol.pyr.znpcsplus.util.CatVariant;
 import lol.pyr.znpcsplus.util.CreeperState;
 import lol.pyr.znpcsplus.util.ParrotVariant;
-import lol.pyr.znpcsplus.util.Vector3f;
 import org.bukkit.DyeColor;
 
 @Deprecated
 public class V1_14MetadataFactory extends V1_13MetadataFactory {
-    @Override
-    public EntityData skinLayers(boolean cape, boolean jacket, boolean leftSleeve, boolean rightSleeve, boolean leftLeg, boolean rightLeg, boolean hat) {
-        return createSkinLayers(15, cape, jacket, leftSleeve, rightSleeve, leftLeg, rightLeg, hat);
-    }
 
     @Override
     public EntityData pose(EntityPose pose) {
@@ -47,41 +42,6 @@ public class V1_14MetadataFactory extends V1_13MetadataFactory {
         return createShoulderEntityRight(18, variant);
     }
 
-    @Override
-    public EntityData armorStandProperties(boolean small, boolean arms, boolean noBasePlate) {
-        return newEntityData(13, EntityDataTypes.BYTE, (byte) ((small ? 0x01 : 0) | (arms ? 0x04 : 0) | (noBasePlate ? 0x08 : 0)));
-    }
-
-    @Override
-    public EntityData armorStandHeadRotation(Vector3f headRotation) {
-        return createRotations(14, headRotation);
-    }
-
-    @Override
-    public EntityData armorStandBodyRotation(Vector3f bodyRotation) {
-        return createRotations(15, bodyRotation);
-    }
-
-    @Override
-    public EntityData armorStandLeftArmRotation(Vector3f leftArmRotation) {
-        return createRotations(16, leftArmRotation);
-    }
-
-    @Override
-    public EntityData armorStandRightArmRotation(Vector3f rightArmRotation) {
-        return createRotations(17, rightArmRotation);
-    }
-
-    @Override
-    public EntityData armorStandLeftLegRotation(Vector3f leftLegRotation) {
-        return createRotations(18, leftLegRotation);
-    }
-
-    @Override
-    public EntityData armorStandRightLegRotation(Vector3f rightLegRotation) {
-        return createRotations(19, rightLegRotation);
-    }
-
     @Override
     public EntityData batHanging(boolean hanging) {
         return newEntityData(14, EntityDataTypes.BYTE, (byte) (hanging ? 0x01 : 0));
diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_15MetadataFactory.java b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_15MetadataFactory.java
index 93a1461..3cb5264 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_15MetadataFactory.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_15MetadataFactory.java
@@ -6,7 +6,6 @@ import com.github.retrooper.packetevents.protocol.entity.villager.VillagerData;
 import lol.pyr.znpcsplus.util.CatVariant;
 import lol.pyr.znpcsplus.util.CreeperState;
 import lol.pyr.znpcsplus.util.ParrotVariant;
-import lol.pyr.znpcsplus.util.Vector3f;
 import org.bukkit.DyeColor;
 
 @Deprecated
@@ -21,41 +20,6 @@ public class V1_15MetadataFactory extends V1_14MetadataFactory {
         return createShoulderEntityRight(19, variant);
     }
 
-    @Override
-    public EntityData armorStandProperties(boolean small, boolean arms, boolean noBasePlate) {
-        return newEntityData(14, EntityDataTypes.BYTE, (byte) ((small ? 0x01 : 0) | (arms ? 0x04 : 0) | (!noBasePlate ? 0x08 : 0)));
-    }
-
-    @Override
-    public EntityData armorStandHeadRotation(Vector3f headRotation) {
-        return createRotations(15, headRotation);
-    }
-
-    @Override
-    public EntityData armorStandBodyRotation(Vector3f bodyRotation) {
-        return createRotations(16, bodyRotation);
-    }
-
-    @Override
-    public EntityData armorStandLeftArmRotation(Vector3f leftArmRotation) {
-        return createRotations(17, leftArmRotation);
-    }
-
-    @Override
-    public EntityData armorStandRightArmRotation(Vector3f rightArmRotation) {
-        return createRotations(18, rightArmRotation);
-    }
-
-    @Override
-    public EntityData armorStandLeftLegRotation(Vector3f leftLegRotation) {
-        return createRotations(19, leftLegRotation);
-    }
-
-    @Override
-    public EntityData armorStandRightLegRotation(Vector3f rightLegRotation) {
-        return createRotations(20, rightLegRotation);
-    }
-
     @Override
     public EntityData batHanging(boolean hanging) {
         return newEntityData(15, EntityDataTypes.BYTE, (byte) (hanging ? 0x01 : 0));
diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_16MetadataFactory.java b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_16MetadataFactory.java
index d3862f3..924efb7 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_16MetadataFactory.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_16MetadataFactory.java
@@ -5,10 +5,6 @@ import com.github.retrooper.packetevents.protocol.entity.data.EntityDataTypes;
 
 @Deprecated
 public class V1_16MetadataFactory extends V1_15MetadataFactory {
-    @Override
-    public EntityData skinLayers(boolean cape, boolean jacket, boolean leftSleeve, boolean rightSleeve, boolean leftLeg, boolean rightLeg, boolean hat) {
-        return createSkinLayers(16, cape, jacket, leftSleeve, rightSleeve, leftLeg, rightLeg, hat);
-    }
 
     @Override
     public EntityData hoglinImmuneToZombification(boolean immuneToZombification) {
diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_17MetadataFactory.java b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_17MetadataFactory.java
index c76536c..4ba29b7 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_17MetadataFactory.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_17MetadataFactory.java
@@ -6,20 +6,10 @@ import com.github.retrooper.packetevents.protocol.entity.villager.VillagerData;
 import lol.pyr.znpcsplus.util.CatVariant;
 import lol.pyr.znpcsplus.util.CreeperState;
 import lol.pyr.znpcsplus.util.ParrotVariant;
-import lol.pyr.znpcsplus.util.Vector3f;
 import org.bukkit.DyeColor;
 
 @Deprecated
 public class V1_17MetadataFactory extends V1_16MetadataFactory {
-    @Override
-    public EntityData skinLayers(boolean cape, boolean jacket, boolean leftSleeve, boolean rightSleeve, boolean leftLeg, boolean rightLeg, boolean hat) {
-        return createSkinLayers(17, cape, jacket, leftSleeve, rightSleeve, leftLeg, rightLeg, hat);
-    }
-
-    @Override
-    public EntityData effects(boolean onFire, boolean glowing, boolean invisible, boolean usingElytra, boolean usingItemLegacy) {
-        return newEntityData(0, EntityDataTypes.BYTE, (byte) ((onFire ? 0x01 : 0) | (invisible ? 0x20 : 0) | (glowing ? 0x40 : 0) | (usingElytra ? 0x80 : 0)));
-    }
 
     @Override
     public EntityData shaking(boolean enabled) {
@@ -51,41 +41,6 @@ public class V1_17MetadataFactory extends V1_16MetadataFactory {
         return createShoulderEntityRight(20, variant);
     }
 
-    @Override
-    public EntityData armorStandProperties(boolean small, boolean arms, boolean noBasePlate) {
-        return newEntityData(15, EntityDataTypes.BYTE, (byte) ((small ? 0x01 : 0) | (arms ? 0x04 : 0) | (noBasePlate ? 0x08 : 0)));
-    }
-
-    @Override
-    public EntityData armorStandHeadRotation(Vector3f headRotation) {
-        return createRotations(16, headRotation);
-    }
-
-    @Override
-    public EntityData armorStandBodyRotation(Vector3f bodyRotation) {
-        return createRotations(17, bodyRotation);
-    }
-
-    @Override
-    public EntityData armorStandLeftArmRotation(Vector3f leftArmRotation) {
-        return createRotations(18, leftArmRotation);
-    }
-
-    @Override
-    public EntityData armorStandRightArmRotation(Vector3f rightArmRotation) {
-        return createRotations(19, rightArmRotation);
-    }
-
-    @Override
-    public EntityData armorStandLeftLegRotation(Vector3f leftLegRotation) {
-        return createRotations(20, leftLegRotation);
-    }
-
-    @Override
-    public EntityData armorStandRightLegRotation(Vector3f rightLegRotation) {
-        return createRotations(21, rightLegRotation);
-    }
-
     @Override
     public EntityData axolotlVariant(int variant) {
         return newEntityData(17, EntityDataTypes.INT, variant);
diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_8MetadataFactory.java b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_8MetadataFactory.java
index 7a86c1d..46e046f 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_8MetadataFactory.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_8MetadataFactory.java
@@ -4,32 +4,11 @@ import com.github.retrooper.packetevents.protocol.entity.data.EntityData;
 import com.github.retrooper.packetevents.protocol.entity.data.EntityDataType;
 import com.github.retrooper.packetevents.protocol.entity.data.EntityDataTypes;
 import com.github.retrooper.packetevents.protocol.entity.pose.EntityPose;
-import com.github.retrooper.packetevents.util.adventure.AdventureSerializer;
 import lol.pyr.znpcsplus.util.*;
-import net.kyori.adventure.text.Component;
 import org.bukkit.DyeColor;
 
 @Deprecated
 public class V1_8MetadataFactory implements MetadataFactory {
-    @Override
-    public EntityData skinLayers(boolean cape, boolean jacket, boolean leftSleeve, boolean rightSleeve, boolean leftLeg, boolean rightLeg, boolean hat) {
-        return createSkinLayers(10, cape, jacket, leftSleeve, rightSleeve, leftLeg, rightLeg, hat);
-    }
-
-    @Override
-    public EntityData effects(boolean onFire, boolean glowing, boolean invisible, boolean usingElytra, boolean usingItemLegacy) {
-        return newEntityData(0, EntityDataTypes.BYTE, (byte) ((onFire ? 0x01 : 0) | (usingItemLegacy ? 0x10 : 0) | (invisible ? 0x20 : 0)));
-    }
-
-    @Override
-    public EntityData name(Component name) {
-        return newEntityData(2, EntityDataTypes.STRING, AdventureSerializer.getLegacyGsonSerializer().serialize(name));
-    }
-
-    @Override
-    public EntityData nameShown() {
-        return newEntityData(3, EntityDataTypes.BYTE, (byte) 1);
-    }
 
     @Override
     public EntityData noGravity() {
@@ -71,41 +50,6 @@ public class V1_8MetadataFactory implements MetadataFactory {
         throw new UnsupportedOperationException("The shoulder entity data isn't supported on this version");
     }
 
-    @Override
-    public EntityData armorStandProperties(boolean small, boolean arms, boolean noBasePlate) {
-        return newEntityData(10, EntityDataTypes.BYTE, (byte) ((small ? 0x01 : 0) | (arms ? 0x04 : 0) | (noBasePlate ? 0x08 : 0)));
-    }
-
-    @Override
-    public EntityData armorStandHeadRotation(Vector3f headRotation) {
-        return createRotations(11, headRotation);
-    }
-
-    @Override
-    public EntityData armorStandBodyRotation(Vector3f bodyRotation) {
-        return createRotations(12, bodyRotation);
-    }
-
-    @Override
-    public EntityData armorStandLeftArmRotation(Vector3f leftArmRotation) {
-        return createRotations(13, leftArmRotation);
-    }
-
-    @Override
-    public EntityData armorStandRightArmRotation(Vector3f rightArmRotation) {
-        return createRotations(14, rightArmRotation);
-    }
-
-    @Override
-    public EntityData armorStandLeftLegRotation(Vector3f leftLegRotation) {
-        return createRotations(15, leftLegRotation);
-    }
-
-    @Override
-    public EntityData armorStandRightLegRotation(Vector3f rightLegRotation) {
-        return createRotations(16, rightLegRotation);
-    }
-
     @Override
     public EntityData axolotlVariant(int variant) {
         throw new UnsupportedOperationException("The axolotl variant entity data isn't supported on this version");
@@ -226,11 +170,6 @@ public class V1_8MetadataFactory implements MetadataFactory {
         return newEntityData(16, EntityDataTypes.INT, profession);
     }
 
-    @Override
-    public EntityData silent(boolean enabled) {
-        return newEntityData(4, EntityDataTypes.BYTE, (byte) (enabled ? 1 : 0));
-    }
-
     protected EntityData createSkinLayers(int index, boolean cape, boolean jacket, boolean leftSleeve, boolean rightSleeve, boolean leftLeg, boolean rightLeg, boolean hat) {
         return newEntityData(index, EntityDataTypes.BYTE, (byte) (
                 (cape ? 0x01 : 0) |
diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_9MetadataFactory.java b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_9MetadataFactory.java
index 433d1c8..33e5d75 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_9MetadataFactory.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_9MetadataFactory.java
@@ -2,27 +2,10 @@ package lol.pyr.znpcsplus.metadata;
 
 import com.github.retrooper.packetevents.protocol.entity.data.EntityData;
 import com.github.retrooper.packetevents.protocol.entity.data.EntityDataTypes;
-import com.github.retrooper.packetevents.util.adventure.AdventureSerializer;
 import lol.pyr.znpcsplus.util.CreeperState;
-import net.kyori.adventure.text.Component;
 
 @Deprecated
 public class V1_9MetadataFactory extends V1_8MetadataFactory {
-    @Override
-    public EntityData skinLayers(boolean cape, boolean jacket, boolean leftSleeve, boolean rightSleeve, boolean leftLeg, boolean rightLeg, boolean hat) {
-        return createSkinLayers(12, cape, jacket, leftSleeve, rightSleeve, leftLeg, rightLeg, hat);
-    }
-
-    @Override
-    public EntityData effects(boolean onFire, boolean glowing, boolean invisible, boolean usingElytra, boolean usingItemLegacy) {
-        return newEntityData(0, EntityDataTypes.BYTE, (byte) (
-                (onFire ? 0x01 : 0) |
-                (usingItemLegacy ? 0x10 : 0) |
-                (invisible ? 0x20 : 0) |
-                (glowing ? 0x40 : 0) |
-                (usingElytra ? 0x80 : 0)
-        ));
-    }
 
     @Override
     public EntityData potionAmbient(boolean ambient) {
@@ -49,21 +32,6 @@ public class V1_9MetadataFactory extends V1_8MetadataFactory {
         return newEntityData(12, EntityDataTypes.BOOLEAN, charged);
     }
 
-    @Override
-    public EntityData name(Component name) {
-        return newEntityData(2, EntityDataTypes.STRING, AdventureSerializer.getGsonSerializer().serialize(name));
-    }
-
-    @Override
-    public EntityData nameShown() {
-        return newEntityData(3, EntityDataTypes.BOOLEAN, true);
-    }
-
-    @Override
-    public EntityData silent(boolean enabled) {
-        return newEntityData(4, EntityDataTypes.BOOLEAN, enabled);
-    }
-
     @Override
     public EntityData ghastAttacking(boolean attacking) {
         return newEntityData(11, EntityDataTypes.BOOLEAN, attacking);