diff --git a/rw_core/core/grpc_nbi_api_handler.go b/rw_core/core/grpc_nbi_api_handler.go
index 1524474..2913b51 100644
--- a/rw_core/core/grpc_nbi_api_handler.go
+++ b/rw_core/core/grpc_nbi_api_handler.go
@@ -189,14 +189,14 @@
 		return &voltha.Device{Id: device.Id}, nil
 	}
 
-	txn, err := handler.createKvTransaction(ctx)
-	if txn == nil {
-		return &voltha.Device{}, err
-	} else if txn.Acquired(MAX_RESPONSE_TIME) {
-		defer txn.Close()   // Ensure active core signals "done" to standby
-	} else {
-		return &voltha.Device{}, nil
-	}
+	//txn, err := handler.createKvTransaction(ctx)
+	//if txn == nil {
+	//	return &voltha.Device{}, err
+	//} else if txn.Acquired(MAX_RESPONSE_TIME) {
+	//	defer txn.Close()   // Ensure active core signals "done" to standby
+	//} else {
+	//	return &voltha.Device{}, nil
+	//}
 
 	ch := make(chan interface{})
 	defer close(ch)
@@ -227,14 +227,14 @@
 		return new(empty.Empty), nil
 	}
 
-	txn, err := handler.createKvTransaction(ctx)
-	if txn == nil {
-		return new(empty.Empty), err
-	} else if txn.Acquired(MAX_RESPONSE_TIME) {
-		defer txn.Close()   // Ensure active core signals "done" to standby
-	} else {
-		return new(empty.Empty), nil
-	}
+	//txn, err := handler.createKvTransaction(ctx)
+	//if txn == nil {
+	//	return new(empty.Empty), err
+	//} else if txn.Acquired(MAX_RESPONSE_TIME) {
+	//	defer txn.Close()   // Ensure active core signals "done" to standby
+	//} else {
+	//	return new(empty.Empty), nil
+	//}
 
 	ch := make(chan interface{})
 	defer close(ch)