diff --git a/core/src/main/java/org/geysermc/geyser/registry/populator/CustomItemRegistryPopulator.java b/core/src/main/java/org/geysermc/geyser/registry/populator/CustomItemRegistryPopulator.java
index 69821c045..d311e1616 100644
--- a/core/src/main/java/org/geysermc/geyser/registry/populator/CustomItemRegistryPopulator.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/populator/CustomItemRegistryPopulator.java
@@ -147,7 +147,7 @@ public class CustomItemRegistryPopulator {
                 .toolType(customItemData.toolType())
                 .toolTier(customItemData.toolTier())
                 .translationString(customItemData.translationString())
-                .customItemOptions(Collections.emptyList())
+                .customItemDefinitions(Collections.emptyList())
                 .javaItem(item)
                 .build();
 
diff --git a/core/src/main/java/org/geysermc/geyser/registry/populator/CustomItemRegistryPopulator_v2.java b/core/src/main/java/org/geysermc/geyser/registry/populator/CustomItemRegistryPopulator_v2.java
index 1936ad5c6..3bc41cc54 100644
--- a/core/src/main/java/org/geysermc/geyser/registry/populator/CustomItemRegistryPopulator_v2.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/populator/CustomItemRegistryPopulator_v2.java
@@ -181,7 +181,7 @@ public class CustomItemRegistryPopulator_v2 {
             }
         }
 
-        componentBuilder.putCompound("minecraft:display_name", NbtMap.builder().putString("value", definition.displayName()).build()); // TODO
+        componentBuilder.putCompound("minecraft:display_name", NbtMap.builder().putString("value", definition.displayName()).build());
 
         // Add a Geyser tag to the item, allowing Molang queries
         addItemTag(componentBuilder, "geyser:is_custom");
diff --git a/core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java b/core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java
index e5b8fcafc..7044f7c22 100644
--- a/core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java
@@ -55,7 +55,6 @@ import org.cloudburstmc.protocol.bedrock.data.definitions.ItemDefinition;
 import org.cloudburstmc.protocol.bedrock.data.definitions.SimpleItemDefinition;
 import org.cloudburstmc.protocol.bedrock.data.inventory.ComponentItemData;
 import org.cloudburstmc.protocol.bedrock.data.inventory.ItemData;
-import org.geysermc.geyser.Constants;
 import org.geysermc.geyser.GeyserBootstrap;
 import org.geysermc.geyser.GeyserImpl;
 import org.geysermc.geyser.api.block.custom.CustomBlockData;
@@ -498,7 +497,6 @@ public class ItemRegistryPopulator {
                     customItemDefinitions = Collections.emptyList();
                 }
                 mappingBuilder.customItemDefinitions(customItemDefinitions);
-                mappingBuilder.customItemOptions(Collections.emptyList());
 
                 ItemMapping mapping = mappingBuilder.build();
 
@@ -525,7 +523,6 @@ public class ItemRegistryPopulator {
                     .bedrockDefinition(lightBlock)
                     .bedrockData(0)
                     .bedrockBlockDefinition(null)
-                    .customItemOptions(Collections.emptyList())
                     .customItemDefinitions(Collections.emptyList())
                     .build();
                 lightBlocks.put(lightBlock.getRuntimeId(), lightBlockEntry);
@@ -543,7 +540,6 @@ public class ItemRegistryPopulator {
                     .bedrockDefinition(lodestoneCompass)
                     .bedrockData(0)
                     .bedrockBlockDefinition(null)
-                    .customItemOptions(Collections.emptyList())
                     .customItemDefinitions(Collections.emptyList())
                     .build();
 
@@ -559,8 +555,7 @@ public class ItemRegistryPopulator {
                         .bedrockDefinition(definition)
                         .bedrockData(0)
                         .bedrockBlockDefinition(null)
-                        .customItemOptions(Collections.emptyList()) // TODO check for custom items with furnace minecart
-                        .customItemDefinitions(Collections.emptyList()) // TODO do not remove the above todo
+                        .customItemDefinitions(Collections.emptyList()) // TODO check for custom items with furnace minecart
                         .build());
 
                 creativeItems.add(ItemData.builder()
diff --git a/core/src/main/java/org/geysermc/geyser/registry/type/ItemMapping.java b/core/src/main/java/org/geysermc/geyser/registry/type/ItemMapping.java
index db10914a8..fb1bc023d 100644
--- a/core/src/main/java/org/geysermc/geyser/registry/type/ItemMapping.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/type/ItemMapping.java
@@ -55,7 +55,6 @@ public class ItemMapping {
             null,
             null,
             Collections.emptyList(),
-            Collections.emptyList(),
             Items.AIR
     );
 
@@ -74,10 +73,6 @@ public class ItemMapping {
 
     String translationString;
 
-    @Deprecated
-    @NonNull
-    List<Pair<CustomItemOptions, ItemDefinition>> customItemOptions; // TODO remove
-
     @NonNull
     List<Pair<CustomItemDefinition, ItemDefinition>> customItemDefinitions;