diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/metadata/MetadataRewriter1_11To1_10.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/metadata/MetadataRewriter1_11To1_10.java
index 6862dc31f..52f78fa2f 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/metadata/MetadataRewriter1_11To1_10.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/metadata/MetadataRewriter1_11To1_10.java
@@ -61,8 +61,6 @@ public class MetadataRewriter1_11To1_10 extends EntityRewriter<ClientboundPacket
                 event.cancel();
             } else if (meta.id() == 15) {
                 meta.setId(14);
-            } else if (meta.id() == 14) {
-                meta.setId(15);
             }
         });
 
@@ -110,7 +108,7 @@ public class MetadataRewriter1_11To1_10 extends EntityRewriter<ClientboundPacket
             byte data = meta.value();
             // Check invisible | Check small | Check if custom name is empty | Check if custom name visible is true
             if ((data & 0x20) == 0x20 && ((byte) flags.getValue() & 0x01) == 0x01
-                    && !((String) customName.getValue()).isEmpty() && (boolean) customNameVisible.getValue()) {
+                && !((String) customName.getValue()).isEmpty() && (boolean) customNameVisible.getValue()) {
                 EntityTracker1_11 tracker = tracker(event.user());
                 int entityId = event.entityId();
                 if (tracker.addHologram(entityId)) {
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/EntityPacketRewriter1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/EntityPacketRewriter1_20_5.java
index 5f7e7c417..3a4d46391 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/EntityPacketRewriter1_20_5.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/EntityPacketRewriter1_20_5.java
@@ -376,8 +376,6 @@ public final class EntityPacketRewriter1_20_5 extends EntityRewriter<Clientbound
             null
         );
 
-        filter().type(EntityTypes1_20_5.ZOMBIFIED_PIGLIN).removeIndex(19); // TODO Somewhere between 1.8 and 1.11 we most likely have bad handling
-
         filter().type(EntityTypes1_20_5.LIVINGENTITY).index(10).handler((event, meta) -> {
             final int effectColor = meta.value();
             final Particle particle = new Particle(protocol.getMappingData().getParticleMappings().mappedId("entity_effect"));