diff --git a/src/main/java/com/minelittlepony/unicopia/client/gui/ItemTraitsTooltipRenderer.java b/src/main/java/com/minelittlepony/unicopia/client/gui/ItemTraitsTooltipRenderer.java
index fcb60e49..55a68e70 100644
--- a/src/main/java/com/minelittlepony/unicopia/client/gui/ItemTraitsTooltipRenderer.java
+++ b/src/main/java/com/minelittlepony/unicopia/client/gui/ItemTraitsTooltipRenderer.java
@@ -128,8 +128,6 @@ public class ItemTraitsTooltipRenderer implements Text, OrderedText, TooltipComp
         String count = value > 99 ? "99+" : Math.round(value) == value ? (int)value + "" : ((Math.round(value * 10) / 10F) + "");
 
         VertexConsumerProvider.Immediate immediate = MinecraftClient.getInstance().getBufferBuilders().getEffectVertexConsumers();
-                // TODO: Before 1.21 was using tessellator's buffer but we can't get it without calling begin()
-                //VertexConsumerProvider.immediate(Tessellator.getInstance().getBuffer());
         textRenderer.draw(count, 0, 0, 16777215, true, matrices.peek().getPositionMatrix(), immediate, TextLayerType.SEE_THROUGH, 0, 15728880);
         immediate.draw();
         matrices.pop();
diff --git a/src/main/java/com/minelittlepony/unicopia/client/render/entity/FriendlyCreeperEntityRenderer.java b/src/main/java/com/minelittlepony/unicopia/client/render/entity/FriendlyCreeperEntityRenderer.java
index a26eded5..2f6e67cb 100644
--- a/src/main/java/com/minelittlepony/unicopia/client/render/entity/FriendlyCreeperEntityRenderer.java
+++ b/src/main/java/com/minelittlepony/unicopia/client/render/entity/FriendlyCreeperEntityRenderer.java
@@ -43,8 +43,7 @@ public class FriendlyCreeperEntityRenderer extends MobEntityRenderer<FriendlyCre
     protected void setupTransforms(FriendlyCreeperEntity entity, MatrixStack matrices, float animationProgress, float bodyYaw, float tickDelta, float scale) {
         super.setupTransforms(entity, matrices, animationProgress, bodyYaw, tickDelta, scale);
         if (entity.isSitting()) {
-            // TODO: Check if creepers are offset correctly
-            matrices.translate(0, -0.25 * scale, 0);
+            matrices.translate(0, -0.25, 0);
         }
     }
 
diff --git a/src/main/java/com/minelittlepony/unicopia/client/render/entity/SpellbookEntityRenderer.java b/src/main/java/com/minelittlepony/unicopia/client/render/entity/SpellbookEntityRenderer.java
index 4b38cf72..36113543 100644
--- a/src/main/java/com/minelittlepony/unicopia/client/render/entity/SpellbookEntityRenderer.java
+++ b/src/main/java/com/minelittlepony/unicopia/client/render/entity/SpellbookEntityRenderer.java
@@ -42,8 +42,7 @@ public class SpellbookEntityRenderer extends LivingEntityRenderer<SpellbookEntit
         super.setupTransforms(entity, matrices, animationProgress, bodyYaw + 90, tickDelta, scale);
 
         if (entity.isOpen()) {
-            // TODO: Check that this is correct for extreme scales
-            matrices.translate(-1.25F * scale, -0.35F * scale, 0);
+            matrices.translate(-1.25F, -0.35F, 0);
 
             float floatPosition = MathHelper.sin((animationProgress + entity.getId()) / 20) * 0.04F;