diff --git a/apps/fpcagent/src/main/java/org/onosproject/fpcagent/FpcRpcManager.java b/apps/fpcagent/src/main/java/org/onosproject/fpcagent/FpcRpcManager.java
index a8afa83..3e9cce2 100644
--- a/apps/fpcagent/src/main/java/org/onosproject/fpcagent/FpcRpcManager.java
+++ b/apps/fpcagent/src/main/java/org/onosproject/fpcagent/FpcRpcManager.java
@@ -1114,24 +1114,6 @@
                             }
                         });
             }
-            if (event.subject().id().toString().contains("bmv2") ||
-                    event.subject().id().toString().contains("tofino")) {
-                switch (event.type()) {
-                    case DEVICE_ADDED: {
-                        addDpn(event.subject().id().toString().split(":")[2]);
-                        break;
-                    }
-                    case DEVICE_REMOVED: {
-                        deleteDpn(event.subject().id().toString().split(":")[2]);
-                        break;
-                    }
-                    case DEVICE_UPDATED:
-                    case DEVICE_AVAILABILITY_CHANGED:
-                        break;
-                    default:
-                        throw new RuntimeException("Unknown Device case.");
-                }
-            }
 //            else if (event.subject().manufacturer().equals("cp")) {
 //                String clientId = event.subject().annotations().value("client-id");
 //                if (CLIENT_INFO.keySet().contains(ClientIdentifier.fromString(clientId))) {
diff --git a/scripts/addP4DPN.sh b/scripts/addP4DPN.sh
index d2b820b..8f3b00c 100755
--- a/scripts/addP4DPN.sh
+++ b/scripts/addP4DPN.sh
@@ -5,7 +5,7 @@
     curl -i --header "Content-type: application/json" --request POST -u onos:rocks --data '{
         "dpns": [
             {
-                "dpn-id": '$1',
+                "dpn-id": "'$1'",
                 "dpn-name": "site1-anchor1",
                 "dpn-groups": [
                     "foo"