diff --git a/src/main/java/org/onosproject/cordvtn/CordVtn.java b/src/main/java/org/onosproject/cordvtn/CordVtn.java
index 4267838..a08bd35 100644
--- a/src/main/java/org/onosproject/cordvtn/CordVtn.java
+++ b/src/main/java/org/onosproject/cordvtn/CordVtn.java
@@ -559,11 +559,8 @@
                 ruleInstaller.populateManagementNetworkRules(host, service);
                 break;
             case PRIVATE:
-            case PRIVATE_INDIRECT:
-            case PRIVATE_DIRECT:
                 arpProxy.addGateway(service.serviceIp(), privateGatewayMac);
-            case PUBLIC_INDIRECT:
-            case PUBLIC_DIRECT:
+            case PUBLIC:
             default:
                 // TODO check if the service needs an update on its group buckets after done CORD-433
                 ruleInstaller.updateServiceGroup(service);
@@ -634,13 +631,10 @@
                 ruleInstaller.removeManagementNetworkRules(host, service);
                 break;
             case PRIVATE:
-            case PRIVATE_INDIRECT:
-            case PRIVATE_DIRECT:
                 if (getHostsWithOpenstackNetwork(vNet).isEmpty()) {
                     arpProxy.removeGateway(service.serviceIp());
                 }
-            case PUBLIC_INDIRECT:
-            case PUBLIC_DIRECT:
+            case PUBLIC:
             default:
                 // TODO check if the service needs an update on its group buckets after done CORD-433
                 ruleInstaller.updateServiceGroup(service);