diff --git a/src/main/java/refinedstorage/tile/TileConstructor.java b/src/main/java/refinedstorage/tile/TileConstructor.java
index ab9e9d205..1c7c2e910 100755
--- a/src/main/java/refinedstorage/tile/TileConstructor.java
+++ b/src/main/java/refinedstorage/tile/TileConstructor.java
@@ -91,8 +91,8 @@ public class TileConstructor extends TileNode implements ICompareConfig {
             compare = tag.getInteger(NBT_COMPARE);
         }
 
-        TileBase.readItems(filter, 0, tag);
-        TileBase.readItems(upgrades, 1, tag);
+        readItems(filter, 0, tag);
+        readItems(upgrades, 1, tag);
 
         scheduler.read(tag);
     }
@@ -103,8 +103,8 @@ public class TileConstructor extends TileNode implements ICompareConfig {
 
         tag.setInteger(NBT_COMPARE, compare);
 
-        TileBase.writeItems(filter, 0, tag);
-        TileBase.writeItems(upgrades, 1, tag);
+        writeItems(filter, 0, tag);
+        writeItems(upgrades, 1, tag);
 
         scheduler.writeToNBT(tag);
 
diff --git a/src/main/java/refinedstorage/tile/TileCrafter.java b/src/main/java/refinedstorage/tile/TileCrafter.java
index 7dec3149c..d34ba7642 100755
--- a/src/main/java/refinedstorage/tile/TileCrafter.java
+++ b/src/main/java/refinedstorage/tile/TileCrafter.java
@@ -78,16 +78,16 @@ public class TileCrafter extends TileNode implements ICraftingPatternContainer {
     public void read(NBTTagCompound nbt) {
         super.read(nbt);
 
-        TileBase.readItems(patterns, 0, nbt);
-        TileBase.readItems(upgrades, 1, nbt);
+        readItems(patterns, 0, nbt);
+        readItems(upgrades, 1, nbt);
     }
 
     @Override
     public NBTTagCompound write(NBTTagCompound tag) {
         super.write(tag);
 
-        TileBase.writeItems(patterns, 0, tag);
-        TileBase.writeItems(upgrades, 1, tag);
+        writeItems(patterns, 0, tag);
+        writeItems(upgrades, 1, tag);
 
         return tag;
     }
@@ -99,7 +99,7 @@ public class TileCrafter extends TileNode implements ICraftingPatternContainer {
 
     @Override
     public IItemHandler getConnectedItems() {
-        return TileBase.getItemHandler(getFacingTile(), getDirection().getOpposite());
+        return getItemHandler(getFacingTile(), getDirection().getOpposite());
     }
 
     public IItemHandler getPatterns() {
diff --git a/src/main/java/refinedstorage/tile/TileDestructor.java b/src/main/java/refinedstorage/tile/TileDestructor.java
index d59834884..dcba0b057 100755
--- a/src/main/java/refinedstorage/tile/TileDestructor.java
+++ b/src/main/java/refinedstorage/tile/TileDestructor.java
@@ -110,8 +110,8 @@ public class TileDestructor extends TileNode implements ICompareConfig, IModeCon
             mode = nbt.getInteger(NBT_MODE);
         }
 
-        TileBase.readItems(filters, 0, nbt);
-        TileBase.readItems(upgrades, 1, nbt);
+        readItems(filters, 0, nbt);
+        readItems(upgrades, 1, nbt);
     }
 
     @Override
@@ -121,8 +121,8 @@ public class TileDestructor extends TileNode implements ICompareConfig, IModeCon
         tag.setInteger(NBT_COMPARE, compare);
         tag.setInteger(NBT_MODE, mode);
 
-        TileBase.writeItems(filters, 0, tag);
-        TileBase.writeItems(upgrades, 1, tag);
+        writeItems(filters, 0, tag);
+        writeItems(upgrades, 1, tag);
 
         return tag;
     }
diff --git a/src/main/java/refinedstorage/tile/TileDetector.java b/src/main/java/refinedstorage/tile/TileDetector.java
index 63e33ba01..6c0ddf55e 100755
--- a/src/main/java/refinedstorage/tile/TileDetector.java
+++ b/src/main/java/refinedstorage/tile/TileDetector.java
@@ -148,7 +148,7 @@ public class TileDetector extends TileNode implements ICompareConfig {
             amount = nbt.getInteger(NBT_AMOUNT);
         }
 
-        TileBase.readItems(filter, 0, nbt);
+        readItems(filter, 0, nbt);
     }
 
     @Override
