diff --git a/tosca-configs/bbsim/bbsim-16.yaml b/tosca-configs/bbsim/bbsim-16.yaml
index 746166b..0d27f4b 100644
--- a/tosca-configs/bbsim/bbsim-16.yaml
+++ b/tosca-configs/bbsim/bbsim-16.yaml
@@ -53,37 +53,6 @@
             node: service#volt
             relationship: tosca.relationships.BelongsToOne
 
-    # map the BNG to a port
-    # this is not really used by BBSIM as there's no data-plane traffic,
-    # but it's required by NEM to configure the crossconnect
-    bngmapping:
-      type: tosca.nodes.BNGPortMapping
-      properties:
-        s_tag: any
-        switch_port: 1
-
-    # DHCP L2 Relay config
-    onos_app#dhcpl2relay:
-      type: tosca.nodes.ONOSApp
-      properties:
-        name: dhcpl2relay
-        must-exist: true
-
-    dhcpl2relay-config-attr:
-      type: tosca.nodes.ServiceInstanceAttribute
-      properties:
-        name: /onos/v1/network/configuration/apps/org.opencord.dhcpl2relay
-        value: >
-          {
-            "dhcpl2relay" : {
-              "useOltUplinkForServerPktInOut" : true
-            }
-          }
-      requirements:
-        - service_instance:
-            node: onos_app#dhcpl2relay
-            relationship: tosca.relationships.BelongsToOne
-
     # Whitelist
     service#att:
       type: tosca.nodes.AttWorkflowDriverService
diff --git a/tosca-configs/bbsim/bbsim-2.yaml b/tosca-configs/bbsim/bbsim-2.yaml
index 607f2f2..63a3f44 100644
--- a/tosca-configs/bbsim/bbsim-2.yaml
+++ b/tosca-configs/bbsim/bbsim-2.yaml
@@ -53,37 +53,6 @@
             node: service#volt
             relationship: tosca.relationships.BelongsToOne
 
-    # map the BNG to a port
-    # this is not really used by BBSIM as there's no data-plane traffic,
-    # but it's required by NEM to configure the crossconnect
-    bngmapping:
-      type: tosca.nodes.BNGPortMapping
-      properties:
-        s_tag: any
-        switch_port: 1
-
-    # DHCP L2 Relay config
-    onos_app#dhcpl2relay:
-      type: tosca.nodes.ONOSApp
-      properties:
-        name: dhcpl2relay
-        must-exist: true
-
-    dhcpl2relay-config-attr:
-      type: tosca.nodes.ServiceInstanceAttribute
-      properties:
-        name: /onos/v1/network/configuration/apps/org.opencord.dhcpl2relay
-        value: >
-          {
-            "dhcpl2relay" : {
-              "useOltUplinkForServerPktInOut" : true
-            }
-          }
-      requirements:
-        - service_instance:
-            node: onos_app#dhcpl2relay
-            relationship: tosca.relationships.BelongsToOne
-
     # Whitelist
     service#att:
       type: tosca.nodes.AttWorkflowDriverService