diff --git a/src/main/java/resonantinduction/mechanical/fluid/pipe/PipeNetwork.java b/src/main/java/resonantinduction/mechanical/fluid/pipe/PipeNetwork.java
index 95aa504e..37cb41fa 100644
--- a/src/main/java/resonantinduction/mechanical/fluid/pipe/PipeNetwork.java
+++ b/src/main/java/resonantinduction/mechanical/fluid/pipe/PipeNetwork.java
@@ -29,8 +29,8 @@ public class PipeNetwork extends FluidNetwork
     public void update()
     {
         super.update();
-        //Slight delay to allow visual effect to take place before draining the pipe tanks
-        if (this.ticks % 2 == 0 && this.getTank().getFluid() != null)
+        //Slight delay to allow visual effect to take place before draining the pipe's internal tank
+        if (this.ticks % 2 == 0 && this.getTank().getFluidAmount() > 0)
         {
             FluidStack stack = this.getTank().getFluid().copy();
             int count = this.connectionMap.size();
diff --git a/src/main/java/resonantinduction/mechanical/fluid/tank/TankNetwork.java b/src/main/java/resonantinduction/mechanical/fluid/tank/TankNetwork.java
index 29530cd3..4f72847e 100644
--- a/src/main/java/resonantinduction/mechanical/fluid/tank/TankNetwork.java
+++ b/src/main/java/resonantinduction/mechanical/fluid/tank/TankNetwork.java
@@ -8,7 +8,6 @@ import net.minecraftforge.fluids.FluidStack;
 import resonantinduction.api.fluid.IFluidPart;
 import resonantinduction.mechanical.fluid.network.FluidNetwork;
 import universalelectricity.core.net.NetworkTickHandler;
-import calclavia.lib.utility.FluidUtility;
 
 /** Network that handles connected tanks
  * 
@@ -23,13 +22,11 @@ public class TankNetwork extends FluidNetwork
     @Override
     public void reloadTanks()
     {
-        System.out.println("TankNetwork: Balancing fluid");
         FluidStack fillStack = this.getTank().getFluid();
         int lowestY = 255, highestY = 0;
 
         if (fillStack == null || fillStack.getFluid().isGaseous())
         {
-            System.out.println("TankNetwork: Stack is null or a gas");
             super.reloadTanks();
         }
         else if (this.getConnectors().size() > 0)
@@ -62,7 +59,6 @@ public class TankNetwork extends FluidNetwork
                 }
                 if (!parts.isEmpty())
                 {
-                    System.out.println("TankNetwork: balancing level: " + y);
                     this.fillTankSet(fillStack, parts);
                 }