diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java
index edec5622b..1a6679e59 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java
@@ -83,8 +83,8 @@ public class ActuallyAdditions {
     };
     public static final Logger LOGGER = LogManager.getLogger(NAME);
 
-    public static final DeferredRegister<EntityType<?>> ENTITIES = DeferredRegister.create(ForgeRegistries.ENTITIES, "entities");
-    public static final RegistryObject<EntityType<EntityWorm>> ENTITY_WORM = ENTITIES.register("worm", () -> EntityType.Builder.of(EntityWorm::new, EntityClassification.CREATURE).build(MODID + ":worm"));
+    public static final DeferredRegister<EntityType<?>> ENTITIES = DeferredRegister.create(ForgeRegistries.ENTITIES, MODID);
+    public static final RegistryObject<EntityType<EntityWorm>> ENTITY_WORM = ENTITIES.register("worm", () -> EntityType.Builder.of(EntityWorm::new, EntityClassification.MISC).build(MODID + ":worm"));
 
     public static boolean commonCapsLoaded;
 
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java
index e09446cfd..dd23482bb 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java
@@ -68,7 +68,6 @@ public class BlockColoredLamp extends BlockBase {
         builder.add(LIT);
     }
 
-    // TODO: [port][test] validate this rework works
     @Override
     public ActionResultType use(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) {
         ItemStack stack = player.getItemInHand(hand);
@@ -101,33 +100,4 @@ public class BlockColoredLamp extends BlockBase {
             ? 15
             : 0;
     }
-
-    // TODO: [port] Add this back correctly
-    //    public static class TheItemBlock extends ItemBlockBase {
-    //
-    //        public TheItemBlock(Block block) {
-    //            super(block);
-    //            this.setHasSubtypes(true);
-    //            this.setMaxDamage(0);
-    //        }
-    //
-    //        @Override
-    //        public String getItemStackDisplayName(ItemStack stack) {
-    //            if (stack.getItemDamage() >= ALL_LAMP_TYPES.length) {
-    //                return StringUtil.BUGGED_ITEM_NAME;
-    //            }
-    //            if (Util.isClient()) {
-    //                return super.getItemStackDisplayName(stack) + (((BlockColoredLamp) this.block).isOn
-    //                    ? " (" + StringUtil.localize("tooltip." + ActuallyAdditions.MODID + ".onSuffix.desc") + ")"
-    //                    : "");
-    //            } else {
-    //                return super.getItemStackDisplayName(stack);
-    //            }
-    //        }
-    //
-    //        @Override
-    //        public String getTranslationKey(ItemStack stack) {
-    //            return ActuallyBlocks.blockColoredLamp.getTranslationKey() + "_" + ALL_LAMP_TYPES[stack.getItemDamage()].regName;
-    //        }
-    //    }
 }
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java
index 254fc9dbf..781a0b544 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java
@@ -29,25 +29,4 @@ public class BlockCrystal extends ActuallyBlock {
             }
         };
     }
-
-    //    public static class TheItemBlock extends ItemBlockBase {
-    //
-    //        public TheItemBlock(Block block) {
-    //            super(block);
-    //            this.setHasSubtypes(true);
-    //            this.setMaxDamage(0);
-    //        }
-    //
-    //        @Override
-    //        public String getTranslationKey(ItemStack stack) {
-    //            return stack.getItemDamage() >= ALL_CRYSTALS.length
-    //                ? StringUtil.BUGGED_ITEM_NAME
-    //                : this.getTranslationKey() + "_" + ALL_CRYSTALS[stack.getItemDamage()].name;
-    //        }
-    //
-    //        @Override
-    //        public boolean hasEffect(ItemStack stack) {
-    //            return this.block instanceof BlockCrystal && ((BlockCrystal) this.block).isEmpowered;
-    //        }
-    //    }
 }