diff --git a/src/main/java/net/floodlightcontroller/core/internal/Controller.java b/src/main/java/net/floodlightcontroller/core/internal/Controller.java
index bae8cc0b8ee3746dc10707c259efea389eccd82c..d72a92b2d54fde9717a18fe06cf0cd47cdb33694 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/Controller.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/Controller.java
@@ -1141,12 +1141,6 @@ public class Controller implements IFloodlightProviderService,
                                          */
 
             }
-            if (false) {
-                // FIXME: IF ANYTHING ELSE HAS CHANGED
-                addUpdateToQueue(
-                        new SwitchUpdate(sw2.getId(),
-                                         SwitchUpdateType.OTHERCHANGE));
-            }
         }
 
         /**
diff --git a/src/main/java/net/floodlightcontroller/core/web/EventHistoryTopologySwitchResource.java b/src/main/java/net/floodlightcontroller/core/web/EventHistoryTopologySwitchResource.java
index 3ab42c48154ccf90cde1d79ef2c4eeeb7c5ccbd7..73a4308c4024c3a24d21575132344d85fbcdc832 100644
--- a/src/main/java/net/floodlightcontroller/core/web/EventHistoryTopologySwitchResource.java
+++ b/src/main/java/net/floodlightcontroller/core/web/EventHistoryTopologySwitchResource.java
@@ -18,9 +18,6 @@ package net.floodlightcontroller.core.web;
 
 import net.floodlightcontroller.core.IFloodlightProviderService;
 import net.floodlightcontroller.core.internal.EventHistorySwitch;
-import net.floodlightcontroller.core.module.IFloodlightService;
-import net.floodlightcontroller.linkdiscovery.ILinkDiscoveryService;
-import net.floodlightcontroller.linkdiscovery.internal.LinkDiscoveryManager;
 import net.floodlightcontroller.util.EventHistory;
 
 import org.restlet.resource.Get;
diff --git a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
index d21f28538276b9641459f52c869c99e9fee9eff9..8e2d2783cb36bfc58cf29d598584bfae484b4242 100644
--- a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
@@ -19,9 +19,7 @@ package net.floodlightcontroller.linkdiscovery.internal;
 
 import java.io.IOException;
 import java.net.InetAddress;
-import java.net.InetSocketAddress;
 import java.net.NetworkInterface;
-import java.net.SocketAddress;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -53,7 +51,6 @@ import net.floodlightcontroller.core.IOFSwitchListener;
 import net.floodlightcontroller.core.annotations.LogMessageCategory;
 import net.floodlightcontroller.core.annotations.LogMessageDoc;
 import net.floodlightcontroller.core.annotations.LogMessageDocs;
-import net.floodlightcontroller.core.internal.EventHistorySwitch;
 import net.floodlightcontroller.core.module.FloodlightModuleContext;
 import net.floodlightcontroller.core.module.FloodlightModuleException;
 import net.floodlightcontroller.core.module.IFloodlightModule;
diff --git a/src/main/java/net/floodlightcontroller/topology/ITopologyService.java b/src/main/java/net/floodlightcontroller/topology/ITopologyService.java
index 5635d637dabfe00652909e1b46184b0fcadb5091..1bbdf60743684399eb2015576121e1b07f3a2f33 100644
--- a/src/main/java/net/floodlightcontroller/topology/ITopologyService.java
+++ b/src/main/java/net/floodlightcontroller/topology/ITopologyService.java
@@ -17,11 +17,9 @@
 package net.floodlightcontroller.topology;
 
 import java.util.Date;
-import java.util.List;
 import java.util.Set;
 
 import net.floodlightcontroller.core.module.IFloodlightService;
-import net.floodlightcontroller.linkdiscovery.ILinkDiscovery.LDUpdate;
 
 public interface ITopologyService extends IFloodlightService  {
 
diff --git a/src/test/java/net/floodlightcontroller/core/internal/OFChannelHandlerTest.java b/src/test/java/net/floodlightcontroller/core/internal/OFChannelHandlerTest.java
index e32b202911519263046db8f82616891f512da1ff..510c5ce108fabf2f99c58d17a13a7420f0d32462 100644
--- a/src/test/java/net/floodlightcontroller/core/internal/OFChannelHandlerTest.java
+++ b/src/test/java/net/floodlightcontroller/core/internal/OFChannelHandlerTest.java
@@ -34,13 +34,10 @@ import org.openflow.protocol.OFError;
 import org.openflow.protocol.OFError.OFBadRequestCode;
 import org.openflow.protocol.OFError.OFErrorType;
 import org.openflow.protocol.OFFeaturesReply;
-import org.openflow.protocol.OFFlowMod;
 import org.openflow.protocol.OFGetConfigReply;
-import org.openflow.protocol.OFMatch;
 import org.openflow.protocol.OFMessage;
 import org.openflow.protocol.OFPacketIn;
 import org.openflow.protocol.OFPhysicalPort;
-import org.openflow.protocol.OFPort;
 import org.openflow.protocol.OFPortStatus;
 import org.openflow.protocol.OFPortStatus.OFPortReason;
 import org.openflow.protocol.OFSetConfig;
@@ -340,18 +337,6 @@ public class OFChannelHandlerTest {
         verifyUniqueXids(msgs);
     }
 
-    /** FIXME:
-     * Verify that the given FlowMod indeed removes all flows from the
-     * switch
-     */
-    private void verifyFlowModIsRemoveAll(OFMessage m) {
-        assertEquals(OFType.FLOW_MOD, m.getType());
-        OFFlowMod fm = (OFFlowMod)m;
-        assertEquals(OFMatch.OFPFW_ALL, fm.getMatch().getWildcards());
-        assertEquals(OFFlowMod.OFPFC_DELETE, fm.getCommand());
-        assertEquals(OFPort.OFPP_NONE.getValue(), fm.getOutPort());
-    }
-
     /** Move the channel from scratch to WAIT_FEATURES_REPLY state
      * Builds on moveToWaitHello()
      * adds testing for WAIT_HELLO state
diff --git a/src/test/java/net/floodlightcontroller/core/internal/OFSwitchBaseTest.java b/src/test/java/net/floodlightcontroller/core/internal/OFSwitchBaseTest.java
index cebed83af8cf9ca5fac985997cdf7988156cd94d..e0ae84f8b20a055337bc94235a5496bba5416715 100644
--- a/src/test/java/net/floodlightcontroller/core/internal/OFSwitchBaseTest.java
+++ b/src/test/java/net/floodlightcontroller/core/internal/OFSwitchBaseTest.java
@@ -36,7 +36,6 @@ import net.floodlightcontroller.packet.IPacket;
 import net.floodlightcontroller.packet.IPv4;
 import net.floodlightcontroller.util.EventHistory.EvAction;
 
-import org.easymock.EasyMock;
 import org.junit.Before;
 import org.junit.Test;
 import org.openflow.protocol.OFFlowMod;