diff --git a/src/main/java/refinedstorage/RefinedStorageGui.java b/src/main/java/refinedstorage/RefinedStorageGui.java
index dee62f6fa..6fb65a6cc 100755
--- a/src/main/java/refinedstorage/RefinedStorageGui.java
+++ b/src/main/java/refinedstorage/RefinedStorageGui.java
@@ -20,5 +20,4 @@ public final class RefinedStorageGui {
     public static final int PROCESSING_PATTERN_ENCODER = 16;
     public static final int GRID_FILTER = 17;
     public static final int NETWORK_TRANSMITTER = 18;
-    public static final int NETWORK_RECEIVER = 19;
 }
diff --git a/src/main/java/refinedstorage/block/BlockNetworkReceiver.java b/src/main/java/refinedstorage/block/BlockNetworkReceiver.java
index eb09a8e23..64b17b618 100755
--- a/src/main/java/refinedstorage/block/BlockNetworkReceiver.java
+++ b/src/main/java/refinedstorage/block/BlockNetworkReceiver.java
@@ -1,15 +1,8 @@
 package refinedstorage.block;
 
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import refinedstorage.RefinedStorage;
-import refinedstorage.RefinedStorageGui;
 import refinedstorage.tile.TileNetworkReceiver;
 
 public class BlockNetworkReceiver extends BlockNode {
@@ -17,15 +10,6 @@ public class BlockNetworkReceiver extends BlockNode {
         super("network_receiver");
     }
 
-    @Override
-    public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
-        if (!world.isRemote) {
-            player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.NETWORK_RECEIVER, world, pos.getX(), pos.getY(), pos.getZ());
-        }
-
-        return true;
-    }
-
     @Override
     public TileEntity createTileEntity(World world, IBlockState state) {
         return new TileNetworkReceiver();
diff --git a/src/main/java/refinedstorage/container/ContainerNetworkReceiver.java b/src/main/java/refinedstorage/container/ContainerNetworkReceiver.java
deleted file mode 100755
index 3e94ad9eb..000000000
--- a/src/main/java/refinedstorage/container/ContainerNetworkReceiver.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package refinedstorage.container;
-
-import net.minecraft.entity.player.EntityPlayer;
-
-public class ContainerNetworkReceiver extends ContainerBase {
-    public ContainerNetworkReceiver(EntityPlayer player) {
-        super(player);
-
-        addPlayerInventory(8, 50);
-    }
-}
diff --git a/src/main/java/refinedstorage/gui/GuiHandler.java b/src/main/java/refinedstorage/gui/GuiHandler.java
index 77803e66a..be609c238 100755
--- a/src/main/java/refinedstorage/gui/GuiHandler.java
+++ b/src/main/java/refinedstorage/gui/GuiHandler.java
@@ -52,8 +52,6 @@ public class GuiHandler implements IGuiHandler {
                 return new ContainerProcessingPatternEncoder(player, (TileProcessingPatternEncoder) tile);
             case RefinedStorageGui.NETWORK_TRANSMITTER:
                 return new ContainerNetworkTransmitter(player, (TileNetworkTransmitter) tile);
-            case RefinedStorageGui.NETWORK_RECEIVER:
-                return new ContainerNetworkReceiver(player);
             default:
                 return null;
         }
@@ -113,8 +111,6 @@ public class GuiHandler implements IGuiHandler {
                 return new GuiGridFilter(getGridFilterContainer(player, x));
             case RefinedStorageGui.NETWORK_TRANSMITTER:
                 return new GuiNetworkTransmitter((ContainerNetworkTransmitter) getContainer(ID, player, tile), (TileNetworkTransmitter) tile);
-            case RefinedStorageGui.NETWORK_RECEIVER:
-                return new GuiNetworkReceiver((ContainerNetworkReceiver) getContainer(ID, player, tile), (TileNetworkReceiver) tile);
             default:
                 return null;
         }
diff --git a/src/main/java/refinedstorage/gui/GuiNetworkReceiver.java b/src/main/java/refinedstorage/gui/GuiNetworkReceiver.java
deleted file mode 100755
index 85425a2a2..000000000
--- a/src/main/java/refinedstorage/gui/GuiNetworkReceiver.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package refinedstorage.gui;
-
-import refinedstorage.container.ContainerNetworkReceiver;
-import refinedstorage.gui.sidebutton.SideButtonRedstoneMode;
-import refinedstorage.tile.TileNetworkReceiver;
-
-public class GuiNetworkReceiver extends GuiBase {
-    private TileNetworkReceiver networkReceiver;
-
-    public GuiNetworkReceiver(ContainerNetworkReceiver container, TileNetworkReceiver networkReceiver) {
-        super(container, 176, 131);
-
-        this.networkReceiver = networkReceiver;
-    }
-
-    @Override
-    public void init(int x, int y) {
-        addSideButton(new SideButtonRedstoneMode(networkReceiver));
-    }
-
-    @Override
-    public void update(int x, int y) {
-    }
-
-    @Override
-    public void drawBackground(int x, int y, int mouseX, int mouseY) {
-        bindTexture("gui/network_receiver.png");
-
-        drawTexture(x, y, 0, 0, width, height);
-    }
-
-    @Override
-    public void drawForeground(int mouseX, int mouseY) {
-        drawString(7, 7, t("gui.refinedstorage:network_receiver"));
-        drawString(7, 39, t("container.inventory"));
-    }
-}
diff --git a/src/main/java/refinedstorage/tile/TileNetworkReceiver.java b/src/main/java/refinedstorage/tile/TileNetworkReceiver.java
index 728c7abc1..3edbe7d30 100755
--- a/src/main/java/refinedstorage/tile/TileNetworkReceiver.java
+++ b/src/main/java/refinedstorage/tile/TileNetworkReceiver.java
@@ -2,13 +2,9 @@ package refinedstorage.tile;
 
 import net.minecraft.inventory.Container;
 import refinedstorage.RefinedStorage;
-import refinedstorage.container.ContainerNetworkReceiver;
+import refinedstorage.tile.config.RedstoneMode;
 
 public class TileNetworkReceiver extends TileNode {
-    public TileNetworkReceiver() {
-        rebuildOnUpdateChange = true;
-    }
-
     @Override
     public void updateNode() {
     }
@@ -20,6 +16,11 @@ public class TileNetworkReceiver extends TileNode {
 
     @Override
     public Class<? extends Container> getContainer() {
-        return ContainerNetworkReceiver.class;
+        return null;
+    }
+
+    @Override
+    public void setRedstoneMode(RedstoneMode mode) {
+        // NO OP
     }
 }
diff --git a/src/main/java/refinedstorage/tile/TileNetworkTransmitter.java b/src/main/java/refinedstorage/tile/TileNetworkTransmitter.java
index 1a731a7a9..1c3e4be79 100755
--- a/src/main/java/refinedstorage/tile/TileNetworkTransmitter.java
+++ b/src/main/java/refinedstorage/tile/TileNetworkTransmitter.java
@@ -125,6 +125,6 @@ public class TileNetworkTransmitter extends TileNode {
     }
 
     public boolean isReceiverValid() {
-        return worldObj.isRemote ? receiverValid : (receiver != null && isInSameDimension() && worldObj.getTileEntity(receiver) instanceof TileNetworkReceiver && ((TileNetworkReceiver) worldObj.getTileEntity(receiver)).canUpdate());
+        return worldObj.isRemote ? receiverValid : (receiver != null && isInSameDimension() && worldObj.getTileEntity(receiver) instanceof TileNetworkReceiver);
     }
 }
diff --git a/src/main/resources/assets/refinedstorage/textures/gui/network_receiver.png b/src/main/resources/assets/refinedstorage/textures/gui/network_receiver.png
deleted file mode 100755
index 1f102b2c0..000000000
Binary files a/src/main/resources/assets/refinedstorage/textures/gui/network_receiver.png and /dev/null differ