diff --git a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowEventHandler.java b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowEventHandler.java
index 1705569..04f99a1 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowEventHandler.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowEventHandler.java
@@ -8,8 +8,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.SortedMap;
-import java.util.Timer;
-import java.util.TimerTask;
 import java.util.TreeMap;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -40,8 +38,6 @@
 import net.onrc.onos.ofcontroller.util.serializers.KryoFactory;
 
 import com.esotericsoftware.kryo.Kryo;
-import com.tinkerpop.blueprints.impls.ramcloud.PerfMon;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -908,14 +904,10 @@
 
 	    switch (eventEntry.eventType()) {
 	    case ENTRY_ADD:
-    	synchronized (topology) {
     		isTopologyModified |= topology.addTopologyElement(topologyElement);
-    	}
 		break;
 	    case ENTRY_REMOVE:
-    	synchronized (topology) {
     		isTopologyModified |= topology.removeTopologyElement(topologyElement);
-    	}
 		break;
 	    }
 	}
@@ -1213,10 +1205,8 @@
 
 	// Compute the new path
 	DataPath newDataPath;
-	synchronized (topology) {
 	newDataPath = TopologyManager.computeNetworkPath(topology,
 								  flowPath);
-	}
 	if (newDataPath == null) {
 	    // We need the DataPath to compare the paths
 	    newDataPath = new DataPath();