diff --git a/src/main/java/refinedstorage/container/ContainerBase.java b/src/main/java/refinedstorage/container/ContainerBase.java
index 3fdf0a63d..a9d9afef1 100755
--- a/src/main/java/refinedstorage/container/ContainerBase.java
+++ b/src/main/java/refinedstorage/container/ContainerBase.java
@@ -10,14 +10,9 @@ import refinedstorage.container.slot.SlotDisabled;
 import refinedstorage.container.slot.SlotSpecimen;
 import refinedstorage.container.slot.SlotSpecimenLegacy;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public abstract class ContainerBase extends Container {
     private EntityPlayer player;
 
-    private List<Slot> playerInventorySlots = new ArrayList<Slot>();
-
     public ContainerBase(EntityPlayer player) {
         this.player = player;
     }
@@ -30,22 +25,14 @@ public abstract class ContainerBase extends Container {
         int id = 0;
 
         for (int i = 0; i < 9; i++) {
-            Slot slot = new Slot(player.inventory, id, xInventory + i * 18, yInventory + 4 + (3 * 18));
-
-            playerInventorySlots.add(slot);
-
-            addSlotToContainer(slot);
+            addSlotToContainer(new Slot(player.inventory, id, xInventory + i * 18, yInventory + 4 + (3 * 18)));
 
             id++;
         }
 
         for (int y = 0; y < 3; y++) {
             for (int x = 0; x < 9; x++) {
-                Slot slot = new Slot(player.inventory, id, xInventory + x * 18, yInventory + y * 18);
-
-                playerInventorySlots.add(slot);
-
-                addSlotToContainer(slot);
+                addSlotToContainer(new Slot(player.inventory, id, xInventory + x * 18, yInventory + y * 18));
 
                 id++;
             }
@@ -123,8 +110,4 @@ public abstract class ContainerBase extends Container {
     public boolean canInteractWith(EntityPlayer player) {
         return true;
     }
-
-    public List<Slot> getPlayerInventorySlots() {
-        return playerInventorySlots;
-    }
 }
diff --git a/src/main/java/refinedstorage/container/ContainerGrid.java b/src/main/java/refinedstorage/container/ContainerGrid.java
index 8caeb1f09..9f49ea3b2 100755
--- a/src/main/java/refinedstorage/container/ContainerGrid.java
+++ b/src/main/java/refinedstorage/container/ContainerGrid.java
@@ -38,7 +38,7 @@ public class ContainerGrid extends ContainerBase {
                 }
             }
 
-            addSlotToContainer(craftingResultSlot = new SlotGridCraftingResult(this, player, ((TileGrid) grid).getMatrix(), ((TileGrid) grid).getResult(), (TileGrid) grid, 0, 133 + 4, 120 + 4));
+            addSlotToContainer(craftingResultSlot = new SlotGridCraftingResult(this, player, (TileGrid) grid, 0, 133 + 4, 120 + 4));
         } else if (grid.getType() == EnumGridType.PATTERN) {
             int x = 8;
             int y = 106;
diff --git a/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java b/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java
index 240d64819..842adae4a 100755
--- a/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java
+++ b/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java
@@ -1,8 +1,6 @@
 package refinedstorage.container.slot;
 
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.inventory.SlotCrafting;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fml.common.FMLCommonHandler;
@@ -11,20 +9,18 @@ import refinedstorage.tile.grid.TileGrid;
 
 public class SlotGridCraftingResult extends SlotCrafting {
     private ContainerGrid container;
-    private IInventory matrix;
     private TileGrid grid;
 
-    public SlotGridCraftingResult(ContainerGrid container, EntityPlayer player, InventoryCrafting matrix, IInventory craftingResult, TileGrid grid, int id, int x, int y) {
-        super(player, matrix, craftingResult, id, x, y);
+    public SlotGridCraftingResult(ContainerGrid container, EntityPlayer player, TileGrid grid, int id, int x, int y) {
+        super(player, grid.getMatrix(), grid.getResult(), id, x, y);
 
         this.container = container;
-        this.matrix = matrix;
         this.grid = grid;
     }
 
     @Override
     public void onPickupFromSlot(EntityPlayer player, ItemStack stack) {
-        FMLCommonHandler.instance().firePlayerCraftingEvent(player, stack, matrix);
+        FMLCommonHandler.instance().firePlayerCraftingEvent(player, stack, grid.getMatrix());
 
         onCrafting(stack);