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 1f72e0b..174d5d7 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
@@ -593,11 +593,19 @@
      */
     @Override
     public boolean deleteAllFlows() {
+	//
+	// TODO: In the notification-based implementation,
+	// deleteFlow() is implemented by using clearFlow()
+	//
+	return clearAllFlows();
+
+	/*
 	if (FlowDatabaseOperation.deleteAllFlows(dbHandlerApi)) {
 	    datagridService.notificationSendAllFlowsRemoved();
 	    return true;
 	}
 	return false;
+	*/
     }
 
     /**
@@ -608,11 +616,18 @@
      */
     @Override
     public boolean deleteFlow(FlowId flowId) {
+	//
+	// TODO: In the notification-based implementation,
+	// deleteFlow() is implemented by using clearFlow()
+	//
+	return clearFlow(flowId);
+	/*
 	if (FlowDatabaseOperation.deleteFlow(dbHandlerApi, flowId)) {
 	    datagridService.notificationSendFlowRemoved(flowId);
 	    return true;
 	}
 	return false;
+	*/
     }
 
     /**