@@ -159,7 +159,7 @@ public class TileDetector extends TileNode implements ICompareConfig {
         tag.setInteger(NBT_MODE, mode);
         tag.setInteger(NBT_AMOUNT, amount);
 
-        TileBase.writeItems(filter, 0, tag);
+        writeItems(filter, 0, tag);
 
         return tag;
     }
diff --git a/src/main/java/refinedstorage/tile/TileDiskDrive.java b/src/main/java/refinedstorage/tile/TileDiskDrive.java
index 71f367718..fdb0275b1 100755
--- a/src/main/java/refinedstorage/tile/TileDiskDrive.java
+++ b/src/main/java/refinedstorage/tile/TileDiskDrive.java
@@ -156,8 +156,8 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag
     public void read(NBTTagCompound nbt) {
         super.read(nbt);
 
-        TileBase.readItems(disks, 0, nbt);
-        TileBase.readItems(filters, 1, nbt);
+        readItems(disks, 0, nbt);
+        readItems(filters, 1, nbt);
 
         if (nbt.hasKey(NBT_PRIORITY)) {
             priority = nbt.getInteger(NBT_PRIORITY);
@@ -182,8 +182,8 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag
             }
         }
 
-        TileBase.writeItems(disks, 0, tag);
-        TileBase.writeItems(filters, 1, tag);
+        writeItems(disks, 0, tag);
+        writeItems(filters, 1, tag);
 
         tag.setInteger(NBT_PRIORITY, priority);
         tag.setInteger(NBT_COMPARE, compare);
