diff --git a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
index f0c0378..1209caa 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
@@ -826,12 +826,11 @@
 		// Send the notifications
 
 		for (FlowEntry flowEntry : flowPath.flowEntries()) {
-		    /* TODO: Not needed?
-		    if (flowEntry.flowEntrySwitchState() ==
+		    if (flowEntry.flowEntrySwitchState() !=
 			FlowEntrySwitchState.FE_SWITCH_NOT_UPDATED) {
-			datagridService.notificationSendFlowEntryIdAdded(flowEntry.flowEntryId(), flowEntry.dpid());
+			continue;
 		    }
-		    */
+		    // datagridService.notificationSendFlowEntryIdAdded(flowEntry.flowEntryId(), flowEntry.dpid());
 
 		    //
 		    // Write the Flow Entry to the Datagrid