diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/FluidGridHandler.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/FluidGridHandler.java
index 83139489b..435298643 100644
--- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/FluidGridHandler.java
+++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/FluidGridHandler.java
@@ -53,7 +53,6 @@ public class FluidGridHandler implements IFluidGridHandler {
                 }
             } else {
                 player.containerMenu.setCarried(fluidHandler.getContainer());
-                // TODO player.broadcastCarriedItem();
             }
 
             network.getNetworkItemManager().drainEnergy(player, RS.SERVER_CONFIG.getWirelessFluidGrid().getExtractUsage());
@@ -87,7 +86,6 @@ public class FluidGridHandler implements IFluidGridHandler {
     @Override
     public void onInsertHeldContainer(ServerPlayer player) {
         player.containerMenu.setCarried(onInsert(player, player.containerMenu.getCarried()));
-        // TODO player.broadcastCarriedItem();
     }
 
     @Override
diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java
index 0021e7591..70590b153 100644
--- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java
+++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java
@@ -63,7 +63,6 @@ public class ItemGridHandler implements IItemGridHandler {
             if (up) { // scroll up
                 if (!stackOnCursor.isEmpty()) {
                     gridHandler.onInsert(player, stackOnCursor, true);
-                     // TODO player.broadcastCarriedItem();
                 }
             } else { //scroll down
                 if (stackOnCursor.isEmpty()) {
@@ -112,7 +111,6 @@ public class ItemGridHandler implements IItemGridHandler {
 
             } else if (up && !player.containerMenu.getCarried().isEmpty()) { // insert stack from cursor
                 gridHandler.onInsert(player, player.containerMenu.getCarried(), true);
-                 // TODO player.broadcastCarriedItem();
             }
         }
     }
@@ -202,8 +200,6 @@ public class ItemGridHandler implements IItemGridHandler {
                     } else {
                         player.containerMenu.setCarried(took);
                     }
-
-                     // TODO player.broadcastCarriedItem();
                 }
             }
 
@@ -257,8 +253,6 @@ public class ItemGridHandler implements IItemGridHandler {
             player.containerMenu.setCarried(network.insertItem(stack, size, Action.PERFORM));
         }
 
-         // TODO player.broadcastCarriedItem();
-
         network.getNetworkItemManager().drainEnergy(player, RS.SERVER_CONFIG.getWirelessGrid().getInsertUsage());
     }
 
diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/PortableFluidGridHandler.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/PortableFluidGridHandler.java
index 3b7c30c17..d8cd3118e 100644
--- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/PortableFluidGridHandler.java
+++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/PortableFluidGridHandler.java
@@ -64,7 +64,6 @@ public class PortableFluidGridHandler implements IFluidGridHandler {
                     }
                 } else {
                     player.containerMenu.setCarried(fluidHandler.getContainer());
-                    // TODO player.broadcastCarriedItem();
                 }
 
                 portableGrid.drainEnergy(RS.SERVER_CONFIG.getPortableGrid().getExtractUsage());
@@ -99,7 +98,6 @@ public class PortableFluidGridHandler implements IFluidGridHandler {
     @Override
     public void onInsertHeldContainer(ServerPlayer player) {
         player.containerMenu.setCarried(onInsert(player, player.containerMenu.getCarried()));
-        // TODO player.broadcastCarriedItem();
     }
 
     @Override
diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/PortableItemGridHandler.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/PortableItemGridHandler.java
index 8407a5669..80a3054ea 100644
--- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/PortableItemGridHandler.java
+++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/PortableItemGridHandler.java
@@ -118,8 +118,6 @@ public class PortableItemGridHandler implements IItemGridHandler {
                 } else {
                     player.containerMenu.setCarried(took);
                 }
-
-                // TODO player.broadcastCarriedItem();
             }
 
             portableGrid.drainEnergy(RS.SERVER_CONFIG.getPortableGrid().getExtractUsage());
@@ -171,8 +169,6 @@ public class PortableItemGridHandler implements IItemGridHandler {
             player.containerMenu.setCarried(portableGrid.getItemStorage().insert(stack, size, Action.PERFORM));
         }
 
-        // TODO player.broadcastCarriedItem();
-
         portableGrid.drainEnergy(RS.SERVER_CONFIG.getPortableGrid().getInsertUsage());
     }
 
diff --git a/src/main/java/com/refinedmods/refinedstorage/command/disk/CreateDiskCommand.java b/src/main/java/com/refinedmods/refinedstorage/command/disk/CreateDiskCommand.java
index aa34b2dcc..38172f322 100644
--- a/src/main/java/com/refinedmods/refinedstorage/command/disk/CreateDiskCommand.java
+++ b/src/main/java/com/refinedmods/refinedstorage/command/disk/CreateDiskCommand.java
@@ -58,7 +58,6 @@ public class CreateDiskCommand implements Command<CommandSourceStack> {
                     }
 
                     player.level.playSound(null, player.getX(), player.getY(), player.getZ(), SoundEvents.ITEM_PICKUP, SoundSource.PLAYERS, 0.2F, ((player.getRandom().nextFloat() - player.getRandom().nextFloat()) * 0.7F + 1.0F) * 2.0F);
-                    // TODO player.getInventory().broadcastChanges();
                 } else {
                     ItemEntity itemEntity = player.drop(stack, false);
                     if (itemEntity != null) {