diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_8PacketFactory.java b/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_8PacketFactory.java
index cbbc35b..b0ec7de 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_8PacketFactory.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_8PacketFactory.java
@@ -125,127 +125,6 @@ public class V1_8PacketFactory implements PacketFactory {
         sendPacket(player, new WrapperPlayServerTeams("npc_team_" + entity.getEntityId(), WrapperPlayServerTeams.TeamMode.REMOVE, (WrapperPlayServerTeams.ScoreBoardTeamInfo) null));
     }
 
-        /*
-        List<EntityData> data = new ArrayList<>();
-        data.add(metadataFactory.effects(
-                properties.getProperty(propertyRegistry.getByName("fire", Boolean.class)),
-                false,
-                properties.getProperty(propertyRegistry.getByName("invisible", Boolean.class)),
-                false,
-                properties.getProperty(propertyRegistry.getByName("using_item", Boolean.class))
-        ));
-        data.add(metadataFactory.silent(properties.getProperty(propertyRegistry.getByName("silent", Boolean.class))));
-        data.add(metadataFactory.potionColor(properties.getProperty(propertyRegistry.getByName("potion_color", Color.class)).asRGB()));
-        data.add(metadataFactory.potionAmbient(properties.getProperty(propertyRegistry.getByName("potion_ambient", Boolean.class))));
-        if (entity.getType().equals(EntityTypes.PLAYER)) {
-            data.add(metadataFactory.skinLayers(
-                    properties.getProperty(propertyRegistry.getByName("skin_cape", Boolean.class)),
-                    properties.getProperty(propertyRegistry.getByName("skin_jacket", Boolean.class)),
-                    properties.getProperty(propertyRegistry.getByName("skin_left_sleeve", Boolean.class)),
-                    properties.getProperty(propertyRegistry.getByName("skin_right_sleeve", Boolean.class)),
-                    properties.getProperty(propertyRegistry.getByName("skin_left_leg", Boolean.class)),
-                    properties.getProperty(propertyRegistry.getByName("skin_right_leg", Boolean.class)),
-                    properties.getProperty(propertyRegistry.getByName("skin_hat", Boolean.class))
-            ));
-            data.add(metadataFactory.shoulderEntityLeft(properties.getProperty(propertyRegistry.getByName("shoulder_entity_left", ParrotVariant.class))));
-            data.add(metadataFactory.shoulderEntityRight(properties.getProperty(propertyRegistry.getByName("shoulder_entity_right", ParrotVariant.class))));
-        }
-        else if (entity.getType().equals(EntityTypes.ARMOR_STAND)) {
-            data.add(metadataFactory.armorStandProperties(
-                    properties.getProperty(propertyRegistry.getByName("small", Boolean.class)),
-                    properties.getProperty(propertyRegistry.getByName("arms", Boolean.class)),
-                    !properties.getProperty(propertyRegistry.getByName("base_plate", Boolean.class))
-            ));
-            data.add(metadataFactory.armorStandHeadRotation(properties.getProperty(propertyRegistry.getByName("head_rotation", Vector3f.class))));
-            data.add(metadataFactory.armorStandBodyRotation(properties.getProperty(propertyRegistry.getByName("body_rotation", Vector3f.class))));
-            data.add(metadataFactory.armorStandLeftArmRotation(properties.getProperty(propertyRegistry.getByName("left_arm_rotation", Vector3f.class))));
-            data.add(metadataFactory.armorStandRightArmRotation(properties.getProperty(propertyRegistry.getByName("right_arm_rotation", Vector3f.class))));
-            data.add(metadataFactory.armorStandLeftLegRotation(properties.getProperty(propertyRegistry.getByName("left_leg_rotation", Vector3f.class))));
-            data.add(metadataFactory.armorStandRightLegRotation(properties.getProperty(propertyRegistry.getByName("right_leg_rotation", Vector3f.class))));
-        }
-        else if (entity.getType().equals(EntityTypes.AXOLOTL)) {
-            data.add(metadataFactory.axolotlVariant(properties.getProperty(propertyRegistry.getByName("axolotl_variant", Integer.class))));
-            data.add(metadataFactory.playingDead(properties.getProperty(propertyRegistry.getByName("playing_dead", Boolean.class))));
-        }
-        else if (entity.getType().equals(EntityTypes.BAT)) {
-            data.add(metadataFactory.batHanging(properties.getProperty(propertyRegistry.getByName("hanging", Boolean.class))));
-        }
-        else if (entity.getType().equals(EntityTypes.BEE)) {
-            data.add(metadataFactory.beeAngry(properties.getProperty(propertyRegistry.getByName("angry", Boolean.class))));
-            data.add(metadataFactory.beeHasNectar(properties.getProperty(propertyRegistry.getByName("has_nectar", Boolean.class))));
-        }
-        else if (entity.getType().equals(EntityTypes.BLAZE)) {
-            data.add(metadataFactory.blazeOnFire(properties.getProperty(propertyRegistry.getByName("blaze_on_fire", Boolean.class))));
-        }
-        else if (entity.getType().equals(EntityTypes.CAT)) {
-            data.add(metadataFactory.catVariant(properties.getProperty(propertyRegistry.getByName("cat_variant", CatVariant.class))));
-            data.add(metadataFactory.catLying(properties.getProperty(propertyRegistry.getByName("cat_lying", Boolean.class))));
-            data.add(metadataFactory.catCollarColor(properties.getProperty(propertyRegistry.getByName("cat_collar_color", DyeColor.class))));
-            data.add(metadataFactory.catTamed(properties.hasProperty(propertyRegistry.getByName("cat_collar_color", DyeColor.class))));
-        }
-        else if (entity.getType().equals(EntityTypes.CREEPER)) {
-            data.add(metadataFactory.creeperState(properties.getProperty(propertyRegistry.getByName("creeper_state", CreeperState.class))));
-            data.add(metadataFactory.creeperCharged(properties.getProperty(propertyRegistry.getByName("creeper_charged", Boolean.class))));
-        }
-        else if (entity.getType().equals(EntityTypes.ENDERMAN)) {
-            data.add(metadataFactory.endermanHeldBlock(
-                    properties.getProperty(propertyRegistry.getByName("enderman_held_block", BlockState.class)).getGlobalId())
-            );
-            data.add(metadataFactory.endermanScreaming(properties.getProperty(propertyRegistry.getByName("enderman_screaming", Boolean.class))));
-            data.add(metadataFactory.endermanStaring(properties.getProperty(propertyRegistry.getByName("enderman_staring", Boolean.class))));
-        }
-        else if (entity.getType().equals(EntityTypes.EVOKER)) {
-            data.add(metadataFactory.evokerSpell(properties.getProperty(propertyRegistry.getByName("evoker_spell", SpellType.class)).ordinal()));
-        }
-        else if (entity.getType().equals(EntityTypes.FOX)) {
-            // Not sure if this should be in here or in 1.14 PacketFactory
-            data.add(metadataFactory.foxVariant(properties.getProperty(propertyRegistry.getByName("fox_variant", FoxVariant.class)).ordinal()));
-            data.add(metadataFactory.foxProperties(
-                properties.getProperty(propertyRegistry.getByName("fox_sitting", Boolean.class)),
-                properties.getProperty(propertyRegistry.getByName("fox_crouching", Boolean.class)),
-                properties.getProperty(propertyRegistry.getByName("fox_sleeping", Boolean.class)),
-                properties.getProperty(propertyRegistry.getByName("fox_faceplanted", Boolean.class))
-            ));
-        }
-        else if (entity.getType().equals(EntityTypes.FROG)) {
-            data.add(metadataFactory.frogVariant(properties.getProperty(propertyRegistry.getByName("frog_variant", FrogVariant.class)).ordinal()));
-        }
-        else if (entity.getType().equals(EntityTypes.GHAST)) {
-            data.add(metadataFactory.ghastAttacking(properties.getProperty(propertyRegistry.getByName("attacking", Boolean.class))));
-        }
-        else if (entity.getType().equals(EntityTypes.GOAT)) {
-            data.add(metadataFactory.goatHasLeftHorn(properties.getProperty(propertyRegistry.getByName("has_left_horn", Boolean.class))));
-            data.add(metadataFactory.goatHasRightHorn(properties.getProperty(propertyRegistry.getByName("has_right_horn", Boolean.class))));
-        }
-        else if (entity.getType().equals(EntityTypes.GUARDIAN)) {
-            // TODO
-        }
-        else if (entity.getType().equals(EntityTypes.HOGLIN)) {
-            data.add(metadataFactory.hoglinImmuneToZombification(properties.getProperty(propertyRegistry.getByName("immune_to_zombification", Boolean.class))));
-        }
-        else if (entity.getType().equals(EntityTypes.VILLAGER)) {
-            VillagerProfession profession = properties.getProperty(propertyRegistry.getByName("villager_profession", VillagerProfession.class));
-            int professionId = profession.ordinal();
-            if (PacketEvents.getAPI().getServerManager().getVersion().isOlderThan(ServerVersion.V_1_14)) {
-                professionId = profession.getLegacyId();
-            }
-            data.add(metadataFactory.villagerData(
-                    properties.getProperty(propertyRegistry.getByName("villager_type", VillagerType.class)).ordinal(),
-                    professionId,
-                    properties.getProperty(propertyRegistry.getByName("villager_level", VillagerLevel.class)).ordinal() + 1
-            ));
-        }
-
-        if (properties.getProperty(propertyRegistry.getByName("dinnerbone", Boolean.class))) {
-            data.add(metadataFactory.name(Component.text("Dinnerbone")));
-        }
-        else if (properties.hasProperty(propertyRegistry.getByName("name"))) {
-            data.add(metadataFactory.name(PapiUtil.set(textSerializer, player, properties.getProperty(propertyRegistry.getByName("name", Component.class)))));
-            data.add(metadataFactory.nameShown());
-        }
-        return data;
-         */
-
     @Override
     public void sendAllMetadata(Player player, PacketEntity entity, PropertyHolder properties) {
         Map<Integer, EntityData> datas = new HashMap<>();