diff --git a/src/main/java/refinedstorage/tile/TileExporter.java b/src/main/java/refinedstorage/tile/TileExporter.java
index 79b6cbbe6..413079980 100755
--- a/src/main/java/refinedstorage/tile/TileExporter.java
+++ b/src/main/java/refinedstorage/tile/TileExporter.java
@@ -34,7 +34,7 @@ public class TileExporter extends TileNode implements ICompareConfig {
 
     @Override
     public void updateNode() {
-        IItemHandler handler = TileBase.getItemHandler(getFacingTile(), getDirection().getOpposite());
+        IItemHandler handler = getItemHandler(getFacingTile(), getDirection().getOpposite());
 
         int size = upgrades.hasUpgrade(ItemUpgrade.TYPE_STACK) ? 64 : 1;
 
@@ -83,8 +83,8 @@ public class TileExporter extends TileNode implements ICompareConfig {
             compare = nbt.getInteger(NBT_COMPARE);
         }
 
-        TileBase.readItems(filters, 0, nbt);
-        TileBase.readItems(upgrades, 1, nbt);
+        readItems(filters, 0, nbt);
+        readItems(upgrades, 1, nbt);
 
         scheduler.read(nbt);
     }
@@ -95,8 +95,8 @@ public class TileExporter extends TileNode implements ICompareConfig {
 
         tag.setInteger(NBT_COMPARE, compare);
 
-        TileBase.writeItems(filters, 0, tag);
-        TileBase.writeItems(upgrades, 1, tag);
+        writeItems(filters, 0, tag);
+        writeItems(upgrades, 1, tag);
 
         scheduler.writeToNBT(tag);
 
diff --git a/src/main/java/refinedstorage/tile/TileImporter.java b/src/main/java/refinedstorage/tile/TileImporter.java
index 464028a72..247bd739f 100755
--- a/src/main/java/refinedstorage/tile/TileImporter.java
+++ b/src/main/java/refinedstorage/tile/TileImporter.java
@@ -37,7 +37,7 @@ public class TileImporter extends TileNode implements ICompareConfig, IModeConfi
 
     @Override
     public void updateNode() {
-        IItemHandler handler = TileBase.getItemHandler(getFacingTile(), getDirection().getOpposite());
+        IItemHandler handler = getItemHandler(getFacingTile(), getDirection().getOpposite());
 
         if (getFacingTile() instanceof TileDiskDrive || handler == null) {
             return;
@@ -104,8 +104,8 @@ public class TileImporter extends TileNode implements ICompareConfig, IModeConfi
             mode = nbt.getInteger(NBT_MODE);
         }
 
-        TileBase.readItems(filters, 0, nbt);
-        TileBase.readItems(upgrades, 1, nbt);
+        readItems(filters, 0, nbt);
+        readItems(upgrades, 1, nbt);
     }
 
     @Override
@@ -115,8 +115,8 @@ public class TileImporter extends TileNode implements ICompareConfig, IModeConfi
         tag.setInteger(NBT_COMPARE, compare);
         tag.setInteger(NBT_MODE, mode);
 
-        TileBase.writeItems(filters, 0, tag);
-        TileBase.writeItems(upgrades, 1, tag);
+        writeItems(filters, 0, tag);
+        writeItems(upgrades, 1, tag);
 
         return tag;
     }
diff --git a/src/main/java/refinedstorage/tile/TileInterface.java b/src/main/java/refinedstorage/tile/TileInterface.java
index 711b0112e..45e35e994 100755
--- a/src/main/java/refinedstorage/tile/TileInterface.java
+++ b/src/main/java/refinedstorage/tile/TileInterface.java
@@ -105,10 +105,10 @@ public class TileInterface extends TileNode implements ICompareConfig {
     public void read(NBTTagCompound nbt) {
         super.read(nbt);
 
-        TileBase.readItems(importItems, 0, nbt);
-        TileBase.readItems(exportSpecimenItems, 1, nbt);
-        TileBase.readItems(exportItems, 2, nbt);
-        TileBase.readItems(upgrades, 3, nbt);
+        readItems(importItems, 0, nbt);
+        readItems(exportSpecimenItems, 1, nbt);
+        readItems(exportItems, 2, nbt);
+        readItems(upgrades, 3, nbt);
 
         if (nbt.hasKey(NBT_COMPARE)) {
             compare = nbt.getInteger(NBT_COMPARE);
@@ -119,10 +119,10 @@ public class TileInterface extends TileNode implements ICompareConfig {
     public NBTTagCompound write(NBTTagCompound tag) {
         super.write(tag);
 
-        TileBase.writeItems(importItems, 0, tag);
-        TileBase.writeItems(exportSpecimenItems, 1, tag);
-        TileBase.writeItems(exportItems, 2, tag);
-        TileBase.writeItems(upgrades, 3, tag);
+        writeItems(importItems, 0, tag);
+        writeItems(exportSpecimenItems, 1, tag);
+        writeItems(exportItems, 2, tag);
+        writeItems(upgrades, 3, tag);
 
         tag.setInteger(NBT_COMPARE, compare);
 
diff --git a/src/main/java/refinedstorage/tile/TileProcessingPatternEncoder.java b/src/main/java/refinedstorage/tile/TileProcessingPatternEncoder.java
index eba85b522..77376f8ff 100755
--- a/src/main/java/refinedstorage/tile/TileProcessingPatternEncoder.java
+++ b/src/main/java/refinedstorage/tile/TileProcessingPatternEncoder.java
@@ -19,8 +19,8 @@ public class TileProcessingPatternEncoder extends TileBase {
     public NBTTagCompound write(NBTTagCompound tag) {
         super.write(tag);
 
-        TileBase.writeItems(patterns, 0, tag);
-        TileBase.writeItems(configuration, 1, tag);
+        writeItems(patterns, 0, tag);
+        writeItems(configuration, 1, tag);
 
         return tag;
     }
@@ -29,8 +29,8 @@ public class TileProcessingPatternEncoder extends TileBase {
     public void read(NBTTagCompound nbt) {
         super.read(nbt);
 
-        TileBase.readItems(patterns, 0, nbt);
-        TileBase.readItems(configuration, 1, nbt);
+        readItems(patterns, 0, nbt);
+        readItems(configuration, 1, nbt);
     }
 
     public void onCreatePattern() {
diff --git a/src/main/java/refinedstorage/tile/TileSolderer.java b/src/main/java/refinedstorage/tile/TileSolderer.java
index a32f43872..2e5cc3704 100755
--- a/src/main/java/refinedstorage/tile/TileSolderer.java
+++ b/src/main/java/refinedstorage/tile/TileSolderer.java
@@ -110,8 +110,8 @@ public class TileSolderer extends TileNode {
     public void read(NBTTagCompound nbt) {
         super.read(nbt);
 
-        TileBase.readItems(items, 0, nbt);
-        TileBase.readItems(upgrades, 1, nbt);
+        readItems(items, 0, nbt);
+        readItems(upgrades, 1, nbt);
 
         recipe = RefinedStorageAPI.SOLDERER_REGISTRY.getRecipe(items);
 
@@ -128,8 +128,8 @@ public class TileSolderer extends TileNode {
     public NBTTagCompound write(NBTTagCompound tag) {
         super.write(tag);
 
-        TileBase.writeItems(items, 0, tag);
-        TileBase.writeItems(upgrades, 1, tag);
+        writeItems(items, 0, tag);
+        writeItems(upgrades, 1, tag);
 
         tag.setBoolean(NBT_WORKING, working);
         tag.setInteger(NBT_PROGRESS, progress);
diff --git a/src/main/java/refinedstorage/tile/TileStorage.java b/src/main/java/refinedstorage/tile/TileStorage.java
index d3ecb4b5d..2bb1d07b6 100755
--- a/src/main/java/refinedstorage/tile/TileStorage.java
+++ b/src/main/java/refinedstorage/tile/TileStorage.java
@@ -107,7 +107,7 @@ public class TileStorage extends TileNode implements IStorageProvider, IStorageG
     public void read(NBTTagCompound nbt) {
         super.read(nbt);
 
-        TileBase.readItems(filters, 0, nbt);
+        readItems(filters, 0, nbt);
 
         if (nbt.hasKey(NBT_PRIORITY)) {
             priority = nbt.getInteger(NBT_PRIORITY);
@@ -130,7 +130,7 @@ public class TileStorage extends TileNode implements IStorageProvider, IStorageG
     public NBTTagCompound write(NBTTagCompound tag) {
         super.write(tag);
 
-        TileBase.writeItems(filters, 0, tag);
+        writeItems(filters, 0, tag);
 
         tag.setInteger(NBT_PRIORITY, priority);
 
diff --git a/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java b/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java
index ad1424d35..89b7b018d 100755
--- a/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java
+++ b/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java
@@ -30,14 +30,14 @@ public class TileWirelessTransmitter extends TileNode implements IWirelessTransm
     public void read(NBTTagCompound nbt) {
         super.read(nbt);
 
-        TileBase.readItems(upgrades, 0, nbt);
+        readItems(upgrades, 0, nbt);
     }
 
     @Override
     public NBTTagCompound write(NBTTagCompound tag) {
         super.write(tag);
 
-        TileBase.writeItems(upgrades, 0, tag);
+        writeItems(upgrades, 0, tag);
 
         return tag;
     }
diff --git a/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java b/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java
index ac4dc6fd9..ccb65761b 100755
--- a/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java
+++ b/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java
@@ -16,7 +16,6 @@ import refinedstorage.container.ContainerStorage;
 import refinedstorage.inventory.BasicItemHandler;
 import refinedstorage.network.MessagePriorityUpdate;
 import refinedstorage.tile.IStorageGui;
-import refinedstorage.tile.TileBase;
 import refinedstorage.tile.TileNode;
 import refinedstorage.tile.config.ICompareConfig;
 import refinedstorage.tile.config.IModeConfig;
@@ -119,7 +118,7 @@ public class TileExternalStorage extends TileNode implements IStorageProvider, I
     public void read(NBTTagCompound nbt) {
         super.read(nbt);
 
-        TileBase.readItems(filters, 0, nbt);
+        readItems(filters, 0, nbt);
 
         if (nbt.hasKey(NBT_PRIORITY)) {
             priority = nbt.getInteger(NBT_PRIORITY);
@@ -138,7 +137,7 @@ public class TileExternalStorage extends TileNode implements IStorageProvider, I
     public NBTTagCompound write(NBTTagCompound tag) {
         super.write(tag);
 
-        TileBase.writeItems(filters, 0, tag);
+        writeItems(filters, 0, tag);
 
         tag.setInteger(NBT_PRIORITY, priority);
         tag.setInteger(NBT_COMPARE, compare);
@@ -200,7 +199,7 @@ public class TileExternalStorage extends TileNode implements IStorageProvider, I
         } else if (facing instanceof IDeepStorageUnit) {
             storages.add(new DeepStorageUnitStorage(this, (IDeepStorageUnit) facing));
         } else {
-            IItemHandler handler = TileBase.getItemHandler(facing, getDirection().getOpposite());
+            IItemHandler handler = getItemHandler(facing, getDirection().getOpposite());
 
             if (handler != null) {
                 storages.add(new ItemHandlerStorage(this, handler));
diff --git a/src/main/java/refinedstorage/tile/grid/TileGrid.java b/src/main/java/refinedstorage/tile/grid/TileGrid.java
index fa5541874..af8c33670 100755
--- a/src/main/java/refinedstorage/tile/grid/TileGrid.java
+++ b/src/main/java/refinedstorage/tile/grid/TileGrid.java
@@ -23,7 +23,6 @@ import refinedstorage.inventory.BasicItemHandler;
 import refinedstorage.inventory.BasicItemValidator;
 import refinedstorage.item.ItemPattern;
 import refinedstorage.network.MessageGridSettingsUpdate;
-import refinedstorage.tile.TileBase;
 import refinedstorage.tile.TileNode;
 import refinedstorage.tile.config.IRedstoneModeConfig;
 
@@ -333,8 +332,8 @@ public class TileGrid extends TileNode implements IGrid {
     public void read(NBTTagCompound tag) {
         super.read(tag);
 
-        TileBase.readItemsLegacy(matrix, 0, tag);
-        TileBase.readItems(patterns, 1, tag);
+        readItemsLegacy(matrix, 0, tag);
+        readItems(patterns, 1, tag);
 
         if (tag.hasKey(NBT_VIEW_TYPE)) {
             viewType = tag.getInteger(NBT_VIEW_TYPE);
@@ -357,8 +356,8 @@ public class TileGrid extends TileNode implements IGrid {
     public NBTTagCompound write(NBTTagCompound tag) {
         super.write(tag);
 
-        TileBase.writeItemsLegacy(matrix, 0, tag);
-        TileBase.writeItems(patterns, 1, tag);
+        writeItemsLegacy(matrix, 0, tag);
+        writeItems(patterns, 1, tag);
 
         tag.setInteger(NBT_VIEW_TYPE, viewType);
         tag.setInteger(NBT_SORTING_DIRECTION, sortingDirection);