diff --git a/src/controller/channel/ChannelNode.java b/src/controller/channel/ChannelNode.java
index 4d787f39..3c5d70ab 100644
--- a/src/controller/channel/ChannelNode.java
+++ b/src/controller/channel/ChannelNode.java
@@ -24,6 +24,9 @@ import javax.swing.JMenu;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import source.tuner.TunerChannel;
 import controller.ConfigurableNode;
 import controller.site.SiteNode;
@@ -36,6 +39,8 @@ import controller.system.SystemNode;
 public class ChannelNode extends ConfigurableNode implements ChannelEventListener
 {
     private static final long serialVersionUID = 1L;
+
+	private final static Logger mLog = LoggerFactory.getLogger( ChannelNode.class );
     
 	private static DecimalFormat sFORMAT = new DecimalFormat( "0.0000" );
 
@@ -84,12 +89,13 @@ public class ChannelNode extends ConfigurableNode implements ChannelEventListene
 			case CHANGE_SITE:
 			case CHANGE_SYSTEM:
 			case CHANNEL_ENABLED:
+			case CHANNEL_DISABLED:
 			case CHANNEL_PROCESSING_STARTED:
 			case CHANNEL_PROCESSING_STOPPED:
 				this.refresh();
 				break;
 			/* We're being deleted, so cleanup */
-			case CHANNEL_DISABLED:
+			case CHANNEL_DELETED:
 				delete();
 				break;
 			default:
diff --git a/src/module/ProcessingChain.java b/src/module/ProcessingChain.java
index 8e9b983f..2a3be696 100644
--- a/src/module/ProcessingChain.java
+++ b/src/module/ProcessingChain.java
@@ -41,7 +41,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import sample.Broadcaster;
-import sample.Buffer;
 import sample.Listener;
 import sample.complex.ComplexBuffer;
 import sample.complex.IComplexBufferListener;
diff --git a/src/spectrum/WaterfallPanel.java b/src/spectrum/WaterfallPanel.java
index 5d94b934..2aa7e37a 100644
--- a/src/spectrum/WaterfallPanel.java
+++ b/src/spectrum/WaterfallPanel.java
@@ -23,13 +23,10 @@ import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Image;
 import java.awt.Point;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
 import java.awt.geom.Line2D;
 import java.awt.image.ColorModel;
 import java.awt.image.MemoryImageSource;
 import java.text.DecimalFormat;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.swing.JPanel;
 
@@ -291,8 +288,6 @@ public class WaterfallPanel extends JPanel implements DFTResultsListener,
 
 		int offset = (int)( getPixelOffset( multiplier ) - binPixelWidth );
 		
-//		mLog.debug( "Offset:" + offset + " Pixel Offset:" + getPixelOffset( multiplier ) + " bin pixel width:" + binPixelWidth );
-		
 		g.drawImage( mWaterfallImage, 
 					 offset, 
 					 0,