diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputter.java
index f4aa743a6..a1e750691 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputter.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputter.java
@@ -13,7 +13,6 @@ package de.ellpeck.actuallyadditions.mod.tile;
 
 import de.ellpeck.actuallyadditions.mod.network.gui.IButtonReactor;
 import de.ellpeck.actuallyadditions.mod.network.gui.INumberReactor;
-import de.ellpeck.actuallyadditions.mod.util.ItemUtil;
 import de.ellpeck.actuallyadditions.mod.util.WorldUtil;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
@@ -22,8 +21,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
-import net.minecraftforge.items.CapabilityItemHandler;
-import net.minecraftforge.items.IItemHandler;
 
 public class TileEntityInputter extends TileEntityInventoryBase implements IButtonReactor, INumberReactor{
 
@@ -82,8 +79,9 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt
         this.markDirty();
     }
 
+    //TODO Fix for new item system
     private boolean newPull(){
-        for(EnumFacing facing : EnumFacing.values()){
+        /*for(EnumFacing facing : EnumFacing.values()){
             IItemHandler handler = this.placeToPull.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, facing);
             if(handler != null){
                 for(int i = Math.max(this.lastPullStart, 0); i < Math.min(this.slotToPullEnd, handler.getSlots()); i++){
@@ -110,12 +108,12 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt
                     }
                 }
             }
-        }
+        }*/
         return false;
     }
 
     private boolean newPut(){
-        if(this.slots[0] != null){
+        /*if(this.slots[0] != null){
             for(EnumFacing facing : EnumFacing.values()){
                 IItemHandler handler = this.placeToPut.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, facing);
                 if(handler != null){
@@ -131,7 +129,7 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt
                     }
                 }
             }
-        }
+        }*/
         return false;
     }
 
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomItemface.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomItemface.java
index e654ac7ed..f2307db89 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomItemface.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomItemface.java
@@ -18,6 +18,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraftforge.common.capabilities.Capability;
 
+//TODO completely adapt to new item system?
 public class TileEntityPhantomItemface extends TileEntityPhantomface{
 
     public TileEntityPhantomItemface(){
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java
index 2f9e52d50..a0a47372c 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java
@@ -246,7 +246,7 @@ public class WorldUtil{
         return blocks;
     }
 
-    //TODO make this work for the stupid new system
+    //TODO make this work for the stupid new item system
 
     public static boolean addToInventory(IInventory inventory, ArrayList<ItemStack> stacks, boolean actuallyDo, boolean shouldAlwaysWork){
         return addToInventory(inventory, stacks, EnumFacing.UP, actuallyDo, shouldAlwaysWork);