diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/Protocol1_18To1_17_1.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/Protocol1_18To1_17_1.java
index eb15cf271..afdd8f4a4 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/Protocol1_18To1_17_1.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/Protocol1_18To1_17_1.java
@@ -98,7 +98,7 @@ public final class Protocol1_18To1_17_1 extends AbstractProtocol<ClientboundPack
 
     @Override
     public void init(final UserConnection connection) {
-        addEntityTracker(connection, new EntityTrackerBase(connection, Entity1_17Types.PLAYER)); //TODO Entity1_18Types
+        addEntityTracker(connection, new EntityTrackerBase(connection, Entity1_17Types.PLAYER));
         connection.put(new ChunkLightStorage());
     }
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/packets/EntityPackets.java
index 973a2a261..019e15f19 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/packets/EntityPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/packets/EntityPackets.java
@@ -34,15 +34,10 @@ public final class EntityPackets extends EntityRewriter<Protocol1_18To1_17_1> {
 
     public EntityPackets(final Protocol1_18To1_17_1 protocol) {
         super(protocol);
-        //mapTypes(Entity1_17Types.values(), Entity1_18Types.class);
     }
 
     @Override
     public void registerPackets() {
-        /*registerTrackerWithData(ClientboundPackets1_17_1.SPAWN_ENTITY, Entity1_18Types.FALLING_BLOCK);
-        registerTracker(ClientboundPackets1_17_1.SPAWN_MOB);
-        registerTracker(ClientboundPackets1_17_1.SPAWN_PLAYER, Entity1_18Types.PLAYER);
-        registerRemoveEntities(ClientboundPackets1_17_1.REMOVE_ENTITIES);*/
         registerMetadataRewriter(ClientboundPackets1_17_1.ENTITY_METADATA, Types1_17.METADATA_LIST, Types1_18.METADATA_LIST);
 
         protocol.registerClientbound(ClientboundPackets1_17_1.JOIN_GAME, new PacketRemapper() {
@@ -102,17 +97,10 @@ public final class EntityPackets extends EntityRewriter<Protocol1_18To1_17_1> {
         });
 
         registerMetaTypeHandler(Types1_18.META_TYPES.itemType, null, null);
-
-        /*filter().filterFamily(Entity1_17Types.MINECART_ABSTRACT).index(11).handler((event, meta) -> { //TODO check id
-            // Convert to new block id
-            int data = (int) meta.getValue();
-            meta.setValue(protocol.getMappingData().getNewBlockStateId(data));
-        });*/
     }
 
     @Override
     public EntityType typeFromId(final int type) {
-        //TODO Entity1_18Types
         return Entity1_17Types.getTypeFromId(type);
     }
 }
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/packets/WorldPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/packets/WorldPackets.java
index 6a9c7f872..fd6559a8d 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/packets/WorldPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/packets/WorldPackets.java
@@ -142,12 +142,6 @@ public final class WorldPackets {
                             final DataPaletteImpl blockPalette = new DataPaletteImpl(ChunkSection.SIZE);
                             blockPalette.addId(0);
                             section.addPalette(PaletteType.BLOCKS, blockPalette);
-                        } else {
-                            /*final DataPalette blockpalette = section.palette(PaletteType.BLOCKS);
-                            for (int j = 0; j < blockpalette.size(); j++) {
-                                final int old = blockpalette.entry(j);
-                                blockpalette.setEntry(j, protocol.getMappingData().getNewBlockStateId(old));
-                            }*/
                         }
 
                         // Fill biome palette