diff --git a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/TopologyManager.java b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/TopologyManager.java
index 0118294..43f287c 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/TopologyManager.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/TopologyManager.java
@@ -63,7 +63,7 @@
      */
     public TopologyManager(IControllerRegistryService registryService,
 			   CopyOnWriteArrayList<INetworkGraphListener> networkGraphListeners) {
-	datastore = new NetworkGraphDatastore(this);
+	datastore = new NetworkGraphDatastore();
 	this.registryService = registryService;
 	this.networkGraphListeners = networkGraphListeners;
     }
@@ -318,6 +318,8 @@
 	if (prepareForRemoveLinkEvent(linkEvent)) {
 	    if (dstCheckBeforeDBmodify) {
 		// write to DB only if it is owner of the dst dpid
+	    // XXX this will cause link remove events to be dropped
+		// if the dst switch just disconnected
 		if (registryService.hasControl(linkEvent.getDst().dpid)) {
 		    datastore.removeLink(linkEvent);
 		}