diff --git a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/NetworkGraphImpl.java b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/NetworkGraphImpl.java
index feb0f57..9acf727 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/NetworkGraphImpl.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/NetworkGraphImpl.java
@@ -297,6 +297,7 @@
 	public void putDeviceEvent(DeviceEvent deviceEvent) {
 		if (prepareForAddDeviceEvent(deviceEvent)) {
 //			datastore.addDevice(deviceEvent);
+//			putDevice(deviceEvent);
 			// Send out notification
 			TopologyEvent topologyEvent =
 			    new TopologyEvent(deviceEvent);
@@ -311,6 +312,7 @@
 	public void removeDeviceEvent(DeviceEvent deviceEvent) {
 		if (prepareForRemoveDeviceEvent(deviceEvent)) {
 //			datastore.removeDevice(deviceEvent);
+//			removeDevice(deviceEvent);
 			// Send out notification
 			eventChannel.removeEntry(deviceEvent.getID());
 		}