diff --git a/src/main/java/appeng/container/AEBaseContainer.java b/src/main/java/appeng/container/AEBaseContainer.java
index 201d10b25..95262d730 100644
--- a/src/main/java/appeng/container/AEBaseContainer.java
+++ b/src/main/java/appeng/container/AEBaseContainer.java
@@ -37,7 +37,14 @@ import appeng.api.storage.data.IAEItemStack;
 import appeng.client.me.SlotME;
 import appeng.container.guisync.GuiSync;
 import appeng.container.guisync.SyncData;
-import appeng.container.slot.*;
+import appeng.container.slot.AppEngSlot;
+import appeng.container.slot.SlotCraftingMatrix;
+import appeng.container.slot.SlotCraftingTerm;
+import appeng.container.slot.SlotDisabled;
+import appeng.container.slot.SlotFake;
+import appeng.container.slot.SlotInaccessible;
+import appeng.container.slot.SlotPlayerHotBar;
+import appeng.container.slot.SlotPlayerInv;
 import appeng.core.AELog;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.PacketInventoryAction;
@@ -48,7 +55,6 @@ import appeng.helpers.InventoryAction;
 import appeng.me.helpers.PlayerSource;
 import appeng.util.InventoryAdaptor;
 import appeng.util.Platform;
-import appeng.util.helpers.ItemHandlerUtil;
 import appeng.util.inv.AdaptorItemHandler;
 import appeng.util.inv.WrapperCursorItemHandler;
 import appeng.util.item.AEItemStack;
diff --git a/src/main/java/appeng/container/implementations/ContainerMEPortableCell.java b/src/main/java/appeng/container/implementations/ContainerMEPortableCell.java
index b5a8c3ef5..3a98274d8 100644
--- a/src/main/java/appeng/container/implementations/ContainerMEPortableCell.java
+++ b/src/main/java/appeng/container/implementations/ContainerMEPortableCell.java
@@ -21,9 +21,7 @@ package appeng.container.implementations;
 
 import appeng.api.config.Actionable;
 import appeng.api.config.PowerMultiplier;
-import appeng.api.config.SecurityPermissions;
 import appeng.api.implementations.IUpgradeableCellContainer;
-import appeng.api.implementations.tiles.IViewCellStorage;
 import appeng.api.networking.security.IActionHost;
 import appeng.container.interfaces.IInventorySlotAware;
 import appeng.container.slot.SlotRestrictedInput;
@@ -36,7 +34,6 @@ import appeng.util.Platform;
 import appeng.util.inv.IAEAppEngInventory;
 import appeng.util.inv.InvOperation;
 import baubles.api.BaublesApi;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/appeng/container/implementations/ContainerWirelessCraftingTerminal.java b/src/main/java/appeng/container/implementations/ContainerWirelessCraftingTerminal.java
index 78435661d..0856bdabe 100644
--- a/src/main/java/appeng/container/implementations/ContainerWirelessCraftingTerminal.java
+++ b/src/main/java/appeng/container/implementations/ContainerWirelessCraftingTerminal.java
@@ -26,7 +26,6 @@ import appeng.helpers.IContainerCraftingPacket;
 import appeng.helpers.WirelessTerminalGuiObject;
 import appeng.tile.inventory.AppEngInternalInventory;
 import appeng.util.Platform;
-import appeng.util.inv.IAEAppEngInventory;
 import appeng.util.inv.InvOperation;
 import appeng.util.inv.WrapperInvItemHandler;
 import net.minecraft.entity.player.InventoryPlayer;
diff --git a/src/main/java/appeng/container/implementations/ContainerWirelessTerm.java b/src/main/java/appeng/container/implementations/ContainerWirelessTerm.java
index cd9eae785..7148e98e5 100644
--- a/src/main/java/appeng/container/implementations/ContainerWirelessTerm.java
+++ b/src/main/java/appeng/container/implementations/ContainerWirelessTerm.java
@@ -19,10 +19,7 @@
 package appeng.container.implementations;
 
 
-import appeng.core.AEConfig;
-import appeng.core.localization.PlayerMessages;
 import appeng.helpers.WirelessTerminalGuiObject;
-import appeng.util.Platform;
 import net.minecraft.entity.player.InventoryPlayer;
 
 
@@ -31,19 +28,4 @@ public class ContainerWirelessTerm extends ContainerMEPortableCell {
     public ContainerWirelessTerm(final InventoryPlayer ip, final WirelessTerminalGuiObject gui) {
         super(ip, gui, true);
     }
-
-    @Override
-    public void detectAndSendChanges() {
-        super.detectAndSendChanges();
-
-        if (!this.wirelessTerminalGUIObject.rangeCheck()) {
-            if (Platform.isServer() && this.isValidContainer()) {
-                this.getPlayerInv().player.sendMessage(PlayerMessages.OutOfRange.get());
-            }
-
-            this.setValidContainer(false);
-        } else {
-            this.setPowerMultiplier(AEConfig.instance().wireless_getDrainRate(this.wirelessTerminalGUIObject.getRange()));
-        }
-    }
 }
diff --git a/src/main/java/appeng/fluids/container/ContainerMEPortableFluidCell.java b/src/main/java/appeng/fluids/container/ContainerMEPortableFluidCell.java
index 40f50dbc6..3f55c4804 100644
--- a/src/main/java/appeng/fluids/container/ContainerMEPortableFluidCell.java
+++ b/src/main/java/appeng/fluids/container/ContainerMEPortableFluidCell.java
@@ -237,7 +237,7 @@ public class ContainerMEPortableFluidCell extends AEBaseContainer implements IAE
                     AELog.debug(e);
                 }
             }
-            //this.updatePowerStatus();
+            super.detectAndSendChanges();
         }
     }