diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java
index bcd0426de..3a4373b46 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java
@@ -192,7 +192,7 @@ public void handle(PacketWrapper wrapper) throws Exception {
 
                         handleChunk(chunk);
 
-                        // only patch it for signs for now, TODO-> Find all the block entities old/new to replace ids and implement in ViaVersion
+                        // only patch it for signs for now
                         for (CompoundTag tag : chunk.getBlockEntities()) {
                             Tag idTag = tag.get("id");
                             if (!(idTag instanceof StringTag)) continue;
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java
index a751c3282..3db9c1bd7 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java
@@ -239,7 +239,7 @@ public void registerMap() {
                     public void handle(PacketWrapper wrapper) throws Exception {
                         // Open Inventory
                         if (wrapper.get(Type.VAR_INT, 0) == 2) {
-                            wrapper.cancel(); // TODO is this replaced by something else?
+                            wrapper.cancel();
                         }
                     }
                 });
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/Protocol1_12_2To1_13.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/Protocol1_12_2To1_13.java
index 041f03fd1..b47fae02b 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/Protocol1_12_2To1_13.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/Protocol1_12_2To1_13.java
@@ -78,7 +78,7 @@ protected void handleTranslate(JsonObject root, String translate) {
         cancelOutgoing(ClientboundPackets1_13.CRAFT_RECIPE_RESPONSE);
         cancelOutgoing(ClientboundPackets1_13.UNLOCK_RECIPES);
         cancelOutgoing(ClientboundPackets1_13.ADVANCEMENTS);
-        cancelOutgoing(ClientboundPackets1_13.DECLARE_RECIPES); //TODO ?
+        cancelOutgoing(ClientboundPackets1_13.DECLARE_RECIPES);
         cancelOutgoing(ClientboundPackets1_13.TAGS);
 
         cancelIncoming(ServerboundPackets1_12_1.CRAFT_RECIPE_REQUEST);
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/PistonHandler.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/PistonHandler.java
index c313b541d..fb2d016e6 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/PistonHandler.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/PistonHandler.java
@@ -1,6 +1,5 @@
 package nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.block_entity_handlers;
 
-import nl.matsv.viabackwards.ViaBackwards;
 import nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.data.BackwardsMappings;
 import nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.providers.BackwardsBlockEntityProvider;
 import us.myles.ViaVersion.api.Via;
@@ -74,7 +73,7 @@ public CompoundTag transform(UserConnection user, int blockId, CompoundTag tag)
 
         Integer id = pistonIds.get(dataFromTag);
         if (id == null) {
-            ViaBackwards.getPlatform().getLogger().warning("Unmapped piston id: " + dataFromTag);
+            //TODO see why this could be null and if this is bad
             return tag;
         }
 
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java
index 970c576be..8f440557b 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java
@@ -513,7 +513,7 @@ public void handle(PacketWrapper wrapper) throws Exception {
                             int statisticId = wrapper.read(Type.VAR_INT);
 
                             String name = "";
-                            //TODO categories 0-7 (items, blocks, entities) - probably not feasible
+                            // categories 0-7 (items, blocks, entities) - probably not feasible
                             switch (categoryId) {
                                 case 0:
                                 case 1:
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java
index d5386f2b7..a3644b6e2 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java
@@ -381,7 +381,6 @@ protected void registerRewrites() {
             if (type.isOrHasParent(Entity1_14Types.EntityType.ABSTRACT_ILLAGER_BASE) || type == Entity1_14Types.EntityType.RAVAGER || type == Entity1_14Types.EntityType.WITCH) {
                 int index = e.getIndex();
                 if (index == 14) {
-                    //TODO handle
                     throw RemovedValueException.EX;
                 } else if (index > 14) {
                     meta.setId(index - 1);