diff --git a/cord-fabric-pingtest.yml b/cord-fabric-pingtest.yml
index 3c2fc86..04411e4 100644
--- a/cord-fabric-pingtest.yml
+++ b/cord-fabric-pingtest.yml
@@ -18,15 +18,6 @@
 # Send some pings from compute nodes to head node over the fabri
 # Mainly useful for CiaB right now
 
-- name: Include vars
-  hosts: head
-  tasks:
-    - name: Include variables
-      include_vars: "{{ item }}"
-      with_items:
-        - "profile_manifests/{{ cord_profile }}.yml"
-        - profile_manifests/local_vars.yml
-
 - name: Fabric ping test to gateway
   hosts: compute
   remote_user: ubuntu
diff --git a/profile_manifests/api-test.yml b/profile_manifests/api-test.yml
deleted file mode 100644
index 46976a8..0000000
--- a/profile_manifests/api-test.yml
+++ /dev/null
@@ -1,80 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# vars/api-test.yaml
-
-site_name: mysite
-deployment_type: MyDeployment
-
-frontend_only: True
-use_openstack: False
-use_vtn: False
-needs_pki_install: True
-
-build_xos_base_image: True
-build_xos_test_image: True
-
-source_ui_image: "xosproject/xos-test"
-
-xos_admin_user: padmin@vicci.org
-xos_admin_pass: letmein
-xos_admin_first: XOS
-xos_admin_last: Admin
-
-xos_tosca_config_templates:
-  - management-net.yaml
-  - sample.yaml
-  - services.yaml
-  - volt-devices.yaml
-  - xos-gui-extensions.yml
-
-# paths relative to repo checkout, defined in manifest/default.xml
-xos_services:
-  - name: volt
-    path: orchestration/xos_services/olt-service
-  - name: onos
-    path: orchestration/xos_services/onos-service
-  - name: vrouter
-    path: orchestration/xos_services/vrouter
-  - name: vsg
-    path: orchestration/xos_services/vsg
-  - name: vtr
-    path: orchestration/xos_services/vtr
-
-xos_service_sshkeys:
-  - name: onos_rsa
-    source_path: "/dev/null"
-  - name: onos_rsa.pub
-    source_path: "/dev/null"
-  - name: volt_rsa
-    source_path: "/dev/null"
-  - name: volt_rsa.pub
-    source_path: "/dev/null"
-  - name: vsg_rsa
-    source_path: "/dev/null"
-  - name: vsg_rsa.pub
-    source_path: "/dev/null"
-
-# site domain suffix
-site_suffix: opencloud.us
-
-# SSL server certificate generation
-server_certs:
-  - cn: "xos-core.{{ site_suffix }}"
-    subj: "/C=US/ST=California/L=Menlo Park/O=ON.Lab/OU=Test Deployment/CN=xos-core.{{ site_suffix }}"
-    altnames:
-      - "DNS:xos-core.{{ site_suffix }}"
diff --git a/profile_manifests/base-cord.yml b/profile_manifests/base-cord.yml
deleted file mode 100644
index 0a20773..0000000
--- a/profile_manifests/base-cord.yml
+++ /dev/null
@@ -1,260 +0,0 @@
----
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# profile_manifests/base-cord.yml
-# Base CORD Profile Manifest
-
-# Site configuration
-site_name: mysite
-site_humanname: MySite
-#site_suffix: "{{ site_name }}.cord.lab" - broken, see CORD-1520
-site_suffix: "cord.lab"
-deployment_type: MyDeployment
-
-# Feature toggles
-use_fabric: True
-use_maas: True
-
-# XOS config
-xos_new_tosca_config_templates:
-  - vtn-service.yaml
-  - fabric-service.yaml
-  - management-net.yaml
-  - addressmanager-service.yaml
-  - public-net.yaml
-  - xos-gui-extensions.yml
-
-# An example of adding TOSCA for a service using the new engine.
-#xos_new_tosca_config_templates:
-#  - template-service.yaml
-
-xos_other_templates:
-  - fabric-network-cfg.json
-
-enabled_gui_extensions:
-  - name: sample
-    path: orchestration/xos-sample-gui-extension
-  - name: rcord
-    path: orchestration/profiles/rcord/xos/gui
-    extra_files:
-      - index.css
-  - name: veestat
-    path: orchestration/xos_services/vEE/xos/veestat
-  - name: vnaas
-    path: orchestration/xos_services/vnaas/xos/gui
-    extra_files:
-      - app/style/style.css
-      - mapconstants.js
-  - name: vtr
-    path: orchestration/xos_services/vtr/xos/gui
-
-# paths defined in manifest/default.xml
-xos_services:
-  - name: vtn
-    path: orchestration/xos_services/vtn-service
-    keypair: vsg_rsa
-  - name: openstack
-    path: orchestration/xos_services/openstack
-  - name: onos
-    path: orchestration/xos_services/onos-service
-    keypair: onos_rsa
-  - name: fabric
-    path: orchestration/xos_services/fabric
-  - name: addressmanager
-    path: orchestration/xos_services/addressmanager
-# An example of adding a new service to the profile
-#  - name: templateservice
-#    path: orchestration/xos_services/templateservice
-#    keypair: templateservice_rsa
-
-# VTN network configuration
-management_network_cidr: 172.27.0.0/24
-management_network_ip: 172.27.0.1/24
-data_plane_ip: 10.168.0.253/24
-
-# Juju config
-charm_versions:
-  ceilometer-agent: "cs:trusty/ceilometer-agent-13"
-  ceilometer: "cs:trusty/ceilometer-17"
-  glance: "cs:trusty/glance-28"
-  keystone: "cs:trusty/keystone-267"
-  mongodb: "cs:trusty/mongodb-33"
-  nagios: "cs:trusty/nagios-10"
-  neutron-api: "cs:~cordteam/trusty/neutron-api-6"
-  nova-cloud-controller: "cs:trusty/nova-cloud-controller-64"
-  nova-compute: "cs:~cordteam/trusty/nova-compute-4"
-  nrpe: "cs:trusty/nrpe-4"
-  ntp: "cs:trusty/ntp-14"
-  openstack-dashboard: "cs:trusty/openstack-dashboard-19"
-  percona-cluster: "cs:trusty/percona-cluster-31"
-  rabbitmq-server: "cs:trusty/rabbitmq-server-42"
-
-head_lxd_list:
-  - name: "juju-1"
-    service: "juju"
-    aliases:
-      - "juju"
-    ipv4_last_octet: 10
-
-  - name: "ceilometer-1"
-    service: "ceilometer"
-    aliases:
-      - "ceilometer"
-    ipv4_last_octet: 20
-    forwarded_ports:
-      - { ext: 8777, int: 8777 }
-
-  - name: "glance-1"
-    service: "glance"
-    aliases:
-      - "glance"
-    ipv4_last_octet: 30
-    forwarded_ports:
-      - { ext: 9292, int: 9292 }
-
-  - name: "keystone-1"
-    service: "keystone"
-    aliases:
-      - "keystone"
-    ipv4_last_octet: 40
-    forwarded_ports:
-      - { ext: 35357, int: 35357 }
-      - { ext: 4990, int: 4990 }
-      - { ext: 5000, int: 5000 }
-
-  - name: "percona-cluster-1"
-    service: "percona-cluster"
-    aliases:
-      - "percona-cluster"
-    ipv4_last_octet: 50
-
-  - name: "nagios-1"
-    service: "nagios"
-    aliases:
-      - "nagios"
-    ipv4_last_octet: 60
-    forwarded_ports:
-      - { ext: 3128, int: 80 }
-
-  - name: "neutron-api-1"
-    service: "neutron-api"
-    aliases:
-      - "neutron-api"
-    ipv4_last_octet: 70
-    forwarded_ports:
-      - { ext: 9696, int: 9696 }
-
-  - name: "nova-cloud-controller-1"
-    service: "nova-cloud-controller"
-    aliases:
-      - "nova-cloud-controller"
-    ipv4_last_octet: 80
-    forwarded_ports:
-      - { ext: 8774, int: 8774 }
-
-  - name: "openstack-dashboard-1"
-    service: "openstack-dashboard"
-    aliases:
-      - "openstack-dashboard"
-    ipv4_last_octet: 90
-    forwarded_ports:
-      - { ext: 8080, int: 80 }
-
-  - name: "rabbitmq-server-1"
-    service: "rabbitmq-server"
-    aliases:
-      - "rabbitmq-server"
-    ipv4_last_octet: 100
-
-  - name: "mongodb-1"
-    service: "mongodb"
-    aliases:
-      - "mongodb"
-    ipv4_last_octet: 110
-
-
-lxd_service_list:
-  - ceilometer
-  - glance
-  - keystone
-  - mongodb
-  - nagios
-  - neutron-api
-  - nova-cloud-controller
-  - openstack-dashboard
-  - percona-cluster
-  - rabbitmq-server
-
-
-standalone_service_list:
-  - ntp
-  - nrpe
-  - ceilometer-agent
-
-
-service_relations:
-  - name: keystone
-    relations: [ "percona-cluster", "nrpe", ]
-
-  - name: nova-cloud-controller
-    relations: [ "percona-cluster", "rabbitmq-server", "glance", "keystone", "nrpe", ]
-
-  - name: glance
-    relations: [ "percona-cluster", "keystone", "nrpe", ]
-
-  - name: neutron-api
-    relations: [ "keystone",  "percona-cluster", "rabbitmq-server", "nova-cloud-controller", "nrpe", ]
-
-  - name: openstack-dashboard
-    relations: [ "keystone", "nrpe", ]
-
-  - name: nagios
-    relations: [ "nrpe", ]
-
-  - name: "percona-cluster:juju-info"
-    relations: [ "nrpe:general-info", ]
-
-  - name: rabbitmq-server
-    relations: [ "nrpe", ]
-
-  - name: ceilometer
-    relations: [ "mongodb", "rabbitmq-server", "nagios", "nrpe", ]
-
-  - name: "ceilometer:identity-service"
-    relations: [ "keystone:identity-service", ]
-
-  - name: "ceilometer:ceilometer-service"
-    relations: [ "ceilometer-agent:ceilometer-service", ]
-
-
-compute_relations:
-  - name: nova-compute
-    relations: [ "ceilometer-agent", "glance", "nova-cloud-controller", "nagios", "nrpe", ]
-
-  - name: "nova-compute:shared-db"
-    relations: [ "percona-cluster:shared-db", ]
-
-  - name: "nova-compute:amqp"
-    relations: [ "rabbitmq-server:amqp", ]
-
-  - name: ntp
-    relations: [ "nova-compute", ]
-
-
-xos_images:
-  - name: "trusty-server-multi-nic"
-    url: "https://github.com/opencord/platform-install/releases/download/vms/trusty-server-cloudimg-amd64-disk1.img.20170201"
-    checksum: "sha256:ebf007ba3ec1043b7cd011fc6668e2a1d1d4c69c41071e8513ab355df7a057cb"
diff --git a/profile_manifests/ecord-global.yml b/profile_manifests/ecord-global.yml
deleted file mode 100644
index 3f9d329..0000000
--- a/profile_manifests/ecord-global.yml
+++ /dev/null
@@ -1,67 +0,0 @@
----
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# profile_manifests/ecord-global.yml
-# Global E-CORD Profile Manifest
-#
-# Note: supports the `single` scenario, but not the virtual/physical scenarios
-# (requires ONOS, but not MaaS/OpenStack)
-
-# Site configuration
-site_name: ecordglobal
-site_humanname: "Global E-CORD"
-site_suffix: "{{ site_name }}.cord.lab"
-deployment_type: "global_ecord"
-
-# Feature toggles
-use_maas: True
-use_apt_cache: True
-
-# XOS config
-xos_new_tosca_config_templates:
-  - onos-global-service.yaml
-  - carrierethernet-global-app.yaml
-  - service-graph-constraints.yaml
-  - xos-gui-extensions.yml
-
-
-xos_other_templates:
- - fabric-network-cfg.json
-
-# GUI Config [new GUI]
-gui_project_name: "Global E-CORD"
-gui_background: "cord-bg.jpg" # TODO find ecord image
-gui_payoff: "Your Enterprise Global VNF orchestrator"
-
-enabled_gui_extensions:
-  - name: vnaas
-    path: orchestration/xos_services/vnaas/xos/gui
-    extra_files:
-      - app/style/style.css
-      - mapconstants.js
-
-# paths defined in manifest/default.xml
-xos_services:
-  - name: onos
-    path: orchestration/xos_services/onos-service
-  - name: vnaas
-    path: orchestration/xos_services/vnaas
-
-# service graph gui constraints
-xos_gui_service_graph_constraints: '["vnaas"]'
-
-# VTN network configuration
-management_network_ip: 172.27.0.1/24
-data_plane_ip: 10.168.0.253/24
diff --git a/profile_manifests/ecord.yml b/profile_manifests/ecord.yml
deleted file mode 100644
index 21a2536..0000000
--- a/profile_manifests/ecord.yml
+++ /dev/null
@@ -1,257 +0,0 @@
----
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# profile_manifests/ecord.yaml
-# E-CORD Profile Manifest
-
-# Site configuration
-site_name: mysite
-site_humanname: MySite
-#site_suffix: "{{ site_name }}.cord.lab" - broken, see CORD-1520
-site_suffix: "cord.lab"
-deployment_type: MyDeployment
-
-# Feature toggles
-use_apt_cache: True
-use_fabric: True
-use_maas: True
-
-# XOS config
-xos_new_tosca_config_templates:
-  - vtn-service.yaml
-  - fabric-service.yaml
-  - management-net.yaml
-  - ecord-services.yaml
-  - public-net.yaml
-  - vee-service.yaml
-  - carrierethernet-local-app.yaml
-  - xos-gui-extensions.yml
-  - service-graph-constraints.yaml
-
-xos_other_templates:
-  - fabric-network-cfg.json
-
-# GUI Config [new GUI]
-gui_project_name: "E-CORD"
-gui_background: "cord-bg.jpg" # TODO find ecord image
-gui_payoff: "Your Enterprise VNF orchestrator"
-
-enabled_gui_extensions:
-  - name: veestat
-    path: orchestration/xos_services/vEE/xos/veestat
-
-# paths defined in manifest/default.xml
-xos_services:
-  - name: addressmanager
-    path: orchestration/xos_services/addressmanager
-  - name: openstack
-    path: orchestration/xos_services/openstack
-  - name: onos
-    path: orchestration/xos_services/onos-service
-    keypair: onos_rsa
-  - name: vtn
-    path: orchestration/xos_services/vtn-service
-  - name: fabric
-    path: orchestration/xos_services/fabric
-  - name: vrouter
-    path: orchestration/xos_services/vrouter
-  - name: veg
-    path: orchestration/xos_services/vEG
-    keypair: veg_rsa
-  - name: vee
-    path: orchestration/xos_services/vEE
-
-# service graph gui constraints
-xos_gui_service_graph_constraints: '["vee", "veg", "vrouter"]'
-
-# VTN network configuration
-management_network_ip: 172.27.0.1/24
-data_plane_ip: 10.168.0.253/24
-
-# Juju config
-charm_versions:
-  ceilometer: "cs:trusty/ceilometer-17"
-  ceilometer-agent: "cs:trusty/ceilometer-agent-13"
-  glance: "cs:trusty/glance-28"
-  keystone: "cs:trusty/keystone-267"
-  mongodb: "cs:trusty/mongodb-33"
-  nagios: "cs:trusty/nagios-10"
-  neutron-api: "cs:~cordteam/trusty/neutron-api-6"
-  nova-cloud-controller: "cs:trusty/nova-cloud-controller-64"
-  nova-compute: "cs:~cordteam/trusty/nova-compute-4"
-  nrpe: "cs:trusty/nrpe-4"
-  ntp: "cs:trusty/ntp-14"
-  openstack-dashboard: "cs:trusty/openstack-dashboard-19"
-  percona-cluster: "cs:trusty/percona-cluster-31"
-  rabbitmq-server: "cs:trusty/rabbitmq-server-42"
-
-head_lxd_list:
-  - name: "juju-1"
-    service: "juju"
-    aliases:
-      - "juju"
-    ipv4_last_octet: 10
-
-  - name: "ceilometer-1"
-    service: "ceilometer"
-    aliases:
-      - "ceilometer"
-    ipv4_last_octet: 20
-    forwarded_ports:
-      - { ext: 8777, int: 8777 }
-
-  - name: "glance-1"
-    service: "glance"
-    aliases:
-      - "glance"
-    ipv4_last_octet: 30
-    forwarded_ports:
-      - { ext: 9292, int: 9292 }
-
-  - name: "keystone-1"
-    service: "keystone"
-    aliases:
-      - "keystone"
-    ipv4_last_octet: 40
-    forwarded_ports:
-      - { ext: 35357, int: 35357 }
-      - { ext: 4990, int: 4990 }
-      - { ext: 5000, int: 5000 }
-
-  - name: "percona-cluster-1"
-    service: "percona-cluster"
-    aliases:
-      - "percona-cluster"
-    ipv4_last_octet: 50
-
-  - name: "nagios-1"
-    service: "nagios"
-    aliases:
-      - "nagios"
-    ipv4_last_octet: 60
-    forwarded_ports:
-      - { ext: 3128, int: 80 }
-
-  - name: "neutron-api-1"
-    service: "neutron-api"
-    aliases:
-      - "neutron-api"
-    ipv4_last_octet: 70
-    forwarded_ports:
-      - { ext: 9696, int: 9696 }
-
-  - name: "nova-cloud-controller-1"
-    service: "nova-cloud-controller"
-    aliases:
-      - "nova-cloud-controller"
-    ipv4_last_octet: 80
-    forwarded_ports:
-      - { ext: 8774, int: 8774 }
-
-  - name: "openstack-dashboard-1"
-    service: "openstack-dashboard"
-    aliases:
-      - "openstack-dashboard"
-    ipv4_last_octet: 90
-    forwarded_ports:
-      - { ext: 8080, int: 80 }
-
-  - name: "rabbitmq-server-1"
-    service: "rabbitmq-server"
-    aliases:
-      - "rabbitmq-server"
-    ipv4_last_octet: 100
-
-  - name: "mongodb-1"
-    service: "mongodb"
-    aliases:
-      - "mongodb"
-    ipv4_last_octet: 110
-
-lxd_service_list:
-  - ceilometer
-  - glance
-  - keystone
-  - mongodb
-  - nagios
-  - neutron-api
-  - nova-cloud-controller
-  - openstack-dashboard
-  - percona-cluster
-  - rabbitmq-server
-
-standalone_service_list:
-  - ntp
-  - nrpe
-  - ceilometer-agent
-
-
-service_relations:
-  - name: keystone
-    relations: [ "percona-cluster", "nrpe", ]
-
-  - name: nova-cloud-controller
-    relations: [ "percona-cluster", "rabbitmq-server", "glance", "keystone", "nrpe", ]
-
-  - name: glance
-    relations: [ "percona-cluster", "keystone", "nrpe", ]
-
-  - name: neutron-api
-    relations: [ "keystone",  "percona-cluster", "rabbitmq-server", "nova-cloud-controller", "nrpe", ]
-
-  - name: openstack-dashboard
-    relations: [ "keystone", "nrpe", ]
-
-  - name: nagios
-    relations: [ "nrpe", ]
-
-  - name: "percona-cluster:juju-info"
-    relations: [ "nrpe:general-info", ]
-
-  - name: rabbitmq-server
-    relations: [ "nrpe", ]
-
-  - name: ceilometer
-    relations: [ "mongodb", "rabbitmq-server", "nagios", "nrpe", ]
-
-  - name: "ceilometer:identity-service"
-    relations: [ "keystone:identity-service", ]
-
-  - name: "ceilometer:ceilometer-service"
-    relations: [ "ceilometer-agent:ceilometer-service", ]
-
-
-compute_relations:
-  - name: nova-compute
-    relations: [ "ceilometer-agent", "glance", "nova-cloud-controller", "nagios", "nrpe", ]
-
-  - name: "nova-compute:shared-db"
-    relations: [ "percona-cluster:shared-db", ]
-
-  - name: "nova-compute:amqp"
-    relations: [ "rabbitmq-server:amqp", ]
-
-  - name: ntp
-    relations: [ "nova-compute", ]
-
-
-xos_images:
-  - name: "trusty-server-multi-nic"
-    url: "https://github.com/opencord/platform-install/releases/download/vms/trusty-server-cloudimg-amd64-disk1.img.20170201"
-    checksum: "sha256:ebf007ba3ec1043b7cd011fc6668e2a1d1d4c69c41071e8513ab355df7a057cb"
-
-  - name: "vsg-1.1"
-    url: "https://github.com/opencord/vsg/releases/download/vms/vsg-1.1.img"
-    checksum: "sha256:16b0beb6778aed0f5feecb05f8d5750e6c262f98e6011e99ddadf7d46a177b6f"
diff --git a/profile_manifests/frontend.yml b/profile_manifests/frontend.yml
deleted file mode 100644
index d7854a4..0000000
--- a/profile_manifests/frontend.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# profile_manifests/frontend.yaml
-# A minimal frontend config for GUI dev
-
-site_name: frontend
-deployment_type: "Frontend Mock"
-site_suffix: "{{ site_name }}.opencloud.us"
-
-# Feature toggles
-frontend_only: True
-use_openstack: False
-use_vtn: False
-
-build_xos_base_image: True
-
-# XOS Config
-xos_tosca_config_templates:
-  - sample.yaml
-  - xos-gui-extensions.yml
-
-# SSL server certificate generation
-server_certs:
-  - cn: "xos-core.{{ site_suffix }}"
-    subj: "/C=US/ST=California/L=Menlo Park/O=ON.Lab/OU=Test Deployment/CN=xos-core.{{ site_suffix }}"
-    altnames:
-      - "DNS:xos-core.{{ site_suffix }}"
-
-enabled_gui_extensions:
-  - name: sample
-    path: orchestration/xos-sample-gui-extension
-
diff --git a/profile_manifests/local_vars.yml b/profile_manifests/local_vars.yml
deleted file mode 100644
index b473a43..0000000
--- a/profile_manifests/local_vars.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-# local_custom_vars.yaml
-# Put any local customizations to variables in this file.
-
diff --git a/profile_manifests/mcord-cavium.yml b/profile_manifests/mcord-cavium.yml
deleted file mode 100644
index 791619c..0000000
--- a/profile_manifests/mcord-cavium.yml
+++ /dev/null
@@ -1,271 +0,0 @@
----
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# profile_manifests/mcord.yml
-# Configures an M-CORD pod
-
-# site configuration
-site_name: mysite
-site_humanname: MySite
-#site_suffix: "{{ site_name }}.opencord.org"
-site_suffix: "cord.lab"
-deployment_type: MyDeployment
-
-# Feature toggles
-use_fabric: True
-use_maas: True
-
-# XOS config
-xos_new_tosca_config_templates:
-  - vtn-service.yaml
-  - fabric-service.yaml
-  - management-net.yaml
-  - shared-net.yaml
-  - wan-net.yaml
-  - vsg-net.yaml
-  - s11-net.yaml
-  - flat-net-s1u.yaml
-  - flat-net-s1mme.yaml
-  - spgw-net.yaml
-  - sgi-net.yaml
-  - mcord-cavium-services.yml
-  - xos-gui-extensions.yml
-  - service-graph-constraints.yaml
-
-xos_other_templates:
-  - fabric-network-cfg.json
-
-# GUI Config [new GUI]
-gui_project_name: "M-CORD"
-gui_background: "cord-bg.jpg" # TODO find mcord image
-
-enabled_gui_extensions: []
-
-# paths defined in manifest/default.xml, eNB is temporally removed
-xos_services:
-  - name: vtn
-    path: orchestration/xos_services/vtn-service
-    keypair: vsg_rsa
-  - name: openstack
-    path: orchestration/xos_services/openstack
-  - name: onos
-    path: orchestration/xos_services/onos-service
-    keypair: onos_rsa
-  - name: addressmanager
-    path: orchestration/xos_services/addressmanager
-  - name: fabric
-    path: orchestration/xos_services/fabric
-  - name: vmme
-    path: orchestration/xos_services/vmme
-    keypair: mcord_rsa
-  - name: vspgwc
-    path: orchestration/xos_services/vspgwc
-    keypair: mcord_rsa
-  - name: vspgwu
-    path: orchestration/xos_services/vspgwu
-    keypair: mcord_rsa
-  - name: vepc
-    path: orchestration/xos_services/epc-service
-    keypair: mcord_rsa
-
-# service graph gui constraints
-xos_gui_service_graph_constraints: '["mcord", "venb", ["vspgwc", "vspgwu"]]'
-
-profile_library: "mcord"
-
-# VTN network configuration
-management_network_cidr: 172.27.0.0/24
-management_network_ip: 172.27.0.1/24
-data_plane_ip: 10.168.0.253/24
-
-# Juju config
-charm_versions:
-  ceilometer: "cs:trusty/ceilometer-17"
-  ceilometer-agent: "cs:trusty/ceilometer-agent-13"
-  glance: "cs:trusty/glance-28"
-  keystone: "cs:trusty/keystone-267"
-  mongodb: "cs:trusty/mongodb-33"
-  percona-cluster: "cs:trusty/percona-cluster-31"
-  nagios: "cs:trusty/nagios-10"
-  neutron-api: "cs:~cordteam/trusty/neutron-api-6"
-  nova-cloud-controller: "cs:trusty/nova-cloud-controller-64"
-  nova-compute: "cs:~cordteam/trusty/nova-compute-3"
-  nrpe: "cs:trusty/nrpe-4"
-  ntp: "cs:trusty/ntp-14"
-  openstack-dashboard: "cs:trusty/openstack-dashboard-19"
-  rabbitmq-server: "cs:trusty/rabbitmq-server-42"
-
-head_lxd_list:
-  - name: "juju-1"
-    service: "juju"
-    aliases:
-      - "juju"
-    ipv4_last_octet: 10
-
-  - name: "ceilometer-1"
-    service: "ceilometer"
-    aliases:
-      - "ceilometer"
-    ipv4_last_octet: 20
-    forwarded_ports:
-      - { ext: 8777, int: 8777 }
-
-  - name: "glance-1"
-    service: "glance"
-    aliases:
-      - "glance"
-    ipv4_last_octet: 30
-    forwarded_ports:
-      - { ext: 9292, int: 9292 }
-
-  - name: "keystone-1"
-    service: "keystone"
-    aliases:
-      - "keystone"
-    ipv4_last_octet: 40
-    forwarded_ports:
-      - { ext: 35357, int: 35357 }
-      - { ext: 4990, int: 4990 }
-      - { ext: 5000, int: 5000 }
-
-  - name: "percona-cluster-1"
-    service: "percona-cluster"
-    aliases:
-      - "percona-cluster"
-    ipv4_last_octet: 50
-
-  - name: "nagios-1"
-    service: "nagios"
-    aliases:
-      - "nagios"
-    ipv4_last_octet: 60
-    forwarded_ports:
-      - { ext: 3128, int: 80 }
-
-  - name: "neutron-api-1"
-    service: "neutron-api"
-    aliases:
-      - "neutron-api"
-    ipv4_last_octet: 70
-    forwarded_ports:
-      - { ext: 9696, int: 9696 }
-
-  - name: "nova-cloud-controller-1"
-    service: "nova-cloud-controller"
-    aliases:
-      - "nova-cloud-controller"
-    ipv4_last_octet: 80
-    forwarded_ports:
-      - { ext: 8774, int: 8774 }
-
-  - name: "openstack-dashboard-1"
-    service: "openstack-dashboard"
-    aliases:
-      - "openstack-dashboard"
-    ipv4_last_octet: 90
-    forwarded_ports:
-      - { ext: 8080, int: 80 }
-
-  - name: "rabbitmq-server-1"
-    service: "rabbitmq-server"
-    aliases:
-      - "rabbitmq-server"
-    ipv4_last_octet: 100
-
-  - name: "mongodb-1"
-    service: "mongodb"
-    aliases:
-      - "mongodb"
-    ipv4_last_octet: 110
-
-lxd_service_list:
-  - ceilometer
-  - glance
-  - keystone
-  - mongodb
-  - nagios
-  - neutron-api
-  - nova-cloud-controller
-  - openstack-dashboard
-  - percona-cluster
-  - rabbitmq-server
-
-standalone_service_list:
-  - ntp
-  - nrpe
-  - ceilometer-agent
-
-
-service_relations:
-  - name: keystone
-    relations: [ "percona-cluster", "nrpe", ]
-
-  - name: nova-cloud-controller
-    relations: [ "percona-cluster", "rabbitmq-server", "glance", "keystone", "nrpe", ]
-
-  - name: glance
-    relations: [ "percona-cluster", "keystone", "nrpe", ]
-
-  - name: neutron-api
-    relations: [ "keystone",  "percona-cluster", "rabbitmq-server", "nova-cloud-controller", "nrpe", ]
-
-  - name: openstack-dashboard
-    relations: [ "keystone", "nrpe", ]
-
-  - name: nagios
-    relations: [ "nrpe", ]
-
-  - name: "percona-cluster:juju-info"
-    relations: [ "nrpe:general-info", ]
-
-  - name: rabbitmq-server
-    relations: [ "nrpe", ]
-
-  - name: ceilometer
-    relations: [ "mongodb", "rabbitmq-server", "nagios", "nrpe", ]
-
-  - name: "ceilometer:identity-service"
-    relations: [ "keystone:identity-service", ]
-
-  - name: "ceilometer:ceilometer-service"
-    relations: [ "ceilometer-agent:ceilometer-service", ]
-
-
-compute_relations:
-  - name: nova-compute
-    relations: [ "ceilometer-agent", "glance", "nova-cloud-controller", "nagios", "nrpe", ]
-
-  - name: "nova-compute:shared-db"
-    relations: [ "percona-cluster:shared-db", ]
-
-  - name: "nova-compute:amqp"
-    relations: [ "rabbitmq-server:amqp", ]
-
-  - name: ntp
-    relations: [ "nova-compute", ]
-
-xos_images:
-  - name: "image-test"
-    url: "https://github.com/opencord/platform-install/releases/download/vms/trusty-server-cloudimg-amd64-disk1.img.20170201"
-    checksum: "sha256:ebf007ba3ec1043b7cd011fc6668e2a1d1d4c69c41071e8513ab355df7a057cb"
-
-  - name: "image-spgwc"
-    url: "http://www.vicci.org/cord/ngic-cp1-cmpress.qcow2.20171121"
-    checksum: "sha256:eca43de006d193625778597cc9b3f171752c31e0ce6dbed363954c87c33935a3"
-
-  - name: "image-spgwu"
-    url: "http://www.vicci.org/cord/ngic-dp1-cmpress.qcow2.20171121"
-    checksum: "sha256:2d431dc24b8de5d531ddf9a82c20f692d9ac8c9d4dd0295c535acc06c6635bc5"
\ No newline at end of file
diff --git a/profile_manifests/mcord-ng40.yml b/profile_manifests/mcord-ng40.yml
deleted file mode 100644
index d473815..0000000
--- a/profile_manifests/mcord-ng40.yml
+++ /dev/null
@@ -1,274 +0,0 @@
----
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# profile_manifests/mcord.yml
-# Configures an M-CORD pod
-
-# site configuration
-site_name: mysite
-site_humanname: MySite
-#site_suffix: "{{ site_name }}.opencord.org"
-site_suffix: "cord.lab"
-deployment_type: MyDeployment
-
-# Feature toggles
-use_fabric: True
-use_maas: True
-
-# XOS config
-xos_new_tosca_config_templates:
-  - vtn-service.yaml
-  - fabric-service.yaml
-  - management-net.yaml
-  - shared-net.yaml
-  - wan-net.yaml
-  - vsg-net.yaml
-  - s11-net.yaml
-  - s1u-net.yaml
-  - nbi-net.yaml
-  - sbi-net.yaml
-  - spgw-net.yaml
-  - sgi-net.yaml
-  - flat-net.yaml
-  - mcord-ng40-services.yml
-  - xos-gui-extensions.yml
-  - service-graph-constraints.yaml
-
-xos_other_templates:
-  - fabric-network-cfg.json
-
-# GUI Config [new GUI]
-gui_project_name: "M-CORD"
-gui_background: "cord-bg.jpg" # TODO find mcord image
-
-enabled_gui_extensions: []
-
-# paths defined in manifest/default.xml
-xos_services:
-  - name: vtn
-    path: orchestration/xos_services/vtn-service
-    keypair: vsg_rsa
-  - name: openstack
-    path: orchestration/xos_services/openstack
-  - name: onos
-    path: orchestration/xos_services/onos-service
-    keypair: onos_rsa
-  - name: addressmanager
-    path: orchestration/xos_services/addressmanager
-  - name: fabric
-    path: orchestration/xos_services/fabric
-  - name: venb
-    path: orchestration/xos_services/venb
-    keypair: mcord_rsa
-  - name: vspgwc
-    path: orchestration/xos_services/vspgwc
-    keypair: mcord_rsa
-  - name: vspgwu
-    path: orchestration/xos_services/vspgwu
-    keypair: mcord_rsa
-  - name: vepc
-    path: orchestration/xos_services/epc-service
-    keypair: mcord_rsa
-
-# service graph gui constraints
-xos_gui_service_graph_constraints: '["mcord", "venb", ["vspgwc", "vspgwu"]]'
-
-profile_library: "mcord"
-
-# VTN network configuration
-management_network_cidr: 172.27.0.0/24
-management_network_ip: 172.27.0.1/24
-data_plane_ip: 10.168.0.253/24
-
-# Juju config
-charm_versions:
-  ceilometer: "cs:trusty/ceilometer-17"
-  ceilometer-agent: "cs:trusty/ceilometer-agent-13"
-  glance: "cs:trusty/glance-28"
-  keystone: "cs:trusty/keystone-267"
-  mongodb: "cs:trusty/mongodb-33"
-  percona-cluster: "cs:trusty/percona-cluster-31"
-  nagios: "cs:trusty/nagios-10"
-  neutron-api: "cs:~cordteam/trusty/neutron-api-6"
-  nova-cloud-controller: "cs:trusty/nova-cloud-controller-64"
-  nova-compute: "cs:~cordteam/trusty/nova-compute-3"
-  nrpe: "cs:trusty/nrpe-4"
-  ntp: "cs:trusty/ntp-14"
-  openstack-dashboard: "cs:trusty/openstack-dashboard-19"
-  rabbitmq-server: "cs:trusty/rabbitmq-server-42"
-
-head_lxd_list:
-  - name: "juju-1"
-    service: "juju"
-    aliases:
-      - "juju"
-    ipv4_last_octet: 10
-
-  - name: "ceilometer-1"
-    service: "ceilometer"
-    aliases:
-      - "ceilometer"
-    ipv4_last_octet: 20
-    forwarded_ports:
-      - { ext: 8777, int: 8777 }
-
-  - name: "glance-1"
-    service: "glance"
-    aliases:
-      - "glance"
-    ipv4_last_octet: 30
-    forwarded_ports:
-      - { ext: 9292, int: 9292 }
-
-  - name: "keystone-1"
-    service: "keystone"
-    aliases:
-      - "keystone"
-    ipv4_last_octet: 40
-    forwarded_ports:
-      - { ext: 35357, int: 35357 }
-      - { ext: 4990, int: 4990 }
-      - { ext: 5000, int: 5000 }
-
-  - name: "percona-cluster-1"
-    service: "percona-cluster"
-    aliases:
-      - "percona-cluster"
-    ipv4_last_octet: 50
-
-  - name: "nagios-1"
-    service: "nagios"
-    aliases:
-      - "nagios"
-    ipv4_last_octet: 60
-    forwarded_ports:
-      - { ext: 3128, int: 80 }
-
-  - name: "neutron-api-1"
-    service: "neutron-api"
-    aliases:
-      - "neutron-api"
-    ipv4_last_octet: 70
-    forwarded_ports:
-      - { ext: 9696, int: 9696 }
-
-  - name: "nova-cloud-controller-1"
-    service: "nova-cloud-controller"
-    aliases:
-      - "nova-cloud-controller"
-    ipv4_last_octet: 80
-    forwarded_ports:
-      - { ext: 8774, int: 8774 }
-
-  - name: "openstack-dashboard-1"
-    service: "openstack-dashboard"
-    aliases:
-      - "openstack-dashboard"
-    ipv4_last_octet: 90
-    forwarded_ports:
-      - { ext: 8080, int: 80 }
-
-  - name: "rabbitmq-server-1"
-    service: "rabbitmq-server"
-    aliases:
-      - "rabbitmq-server"
-    ipv4_last_octet: 100
-
-  - name: "mongodb-1"
-    service: "mongodb"
-    aliases:
-      - "mongodb"
-    ipv4_last_octet: 110
-
-lxd_service_list:
-  - ceilometer
-  - glance
-  - keystone
-  - mongodb
-  - nagios
-  - neutron-api
-  - nova-cloud-controller
-  - openstack-dashboard
-  - percona-cluster
-  - rabbitmq-server
-
-standalone_service_list:
-  - ntp
-  - nrpe
-  - ceilometer-agent
-
-
-service_relations:
-  - name: keystone
-    relations: [ "percona-cluster", "nrpe", ]
-
-  - name: nova-cloud-controller
-    relations: [ "percona-cluster", "rabbitmq-server", "glance", "keystone", "nrpe", ]
-
-  - name: glance
-    relations: [ "percona-cluster", "keystone", "nrpe", ]
-
-  - name: neutron-api
-    relations: [ "keystone",  "percona-cluster", "rabbitmq-server", "nova-cloud-controller", "nrpe", ]
-
-  - name: openstack-dashboard
-    relations: [ "keystone", "nrpe", ]
-
-  - name: nagios
-    relations: [ "nrpe", ]
-
-  - name: "percona-cluster:juju-info"
-    relations: [ "nrpe:general-info", ]
-
-  - name: rabbitmq-server
-    relations: [ "nrpe", ]
-
-  - name: ceilometer
-    relations: [ "mongodb", "rabbitmq-server", "nagios", "nrpe", ]
-
-  - name: "ceilometer:identity-service"
-    relations: [ "keystone:identity-service", ]
-
-  - name: "ceilometer:ceilometer-service"
-    relations: [ "ceilometer-agent:ceilometer-service", ]
-
-
-compute_relations:
-  - name: nova-compute
-    relations: [ "ceilometer-agent", "glance", "nova-cloud-controller", "nagios", "nrpe", ]
-
-  - name: "nova-compute:shared-db"
-    relations: [ "percona-cluster:shared-db", ]
-
-  - name: "nova-compute:amqp"
-    relations: [ "rabbitmq-server:amqp", ]
-
-  - name: ntp
-    relations: [ "nova-compute", ]
-
-
-xos_images:
-  - name: "image-venb"
-    url: "https://github.com/opencord/venb/releases/download/vms/ng40-vmcord-1-4GB.img.20171201"
-    checksum: "sha256:3d6d385247560c90db90b2591578c200eafaa62c232a964ab664420e8b2b33ac"
-
-  - name: "image-spgwc"
-    url: "http://www.vicci.org/cord/ngic-cp1-cmpress.qcow2.20171121"
-    checksum: "sha256:eca43de006d193625778597cc9b3f171752c31e0ce6dbed363954c87c33935a3"
-
-  - name: "image-spgwu"
-    url: "http://www.vicci.org/cord/ngic-dp1-cmpress.qcow2.20171121"
-    checksum: "sha256:2d431dc24b8de5d531ddf9a82c20f692d9ac8c9d4dd0295c535acc06c6635bc5"
diff --git a/profile_manifests/mcord-spirent.yml b/profile_manifests/mcord-spirent.yml
deleted file mode 100644
index 00ec35a..0000000
--- a/profile_manifests/mcord-spirent.yml
+++ /dev/null
@@ -1,274 +0,0 @@
----
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# profile_manifests/mcord.yml
-# Configures an M-CORD pod
-
-# site configuration
-site_name: mysite
-site_humanname: MySite
-#site_suffix: "{{ site_name }}.opencord.org"
-site_suffix: "cord.lab"
-deployment_type: MyDeployment
-
-# Feature toggles
-use_fabric: True
-use_maas: True
-
-# XOS config
-
-xos_new_tosca_config_templates:
-  - vtn-service.yaml
-  - fabric-service.yaml
-  - management-net.yaml
-  - shared-net.yaml
-  - wan-net.yaml
-  - vsg-net.yaml
-  - xos-gui-extensions.yml
-  - s11-net.yaml
-  - s1u-net.yaml
-  - nbi-net.yaml
-  - sbi-net.yaml
-  - spgw-net.yaml
-  - sgi-net.yaml
-  - flat-net.yaml
-  - mcord-spirent-services.yml
-  - service-graph-constraints.yaml
-
-xos_other_templates:
-  - fabric-network-cfg.json
-
-# GUI Config [new GUI]
-gui_project_name: "M-CORD"
-gui_background: "cord-bg.jpg" # TODO find mcord image
-
-enabled_gui_extensions: []
-
-# paths defined in manifest/default.xml
-xos_services:
-  - name: vtn
-    path: orchestration/xos_services/vtn-service
-    keypair: vsg_rsa
-  - name: openstack
-    path: orchestration/xos_services/openstack
-  - name: onos
-    path: orchestration/xos_services/onos-service
-    keypair: onos_rsa
-  - name: fabric
-    path: orchestration/xos_services/fabric
-  - name: venb
-    path: orchestration/xos_services/venb
-    keypair: mcord_rsa
-  - name: vspgwc
-    path: orchestration/xos_services/vspgwc
-    keypair: mcord_rsa
-  - name: vspgwu
-    path: orchestration/xos_services/vspgwu
-    keypair: mcord_rsa
-
-# service graph gui constraints
-xos_gui_service_graph_constraints: '[]'
-
-profile_library: "mcord"
-
-# VTN network configuration
-management_network_cidr: 172.27.0.0/24
-management_network_ip: 172.27.0.1/24
-data_plane_ip: 10.168.0.253/24
-
-# Juju config
-charm_versions:
-  ceilometer: "cs:trusty/ceilometer-17"
-  ceilometer-agent: "cs:trusty/ceilometer-agent-13"
-  glance: "cs:trusty/glance-28"
-  keystone: "cs:trusty/keystone-267"
-  mongodb: "cs:trusty/mongodb-33"
-  percona-cluster: "cs:trusty/percona-cluster-31"
-  nagios: "cs:trusty/nagios-10"
-  neutron-api: "cs:~cordteam/trusty/neutron-api-6"
-  nova-cloud-controller: "cs:trusty/nova-cloud-controller-64"
-  nova-compute: "cs:~cordteam/trusty/nova-compute-4"
-  nrpe: "cs:trusty/nrpe-4"
-  ntp: "cs:trusty/ntp-14"
-  openstack-dashboard: "cs:trusty/openstack-dashboard-19"
-  rabbitmq-server: "cs:trusty/rabbitmq-server-42"
-
-head_lxd_list:
-  - name: "juju-1"
-    service: "juju"
-    aliases:
-      - "juju"
-    ipv4_last_octet: 10
-
-  - name: "ceilometer-1"
-    service: "ceilometer"
-    aliases:
-      - "ceilometer"
-    ipv4_last_octet: 20
-    forwarded_ports:
-      - { ext: 8777, int: 8777 }
-
-  - name: "glance-1"
-    service: "glance"
-    aliases:
-      - "glance"
-    ipv4_last_octet: 30
-    forwarded_ports:
-      - { ext: 9292, int: 9292 }
-
-  - name: "keystone-1"
-    service: "keystone"
-    aliases:
-      - "keystone"
-    ipv4_last_octet: 40
-    forwarded_ports:
-      - { ext: 35357, int: 35357 }
-      - { ext: 4990, int: 4990 }
-      - { ext: 5000, int: 5000 }
-
-  - name: "percona-cluster-1"
-    service: "percona-cluster"
-    aliases:
-      - "percona-cluster"
-    ipv4_last_octet: 50
-
-  - name: "nagios-1"
-    service: "nagios"
-    aliases:
-      - "nagios"
-    ipv4_last_octet: 60
-    forwarded_ports:
-      - { ext: 3128, int: 80 }
-
-  - name: "neutron-api-1"
-    service: "neutron-api"
-    aliases:
-      - "neutron-api"
-    ipv4_last_octet: 70
-    forwarded_ports:
-      - { ext: 9696, int: 9696 }
-
-  - name: "nova-cloud-controller-1"
-    service: "nova-cloud-controller"
-    aliases:
-      - "nova-cloud-controller"
-    ipv4_last_octet: 80
-    forwarded_ports:
-      - { ext: 8774, int: 8774 }
-
-  - name: "openstack-dashboard-1"
-    service: "openstack-dashboard"
-    aliases:
-      - "openstack-dashboard"
-    ipv4_last_octet: 90
-    forwarded_ports:
-      - { ext: 8080, int: 80 }
-
-  - name: "rabbitmq-server-1"
-    service: "rabbitmq-server"
-    aliases:
-      - "rabbitmq-server"
-    ipv4_last_octet: 100
-
-  - name: "mongodb-1"
-    service: "mongodb"
-    aliases:
-      - "mongodb"
-    ipv4_last_octet: 110
-
-lxd_service_list:
-  - ceilometer
-  - glance
-  - keystone
-  - mongodb
-  - nagios
-  - neutron-api
-  - nova-cloud-controller
-  - openstack-dashboard
-  - percona-cluster
-  - rabbitmq-server
-
-standalone_service_list:
-  - ntp
-  - nrpe
-  - ceilometer-agent
-
-
-service_relations:
-  - name: keystone
-    relations: [ "percona-cluster", "nrpe", ]
-
-  - name: nova-cloud-controller
-    relations: [ "percona-cluster", "rabbitmq-server", "glance", "keystone", "nrpe", ]
-
-  - name: glance
-    relations: [ "percona-cluster", "keystone", "nrpe", ]
-
-  - name: neutron-api
-    relations: [ "keystone",  "percona-cluster", "rabbitmq-server", "nova-cloud-controller", "nrpe", ]
-
-  - name: openstack-dashboard
-    relations: [ "keystone", "nrpe", ]
-
-  - name: nagios
-    relations: [ "nrpe", ]
-
-  - name: "percona-cluster:juju-info"
-    relations: [ "nrpe:general-info", ]
-
-  - name: rabbitmq-server
-    relations: [ "nrpe", ]
-
-  - name: ceilometer
-    relations: [ "mongodb", "rabbitmq-server", "nagios", "nrpe", ]
-
-  - name: "ceilometer:identity-service"
-    relations: [ "keystone:identity-service", ]
-
-  - name: "ceilometer:ceilometer-service"
-    relations: [ "ceilometer-agent:ceilometer-service", ]
-
-
-compute_relations:
-  - name: nova-compute
-    relations: [ "ceilometer-agent", "glance", "nova-cloud-controller", "nagios", "nrpe", ]
-
-  - name: "nova-compute:shared-db"
-    relations: [ "percona-cluster:shared-db", ]
-
-  - name: "nova-compute:amqp"
-    relations: [ "rabbitmq-server:amqp", ]
-
-  - name: ntp
-    relations: [ "nova-compute", ]
-
-
-xos_images:
-  - name: "trusty-server-multi-nic"
-    url: "https://github.com/opencord/platform-install/releases/download/vms/trusty-server-cloudimg-amd64-disk1.img.20170201"
-    checksum: "sha256:ebf007ba3ec1043b7cd011fc6668e2a1d1d4c69c41071e8513ab355df7a057cb"
-
-  - name: "image-venb"
-    url: "https://github.com/opencord/platform-install/releases/download/vms/trusty-server-cloudimg-amd64-disk1.img.20170201"
-    checksum: "sha256:ebf007ba3ec1043b7cd011fc6668e2a1d1d4c69c41071e8513ab355df7a057cb"
-
-  - name: "image-spgwc"
-    url: "http://www.vicci.org/cord/ngic-cp1-cmpress.qcow2.20171121"
-    checksum: "sha256:eca43de006d193625778597cc9b3f171752c31e0ce6dbed363954c87c33935a3"
-
-  - name: "image-spgwu"
-    url: "http://www.vicci.org/cord/ngic-dp1-cmpress.qcow2.20171121"
-    checksum: "sha256:2d431dc24b8de5d531ddf9a82c20f692d9ac8c9d4dd0295c535acc06c6635bc5"
diff --git a/profile_manifests/mcord.yml b/profile_manifests/mcord.yml
deleted file mode 100644
index fb8fdeb..0000000
--- a/profile_manifests/mcord.yml
+++ /dev/null
@@ -1,296 +0,0 @@
----
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# profile_manifests/mcord.yml
-# Configures an M-CORD pod
-
-# site configuration
-site_name: mysite
-site_humanname: MySite
-#site_suffix: "{{ site_name }}.opencord.org"
-site_suffix: "cord.lab"
-deployment_type: MyDeployment
-
-# Feature toggles
-use_fabric: True
-use_maas: True
-
-# XOS config
-xos_new_tosca_config_templates:
-  - vtn-service.yaml
-  - fabric-service.yaml
-  - management-net.yaml
-  - shared-net.yaml
-  - wan-net.yaml
-  - vsg-net.yaml
-  - xos-gui-extensions.yml
-  - s11-net.yaml
-  - s1u-net.yaml
-  - s1mme-net.yaml
-  - nbi-net.yaml
-  - sbi-net.yaml
-  - sgi-net.yaml
-  - flat-net.yaml
-  - mcord-services.yml
-  - internet-emulator-service.yaml
-  - sdn-controller-service.yaml
-  - vspgwc-service.yaml
-  - vspgwu-service.yaml
-  - service-graph-constraints.yaml
-#  - vepc-service.yaml
-#  - mcord-service-graph.yml
-
-xos_other_templates:
-  - fabric-network-cfg.json
-
-# GUI Config [new GUI]
-gui_project_name: "M-CORD"
-gui_background: "cord-bg.jpg" # TODO find mcord image
-
-enabled_gui_extensions: []
-
-# paths defined in manifest/default.xml
-xos_services:
-  - name: vtn
-    path: orchestration/xos_services/vtn-service
-    keypair: vsg_rsa
-  - name: openstack
-    path: orchestration/xos_services/openstack
-  - name: onos
-    path: orchestration/xos_services/onos-service
-    keypair: onos_rsa
-  - name: addressmanager
-    path: orchestration/xos_services/addressmanager
-  - name: fabric
-    path: orchestration/xos_services/fabric
-  - name: vmme
-    path: orchestration/xos_services/vmme
-    keypair: mcord_rsa
-  - name: internetemulator
-    path: orchestration/xos_services/internetemulator
-    keypair: mcord_rsa
-  - name: sdncontroller
-    path: orchestration/xos_services/sdn-controller
-    keypair: mcord_rsa
-  - name: vspgwc
-    path: orchestration/xos_services/vspgwc
-    keypair: mcord_rsa
-  - name: vspgwu
-    path: orchestration/xos_services/vspgwu
-    keypair: mcord_rsa
-  - name: exampleservice
-    path: orchestration/xos_services/exampleservice
-    keypair: exampleservice_rsa
-  - name: venb
-    path: orchestration/xos_services/venb
-    keypair: mcord_rsa
-  - name: vepc
-    path: orchestration/xos_services/epc-service
-    keypair: mcord_rsa
-
-# service graph gui constraints
-xos_gui_service_graph_constraints: '[]'
-
-profile_library: "mcord"
-
-# VTN network configuration
-management_network_cidr: 172.27.0.0/24
-management_network_ip: 172.27.0.1/24
-data_plane_ip: 10.168.0.253/24
-
-# Juju config
-charm_versions:
-  ceilometer: "cs:trusty/ceilometer-17"
-  ceilometer-agent: "cs:trusty/ceilometer-agent-13"
-  glance: "cs:trusty/glance-28"
-  keystone: "cs:trusty/keystone-267"
-  mongodb: "cs:trusty/mongodb-33"
-  percona-cluster: "cs:trusty/percona-cluster-31"
-  nagios: "cs:trusty/nagios-10"
-  neutron-api: "cs:~cordteam/trusty/neutron-api-6"
-  nova-cloud-controller: "cs:trusty/nova-cloud-controller-64"
-  nova-compute: "cs:~cordteam/trusty/nova-compute-4"
-  nrpe: "cs:trusty/nrpe-4"
-  ntp: "cs:trusty/ntp-14"
-  openstack-dashboard: "cs:trusty/openstack-dashboard-19"
-  rabbitmq-server: "cs:trusty/rabbitmq-server-42"
-
-head_lxd_list:
-  - name: "juju-1"
-    service: "juju"
-    aliases:
-      - "juju"
-    ipv4_last_octet: 10
-
-  - name: "ceilometer-1"
-    service: "ceilometer"
-    aliases:
-      - "ceilometer"
-    ipv4_last_octet: 20
-    forwarded_ports:
-      - { ext: 8777, int: 8777 }
-
-  - name: "glance-1"
-    service: "glance"
-    aliases:
-      - "glance"
-    ipv4_last_octet: 30
-    forwarded_ports:
-      - { ext: 9292, int: 9292 }
-
-  - name: "keystone-1"
-    service: "keystone"
-    aliases:
-      - "keystone"
-    ipv4_last_octet: 40
-    forwarded_ports:
-      - { ext: 35357, int: 35357 }
-      - { ext: 4990, int: 4990 }
-      - { ext: 5000, int: 5000 }
-
-  - name: "percona-cluster-1"
-    service: "percona-cluster"
-    aliases:
-      - "percona-cluster"
-    ipv4_last_octet: 50
-
-  - name: "nagios-1"
-    service: "nagios"
-    aliases:
-      - "nagios"
-    ipv4_last_octet: 60
-    forwarded_ports:
-      - { ext: 3128, int: 80 }
-
-  - name: "neutron-api-1"
-    service: "neutron-api"
-    aliases:
-      - "neutron-api"
-    ipv4_last_octet: 70
-    forwarded_ports:
-      - { ext: 9696, int: 9696 }
-
-  - name: "nova-cloud-controller-1"
-    service: "nova-cloud-controller"
-    aliases:
-      - "nova-cloud-controller"
-    ipv4_last_octet: 80
-    forwarded_ports:
-      - { ext: 8774, int: 8774 }
-
-  - name: "openstack-dashboard-1"
-    service: "openstack-dashboard"
-    aliases:
-      - "openstack-dashboard"
-    ipv4_last_octet: 90
-    forwarded_ports:
-      - { ext: 8080, int: 80 }
-
-  - name: "rabbitmq-server-1"
-    service: "rabbitmq-server"
-    aliases:
-      - "rabbitmq-server"
-    ipv4_last_octet: 100
-
-  - name: "mongodb-1"
-    service: "mongodb"
-    aliases:
-      - "mongodb"
-    ipv4_last_octet: 110
-
-lxd_service_list:
-  - ceilometer
-  - glance
-  - keystone
-  - mongodb
-  - nagios
-  - neutron-api
-  - nova-cloud-controller
-  - openstack-dashboard
-  - percona-cluster
-  - rabbitmq-server
-
-standalone_service_list:
-  - ntp
-  - nrpe
-  - ceilometer-agent
-
-
-service_relations:
-  - name: keystone
-    relations: [ "percona-cluster", "nrpe", ]
-
-  - name: nova-cloud-controller
-    relations: [ "percona-cluster", "rabbitmq-server", "glance", "keystone", "nrpe", ]
-
-  - name: glance
-    relations: [ "percona-cluster", "keystone", "nrpe", ]
-
-  - name: neutron-api
-    relations: [ "keystone",  "percona-cluster", "rabbitmq-server", "nova-cloud-controller", "nrpe", ]
-
-  - name: openstack-dashboard
-    relations: [ "keystone", "nrpe", ]
-
-  - name: nagios
-    relations: [ "nrpe", ]
-
-  - name: "percona-cluster:juju-info"
-    relations: [ "nrpe:general-info", ]
-
-  - name: rabbitmq-server
-    relations: [ "nrpe", ]
-
-  - name: ceilometer
-    relations: [ "mongodb", "rabbitmq-server", "nagios", "nrpe", ]
-
-  - name: "ceilometer:identity-service"
-    relations: [ "keystone:identity-service", ]
-
-  - name: "ceilometer:ceilometer-service"
-    relations: [ "ceilometer-agent:ceilometer-service", ]
-
-
-compute_relations:
-  - name: nova-compute
-    relations: [ "ceilometer-agent", "glance", "nova-cloud-controller", "nagios", "nrpe", ]
-
-  - name: "nova-compute:shared-db"
-    relations: [ "percona-cluster:shared-db", ]
-
-  - name: "nova-compute:amqp"
-    relations: [ "rabbitmq-server:amqp", ]
-
-  - name: ntp
-    relations: [ "nova-compute", ]
-
-
-xos_images:
-  - name: "trusty-server-multi-nic"
-    url: "https://github.com/opencord/platform-install/releases/download/vms/trusty-server-cloudimg-amd64-disk1.img.20170201"
-    checksum: "sha256:ebf007ba3ec1043b7cd011fc6668e2a1d1d4c69c41071e8513ab355df7a057cb"
-
-  - name: "vsg-1.1"
-    url: "https://github.com/opencord/vsg/releases/download/vms/vsg-1.1.img"
-    checksum: "sha256:16b0beb6778aed0f5feecb05f8d5750e6c262f98e6011e99ddadf7d46a177b6f"
-
-  - name: "ceilometer-trusty-server-multi-nic"
-    url: "https://github.com/opencord/platform-install/releases/download/vms/ceilometer-trusty-server-multi-nic.compressed.qcow2"
-    checksum: "sha256:b77ef8d692b640568dea13df99fe1dfcb1f4bb4ac05408db9ff77399b34f754f"
-
-  - name: "ceilometer-service-trusty-server-multi-nic"
-    url: "https://github.com/opencord/platform-install/releases/download/vms/ceilometer-service-trusty-server-multi-nic.compressed.qcow2.20170131"
-    checksum: "sha256:f0341e283f0f2cb8f70cd1a6347e0081c9c8492ef34eb6397c657ef824800d4f"
diff --git a/profile_manifests/opencloud.yml b/profile_manifests/opencloud.yml
deleted file mode 100644
index 7b9ffa0..0000000
--- a/profile_manifests/opencloud.yml
+++ /dev/null
@@ -1,213 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# profile_manifests/opencloud.yml
-# OpenCloud Profile Manifest
-
-# Site configuration
-site_name: generic-opencloud
-site_humanname: "Generic OpenCloud"
-site_suffix: "{{ site_name }}.opencloud.us"
-deployment_type: campus
-
-# Feature toggles
-use_maas: False
-
-# XOS config
-xos_tosca_config_templates:
-  - xos-gui-extensions.yml
-  - vtn-service.yaml
-  - management-net.yaml
-
-# GUI Config [new GUI], used in app.config.js.j2 and style.config.js.j2
-gui_project_name: "OpenCloud"
-gui_favicon: "opencloud-favicon.png"
-gui_background: "opencloud-bg.jpg"
-gui_payoff: "A Value-Added Cloud for the Internet2 Community"
-gui_logo: "opencloud-logo.png"
-
-# paths defined in manifest/default.xml
-xos_services:
-  - name: vtn
-    path: orchestration/xos_services/vtn-service
-    keypair: vsg_rsa
-  - name: openstack
-    path: orchestration/xos_services/openstack
-  - name: onos
-    path: orchestration/xos_services/onos-service
-    keypair: onos_rsa
-  - name: vrouter
-    path: orchestration/xos_services/vrouter
-
-# External interface name on compute nodes
-compute_external_interface: eth0
-
-# VTN network configuration
-management_network_cidr: 172.27.0.0/24
-management_network_ip: 172.27.0.1/24
-data_plane_ip: 10.168.0.253/24
-
-# Juju setup
-charm_versions:
-  ceilometer-agent: "cs:trusty/ceilometer-agent-13"
-  ceilometer: "cs:trusty/ceilometer-17"
-  glance: "cs:trusty/glance-28"
-  keystone: "cs:trusty/keystone-267"
-  mongodb: "cs:trusty/mongodb-33"
-  neutron-api: "cs:~cordteam/trusty/neutron-api-6"
-  nova-cloud-controller: "cs:trusty/nova-cloud-controller-64"
-  nova-compute: "cs:~cordteam/trusty/nova-compute-4"
-  ntp: "cs:trusty/ntp-14"
-  openstack-dashboard: "cs:trusty/openstack-dashboard-19"
-  percona-cluster: "cs:trusty/percona-cluster-31"
-  rabbitmq-server: "cs:trusty/rabbitmq-server-42"
-
-head_lxd_list:
-  - name: "juju-1"
-    service: "juju"
-    aliases:
-       - "juju"
-    ipv4_last_octet: 50
-
-  - name: "ceilometer-1"
-    service: "ceilometer"
-    aliases:
-      - "ceilometer"
-    ipv4_last_octet: 51
-    forwarded_ports:
-      - { ext: 8777, int: 8777 }
-
-  - name: "glance-1"
-    service: "glance"
-    aliases:
-      - "glance"
-    ipv4_last_octet: 52
-    forwarded_ports:
-      - { ext: 9292, int: 9292 }
-
-  - name: "keystone-1"
-    service: "keystone"
-    aliases:
-      - "keystone"
-    ipv4_last_octet: 53
-    forwarded_ports:
-      - { ext: 35357, int: 35357 }
-      - { ext: 4990, int: 4990 }
-      - { ext: 5000, int: 5000 }
-
-  - name: "percona-cluster-1"
-    service: "percona-cluster"
-    aliases:
-      - "percona-cluster"
-    ipv4_last_octet: 54
-
-  - name: "neutron-api-1"
-    service: "neutron-api"
-    aliases:
-      - "neutron-api"
-    ipv4_last_octet: 55
-    forwarded_ports:
-      - { ext: 9696, int: 9696 }
-
-  - name: "nova-cloud-controller-1"
-    service: "nova-cloud-controller"
-    aliases:
-      - "nova-cloud-controller"
-    ipv4_last_octet: 56
-    forwarded_ports:
-      - { ext: 8774, int: 8774 }
-
-  - name: "openstack-dashboard-1"
-    service: "openstack-dashboard"
-    aliases:
-      - "openstack-dashboard"
-    ipv4_last_octet: 57
-    forwarded_ports:
-      - { ext: 8080, int: 80 }
-
-  - name: "rabbitmq-server-1"
-    service: "rabbitmq-server"
-    aliases:
-      - "rabbitmq-server"
-    ipv4_last_octet: 58
-
-  - name: "mongodb-1"
-    service: "mongodb"
-    aliases:
-      - "mongodb"
-    ipv4_last_octet: 59
-
-lxd_service_list:
-  - ceilometer
-  - glance
-  - keystone
-  - mongodb
-  - neutron-api
-  - nova-cloud-controller
-  - openstack-dashboard
-  - percona-cluster
-  - rabbitmq-server
-
-standalone_service_list:
-  - ceilometer-agent
-  - ntp
-
-service_relations:
-  - name: keystone
-    relations: [ "percona-cluster", ]
-
-  - name: nova-cloud-controller
-    relations: [ "percona-cluster", "rabbitmq-server", "glance", "keystone", ]
-
-  - name: glance
-    relations: [ "percona-cluster", "keystone", ]
-
-  - name: neutron-api
-    relations: [ "keystone", "percona-cluster", "rabbitmq-server", "nova-cloud-controller", ]
-
-  - name: openstack-dashboard
-    relations: [ "keystone", ]
-
-  - name: ceilometer
-    relations: [ "mongodb", "rabbitmq-server" ]
-
-  - name: "ceilometer:identity-service"
-    relations: [ "keystone:identity-service", ]
-
-  - name: "ceilometer:ceilometer-service"
-    relations: [ "ceilometer-agent:ceilometer-service", ]
-
-
-compute_relations:
-  - name: nova-compute
-    relations: [ "ceilometer-agent", "glance", "nova-cloud-controller", ]
-
-  - name: "nova-compute:shared-db"
-    relations: [ "percona-cluster:shared-db", ]
-
-  - name: "nova-compute:amqp"
-    relations: [ "rabbitmq-server:amqp", ]
-
-  - name: ntp
-    relations: [ "nova-compute", ]
-
-
-xos_images:
-  - name: "trusty-server-multi-nic"
-    url: "https://github.com/opencord/platform-install/releases/download/vms/trusty-server-cloudimg-amd64-disk1.img.20170201"
-    checksum: "sha256:ebf007ba3ec1043b7cd011fc6668e2a1d1d4c69c41071e8513ab355df7a057cb"
-
diff --git a/profile_manifests/rcord.yml b/profile_manifests/rcord.yml
deleted file mode 100644
index cfee43c..0000000
--- a/profile_manifests/rcord.yml
+++ /dev/null
@@ -1,273 +0,0 @@
----
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# profile_manifests/rcord.yml
-# R-CORD Profile Manifest
-
-# Site configuration
-site_name: mysite
-site_humanname: MySite
-#site_suffix: "{{ site_name }}.cord.lab" - broken, see CORD-1520
-site_suffix: "cord.lab"
-deployment_type: MyDeployment
-
-# Feature toggles
-use_fabric: True
-use_maas: True
-
-# XOS config
-xos_new_tosca_config_templates:
-  - vtn-service.yaml
-  - fabric-service.yaml
-  - management-net.yaml
-  - cord-services.yaml
-  - public-net.yaml
-  - service-graph-constraints.yaml
-  - xos-gui-extensions.yml
-
-xos_other_templates:
-  - fabric-network-cfg.json
-
-enabled_gui_extensions:
-  - name: vtr
-    path: orchestration/xos_services/vtr/xos/gui
-  - name: rcord
-    path: orchestration/profiles/rcord/xos/gui
-    extra_files:
-      - index.css
-
-# paths defined in manifest/default.xml
-xos_services:
-  - name: volt
-    path: orchestration/xos_services/olt-service
-    keypair: volt_rsa
-    synchronizer: true
-  - name: vtn
-    path: orchestration/xos_services/vtn-service
-    keypair: vsg_rsa
-  - name: openstack
-    path: orchestration/xos_services/openstack
-  - name: onos
-    path: orchestration/xos_services/onos-service
-    keypair: onos_rsa
-  - name: vrouter
-    path: orchestration/xos_services/vrouter
-  - name: addressmanager
-    path: orchestration/xos_services/addressmanager
-  - name: vsg
-    path: orchestration/xos_services/vsg
-    keypair: vsg_rsa
-  - name: vtr
-    path: orchestration/xos_services/vtr
-    keypair: vsg_rsa
-  - name: fabric
-    path: orchestration/xos_services/fabric
-  - name: exampleservice
-    path: orchestration/xos_services/exampleservice
-    keypair: exampleservice_rsa
-#  - name: monitoring
-#    path: orchestration/xos_services/monitoring
-#    keypair: monitoringservice_rsa
-#    synchronizer: false
-
-# service graph gui constraints
-xos_gui_service_graph_constraints: '[[null, "rcord"], [null, "volt"], ["addressmanager", "vsg"], [null, "vrouter"]]'
-
-profile_library: "rcord"
-
-# VTN network configuration
-management_network_cidr: 172.27.0.0/24
-management_network_ip: 172.27.0.1/24
-data_plane_ip: 10.168.0.253/24
-
-# Juju config
-charm_versions:
-  ceilometer-agent: "cs:trusty/ceilometer-agent-13"
-  ceilometer: "cs:trusty/ceilometer-17"
-  glance: "cs:trusty/glance-28"
-  keystone: "cs:trusty/keystone-267"
-  mongodb: "cs:trusty/mongodb-33"
-  nagios: "cs:trusty/nagios-10"
-  neutron-api: "cs:~cordteam/trusty/neutron-api-6"
-  nova-cloud-controller: "cs:trusty/nova-cloud-controller-64"
-  nova-compute: "cs:~cordteam/trusty/nova-compute-4"
-  nrpe: "cs:trusty/nrpe-4"
-  ntp: "cs:trusty/ntp-14"
-  openstack-dashboard: "cs:trusty/openstack-dashboard-19"
-  percona-cluster: "cs:trusty/percona-cluster-31"
-  rabbitmq-server: "cs:trusty/rabbitmq-server-42"
-
-head_lxd_list:
-  - name: "juju-1"
-    service: "juju"
-    aliases:
-      - "juju"
-    ipv4_last_octet: 10
-
-  - name: "ceilometer-1"
-    service: "ceilometer"
-    aliases:
-      - "ceilometer"
-    ipv4_last_octet: 20
-    forwarded_ports:
-      - { ext: 8777, int: 8777 }
-
-  - name: "glance-1"
-    service: "glance"
-    aliases:
-      - "glance"
-    ipv4_last_octet: 30
-    forwarded_ports:
-      - { ext: 9292, int: 9292 }
-
-  - name: "keystone-1"
-    service: "keystone"
-    aliases:
-      - "keystone"
-    ipv4_last_octet: 40
-    forwarded_ports:
-      - { ext: 35357, int: 35357 }
-      - { ext: 4990, int: 4990 }
-      - { ext: 5000, int: 5000 }
-
-  - name: "percona-cluster-1"
-    service: "percona-cluster"
-    aliases:
-      - "percona-cluster"
-    ipv4_last_octet: 50
-
-  - name: "nagios-1"
-    service: "nagios"
-    aliases:
-      - "nagios"
-    ipv4_last_octet: 60
-    forwarded_ports:
-      - { ext: 3128, int: 80 }
-
-  - name: "neutron-api-1"
-    service: "neutron-api"
-    aliases:
-      - "neutron-api"
-    ipv4_last_octet: 70
-    forwarded_ports:
-      - { ext: 9696, int: 9696 }
-
-  - name: "nova-cloud-controller-1"
-    service: "nova-cloud-controller"
-    aliases:
-      - "nova-cloud-controller"
-    ipv4_last_octet: 80
-    forwarded_ports:
-      - { ext: 8774, int: 8774 }
-
-  - name: "openstack-dashboard-1"
-    service: "openstack-dashboard"
-    aliases:
-      - "openstack-dashboard"
-    ipv4_last_octet: 90
-    forwarded_ports:
-      - { ext: 8080, int: 80 }
-
-  - name: "rabbitmq-server-1"
-    service: "rabbitmq-server"
-    aliases:
-      - "rabbitmq-server"
-    ipv4_last_octet: 100
-
-  - name: "mongodb-1"
-    service: "mongodb"
-    aliases:
-      - "mongodb"
-    ipv4_last_octet: 110
-
-
-lxd_service_list:
-  - ceilometer
-  - glance
-  - keystone
-  - mongodb
-  - nagios
-  - neutron-api
-  - nova-cloud-controller
-  - openstack-dashboard
-  - percona-cluster
-  - rabbitmq-server
-
-
-standalone_service_list:
-  - ntp
-  - nrpe
-  - ceilometer-agent
-
-
-service_relations:
-  - name: keystone
-    relations: [ "percona-cluster", "nrpe", ]
-
-  - name: nova-cloud-controller
-    relations: [ "percona-cluster", "rabbitmq-server", "glance", "keystone", "nrpe", ]
-
-  - name: glance
-    relations: [ "percona-cluster", "keystone", "nrpe", ]
-
-  - name: neutron-api
-    relations: [ "keystone",  "percona-cluster", "rabbitmq-server", "nova-cloud-controller", "nrpe", ]
-
-  - name: openstack-dashboard
-    relations: [ "keystone", "nrpe", ]
-
-  - name: nagios
-    relations: [ "nrpe", ]
-
-  - name: "percona-cluster:juju-info"
-    relations: [ "nrpe:general-info", ]
-
-  - name: rabbitmq-server
-    relations: [ "nrpe", ]
-
-  - name: ceilometer
-    relations: [ "mongodb", "rabbitmq-server", "nagios", "nrpe", ]
-
-  - name: "ceilometer:identity-service"
-    relations: [ "keystone:identity-service", ]
-
-  - name: "ceilometer:ceilometer-service"
-    relations: [ "ceilometer-agent:ceilometer-service", ]
-
-
-compute_relations:
-  - name: nova-compute
-    relations: [ "ceilometer-agent", "glance", "nova-cloud-controller", "nagios", "nrpe", ]
-
-  - name: "nova-compute:shared-db"
-    relations: [ "percona-cluster:shared-db", ]
-
-  - name: "nova-compute:amqp"
-    relations: [ "rabbitmq-server:amqp", ]
-
-  - name: ntp
-    relations: [ "nova-compute", ]
-
-
-xos_images:
-  - name: "trusty-server-multi-nic"
-    url: "https://github.com/opencord/platform-install/releases/download/vms/trusty-server-cloudimg-amd64-disk1.img.20170201"
-    checksum: "sha256:ebf007ba3ec1043b7cd011fc6668e2a1d1d4c69c41071e8513ab355df7a057cb"
-
-  - name: "vsg-1.1"
-    url: "https://github.com/opencord/vsg/releases/download/vms/vsg-1.1.img"
-    checksum: "sha256:16b0beb6778aed0f5feecb05f8d5750e6c262f98e6011e99ddadf7d46a177b6f"
-
diff --git a/roles/cord-profile/tasks/main.yml b/roles/cord-profile/tasks/main.yml
index edf811b..c5e0fc1 100644
--- a/roles/cord-profile/tasks/main.yml
+++ b/roles/cord-profile/tasks/main.yml
@@ -108,25 +108,28 @@
     - style.config.js
     - app.config.js
     - Dockerfile.xos
-    - xos-gui-extensions.yml
     - docker-compose.yml
     - xos-tosca.config.yaml
 
+- name: Set cord_profile_src_dir
+  set_fact:
+    cord_profile_src_dir: "../../orchestration/profiles/{{ cord_use_case }}"
+
 - name: Create profile specific templated TOSCA config files
   template:
-    src: "{{ item }}.j2"
+    src: "{{ cord_profile_src_dir }}/templates/{{ item }}.j2"
     dest: "{{ config_cord_profile_dir }}/{{ item }}"
   with_items: "{{ xos_tosca_config_templates }}"
 
 - name: Create profile specific templated TOSCA config files (new Engine)
   template:
-    src: "{{ item }}.j2"
+    src: "{{ cord_profile_src_dir }}/templates/{{ item }}.j2"
     dest: "{{ config_cord_profile_dir }}/{{ item }}"
   with_items: "{{ xos_new_tosca_config_templates }}"
 
 - name: Create profile specific templated non-TOSCA files
   template:
-    src: "{{ item }}.j2"
+    src: "{{ cord_profile_src_dir }}/templates/{{ item }}.j2"
     dest: "{{ config_cord_profile_dir }}/{{ item }}"
   with_items: "{{ xos_other_templates }}"
 
diff --git a/roles/cord-profile/templates/addressmanager-service.yaml.j2 b/roles/cord-profile/templates/addressmanager-service.yaml.j2
deleted file mode 100644
index aae46f2..0000000
--- a/roles/cord-profile/templates/addressmanager-service.yaml.j2
+++ /dev/null
@@ -1,58 +0,0 @@
-
-{#
-Copyright 2017-present Open Networking Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
-
-# Only used by BASE-CORD
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: TOSCA for bootstrapping Address Manager service
-
-imports:
-   - custom_types/addressmanagerservice.yaml
-   - custom_types/addresspool.yaml
-
-topology_template:
-  node_templates:
-
-    addresses_vsg:
-      type: tosca.nodes.AddressPool
-      properties:
-        name: addresses_vsg
-        addresses: 10.7.1.0/24
-        gateway_ip: 10.7.1.1
-        gateway_mac: a4:23:05:06:01:01
-      requirements:
-        - service:
-            node: service#addressmanager
-            relationship: tosca.relationships.BelongsToOne
-
-    addresses_public:
-      type: tosca.nodes.AddressPool
-      properties:
-        name: addresses_public
-        addresses: 10.8.1.0/24
-        gateway_ip: 10.8.1.1
-        gateway_mac: a4:23:05:06:01:01
-      requirements:
-        - service:
-            node: service#addressmanager
-            relationship: tosca.relationships.BelongsToOne
-
-    service#addressmanager:
-      type: tosca.nodes.AddressManagerService
-      properties:
-        name: addressmanager
diff --git a/roles/cord-profile/templates/carrierethernet-global-app.yaml.j2 b/roles/cord-profile/templates/carrierethernet-global-app.yaml.j2
deleted file mode 100644
index d1406fb..0000000
--- a/roles/cord-profile/templates/carrierethernet-global-app.yaml.j2
+++ /dev/null
@@ -1,28 +0,0 @@
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
-   - custom_types/onosapp.yaml
-   - custom_types/onosservice.yaml
-   - custom_types/serviceinstanceattribute.yaml
-
-description: carrierethernet-app onboarding, generated by platform-install
-topology_template:
-  node_templates:
-
-    # ONOS_CORD fully created in onos-global-service.yaml
-    service#ONOS_CORD:
-      type: tosca.nodes.ONOSService
-      properties:
-        name: ONOS_CORD
-        must-exist: true
-
-    CarrierEthernet_ONOS_app:
-      type: tosca.nodes.ONOSApp
-      properties:
-          name: CarrierEthernet_ONOS_app
-          install_dependencies: {{ onos_mavenrepo_url }}/repository/org/opencord/ce/ce-api/1.1.0-SNAPSHOT/ce-api-1.1.0-SNAPSHOT.oar, {{ onos_mavenrepo_url }}/repository/org/opencord/ce/ecord-global-app/1.1.0-SNAPSHOT/ecord-global-app-1.1.0-SNAPSHOT.oar
-      requirements:
-          - owner:
-              node: service#ONOS_CORD
-              relationship: tosca.relationships.BelongsToOne
diff --git a/roles/cord-profile/templates/carrierethernet-local-app.yaml.j2 b/roles/cord-profile/templates/carrierethernet-local-app.yaml.j2
deleted file mode 100644
index 70f24aa..0000000
--- a/roles/cord-profile/templates/carrierethernet-local-app.yaml.j2
+++ /dev/null
@@ -1,79 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
-   - custom_types/onosapp.yaml
-   - custom_types/onosservice.yaml
-   - custom_types/serviceinstanceattribute.yaml
-
-description: carrierethernet-app onboarding, generated by platform-install
-topology_template:
-  node_templates:
-
-    # ONOS_CORD, fully created in vtn.yaml
-    service#ONOS_CORD:
-      type: tosca.nodes.ONOSService
-      properties:
-        name: ONOS_CORD
-        must-exist: true
-
-    # ONOS_Fabric, fully created in fabric.yaml
-    service#ONOS_Fabric:
-      type: tosca.nodes.ONOSService
-      properties:
-        name: ONOS_Fabric
-        must-exist: true
-
-    CarrierEthernet_ONOS_app:
-      type: tosca.nodes.ONOSApp
-      requirements:
-          - owner:
-              node: service#ONOS_CORD
-              relationship: tosca.relationships.BelongsToOne
-      properties:
-          name: CarrierEthernet_ONOS_app
-          install_dependencies: {{ onos_mavenrepo_url }}/repository/org/opencord/ce/ce-api/1.1.0-SNAPSHOT/ce-api-1.1.0-SNAPSHOT.oar, {{ onos_mavenrepo_url }}/repository/org/opencord/ce/bigswitch/1.1.0-SNAPSHOT/bigswitch-1.1.0-SNAPSHOT.oar, {{ onos_mavenrepo_url }}/repository/org/opencord/ce/local-channel/1.1.0-SNAPSHOT/local-channel-1.1.0-SNAPSHOT.oar, {{ onos_mavenrepo_url }}//repository/org/opencord/ce/vee/1.1.0-SNAPSHOT/vee-1.1.0-SNAPSHOT.oar
-          dependencies: org.onosproject.drivers.microsemi, org.onosproject.cfm
-
-    CarrierEthernet_ONOS_app_component_config:
-        type: tosca.nodes.ServiceInstanceAttribute
-        requirements:
-          - service_instance:
-              node: CarrierEthernet_ONOS_app
-              relationship: tosca.relationships.BelongsToOne
-        properties:
-            name: component_config
-            value: >
-              {
-                  "org.onosproject.netconf.ctl.impl.NetconfControllerImpl": {
-                      "netconfConnectTimeout": "120",
-                      "netconfReplyTimeout": "120"
-                  },
-                  "org.opencord.ce.local.bigswitch.BigSwitchManager": {
-                      "domainId": "{{ carrierethernet_domainid_prefix }}-cord-onos"
-                  }
-              }
-
-    CarrierEthernet_Fabric_ONOS_app:
-      type: tosca.nodes.ONOSApp
-      requirements:
-          - owner:
-              node: service#ONOS_Fabric
-              relationship: tosca.relationships.BelongsToOne
-      properties:
-          name: CarrierEthernet_Fabric_ONOS_app
-          install_dependencies: {{ onos_mavenrepo_url }}/repository/org/opencord/ce/ce-api/1.1.0-SNAPSHOT/ce-api-1.1.0-SNAPSHOT.oar, {{ onos_mavenrepo_url }}/repository/org/opencord/ce/bigswitch/1.1.0-SNAPSHOT/bigswitch-1.1.0-SNAPSHOT.oar, {{ onos_mavenrepo_url }}//repository/org/opencord/ce/local-channel/1.1.0-SNAPSHOT/local-channel-1.1.0-SNAPSHOT.oar, {{ onos_mavenrepo_url }}//repository/org/opencord/ce/fabric/1.1.0-SNAPSHOT/fabric-1.1.0-SNAPSHOT.oar
-
-    CarrierEthernet_Fabric_ONOS_app_component_config:
-        type: tosca.nodes.ServiceInstanceAttribute
-        requirements:
-          - service_instance:
-              node: CarrierEthernet_Fabric_ONOS_app
-              relationship: tosca.relationships.BelongsToOne
-        properties:
-            name: component_config
-            value: >
-              {
-                  "org.opencord.ce.local.bigswitch.BigSwitchManager": {
-                      "domainId": "{{ carrierethernet_domainid_prefix }}-fabric-onos"
-                  }
-              }
diff --git a/roles/cord-profile/templates/cdn-content.yaml.j2 b/roles/cord-profile/templates/cdn-content.yaml.j2
deleted file mode 100644
index dff1f91..0000000
--- a/roles/cord-profile/templates/cdn-content.yaml.j2
+++ /dev/null
@@ -1,242 +0,0 @@
-
-{#
-Copyright 2017-present Open Networking Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
-
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: Hypercache CDN Content
-
-imports:
-   - custom_types/xos.yaml
-   - custom_types/cdn.yaml
-
-topology_template:
-  node_templates:
-    HyperCache:
-      type: tosca.nodes.CDNService
-      properties:
-          # HyperCache service must already exist before running this recipe
-          no-create: true
-          no-delete: true
-          no-update: true
-
-    # Setup the CDN Service Provider
-
-    main_service_provider:
-        type: tosca.nodes.ServiceProvider
-        requirements:
-           - hpc_service:
-                 node: HyperCache
-                 relationship: tosca.relationships.MemberOfService
-
-    # Wall Street Journal Content Provider
-
-    wsj_content:
-        type: tosca.nodes.ContentProvider
-        requirements:
-            - service_provider:
-                  node: main_service_provider
-                  relationship: tosca.relationships.MemberOfServiceProvider
-
-    www.wsj.com:
-        type: tosca.nodes.CDNPrefix
-        requirements:
-             - content_provider:
-                   node: wsj_content
-                   relationship: tosca.relationships.MemberOfContentProvider
-             - default_origin_server:
-                   node: http_www.wsj.com
-                   relationship: tosca.relationships.DefaultOriginServer
-
-    si.wsj.net:
-        type: tosca.nodes.CDNPrefix
-        requirements:
-             - content_provider:
-                   node: wsj_content
-                   relationship: tosca.relationships.MemberOfContentProvider
-             - default_origin_server:
-                   node: http_si.wsj.net
-                   relationship: tosca.relationships.DefaultOriginServer
-
-    s.wsj.net:
-        type: tosca.nodes.CDNPrefix
-        requirements:
-             - content_provider:
-                   node: wsj_content
-                   relationship: tosca.relationships.MemberOfContentProvider
-             - default_origin_server:
-                   node: http_s.wsj.net
-                   relationship: tosca.relationships.DefaultOriginServer
-
-    ore.wsj.net:
-        type: tosca.nodes.CDNPrefix
-        requirements:
-             - content_provider:
-                   node: wsj_content
-                   relationship: tosca.relationships.MemberOfContentProvider
-             - default_origin_server:
-                   node: http_ore.wsj.net
-                   relationship: tosca.relationships.DefaultOriginServer
-
-    http_www.wsj.com:
-        type: tosca.nodes.OriginServer
-        requirements:
-             - content_provider:
-                   node: wsj_content
-                   relationship: tosca.relationships.MemberOfContentProvider
-
-    http_si.wsj.net:
-        type: tosca.nodes.OriginServer
-        requirements:
-             - content_provider:
-                   node: wsj_content
-                   relationship: tosca.relationships.MemberOfContentProvider
-
-    http_s.wsj.net:
-        type: tosca.nodes.OriginServer
-        requirements:
-             - content_provider:
-                   node: wsj_content
-                   relationship: tosca.relationships.MemberOfContentProvider
-
-    http_ore.wsj.net:
-        type: tosca.nodes.OriginServer
-        requirements:
-             - content_provider:
-                   node: wsj_content
-                   relationship: tosca.relationships.MemberOfContentProvider
-
-    # ON.Lab content provider
-
-    on_lab_content:
-        type: tosca.nodes.ContentProvider
-        requirements:
-            - service_provider:
-                  node: main_service_provider
-                  relationship: tosca.relationships.MemberOfServiceProvider
-
-    # Create CDN prefix onlab.vicci.org
-    onlab.vicci.org:
-        type: tosca.nodes.CDNPrefix
-        requirements:
-             - content_provider:
-                   node: on_lab_content
-                   relationship: tosca.relationships.MemberOfContentProvider
-
-    http_onos-videos.s3.amazonaws.com:
-        type: tosca.nodes.OriginServer
-        requirements:
-             - content_provider:
-                   node: on_lab_content
-                   relationship: tosca.relationships.MemberOfContentProvider
-
-    # Create origin server s3-us-west-1.amazonaws.com
-    http_s3-us-west-1.amazonaws.com:
-        type: tosca.nodes.OriginServer
-        requirements:
-             - content_provider:
-                   node: on_lab_content
-                   relationship: tosca.relationships.MemberOfContentProvider
-
-    # Create origin server s3.amazonaws.com
-    http_s3.amazonaws.com:
-        type: tosca.nodes.OriginServer
-        requirements:
-             - content_provider:
-                   node: on_lab_content
-                   relationship: tosca.relationships.MemberOfContentProvider
-
-    # Test Content Provider
-
-    testcp2:
-        type: tosca.nodes.ContentProvider
-        requirements:
-            - service_provider:
-                  node: main_service_provider
-                  relationship: tosca.relationships.MemberOfServiceProvider
-
-    http_www.cs.arizona.edu:
-        type: tosca.nodes.OriginServer
-        requirements:
-             - content_provider:
-                   node: testcp2
-                   relationship: tosca.relationships.MemberOfContentProvider
-
-    test-cdn.opencloud.us:
-        type: tosca.nodes.CDNPrefix
-        requirements:
-             - content_provider:
-                   node: testcp2
-                   relationship: tosca.relationships.MemberOfContentProvider
-
-             - default_origin_server:
-                   node: http_www.cs.arizona.edu
-                   relationship: tosca.relationships.DefaultOriginServer
-
-    # Health Checks
-
-    healthcheck_dns_onlab.vicci.org:
-        type: tosca.nodes.HpcHealthCheck
-        requirements:
-           - hpc_service:
-                 node: HyperCache
-                 relationship: tosca.relationships.MemberOfService
-        properties:
-           kind: dns
-           resource_name: onlab.vicci.org
-
-    healthcheck_dns_test-cdn.opencloud.us:
-        type: tosca.nodes.HpcHealthCheck
-        requirements:
-           - hpc_service:
-                 node: HyperCache
-                 relationship: tosca.relationships.MemberOfService
-        properties:
-           kind: dns
-           resource_name: test-cdn.opencloud.us
-
-    healthcheck_http_test-cdn-index:
-        type: tosca.nodes.HpcHealthCheck
-        requirements:
-           - hpc_service:
-                 node: HyperCache
-                 relationship: tosca.relationships.MemberOfService
-        properties:
-           kind: http
-           resource_name: test-cdn.opencloud.us:/
-           result_contains: Lowenthal
-
-    healthcheck_http_onlab_onos_image:
-        type: tosca.nodes.HpcHealthCheck
-        requirements:
-           - hpc_service:
-                 node: HyperCache
-                 relationship: tosca.relationships.MemberOfService
-        properties:
-           kind: http
-           resource_name: onlab.vicci.org:/onos/vm/onos-tutorial-1.1.0r220-ovf.zip
-
-    healthcheck_http_onlab_mininet_image:
-        type: tosca.nodes.HpcHealthCheck
-        requirements:
-           - hpc_service:
-                 node: HyperCache
-                 relationship: tosca.relationships.MemberOfService
-        properties:
-           kind: http
-           resource_name: onlab.vicci.org:/mininet-vm/mininet-2.1.0-130919-ubuntu-13.04-server-amd64-ovf.zip
-
diff --git a/roles/cord-profile/templates/cord-services.yaml.j2 b/roles/cord-profile/templates/cord-services.yaml.j2
deleted file mode 100644
index 0fb5171..0000000
--- a/roles/cord-profile/templates/cord-services.yaml.j2
+++ /dev/null
@@ -1,367 +0,0 @@
-
-{#
-Copyright 2017-present Open Networking Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
-
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: Just enough Tosca to get the vSG slice running on the CORD POD, created by platform-install
-
-imports:
-  - custom_types/addressmanagerservice.yaml
-  - custom_types/addresspool.yaml
-  - custom_types/image.yaml
-  - custom_types/network.yaml
-  - custom_types/networkslice.yaml
-  - custom_types/networktemplate.yaml
-  - custom_types/nodelabel.yaml
-  - custom_types/onosapp.yaml
-  - custom_types/onosservice.yaml
-  - custom_types/site.yaml
-  - custom_types/service.yaml
-  - custom_types/servicedependency.yaml
-  - custom_types/serviceinstanceattribute.yaml
-  - custom_types/serviceinstancelink.yaml
-  - custom_types/slice.yaml
-  - custom_types/voltservice.yaml
-  - custom_types/vrouterservice.yaml
-  - custom_types/vsgservice.yaml
-  - custom_types/vtrservice.yaml
-
-topology_template:
-  node_templates:
-
-    {{ site_name }}:
-      type: tosca.nodes.Site
-      properties:
-        name: {{ site_name }}
-        must-exist: true
-
-    image#vsg-1.1:
-      type: tosca.nodes.Image
-      properties:
-        name: vsg-1.1
-
-# management networks, fully created in management-net.yaml
-    management:
-      type: tosca.nodes.Network
-      properties:
-        name: management
-        must-exist: true
-
-{% if use_management_hosts %}
-    management_hosts:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-{% endif %}
-
-    service#rcord:
-      type: tosca.nodes.Service
-      properties:
-        name: rcord
-
-    rcord_volt:
-      type: tosca.nodes.ServiceDependency
-      properties:
-        connect_method: None
-      requirements:
-        - subscriber_service:
-            node: service#rcord
-            relationship: tosca.relationships.BelongsToOne
-        - provider_service:
-            node: service#volt
-            relationship: tosca.relationships.BelongsToOne
-
-# ONOS_CORD, fully created in vtn.yaml
-    service#ONOS_CORD:
-      type: tosca.nodes.ONOSService
-      properties:
-        name: ONOS_CORD
-        must-exist: true
-
-# ONOS_Fabric, fully created in fabric.yaml
-    service#ONOS_Fabric:
-      type: tosca.nodes.ONOSService
-      properties:
-        name: ONOS_Fabric
-        must-exist: true
-
-# CORD Services
-    service#vtr:
-      type: tosca.nodes.VTRService
-      properties:
-        name: vtr
-        kind: rcord
-
-    service#volt:
-      type: tosca.nodes.VOLTService
-      properties:
-        name: volt
-        kind: rcord
-        public_key: {{ lookup('file', config_cord_profile_dir + '/key_import/volt_rsa.pub') }}
-        private_key_fn: /opt/xos/services/volt/keys/volt_rsa
-
-    volt_vsg:
-      type: tosca.nodes.ServiceDependency
-      properties:
-        connect_method: None
-      requirements:
-        - subscriber_service:
-            node: service#volt
-            relationship: tosca.relationships.BelongsToOne
-        - provider_service:
-            node: service#vsg
-            relationship: tosca.relationships.BelongsToOne
-
-    addresses_vsg:
-      type: tosca.nodes.AddressPool
-      properties:
-        name: addresses_vsg
-        addresses: 10.7.1.0/24
-        gateway_ip: 10.7.1.1
-        gateway_mac: a4:23:05:06:01:01
-      requirements:
-        - service:
-            node: service#addressmanager
-            relationship: tosca.relationships.BelongsToOne
-
-    addresses_public:
-      type: tosca.nodes.AddressPool
-      properties:
-        name: addresses_public
-        addresses: 10.8.1.0/24
-        gateway_ip: 10.8.1.1
-        gateway_mac: a4:23:05:06:01:01
-      requirements:
-        - service:
-            node: service#addressmanager
-            relationship: tosca.relationships.BelongsToOne
-
-    label_vsg:
-      type: tosca.nodes.NodeLabel
-      properties:
-        name: label_vsg
-
-    service#vsg:
-      type: tosca.nodes.VSGService
-      properties:
-        name: vsg
-        # backend_network_label: hpc_client # what is this? can we drop it?
-        public_key: {{ lookup('file', config_cord_profile_dir + '/key_import/vsg_rsa.pub') }}
-        private_key_fn: /opt/xos/services/vsg/keys/vsg_rsa
-        # node_label: label_vsg
-
-    vsg_vrouter:
-      type: tosca.nodes.ServiceDependency
-      properties:
-        connect_method: None
-      requirements:
-        - subscriber_service:
-            node: service#vsg
-            relationship: tosca.relationships.BelongsToOne
-        - provider_service:
-            node: service#vrouter
-            relationship: tosca.relationships.BelongsToOne
-
-    vsg_addressmanager:
-      type: tosca.nodes.ServiceDependency
-      properties:
-        connect_method: None
-      requirements:
-        - subscriber_service:
-            node: service#vsg
-            relationship: tosca.relationships.BelongsToOne
-        - provider_service:
-            node: service#addressmanager
-            relationship: tosca.relationships.BelongsToOne
-
-    service#addressmanager:
-      type: tosca.nodes.AddressManagerService
-      properties:
-        name: addressmanager
-
-    service#vrouter:
-      type: tosca.nodes.VRouterService
-      properties:
-        name: vrouter
-        rest_hostname: onos-fabric.{{ site_suffix }}
-        rest_port: 8181
-        rest_user: onos
-        rest_pass: rocks
-
-    vRouter_ONOS_app:
-      type: tosca.nodes.ONOSApp
-      requirements:
-        - owner:
-            node: service#ONOS_Fabric
-            relationship: tosca.relationships.BelongsToOne
-      properties:
-        name: vRouter_ONOS_app
-        dependencies: org.onosproject.fpm
-
-    vRouter_ONOS_app_autogenerate:
-        type: tosca.nodes.ServiceInstanceAttribute
-        requirements:
-          - service_instance:
-              node: vRouter_ONOS_app
-              relationship: tosca.relationships.BelongsToOne
-        properties:
-            name: autogenerate
-            value: vrouter-network-cfg
-
-    vRouter_ONOS_app_ONOS_CORD:
-        type: tosca.nodes.ServiceInstanceLink
-        requirements:
-          - provider_service_instance:
-              node: vRouter_ONOS_app
-              relationship: tosca.relationships.BelongsToOne
-          - subscriber_service:
-              node: service#vrouter
-              relationship: tosca.relationships.BelongsToOne
-
-    template#vsg:
-      type: tosca.nodes.NetworkTemplate
-      properties:
-        name: vsg
-        visibility: private
-        translation: none
-        vtn_kind: VSG
-
-    # Networks required by the CORD setup
-    {{ site_name }}_vsg-access:
-      type: tosca.nodes.Network
-      properties:
-        name: {{ site_name }}_vsg-access
-        # ip_version: 4
-      requirements:
-        - template:
-            node: template#vsg
-            relationship: tosca.relationships.BelongsToOne
-        - owner:
-            node: {{ site_name }}_vsg
-            relationship: tosca.relationships.BelongsToOne
-
-    networkslice#{{ site_name }}_vsg-access_to_{{ site_name }}_vsg:
-        type: tosca.nodes.NetworkSlice
-        requirements:
-          - network:
-              node: {{ site_name }}_vsg-access
-              relationship: tosca.relationships.BelongsToOne
-          - slice:
-              node: {{ site_name }}_vsg
-              relationship: tosca.relationships.BelongsToOne
-
-    # CORD Slices
-    {{ site_name }}_vsg:
-      description: vSG Controller Slice
-      type: tosca.nodes.Slice
-      properties:
-        network: noauto
-        name: {{ site_name }}_vsg
-      requirements: 
-        - service:
-            node: service#vsg
-            relationship: tosca.relationships.BelongsToOne
-        - site:
-            node: {{ site_name }}
-            relationship: tosca.relationships.BelongsToOne
-        - default_image:
-            node: image#vsg-1.1
-            relationship: tosca.relationships.BelongsToOne
-
-    networkslice#management_to_{{ site_name }}_vsg:
-        type: tosca.nodes.NetworkSlice
-        requirements:
-          - network:
-              node: management
-              relationship: tosca.relationships.BelongsToOne
-          - slice:
-              node: {{ site_name }}_vsg
-              relationship: tosca.relationships.BelongsToOne
-
-{% if use_management_hosts %}
-    networkslice#management_hosts_to_{{ site_name }}_vsg:
-        type: tosca.nodes.NetworkSlice
-        requirements:
-          - network:
-              node: management_hosts
-              relationship: tosca.relationships.BelongsToOne
-          - slice:
-            node: {{ site_name }}_vsg
-            relationship: tosca.relationships.BelongsToOne
-{% endif %}
-    
-    # TODO: migrate interfaces when we'll start using them
-    # in#lanside:
-    #   type: tosca.nodes.InterfaceType
-    #   properties:
-    #      direction: in
-
-    # out#lanside:
-    #   type: tosca.nodes.InterfaceType
-    #   properties:
-    #      direction: out
-
-    # in#wanside:
-    #   type: tosca.nodes.InterfaceType
-    #   properties:
-    #      direction: in
-
-    # out#wanside:
-    #   type: tosca.nodes.InterfaceType
-    #   properties:
-    #      direction: out
-
-    # volt_lanside:
-    #   type: tosca.nodes.ServiceInterface
-    #   requirements:
-    #     - service:
-    #         node: service#volt
-    #         relationship: tosca.relationships.MemberOfService
-    #     - interface:
-    #         node: out#lanside
-    #         relationship: tosca.relationships.IsType
-
-    # vsg_lanside:
-    #   type: tosca.nodes.ServiceInterface
-    #   requirements:
-    #     - service:
-    #         node: service#vsg
-    #         relationship: tosca.relationships.MemberOfService
-    #     - interface:
-    #         node: in#lanside
-    #         relationship: tosca.relationships.IsType
-
-    # vsg_wanside:
-    #   type: tosca.nodes.ServiceInterface
-    #   requirements:
-    #     - service:
-    #         node: service#vsg
-    #         relationship: tosca.relationships.MemberOfService
-    #     - interface:
-    #         node: out#wanside
-    #         relationship: tosca.relationships.IsType
-
-    # addressmanager_wanside:
-    #   type: tosca.nodes.ServiceInterface
-    #   requirements:
-    #     - service:
-    #         node: service#addressmanager
-    #         relationship: tosca.relationships.MemberOfService
-    #     - interface:
-    #         node: in#wanside
-    #         relationship: tosca.relationships.IsType
\ No newline at end of file
diff --git a/roles/cord-profile/templates/ecord-services.yaml.j2 b/roles/cord-profile/templates/ecord-services.yaml.j2
deleted file mode 100644
index cbdc2bf..0000000
--- a/roles/cord-profile/templates/ecord-services.yaml.j2
+++ /dev/null
@@ -1,319 +0,0 @@
-{#
-Copyright 2017-present Open Networking Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: Just enough Tosca to get the vEG slice running on the CORD POD, created by platform-install
-
-imports:
-  - custom_types/addressmanagerservice.yaml
-  - custom_types/addresspool.yaml
-  - custom_types/image.yaml
-  - custom_types/network.yaml
-  - custom_types/networkslice.yaml
-  - custom_types/networktemplate.yaml
-  - custom_types/nodelabel.yaml
-  - custom_types/onosapp.yaml
-  - custom_types/onosservice.yaml
-  - custom_types/servicedependency.yaml
-  - custom_types/serviceinstanceattribute.yaml
-  - custom_types/serviceinstancelink.yaml
-  - custom_types/site.yaml
-  - custom_types/slice.yaml
-  - custom_types/vegservice.yaml
-  - custom_types/vrouterservice.yaml
-
-topology_template:
-  node_templates:
-
-# site, image, fully created in deployment.yaml
-    {{ site_name }}:
-      type: tosca.nodes.Site
-      properties:
-        name: {{ site_name }}
-        must-exist: true
-
-    image#vsg-1.1:
-      type: tosca.nodes.Image
-      properties:
-        name: vsg-1.1
-
-# management networks, fully created in management-net.yaml
-    management:
-      type: tosca.nodes.Network
-      properties:
-        name: management
-        must-exist: true
-
-{% if use_management_hosts %}
-    management_hosts:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-{% endif %}
-
-# ONOS_CORD, fully created in vtn.yaml
-    service#ONOS_CORD:
-      type: tosca.nodes.ONOSService
-      properties:
-        name: ONOS_CORD
-        must-exist: true
-
-# ONOS_Fabric, fully created in fabric.yaml
-    service#ONOS_Fabric:
-      type: tosca.nodes.ONOSService
-      properties:
-        name: ONOS_Fabric
-        must-exist: true
-
-# CORD Services
-    addresses_veg:
-      type: tosca.nodes.AddressPool
-      properties:
-        name: addresses_veg
-        addresses: 10.7.1.0/24
-        gateway_ip: 10.7.1.1
-        gateway_mac: a4:23:05:06:01:01
-      requirements:
-        - service:
-            node: service#addressmanager
-            relationship: tosca.relationships.BelongsToOne
-
-    addresses_public:
-      type: tosca.nodes.AddressPool
-      properties:
-        name: addresses_public
-        addresses: 10.8.1.0/24
-        gateway_ip: 10.8.1.1
-        gateway_mac: a4:23:05:06:01:01
-      requirements:
-        - service:
-            node: service#addressmanager
-            relationship: tosca.relationships.BelongsToOne
-
-    service#addressmanager:
-      type: tosca.nodes.AddressManagerService
-      properties:
-        name: addressmanager
-
-    label_veg:
-      type: tosca.nodes.NodeLabel
-      properties:
-        name: label_veg
-
-    service#veg:
-      type: tosca.nodes.VEGService
-      properties:
-        name: veg
-        public_key: {{ lookup('file', config_cord_profile_dir + '/key_import/veg_rsa.pub') }}
-        private_key_fn: /opt/xos/services/veg/keys/veg_rsa
-        # node_label: label_veg
-
-    veg_vrouter:
-      type: tosca.nodes.ServiceDependency
-      properties:
-        connect_method: None
-      requirements:
-        - subscriber_service:
-            node: service#veg
-            relationship: tosca.relationships.BelongsToOne
-        - provider_service:
-            node: service#vrouter
-            relationship: tosca.relationships.BelongsToOne
-
-    # NOTE are this connected?
-    veg_addressmanager:
-      type: tosca.nodes.ServiceDependency
-      properties:
-        connect_method: None
-      requirements:
-        - subscriber_service:
-            node: service#veg
-            relationship: tosca.relationships.BelongsToOne
-        - provider_service:
-            node: service#addressmanager
-            relationship: tosca.relationships.BelongsToOne
-
-    service#vrouter:
-      type: tosca.nodes.VRouterService
-      properties:
-        name: vrouter
-        rest_hostname: onos-fabric.{{ site_suffix }}
-        rest_port: 8181
-        rest_user: onos
-        rest_pass: rocks
-      # NOTE: shouldn't the addresses be attached to address_manager? I don't think vRouter is used now
-      # requirements:
-      #   - addresses_veg:
-      #       node: addresses_veg
-      #       relationship: tosca.relationships.ProvidesAddresses
-      #   - addresses_public:
-      #       node: addresses_public
-      #       relationship: tosca.relationships.ProvidesAddresses
-
-    vRouter_ONOS_app:
-      type: tosca.nodes.ONOSApp
-      requirements:
-        - owner:
-            node: service#ONOS_Fabric
-            relationship: tosca.relationships.BelongsToOne
-      properties:
-        name: vRouter_ONOS_app
-        dependencies: org.onosproject.fpm
-
-    vRouter_ONOS_app_autogenerate:
-        type: tosca.nodes.ServiceInstanceAttribute
-        requirements:
-          - service_instance:
-              node: vRouter_ONOS_app
-              relationship: tosca.relationships.BelongsToOne
-        properties:
-            name: autogenerate
-            value: vrouter-network-cfg
-
-    vRouter_ONOS_app_ONOS_CORD:
-        type: tosca.nodes.ServiceInstanceLink
-        requirements:
-          - provider_service_instance:
-              node: vRouter_ONOS_app
-              relationship: tosca.relationships.BelongsToOne
-          - subscriber_service:
-              node: service#vrouter
-              relationship: tosca.relationships.BelongsToOne
-
-    template#veg:
-      type: tosca.nodes.NetworkTemplate
-      properties:
-        name: veg
-        visibility: private
-        translation: none
-        vtn_kind: VSG
-
-    # Networks required by the CORD setup
-    {{ site_name }}_veg-access:
-      type: tosca.nodes.Network
-      properties:
-        name: {{ site_name }}_veg-access
-        # ip_version: 4
-      requirements:
-        - template:
-            node: template#veg
-            relationship: tosca.relationships.BelongsToOne
-        - owner:
-            node: {{ site_name }}_veg
-            relationship: tosca.relationships.BelongsToOne
-
-    networkslice#{{ site_name }}_veg-access_to_{{ site_name }}_veg:
-      type: tosca.nodes.NetworkSlice
-      requirements:
-        - network:
-            node: {{ site_name }}_veg-access
-            relationship: tosca.relationships.BelongsToOne
-        - slice:
-            node: {{ site_name }}_veg
-            relationship: tosca.relationships.BelongsToOne
-
-    # CORD Slices
-    {{ site_name }}_veg:
-      description: vEG Controller Slice
-      type: tosca.nodes.Slice
-      properties:
-        network: noauto
-        name: {{ site_name }}_veg
-      requirements:
-        - service:
-            node: service#veg
-            relationship: tosca.relationships.BelongsToOne
-        - site:
-            node: {{ site_name }}
-            relationship: tosca.relationships.BelongsToOne
-        - default_image:
-            node: image#vsg-1.1
-            relationship: tosca.relationships.BelongsToOne
-
-    networkslice#management_to_{{ site_name }}_veg:
-        type: tosca.nodes.NetworkSlice
-        requirements:
-          - network:
-              node: management
-              relationship: tosca.relationships.BelongsToOne
-          - slice:
-              node: {{ site_name }}_veg
-              relationship: tosca.relationships.BelongsToOne
-
-{% if use_management_hosts %}
-    networkslice#management_hosts_to_{{ site_name }}_veg:
-        type: tosca.nodes.NetworkSlice
-        requirements:
-          - network:
-              node: management_hosts
-              relationship: tosca.relationships.BelongsToOne
-          - slice:
-            node: {{ site_name }}_veg
-            relationship: tosca.relationships.BelongsToOne
-{% endif %}
-
-    # TODO: migrate interfaces when we'll start using
-    # in#lanside:
-    #   type: tosca.nodes.InterfaceType
-    #   properties:
-    #      direction: in
-
-    # out#lanside:
-    #   type: tosca.nodes.InterfaceType
-    #   properties:
-    #      direction: out
-
-    # in#wanside:
-    #   type: tosca.nodes.InterfaceType
-    #   properties:
-    #      direction: in
-
-    # out#wanside:
-    #   type: tosca.nodes.InterfaceType
-    #   properties:
-    #      direction: out
-
-    # veg_lanside:
-    #   type: tosca.nodes.ServiceInterface
-    #   requirements:
-    #     - service:
-    #         node: service#veg
-    #         relationship: tosca.relationships.MemberOfService
-    #     - interface:
-    #         node: in#lanside
-    #         relationship: tosca.relationships.IsType
-
-    # veg_wanside:
-    #   type: tosca.nodes.ServiceInterface
-    #   requirements:
-    #     - service:
-    #         node: service#veg
-    #         relationship: tosca.relationships.MemberOfService
-    #     - interface:
-    #         node: out#wanside
-    #         relationship: tosca.relationships.IsType
-
-    # addressmanager_wanside:
-    #   type: tosca.nodes.ServiceInterface
-    #   requirements:
-    #     - service:
-    #         node: service#addressmanager
-    #         relationship: tosca.relationships.MemberOfService
-    #     - interface:
-    #         node: in#wanside
-    #         relationship: tosca.relationships.IsType
-
diff --git a/roles/cord-profile/templates/fabric-network-cfg.json.j2 b/roles/cord-profile/templates/fabric-network-cfg.json.j2
deleted file mode 100644
index 853c7e9..0000000
--- a/roles/cord-profile/templates/fabric-network-cfg.json.j2
+++ /dev/null
@@ -1,19 +0,0 @@
-
-{#
-Copyright 2017-present Open Networking Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
-
-
-{}
\ No newline at end of file
diff --git a/roles/cord-profile/templates/fabric-service.yaml.j2 b/roles/cord-profile/templates/fabric-service.yaml.j2
deleted file mode 100644
index e28d5ea..0000000
--- a/roles/cord-profile/templates/fabric-service.yaml.j2
+++ /dev/null
@@ -1,78 +0,0 @@
-
-{#
-Copyright 2017-present Open Networking Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
-
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
-   - custom_types/onosservice.yaml
-   - custom_types/serviceattribute.yaml
-   - custom_types/fabricservice.yaml
-   - custom_types/onosapp.yaml
-   - custom_types/serviceinstancelink.yaml
-
-description: fabric services, generated by platform-install
-
-topology_template:
-  node_templates:
-
-    service#ONOS_Fabric:
-      type: tosca.nodes.ONOSService
-      properties:
-          name: ONOS_Fabric
-          kind: platform
-          no_container: true
-          rest_hostname: onos-fabric.{{ site_suffix }}
-
-    serviceattribute#fabric_network_cfg_json:
-      type: tosca.nodes.ServiceAttribute
-      requirements:
-          - service:
-              node: service#ONOS_Fabric
-              relationship: tosca.relationships.BelongsToOne
-      properties:
-          name: fabric_network_cfg_json
-          value: {{ fabric_network_cfg_json }}
-
-    service#fabric:
-      type: tosca.nodes.FabricService
-      properties:
-          name: fabric
-          kind: platform
-
-
-
-    Fabric_ONOS_app:
-      type: tosca.nodes.ONOSApp
-      requirements:
-          - owner:
-              node: service#ONOS_Fabric
-              relationship: tosca.relationships.BelongsToOne
-      properties:
-          name: Fabric_ONOS_app
-          dependencies: org.onosproject.drivers, org.onosproject.openflow, org.onosproject.netcfghostprovider, org.onosproject.segmentrouting
-
-    Fabric_ONOS_app_ONOS_Fabric:
-        type: tosca.nodes.ServiceInstanceLink
-        requirements:
-          - provider_service_instance:
-              node: Fabric_ONOS_app
-              relationship: tosca.relationships.BelongsToOne
-          - subscriber_service:
-              node: service#fabric
-              relationship: tosca.relationships.BelongsToOne
-
diff --git a/roles/cord-profile/templates/flat-net-s1mme.yaml.j2 b/roles/cord-profile/templates/flat-net-s1mme.yaml.j2
deleted file mode 100644
index b4c5c93..0000000
--- a/roles/cord-profile/templates/flat-net-s1mme.yaml.j2
+++ /dev/null
@@ -1,55 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
-   - custom_types/xos.yaml
-   - custom_types/site.yaml
-   - custom_types/slice.yaml
-   - custom_types/flavor.yaml
-   - custom_types/network.yaml
-   - custom_types/networktemplate.yaml
-
-description: flat network for S1MME interface
-
-topology_template:
-  node_templates:
-
-# site, fully created in deployment.yaml
-    {{ site_name }}:
-      type: tosca.nodes.Site
-      properties:
-          name: {{ site_name }}
-
-# flat network for s1mme
-    flat_template_s1mme:
-      type: tosca.nodes.NetworkTemplate
-      properties:
-          name: flat_template_s1mme
-          visibility: private
-          translation: none
-          vtn_kind: FLAT
-
-    flat_network_s1mme:
-      type: tosca.nodes.Network
-      properties:
-          name: flat_network_s1mme
-          subnet: 118.0.0.0/24
-          permit_all_slices: true
-      requirements:
-          - template:
-              node: flat_template_s1mme
-              relationship: tosca.relationships.BelongsToOne
-          - owner:
-              node: {{ site_name }}_flat_s1mme
-              relationship: tosca.relationships.BelongsToOne
-
-    {{ site_name }}_flat_s1mme:
-      description: This slice exists solely to own the Flat network
-      type: tosca.nodes.Slice
-      properties:
-          name: {{ site_name }}_flat_s1mme
-          default_isolation: vm
-          network: noauto
-      requirements:
-          - site:
-              node: {{ site_name }}
-              relationship: tosca.relationships.BelongsToOne
\ No newline at end of file
diff --git a/roles/cord-profile/templates/flat-net-s1u.yaml.j2 b/roles/cord-profile/templates/flat-net-s1u.yaml.j2
deleted file mode 100644
index 01ca850..0000000
--- a/roles/cord-profile/templates/flat-net-s1u.yaml.j2
+++ /dev/null
@@ -1,55 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
-   - custom_types/xos.yaml
-   - custom_types/site.yaml
-   - custom_types/slice.yaml
-   - custom_types/flavor.yaml
-   - custom_types/network.yaml
-   - custom_types/networktemplate.yaml
-
-description: flat network for S1U interface
-
-topology_template:
-  node_templates:
-
-# site, fully created in deployment.yaml
-    {{ site_name }}:
-      type: tosca.nodes.Site
-      properties:
-          name: {{ site_name }}
-
-# flat network for s1u
-    flat_template_s1u:
-      type: tosca.nodes.NetworkTemplate
-      properties:
-          name: flat_template_s1u
-          visibility: private
-          translation: none
-          vtn_kind: FLAT
-
-    flat_network_s1u:
-      type: tosca.nodes.Network
-      properties:
-          name: flat_network_s1u
-          subnet: 119.0.0.0/24
-          permit_all_slices: true
-      requirements:
-          - template:
-              node: flat_template_s1u
-              relationship: tosca.relationships.BelongsToOne
-          - owner:
-              node: {{ site_name }}_flat_s1u
-              relationship: tosca.relationships.BelongsToOne
-
-    {{ site_name }}_flat_s1u:
-      description: This slice exists solely to own the Flat network
-      type: tosca.nodes.Slice
-      properties:
-          name: {{ site_name }}_flat_s1u
-          default_isolation: vm
-          network: noauto
-      requirements:
-          - site:
-              node: {{ site_name }}
-              relationship: tosca.relationships.BelongsToOne
\ No newline at end of file
diff --git a/roles/cord-profile/templates/flat-net.yaml.j2 b/roles/cord-profile/templates/flat-net.yaml.j2
deleted file mode 100644
index e9588c0..0000000
--- a/roles/cord-profile/templates/flat-net.yaml.j2
+++ /dev/null
@@ -1,56 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
-   - custom_types/xos.yaml
-   - custom_types/site.yaml
-   - custom_types/slice.yaml
-   - custom_types/flavor.yaml
-   - custom_types/network.yaml
-   - custom_types/networktemplate.yaml
-
-description: flat network for connecting from VM in CORD to servers outside
-
-topology_template:
-  node_templates:
-
-# site, fully created in deployment.yaml
-    {{ site_name }}:
-      type: tosca.nodes.Site
-      properties:
-          name: {{ site_name }}
-
-# flat network
-    flat_template:
-      type: tosca.nodes.NetworkTemplate
-      properties:
-          name: flat_template
-          visibility: private
-          translation: none
-          vtn_kind: FLAT
-
-    flat_network:
-      type: tosca.nodes.Network
-      properties:
-          name: flat_network
-          subnet: 103.0.0.0/24
-          permit_all_slices: true
-      requirements:
-          - template:
-              node: flat_template
-              relationship: tosca.relationships.BelongsToOne
-          - owner:
-              node: {{ site_name }}_flat
-              relationship: tosca.relationships.MemberOfSlice
-
-    {{ site_name }}_flat:
-      description: This slice exists solely to own the flat network
-      type: tosca.nodes.Slice
-      properties:
-          name: {{ site_name }}_flat
-          default_isolation: vm
-          network: noauto
-      requirements:
-          - site:
-              node: {{ site_name }}
-              relationship: tosca.relationships.BelongsToOne
-
diff --git a/roles/cord-profile/templates/internet-emulator-service.yaml.j2 b/roles/cord-profile/templates/internet-emulator-service.yaml.j2
deleted file mode 100644
index 8b56bf6..0000000
--- a/roles/cord-profile/templates/internet-emulator-service.yaml.j2
+++ /dev/null
@@ -1,140 +0,0 @@
-
-{#
-Copyright 2017-present Open Networking Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
-
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: created by platform-install, need to add M-CORD services later
-
-imports:
-   - custom_types/xos.yaml
-   - custom_types/slice.yaml
-   - custom_types/site.yaml
-   - custom_types/image.yaml
-   - custom_types/flavor.yaml
-   - custom_types/network.yaml
-   - custom_types/networkslice.yaml
-   - custom_types/internetemulatorservice.yaml
-   - custom_types/internetemulatorserviceinstance.yaml
-
-topology_template:
-  node_templates:
-
-# site, image, fully created in deployment.yaml
-    {{ site_name }}:
-      type: tosca.nodes.Site
-      properties:
-        must-exist: true
-        name: {{ site_name }}
-
-    m1.small:
-      type: tosca.nodes.Flavor
-      properties:
-        name: m1.small
-        must-exist: true
-
-    trusty-server-multi-nic:
-      type: tosca.nodes.Image
-      properties:
-        name: trusty-server-multi-nic
-        must-exist: true
-
-# management networks, fully created in management-net.yaml
-    management:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: management
-
-{% if use_management_hosts %}
-    management_hosts:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: management_hosts
-{% endif %}
-
-# sgi_network is for connectivity between VMs, fully created in sgi-net.yaml
-    sgi_network:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: sgi_network
-
-
-# CORD Services
-    service#internetemulator:
-      type: tosca.nodes.InternetEmulatorService
-      properties:
-          name: internetemulator
-          public_key: {{ lookup('file', config_cord_profile_dir + '/key_import/mcord_rsa.pub') }}
-          private_key_fn: /opt/xos/services/internetemulator/keys/mcord_rsa
-      artifacts:
-          pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
-
-# CORD Slices
-    {{ site_name }}_internetemulator:
-      description: Internet Emulator Slice
-      type: tosca.nodes.Slice
-      properties:
-          name: {{ site_name }}_internetemulator
-          default_isolation: vm
-          network: noauto
-      requirements:
-          - site:
-              node: mysite
-              relationship: tosca.relationships.BelongsToOne
-          - service:
-              node: service#internetemulator
-              relationship: tosca.relationships.BelongsToOne
-          - default_image:
-              node: trusty-server-multi-nic
-              relationship: tosca.relationships.BelongsToOne
-          - default_flavor:
-              node: m1.small
-              relationship: tosca.relationships.BelongsToOne
-
-# CORD Service Instances
-    serviceinstance#internetemulator_instance:
-      type: tosca.nodes.InternetEmulatorServiceInstance
-      properties:
-          name: internetemulator_instance
-      requirements:
-        - owner:
-            node: service#internetemulator
-            relationship: tosca.relationships.BelongsToOne
-
-# CORD NetworkSlices
-    internetemulator_slice_management_network:
-      type: tosca.nodes.NetworkSlice
-      requirements:
-        - network:
-            node: management
-            relationship: tosca.relationships.BelongsToOne
-        - slice:
-            node: {{ site_name }}_internetemulator
-            relationship: tosca.relationships.BelongsToOne
-
-    internetemulator_slice_sgi_network:
-      type: tosca.nodes.NetworkSlice
-      requirements:
-        - network:
-            node: sgi_network
-            relationship: tosca.relationships.BelongsToOne
-        - slice:
-            node: {{ site_name }}_internetemulator
-            relationship: tosca.relationships.BelongsToOne
\ No newline at end of file
diff --git a/roles/cord-profile/templates/management-net.yaml.j2 b/roles/cord-profile/templates/management-net.yaml.j2
deleted file mode 100644
index 9c7b03c..0000000
--- a/roles/cord-profile/templates/management-net.yaml.j2
+++ /dev/null
@@ -1,97 +0,0 @@
-
-{#
-Copyright 2017-present Open Networking Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
-
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
-   - custom_types/networktemplate.yaml
-   - custom_types/network.yaml
-   - custom_types/slice.yaml
-   - custom_types/site.yaml
-
-description: management network config, generated by platform-install
-
-topology_template:
-  node_templates:
-
-# site, fully created in deployment.yaml
-    {{ site_name }}:
-      type: tosca.nodes.Site
-      properties:
-        name: {{ site_name }}
-
-# management network
-    management_template:
-      type: tosca.nodes.NetworkTemplate
-      properties:
-        name: management_template
-        visibility: private
-        translation: none
-        vtn_kind: MANAGEMENT_LOCAL
-
-    management:
-      type: tosca.nodes.Network
-      properties:
-        name: management
-        # ip_version: 4
-        subnet: {{ management_network_cidr }}
-        permit_all_slices: true
-      requirements:
-        - template:
-            node: management_template
-            relationship: tosca.relationships.BelongsToOne
-        - owner:
-            node: slice#{{ site_name }}_management
-            relationship: tosca.relationships.BelongsToOne
-
-{% if use_management_hosts %}
-    management_hosts_template:
-      type: tosca.nodes.NetworkTemplate
-      properties:
-        name: management_hosts_template
-        visibility: private
-        translation: none
-        vtn_kind: MANAGEMENT_HOST
-
-    management_hosts:
-      type: tosca.nodes.Network
-      properties:
-        # ip_version: 4
-        subnet: {{ management_hosts_net_cidr }}
-        start_ip: {{ management_hosts_net_range_xos_low }}
-        end_ip: {{ management_hosts_net_range_xos_high }}
-      requirements:
-        - template:
-            node: management_hosts_template
-            relationship: tosca.relationships.BelongsToOne
-        - owner:
-            node: slice#{{ site_name }}_management
-            relationship: tosca.relationships.BelongsToOne
-{% endif %}
-
-    slice#{{ site_name }}_management:
-      description: This slice exists solely to own the management network
-      type: tosca.nodes.Slice
-      properties:
-        network: noauto
-        name: {{ site_name }}_management
-      requirements:
-        - site:
-            node: {{ site_name }}
-            relationship: tosca.relationships.BelongsToOne
-
diff --git a/roles/cord-profile/templates/mcord-cavium-services.yml.j2 b/roles/cord-profile/templates/mcord-cavium-services.yml.j2
deleted file mode 100644
index 99fab61..0000000
--- a/roles/cord-profile/templates/mcord-cavium-services.yml.j2
+++ /dev/null
@@ -1,342 +0,0 @@
-
-{#
-Copyright 2017-present Open Networking Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
-
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: created by platform-install
-
-imports:
-   - custom_types/xos.yaml
-   - custom_types/slice.yaml
-   - custom_types/site.yaml
-   - custom_types/image.yaml
-   - custom_types/flavor.yaml
-   - custom_types/network.yaml
-   - custom_types/onosservice.yaml
-   - custom_types/networkslice.yaml
-   - custom_types/vspgwcservice.yaml
-   - custom_types/vspgwcvendor.yaml
-   - custom_types/vspgwuservice.yaml
-   - custom_types/vspgwuvendor.yaml
-   - custom_types/vmmeservice.yaml
-   - custom_types/vmmevendor.yaml
-   - custom_types/vepcservice.yaml
-   - custom_types/servicedependency.yaml
-   - custom_types/mcordsubscriberservice.yaml
-
-topology_template:
-  node_templates:
-
-# site, image, fully created in deployment.yaml
-    {{ site_name }}:
-      type: tosca.nodes.Site
-      properties:
-        must-exist: true
-        name: {{ site_name }}
-
-    m1.small:
-      type: tosca.nodes.Flavor
-      properties:
-        name: m1.small
-        must-exist: true
-    m1.large:
-      type: tosca.nodes.Flavor
-      properties:
-        name: m1.large
-        must-exist: true
-    m1.medium:
-      type: tosca.nodes.Flavor
-      properties:
-        name: m1.medium
-        must-exist: true
-    m1.xlarge:
-      type: tosca.nodes.Flavor
-      properties:
-        name: m1.xlarge
-        must-exist: true
-
-    image-test:
-      type: tosca.nodes.Image
-      properties:
-        name: image-test
-
-    image-spgwc:
-      type: tosca.nodes.Image
-      properties:
-        name: image-spgwc
-
-    image-spgwu:
-      type: tosca.nodes.Image
-      properties:
-        name: image-spgwu
-
-# management networks, fully created in management-net.yaml
-    management:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: management
-
-{% if use_management_hosts %}
-    management_hosts:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: management_hosts
-{% endif %}
-
-# flat_network_s1mme is for connectivity between VMs, fully created in flat-net-s1mme.yaml
-    flat_network_s1mme:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: flat_network_s1mme
-# flat_network_s1u is for connectivity between VMs, fully created in flat-net-s1u.yaml
-    flat_network_s1u:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: flat_network_s1u
-# s11_network is for connectivity between VMs, fully created in s11-net.yaml
-    s11_network:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: s11_network
-# sgi_network is for connectivity between VMs, fully created in sgi-net.yaml
-    sgi_network:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: sgi_network
-# spgw_network is for connectivity between VMs, fully created in spgw-net.yaml
-    spgw_network:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: spgw_network
-
-# ONOS_CORD, fully created in vtn.yaml
-    service#ONOS_CORD:
-      type: tosca.nodes.ONOSService
-      properties:
-        must-exist: true
-        name: ONOS_CORD
-
-# ONOS_Fabric, fully created in fabric.yaml
-    service#ONOS_Fabric:
-      type: tosca.nodes.ONOSService
-      properties:
-        must-exist: true
-        name: ONOS_Fabric
-
-# vMME Service
-    service#vmme:
-      type: tosca.nodes.VMMEService
-      properties:
-          name: vmme
-          public_key: {{ lookup('file', config_cord_profile_dir + '/key_import/mcord_rsa.pub') }}
-          private_key_fn: /opt/xos/services/vmme/keys/mcord_rsa
-      artifacts:
-          pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
-
-    {{ site_name }}_vmme:
-      description: vMME Service Slice
-      type: tosca.nodes.Slice
-      properties:
-          name: {{ site_name }}_vmme
-          default_isolation: vm
-          network: noauto
-      requirements:
-          - site:
-              node: mysite
-              relationship: tosca.relationships.BelongsToOne
-          - service:
-              node: service#vmme
-              relationship: tosca.relationships.BelongsToOne
-          - default_image:
-              node: image-test
-              relationship: tosca.relationships.BelongsToOne
-          - default_flavor:
-              node: m1.medium
-              relationship: tosca.relationships.BelongsToOne
-
-    sprint_mme:
-      type: tosca.nodes.VMMEVendor
-      properties:
-        name: sprint_mme
-      requirements:
-        - image:
-            node: image-test
-            relationship: tosca.relationships.BelongsToOne
-        - flavor:
-            node: m1.medium
-            relationship: tosca.relationships.BelongsToOne
-
-#vSPGWC Service
-    service#vspgwc:
-      type: tosca.nodes.VSPGWCService
-      properties:
-          name: vspgwc
-          public_key: {{ lookup('file', config_cord_profile_dir + '/key_import/mcord_rsa.pub') }}
-          private_key_fn: /opt/xos/services/vspgwc/keys/mcord_rsa
-      artifacts:
-          pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
-
-    {{ site_name }}_vspgwc:
-      description: SDN controller slice
-      type: tosca.nodes.Slice
-      properties:
-          name: {{ site_name }}_vspgwc
-          default_isolation: vm
-          network: noauto
-      requirements:
-          - site:
-              node: mysite
-              relationship: tosca.relationships.BelongsToOne
-          - service:
-              node: service#vspgwc
-              relationship: tosca.relationships.BelongsToOne
-          - default_image:
-              node: image-spgwc
-              relationship: tosca.relationships.BelongsToOne
-          - default_flavor:
-              node: m1.large
-              relationship: tosca.relationships.BelongsToOne
-
-    intel_vspgwc:
-      type: tosca.nodes.VSPGWCVendor
-      properties:
-        name: intel_vspgwc
-      requirements:
-        - image:
-            node: image-spgwc
-            relationship: tosca.relationships.BelongsToOne
-        - flavor:
-            node: m1.large
-            relationship: tosca.relationships.BelongsToOne
-
-
-#vSPGWU Service
-    service#vspgwu:
-      type: tosca.nodes.VSPGWUService
-      properties:
-          name: vspgwu
-          public_key: {{ lookup('file', config_cord_profile_dir + '/key_import/mcord_rsa.pub') }}
-          private_key_fn: /opt/xos/services/vspgwu/keys/mcord_rsa
-      artifacts:
-          pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
-
-    {{ site_name }}_vspgwu:
-      description: SDN controller slice
-      type: tosca.nodes.Slice
-      properties:
-          name: {{ site_name }}_vspgwu
-          default_isolation: vm
-          network: noauto
-      requirements:
-          - site:
-              node: mysite
-              relationship: tosca.relationships.BelongsToOne
-          - service:
-              node: service#vspgwu
-              relationship: tosca.relationships.BelongsToOne
-          - default_image:
-              node: image-spgwu
-              relationship: tosca.relationships.BelongsToOne
-          - default_flavor:
-              node: m1.xlarge
-              relationship: tosca.relationships.BelongsToOne
-
-    intel_vspgwu:
-      type: tosca.nodes.VSPGWUVendor
-      properties:
-        name: intel_vspgwu
-      requirements:
-        - image:
-            node: image-spgwu
-            relationship: tosca.relationships.BelongsToOne
-        - flavor:
-            node: m1.xlarge
-            relationship: tosca.relationships.BelongsToOne
-
-# vEPC Service
-    service#vepc:
-      type: tosca.nodes.VEPCService
-      properties:
-          name: vepc
-          public_key: {{ lookup('file', config_cord_profile_dir + '/key_import/mcord_rsa.pub') }}
-          private_key_fn: /opt/xos/services/epc-service/keys/mcord_rsa
-      artifacts:
-          pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
-
-# ServiceDependencies
-    vmme_vspgwc:
-      type: tosca.nodes.ServiceDependency
-      properties:
-        connect_method: None
-      requirements:
-        - subscriber_service:
-            node: service#vmme
-            relationship: tosca.relationships.BelongsToOne
-        - provider_service:
-            node: service#vspgwc
-            relationship: tosca.relationships.BelongsToOne
-
-    vmme_vspgwu:
-      type: tosca.nodes.ServiceDependency
-      properties:
-        connect_method: None
-      requirements:
-        - subscriber_service:
-            node: service#vmme
-            relationship: tosca.relationships.BelongsToOne
-        - provider_service:
-            node: service#vspgwu
-            relationship: tosca.relationships.BelongsToOne
-
-    vspgwc_vspgwu:
-      type: tosca.nodes.ServiceDependency
-      properties:
-        connect_method: None
-      requirements:
-        - subscriber_service:
-            node: service#vspgwc
-            relationship: tosca.relationships.BelongsToOne
-        - provider_service:
-            node: service#vspgwu
-            relationship: tosca.relationships.BelongsToOne
-
-# M-CORD Subscriber
-    service#mcord:
-      type: tosca.nodes.MCordSubscriberService
-      properties:
-        name: mcord
-
-    # ServiceDependency M-CORD to vENB
-    mcord_vmme:
-      type: tosca.nodes.ServiceDependency
-      properties:
-        connect_method: None
-      requirements:
-        - subscriber_service:
-            node: service#vmme
-            relationship: tosca.relationships.BelongsToOne
-        - provider_service:
-            node: service#mcord
-            relationship: tosca.relationships.BelongsToOne
diff --git a/roles/cord-profile/templates/mcord-ng40-services.yml.j2 b/roles/cord-profile/templates/mcord-ng40-services.yml.j2
deleted file mode 100644
index 4cd0fc2..0000000
--- a/roles/cord-profile/templates/mcord-ng40-services.yml.j2
+++ /dev/null
@@ -1,343 +0,0 @@
-
-{#
-Copyright 2017-present Open Networking Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
-
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: created by platform-install, need to add M-CORD services later
-
-imports:
-   - custom_types/xos.yaml
-   - custom_types/slice.yaml
-   - custom_types/site.yaml
-   - custom_types/image.yaml
-   - custom_types/flavor.yaml
-   - custom_types/network.yaml
-   - custom_types/onosservice.yaml
-   - custom_types/networkslice.yaml
-   - custom_types/venbservice.yaml
-   - custom_types/vspgwcservice.yaml
-   - custom_types/vspgwcvendor.yaml
-   - custom_types/vspgwuservice.yaml
-   - custom_types/vspgwuvendor.yaml
-   - custom_types/vepcservice.yaml
-   - custom_types/servicedependency.yaml
-   - custom_types/mcordsubscriberservice.yaml
-
-topology_template:
-  node_templates:
-
-# site, image, fully created in deployment.yaml
-    {{ site_name }}:
-      type: tosca.nodes.Site
-      properties:
-        must-exist: true
-        name: {{ site_name }}
-
-    m1.small:
-      type: tosca.nodes.Flavor
-      properties:
-        name: m1.small
-        must-exist: true
-    m1.large:
-      type: tosca.nodes.Flavor
-      properties:
-        name: m1.large
-        must-exist: true
-    m1.medium:
-      type: tosca.nodes.Flavor
-      properties:
-        name: m1.medium
-        must-exist: true
-    m1.xlarge:
-      type: tosca.nodes.Flavor
-      properties:
-        name: m1.xlarge
-        must-exist: true
-
-    image-venb:
-      type: tosca.nodes.Image
-      properties:
-        name: image-venb
-
-    image-spgwc:
-      type: tosca.nodes.Image
-      properties:
-        name: image-spgwc
-
-    image-spgwu:
-      type: tosca.nodes.Image
-      properties:
-        name: image-spgwu
-
-# management networks, fully created in management-net.yaml
-    management:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: management
-
-{% if use_management_hosts %}
-    management_hosts:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: management_hosts
-{% endif %}
-
-# s1u_network is for connectivity between VMs, fully created in s1u-net.yaml
-    s1u_network:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: s1u_network
-# s11_network is for connectivity between VMs, fully created in s11-net.yaml
-    s11_network:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: s11_network
-# nbi_network is for connectivity between VMs, fully created in nbi-net.yaml
-    nbi_network:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: nbi_network
-# sbi_network is for connectivity between VMs, fully created in sbi-net.yaml
-    sbi_network:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: sbi_network
-# sgi_network is for connectivity between VMs, fully created in sgi-net.yaml
-    sgi_network:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: sgi_network
-# spgw_network is for connectivity between VMs, fully created in spgw-net.yaml
-    spgw_network:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: spgw_network
-# flat_network is for connectivity between VM inside cord and server outside, fully created in flat-net.yaml
-    flat_network:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: flat_network
-
-# ONOS_CORD, fully created in vtn.yaml
-    service#ONOS_CORD:
-      type: tosca.nodes.ONOSService
-      properties:
-        must-exist: true
-        name: ONOS_CORD
-
-# ONOS_Fabric, fully created in fabric.yaml
-    service#ONOS_Fabric:
-      type: tosca.nodes.ONOSService
-      properties:
-        must-exist: true
-        name: ONOS_Fabric
-
-# vENB Service
-    service#venb:
-      type: tosca.nodes.VENBService
-      properties:
-          name: venb
-          public_key: {{ lookup('file', config_cord_profile_dir + '/key_import/mcord_rsa.pub') }}
-          private_key_fn: /opt/xos/services/venb/keys/mcord_rsa
-      artifacts:
-          pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
-
-    {{ site_name }}_venb:
-      description: vENB Service Slice
-      type: tosca.nodes.Slice
-      properties:
-          name: {{ site_name }}_venb
-          default_isolation: vm
-          network: noauto
-      requirements:
-          - site:
-              node: mysite
-              relationship: tosca.relationships.BelongsToOne
-          - service:
-              node: service#venb
-              relationship: tosca.relationships.BelongsToOne
-          - default_image:
-              node: image-venb
-              relationship: tosca.relationships.BelongsToOne
-          - default_flavor:
-              node: m1.medium
-              relationship: tosca.relationships.BelongsToOne
-
-
-#vSPGWC Service
-    service#vspgwc:
-      type: tosca.nodes.VSPGWCService
-      properties:
-          name: vspgwc
-          public_key: {{ lookup('file', config_cord_profile_dir + '/key_import/mcord_rsa.pub') }}
-          private_key_fn: /opt/xos/services/vspgwc/keys/mcord_rsa
-      artifacts:
-          pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
-
-    {{ site_name }}_vspgwc:
-      description: SDN controller slice
-      type: tosca.nodes.Slice
-      properties:
-          name: {{ site_name }}_vspgwc
-          default_isolation: vm
-          network: noauto
-      requirements:
-          - site:
-              node: mysite
-              relationship: tosca.relationships.BelongsToOne
-          - service:
-              node: service#vspgwc
-              relationship: tosca.relationships.BelongsToOne
-          - default_image:
-              node: image-spgwc
-              relationship: tosca.relationships.BelongsToOne
-          - default_flavor:
-              node: m1.large
-              relationship: tosca.relationships.BelongsToOne
-
-    intel_vspgwc:
-      type: tosca.nodes.VSPGWCVendor
-      properties:
-        name: intel_vspgwc
-      requirements:
-        - image:
-            node: image-spgwc
-            relationship: tosca.relationships.BelongsToOne
-        - flavor:
-            node: m1.large
-            relationship: tosca.relationships.BelongsToOne
-
-
-#vSPGWU Service
-    service#vspgwu:
-      type: tosca.nodes.VSPGWUService
-      properties:
-          name: vspgwu
-          public_key: {{ lookup('file', config_cord_profile_dir + '/key_import/mcord_rsa.pub') }}
-          private_key_fn: /opt/xos/services/vspgwu/keys/mcord_rsa
-      artifacts:
-          pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
-
-    {{ site_name }}_vspgwu:
-      description: SDN controller slice
-      type: tosca.nodes.Slice
-      properties:
-          name: {{ site_name }}_vspgwu
-          default_isolation: vm
-          network: noauto
-      requirements:
-          - site:
-              node: mysite
-              relationship: tosca.relationships.BelongsToOne
-          - service:
-              node: service#vspgwu
-              relationship: tosca.relationships.BelongsToOne
-          - default_image:
-              node: image-spgwu
-              relationship: tosca.relationships.BelongsToOne
-          - default_flavor:
-              node: m1.xlarge
-              relationship: tosca.relationships.BelongsToOne
-
-    intel_vspgwu:
-      type: tosca.nodes.VSPGWUVendor
-      properties:
-        name: intel_vspgwu
-      requirements:
-        - image:
-            node: image-spgwu
-            relationship: tosca.relationships.BelongsToOne
-        - flavor:
-            node: m1.xlarge
-            relationship: tosca.relationships.BelongsToOne
-
-# vEPC Service
-    service#vepc:
-      type: tosca.nodes.VEPCService
-      properties:
-          name: vepc
-          public_key: {{ lookup('file', config_cord_profile_dir + '/key_import/mcord_rsa.pub') }}
-          private_key_fn: /opt/xos/services/venb/keys/mcord_rsa
-      artifacts:
-          pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
-
-
-# ServiceDependencies
-    venb_vspgwc:
-      type: tosca.nodes.ServiceDependency
-      properties:
-        connect_method: None
-      requirements:
-        - subscriber_service:
-            node: service#venb
-            relationship: tosca.relationships.BelongsToOne
-        - provider_service:
-            node: service#vspgwc
-            relationship: tosca.relationships.BelongsToOne
-
-    venb_vspgwu:
-      type: tosca.nodes.ServiceDependency
-      properties:
-        connect_method: None
-      requirements:
-        - subscriber_service:
-            node: service#venb
-            relationship: tosca.relationships.BelongsToOne
-        - provider_service:
-            node: service#vspgwu
-            relationship: tosca.relationships.BelongsToOne
-
-    vspgwc_vspgwu:
-      type: tosca.nodes.ServiceDependency
-      properties:
-        connect_method: None
-      requirements:
-        - subscriber_service:
-            node: service#vspgwc
-            relationship: tosca.relationships.BelongsToOne
-        - provider_service:
-            node: service#vspgwu
-            relationship: tosca.relationships.BelongsToOne
-
-# M-CORD Subscriber
-    service#mcord:
-      type: tosca.nodes.MCordSubscriberService
-      properties:
-        name: mcord
-
-    # ServiceDependency M-CORD to vENB
-    mcord_venb:
-      type: tosca.nodes.ServiceDependency
-      properties:
-        connect_method: None
-      requirements:
-        - subscriber_service:
-            node: service#venb
-            relationship: tosca.relationships.BelongsToOne
-        - provider_service:
-            node: service#mcord
-            relationship: tosca.relationships.BelongsToOne
diff --git a/roles/cord-profile/templates/mcord-service-graph.yml.j2 b/roles/cord-profile/templates/mcord-service-graph.yml.j2
deleted file mode 100644
index 745b5ac..0000000
--- a/roles/cord-profile/templates/mcord-service-graph.yml.j2
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: Persist M-CORD Subscriber
-
-imports:
-   - custom_types/mcordsubscriberservice.yaml
-   - custom_types/venbservice.yaml
-   - custom_types/slice.yaml
-   - custom_types/site.yaml
-   - custom_types/image.yaml
-   - custom_types/servicedependency.yaml
-
-topology_template:
-  node_templates:
-
-    # Site
-    {{ site_humanname | lower }}:
-      type: tosca.nodes.Site
-      properties:
-        must-exist: true
-        name: {{ site_humanname | lower }}
-
-    # Images
-    image#vsg-1.1:
-      type: tosca.nodes.Image
-      properties:
-        must-exist: true
-        name: vsg-1.1
-
-    # M-CORD Subscriber Service
-    mcord:
-      type: tosca.nodes.MCordSubscriberService
-      properties:
-        name: mcord
-
-    # M-CORD vENB Service
-    service#vENB:
-      type: tosca.nodes.VENBService
-      properties:
-        name: vENB
-
-    slice#vENB_slice:
-      type: tosca.nodes.Slice
-      properties:
-        name: {{ site_name }}_vENB_slice
-      requirements:
-        - service:
-            node: service#vENB
-            relationship: tosca.relationships.BelongsToOne
-        - site:
-            node: {{ site_humanname | lower }}
-            relationship: tosca.relationships.BelongsToOne
-        - default_image:
-            node: image#vsg-1.1
-            relationship: tosca.relationships.BelongsToOne
-
-    # ServiceDependency M-CORD to vENB
-    mcord_venb:
-      type: tosca.nodes.ServiceDependency
-      properties:
-        connect_method: None
-      requirements:
-        - subscriber_service:
-            node: mcord
-            relationship: tosca.relationships.BelongsToOne
-        - provider_service:
-            node: service#vENB
-            relationship: tosca.relationships.BelongsToOne
diff --git a/roles/cord-profile/templates/mcord-services.yml.j2 b/roles/cord-profile/templates/mcord-services.yml.j2
deleted file mode 100644
index 40d21ef..0000000
--- a/roles/cord-profile/templates/mcord-services.yml.j2
+++ /dev/null
@@ -1,225 +0,0 @@
-
-{#
-Copyright 2017-present Open Networking Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
-
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: created by platform-install, need to add M-CORD services later
-
-imports:
-   - custom_types/xos.yaml
-   - custom_types/slice.yaml
-   - custom_types/site.yaml
-   - custom_types/image.yaml
-   - custom_types/flavor.yaml
-   - custom_types/network.yaml
-   - custom_types/onosservice.yaml
-   - custom_types/networkslice.yaml
-   - custom_types/vmmeservice.yaml
-   - custom_types/vmmevendor.yaml
-   - custom_types/vmmetenant.yaml
-
-topology_template:
-  node_templates:
-
-# site, image, fully created in deployment.yaml
-    {{ site_name }}:
-      type: tosca.nodes.Site
-      properties:
-        must-exist: true
-        name: {{ site_name }}
-
-    m1.small:
-      type: tosca.nodes.Flavor
-      properties:
-        name: m1.small
-        must-exist: true
-    m1.large:
-      type: tosca.nodes.Flavor
-      properties:
-        name: m1.large
-        must-exist: true
-    m1.medium:
-      type: tosca.nodes.Flavor
-      properties:
-        name: m1.medium
-        must-exist: true
-    m1.xlarge:
-      type: tosca.nodes.Flavor
-      properties:
-        name: m1.xlarge
-        must-exist: true
-
-    trusty-server-multi-nic:
-      type: tosca.nodes.Image
-      properties:
-        name: trusty-server-multi-nic
-
-# management networks, fully created in management-net.yaml
-    management:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: management
-
-{% if use_management_hosts %}
-    management_hosts:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: management_hosts
-{% endif %}
-
-# s1u_network is for connectivity between VMs, fully created in s1u-net.yaml
-    s1u_network:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: s1u_network
-# s11_network is for connectivity between VMs, fully created in s11-net.yaml
-    s11_network:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: s11_network
-# nbi_network is for connectivity between VMs, fully created in nbi-net.yaml
-    nbi_network:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: nbi_network
-# sbi_network is for connectivity between VMs, fully created in sbi-net.yaml
-    sbi_network:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: sbi_network
-# sgi_network is for connectivity between VMs, fully created in sgi-net.yaml
-    sgi_network:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: sgi_network
-# s1mme_network is for connectivity between VMs, fully created in s1mme-net.yaml
-    s1mme_network:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: s1mme_network
-
-
-
-# ONOS_CORD, fully created in vtn.yaml
-    service#ONOS_CORD:
-      type: tosca.nodes.ONOSService
-      properties:
-        must-exist: true
-        name: ONOS_CORD
-
-# ONOS_Fabric, fully created in fabric.yaml
-    service#ONOS_Fabric:
-      type: tosca.nodes.ONOSService
-      properties:
-        must-exist: true
-        name: ONOS_Fabric
-
-# CORD Services
-    service#vmme:
-      type: tosca.nodes.VMMEService
-      properties:
-          name: mme
-          kind: vEPC
-          public_key: {{ lookup('file', config_cord_profile_dir + '/key_import/mcord_rsa.pub') }}
-          private_key_fn: /opt/xos/services/vmme/keys/mcord_rsa
-      artifacts:
-          pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
-
-    intel_mme:
-      type: tosca.nodes.VMMEVendor
-      properties:
-        name: intel_mme
-      requirements:
-        - image:
-            node: trusty-server-multi-nic
-            relationship: tosca.relationships.BelongsToOne
-        - flavor:
-            node: m1.small
-            relationship: tosca.relationships.BelongsToOne
-
-    vmme_tenant1:
-      type: tosca.nodes.VMMETenant
-      properties:
-        name: vmme_tenant1
-      requirements:
-        - vmme_vendor:
-            node: intel_mme
-            relationship: tosca.relationships.BelongsToOne
-        - owner:
-            node: service#vmme
-            relationship: tosca.relationships.BelongsToOne
-
-# CORD Slices
-    {{ site_name }}_vmme:
-      description: vMME Service Slice
-      type: tosca.nodes.Slice
-      properties:
-          name: {{ site_name }}_vmme
-          default_isolation: vm
-          network: noauto
-      requirements:
-          - site:
-              node: mysite
-              relationship: tosca.relationships.BelongsToOne
-          - service:
-              node: service#vmme
-              relationship: tosca.relationships.BelongsToOne
-          - default_image:
-              node: trusty-server-multi-nic
-              relationship: tosca.relationships.BelongsToOne
-          - default_flavor:
-              node: m1.small
-              relationship: tosca.relationships.BelongsToOne
-
-    mme_slice_management_network:
-      type: tosca.nodes.NetworkSlice
-      requirements:
-        - network:
-            node: management
-            relationship: tosca.relationships.BelongsToOne
-        - slice:
-            node: {{ site_name }}_vmme
-            relationship: tosca.relationships.BelongsToOne
-
-    mme_slice_s11_network:
-      type: tosca.nodes.NetworkSlice
-      requirements:
-        - network:
-            node: s11_network
-            relationship: tosca.relationships.BelongsToOne
-        - slice:
-            node: {{ site_name }}_vmme
-            relationship: tosca.relationships.BelongsToOne
-
-    mme_slice_s1mme_network:
-      type: tosca.nodes.NetworkSlice
-      requirements:
-        - network:
-            node: s1mme_network
-            relationship: tosca.relationships.BelongsToOne
-        - slice:
-            node: {{ site_name }}_vmme
-            relationship: tosca.relationships.BelongsToOne
diff --git a/roles/cord-profile/templates/mcord-spirent-services.yml.j2 b/roles/cord-profile/templates/mcord-spirent-services.yml.j2
deleted file mode 100644
index 98a508c..0000000
--- a/roles/cord-profile/templates/mcord-spirent-services.yml.j2
+++ /dev/null
@@ -1,428 +0,0 @@
-
-{#
-Copyright 2017-present Open Networking Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
-
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: created by platform-install, need to add M-CORD services later
-
-imports:
-   - custom_types/xos.yaml
-   - custom_types/slice.yaml
-   - custom_types/site.yaml
-   - custom_types/image.yaml
-   - custom_types/flavor.yaml
-   - custom_types/network.yaml
-   - custom_types/onosservice.yaml
-   - custom_types/networkslice.yaml
-   - custom_types/venbservice.yaml
-   - custom_types/venbserviceinstance.yaml
-   - custom_types/vspgwcservice.yaml
-   - custom_types/vspgwcvendor.yaml
-   - custom_types/vspgwctenant.yaml
-   - custom_types/vspgwuservice.yaml
-   - custom_types/vspgwuvendor.yaml
-   - custom_types/vspgwutenant.yaml
-
-topology_template:
-  node_templates:
-
-# site, image, fully created in deployment.yaml
-    {{ site_name }}:
-      type: tosca.nodes.Site
-      properties:
-        must-exist: true
-        name: {{ site_name }}
-
-    m1.small:
-      type: tosca.nodes.Flavor
-      properties:
-        name: m1.small
-        must-exist: true
-    m1.large:
-      type: tosca.nodes.Flavor
-      properties:
-        name: m1.large
-        must-exist: true
-    m1.medium:
-      type: tosca.nodes.Flavor
-      properties:
-        name: m1.medium
-        must-exist: true
-    m1.xlarge:
-      type: tosca.nodes.Flavor
-      properties:
-        name: m1.xlarge
-        must-exist: true
-
-    image-venb:
-      type: tosca.nodes.Image
-      properties:
-        name: image-venb
-
-    image-spgwc:
-      type: tosca.nodes.Image
-      properties:
-        name: image-spgwc
-
-    image-spgwu:
-      type: tosca.nodes.Image
-      properties:
-        name: image-spgwu
-
-# management networks, fully created in management-net.yaml
-    management:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: management
-
-{% if use_management_hosts %}
-    management_hosts:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: management_hosts
-{% endif %}
-
-# s1u_network is for connectivity between VMs, fully created in s1u-net.yaml
-    s1u_network:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: s1u_network
-# s11_network is for connectivity between VMs, fully created in s11-net.yaml
-    s11_network:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: s11_network
-# nbi_network is for connectivity between VMs, fully created in nbi-net.yaml
-    nbi_network:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: nbi_network
-# sbi_network is for connectivity between VMs, fully created in sbi-net.yaml
-    sbi_network:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: sbi_network
-# sgi_network is for connectivity between VMs, fully created in sgi-net.yaml
-    sgi_network:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: sgi_network
-# spgw_network is for connectivity between VMs, fully created in spgw-net.yaml
-    spgw_network:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: spgw_network
-# flat_network is for connectivity between VM inside cord and server outside, fully created in flat-net.yaml
-    flat_network:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: flat_network
-
-# ONOS_CORD, fully created in vtn.yaml
-    service#ONOS_CORD:
-      type: tosca.nodes.ONOSService
-      properties:
-        must-exist: true
-        name: ONOS_CORD
-
-# ONOS_Fabric, fully created in fabric.yaml
-    service#ONOS_Fabric:
-      type: tosca.nodes.ONOSService
-      properties:
-        must-exist: true
-        name: ONOS_Fabric
-
-# vENB Service
-    service#venb:
-      type: tosca.nodes.VENBService
-      properties:
-          name: venb
-          kind: vEPC
-          public_key: {{ lookup('file', config_cord_profile_dir + '/key_import/mcord_rsa.pub') }}
-          private_key_fn: /opt/xos/services/venb/keys/mcord_rsa
-      artifacts:
-          pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
-
-    {{ site_name }}_venb:
-      description: vENB Service Slice
-      type: tosca.nodes.Slice
-      properties:
-          name: {{ site_name }}_venb
-          default_isolation: vm
-          network: noauto
-      requirements:
-          - site:
-              node: mysite
-              relationship: tosca.relationships.BelongsToOne
-          - service:
-              node: service#venb
-              relationship: tosca.relationships.BelongsToOne
-          - default_image:
-              node: image-venb
-              relationship: tosca.relationships.BelongsToOne
-          - default_flavor:
-              node: m1.xlarge
-              relationship: tosca.relationships.BelongsToOne
-
-    venb_instance1:
-      type: tosca.nodes.VENBServiceInstance
-      properties:
-        name: venb_instance1
-      requirements:
-        - owner:
-            node: service#venb
-            relationship: tosca.relationships.BelongsToOne
-
-    venb_slice_management_network:
-      type: tosca.nodes.NetworkSlice
-      requirements:
-        - network:
-            node: management
-            relationship: tosca.relationships.BelongsToOne
-        - slice:
-            node: {{ site_name }}_venb
-            relationship: tosca.relationships.BelongsToOne
-
-    venb_slice_s11_network:
-      type: tosca.nodes.NetworkSlice
-      requirements:
-        - network:
-            node: s11_network
-            relationship: tosca.relationships.BelongsToOne
-        - slice:
-            node: {{ site_name }}_venb
-            relationship: tosca.relationships.BelongsToOne
-
-    venb_slice_s1u_network:
-      type: tosca.nodes.NetworkSlice
-      requirements:
-        - network:
-            node: s1u_network
-            relationship: tosca.relationships.BelongsToOne
-        - slice:
-            node: {{ site_name }}_venb
-            relationship: tosca.relationships.BelongsToOne
-
-    venb_slice_sgi_network:
-      type: tosca.nodes.NetworkSlice
-      requirements:
-        - network:
-            node: sgi_network
-            relationship: tosca.relationships.BelongsToOne
-        - slice:
-            node: {{ site_name }}_venb
-            relationship: tosca.relationships.BelongsToOne
-
-    venb_slice_flat_network:
-      type: tosca.nodes.NetworkSlice
-      requirements:
-        - network:
-            node: flat_network
-            relationship: tosca.relationships.BelongsToOne
-        - slice:
-            node: {{ site_name }}_venb
-            relationship: tosca.relationships.BelongsToOne
-
-#vSPGWC Service
-    service#vspgwc:
-      type: tosca.nodes.VSPGWCService
-      properties:
-          name: vspgwc
-          public_key: {{ lookup('file', config_cord_profile_dir + '/key_import/mcord_rsa.pub') }}
-          private_key_fn: /opt/xos/services/vspgwc/keys/mcord_rsa
-      artifacts:
-          pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
-
-    {{ site_name }}_vspgwc:
-      description: SDN controller slice
-      type: tosca.nodes.Slice
-      properties:
-          name: {{ site_name }}_vspgwc
-          default_isolation: vm
-          network: noauto
-      requirements:
-          - site:
-              node: mysite
-              relationship: tosca.relationships.BelongsToOne
-          - service:
-              node: service#vspgwc
-              relationship: tosca.relationships.BelongsToOne
-          - default_image:
-              node: image-spgwc
-              relationship: tosca.relationships.BelongsToOne
-          - default_flavor:
-              node: m1.large
-              relationship: tosca.relationships.BelongsToOne
-
-    intel_vspgwc:
-      type: tosca.nodes.VSPGWCVendor
-      properties:
-        name: intel_vspgwc
-      requirements:
-        - image:
-            node: image-spgwc
-            relationship: tosca.relationships.BelongsToOne
-        - flavor:
-            node: m1.large
-            relationship: tosca.relationships.BelongsToOne
-
-    serviceinstance#vspgwc_instance:
-      type: tosca.nodes.VSPGWCTenant
-      properties:
-          name: vspgwc_instance1
-      requirements:
-        - vspgwc_vendor:
-            node: intel_vspgwc
-            relationship: tosca.relationships.BelongsToOne
-        - owner:
-            node: service#vspgwc
-            relationship: tosca.relationships.BelongsToOne
-
-    vspgwc_slice_management_network:
-      type: tosca.nodes.NetworkSlice
-      requirements:
-        - network:
-            node: management
-            relationship: tosca.relationships.BelongsToOne
-        - slice:
-            node: {{ site_name }}_vspgwc
-            relationship: tosca.relationships.BelongsToOne
-
-    vspgwc_slice_s11_network:
-      type: tosca.nodes.NetworkSlice
-      requirements:
-        - network:
-            node: s11_network
-            relationship: tosca.relationships.BelongsToOne
-        - slice:
-            node: {{ site_name }}_vspgwc
-            relationship: tosca.relationships.BelongsToOne
-
-    vspgwc_slice_spgw_network:
-      type: tosca.nodes.NetworkSlice
-      requirements:
-        - network:
-            node: spgw_network
-            relationship: tosca.relationships.BelongsToOne
-        - slice:
-            node: {{ site_name }}_vspgwc
-            relationship: tosca.relationships.BelongsToOne
-
-#vSPGWU Service
-    service#vspgwu:
-      type: tosca.nodes.VSPGWUService
-      properties:
-          name: vspgwu
-          public_key: {{ lookup('file', config_cord_profile_dir + '/key_import/mcord_rsa.pub') }}
-          private_key_fn: /opt/xos/services/vspgwu/keys/mcord_rsa
-      artifacts:
-          pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
-
-    {{ site_name }}_vspgwu:
-      description: SDN controller slice
-      type: tosca.nodes.Slice
-      properties:
-          name: {{ site_name }}_vspgwu
-          default_isolation: vm
-          network: noauto
-      requirements:
-          - site:
-              node: mysite
-              relationship: tosca.relationships.BelongsToOne
-          - service:
-              node: service#vspgwu
-              relationship: tosca.relationships.BelongsToOne
-          - default_image:
-              node: image-spgwu
-              relationship: tosca.relationships.BelongsToOne
-          - default_flavor:
-              node: m1.xlarge
-              relationship: tosca.relationships.BelongsToOne
-
-    intel_vspgwu:
-      type: tosca.nodes.VSPGWUVendor
-      properties:
-        name: intel_vspgwu
-      requirements:
-        - image:
-            node: image-spgwu
-            relationship: tosca.relationships.BelongsToOne
-        - flavor:
-            node: m1.xlarge
-            relationship: tosca.relationships.BelongsToOne
-
-    serviceinstance#vspgwu_instance:
-      type: tosca.nodes.VSPGWUTenant
-      properties:
-          name: vspgwu_instance1
-      requirements:
-        - vspgwu_vendor:
-            node: intel_vspgwu
-            relationship: tosca.relationships.BelongsToOne
-        - owner:
-            node: service#vspgwu
-            relationship: tosca.relationships.BelongsToOne
-
-    vspgwu_slice_management_network:
-      type: tosca.nodes.NetworkSlice
-      requirements:
-        - network:
-            node: management
-            relationship: tosca.relationships.BelongsToOne
-        - slice:
-            node: {{ site_name }}_vspgwu
-            relationship: tosca.relationships.BelongsToOne
-
-    vspgwu_slice_sgi_network:
-      type: tosca.nodes.NetworkSlice
-      requirements:
-        - network:
-            node: sgi_network
-            relationship: tosca.relationships.BelongsToOne
-        - slice:
-            node: {{ site_name }}_vspgwu
-            relationship: tosca.relationships.BelongsToOne
-
-    vspgwu_slice_spgw_network:
-      type: tosca.nodes.NetworkSlice
-      requirements:
-        - network:
-            node: spgw_network
-            relationship: tosca.relationships.BelongsToOne
-        - slice:
-            node: {{ site_name }}_vspgwu
-            relationship: tosca.relationships.BelongsToOne
-
-    vspgwu_slice_s1u_network:
-      type: tosca.nodes.NetworkSlice
-      requirements:
-        - network:
-            node: s1u_network
-            relationship: tosca.relationships.BelongsToOne
-        - slice:
-            node: {{ site_name }}_vspgwu
-            relationship: tosca.relationships.BelongsToOne
diff --git a/roles/cord-profile/templates/mock-mcord.yaml.j2 b/roles/cord-profile/templates/mock-mcord.yaml.j2
deleted file mode 100644
index ff1d6ac..0000000
--- a/roles/cord-profile/templates/mock-mcord.yaml.j2
+++ /dev/null
@@ -1,337 +0,0 @@
-
-{#
-Copyright 2017-present Open Networking Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
-
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: Setup CORD-related services
-
-imports:
-   - custom_types/xos.yaml
-
-topology_template:
-  node_templates:
-    # M-CORD Services
-    
-    # RAN
-    vBBU:
-      type: tosca.nodes.Service
-      properties:
-          view_url: /mcord/?service=vBBU
-          kind: RAN
-
-    eSON:
-      type: tosca.nodes.Service
-      properties:
-          view_url: http://www.google.com
-          kind: RAN
-
-    # EPC
-    vMME:
-      type: tosca.nodes.Service
-      properties:
-          view_url: /mcord/?service=vMME
-          kind: EPC
-
-    vSGW:
-      type: tosca.nodes.Service
-      properties:
-          view_url: /mcord/?service=vSGW
-          kind: EPC
-
-    vPGW:
-      type: tosca.nodes.Service
-      properties:
-          view_url: /mcord/?service=vPGW
-          kind: EPC
-
-    # EDGE
-    Cache:
-      type: tosca.nodes.Service
-      properties:
-          view_url: /mcord/?service=Cache
-          icon_url: /static/mCordServices/service_cache.png
-          kind: EDGE
-
-    Firewall:
-      type: tosca.nodes.Service
-      properties:
-          view_url: /mcord/?service=Firewall
-          icon_url: /static/mCordServices/service_firewall.png
-          kind: EDGE
-
-    Video Optimization:
-      type: tosca.nodes.Service
-      properties:
-          view_url: /mcord/?service=Video%20Optimization
-          icon_url: /static/mCordServices/service_video.png
-          kind: EDGE
-          
-    # Images
-    trusty-server-multi-nic:
-      type: tosca.nodes.Image
-      properties:
-         disk_format: QCOW2
-         container_format: BARE
-
-    # Deployments
-    StanfordDeployment:
-      type: tosca.nodes.Deployment
-      properties:
-          flavors: m1.large, m1.medium, m1.small
-      requirements:
-          - image:
-              node: trusty-server-multi-nic
-              relationship: tosca.relationships.SupportsImage
-
-    # Site
-    stanford:
-      type: tosca.nodes.Site
-      properties:
-          display_name: Stanford University
-          site_url: https://www.stanford.edu/
-      requirements:
-          - deployment:
-               node: StanfordDeployment
-               relationship: tosca.relationships.MemberOfDeployment
-          - controller:
-               node: CloudLab
-               relationship: tosca.relationships.UsesController
-
-
-    # Nodes
-    node1.stanford.edu:
-      type: tosca.nodes.Node
-      requirements:
-        - site:
-            node: stanford
-            relationship: tosca.relationships.MemberOfSite
-        - deployment:
-            node: StanfordDeployment
-            relationship: tosca.relationships.MemberOfDeployment
-
-    # Slices
-    stanford_slice:
-      description: Slice that contains sample instances
-      type: tosca.nodes.Slice
-      requirements:
-          - site:
-              node: stanford
-              relationship: tosca.relationships.MemberOfSite
-
-    # Instances
-    BBU_service_instance1:
-      type: tosca.nodes.Compute
-      capabilities:
-        # Host container properties
-        host:
-         properties:
-           num_cpus: 1
-           disk_size: 10 GB
-           mem_size: 4 MB
-        # Guest Operating System properties
-        os:
-          properties:
-            # host Operating System image properties
-            architecture: x86_64
-            type: linux
-            distribution: ubuntu
-            version: 14.04
-      requirements:
-          - slice:
-                node: stanford_slice
-                relationship: tosca.relationships.MemberOfSlice
-
-    BBU_service_instance2:
-      type: tosca.nodes.Compute
-      capabilities:
-        # Host container properties
-        host:
-         properties:
-           num_cpus: 1
-           disk_size: 10 GB
-           mem_size: 4 MB
-        # Guest Operating System properties
-        os:
-          properties:
-            # host Operating System image properties
-            architecture: x86_64
-            type: linux
-            distribution: ubuntu
-            version: 14.04
-      requirements:
-          - slice:
-                node: stanford_slice
-                relationship: tosca.relationships.MemberOfSlice
-
-    MME_service_instance1:
-      type: tosca.nodes.Compute
-      capabilities:
-        # Host container properties
-        host:
-         properties:
-           num_cpus: 1
-           disk_size: 10 GB
-           mem_size: 4 MB
-        # Guest Operating System properties
-        os:
-          properties:
-            # host Operating System image properties
-            architecture: x86_64
-            type: linux
-            distribution: ubuntu
-            version: 14.04
-      requirements:
-          - slice:
-                node: stanford_slice
-                relationship: tosca.relationships.MemberOfSlice
-
-    SGW_service_instance1:
-      type: tosca.nodes.Compute
-      capabilities:
-        # Host container properties
-        host:
-         properties:
-           num_cpus: 1
-           disk_size: 10 GB
-           mem_size: 4 MB
-        # Guest Operating System properties
-        os:
-          properties:
-            # host Operating System image properties
-            architecture: x86_64
-            type: linux
-            distribution: ubuntu
-            version: 14.04
-      requirements:
-          - slice:
-                node: stanford_slice
-                relationship: tosca.relationships.MemberOfSlice
-
-    PGW_service_instance1:
-      type: tosca.nodes.Compute
-      capabilities:
-        # Host container properties
-        host:
-         properties:
-           num_cpus: 1
-           disk_size: 10 GB
-           mem_size: 4 MB
-        # Guest Operating System properties
-        os:
-          properties:
-            # host Operating System image properties
-            architecture: x86_64
-            type: linux
-            distribution: ubuntu
-            version: 14.04
-      requirements:
-          - slice:
-                node: stanford_slice
-                relationship: tosca.relationships.MemberOfSlice
-
-    # Let's add a user who can be administrator of the household
-    johndoe@stanford.us:
-      type: tosca.nodes.User
-      properties:
-          password: letmein
-          firstname: john
-          lastname: doe
-      requirements:
-          - site:
-              node: stanford
-              relationship: tosca.relationships.MemberOfSite
-
-    # A subscriber
-    Stanford:
-       type: tosca.nodes.CORDSubscriber
-       properties:
-           service_specific_id: 123
-           firewall_enable: false
-           cdn_enable: false
-           url_filter_enable: false
-           url_filter_level: R
-       requirements:
-          - house_admin:
-              node: johndoe@stanford.us
-              relationship: tosca.relationships.AdminPrivilege
-
-    Barbera Lapinski:
-       type: tosca.nodes.CORDUser
-       properties:
-           mac: 01:02:03:04:05:06
-           level: PG_13
-       requirements:
-           - household:
-               node: Stanford
-               relationship: tosca.relationships.SubscriberDevice
-
-    Norbert Shumway:
-       type: tosca.nodes.CORDUser
-       properties:
-           mac: 90:E2:BA:82:F9:75
-           level: PG_13
-       requirements:
-           - household:
-               node: Stanford
-               relationship: tosca.relationships.SubscriberDevice
-
-    Fay Muldoon:
-       type: tosca.nodes.CORDUser
-       properties:
-           mac: 68:5B:35:9D:91:D5
-           level: PG_13
-       requirements:
-           - household:
-               node: Stanford
-               relationship: tosca.relationships.SubscriberDevice
-
-    Janene Earnest:
-       type: tosca.nodes.CORDUser
-       properties:
-           mac: 34:36:3B:C9:B6:A6
-           level: PG_13
-       requirements:
-           - household:
-               node: Stanford
-               relationship: tosca.relationships.SubscriberDevice
-
-
-    Topology:
-      type: tosca.nodes.DashboardView
-      properties:
-          url: template:xosMcordTopology
-
-    Ceilometer:
-      type: tosca.nodes.DashboardView
-      properties:
-          url: template:xosCeilometerDashboard
-
-    padmin@vicci.org:
-      type: tosca.nodes.User
-      properties:
-          firstname: XOS
-          lastname: admin
-          is_admin: true
-      requirements:
-          - mcord_dashboard:
-              node: Topology
-              relationship: tosca.relationships.UsesDashboard
-          - ceilometer_dashboard:
-              node: Ceilometer
-              relationship: tosca.relationships.UsesDashboard
-
diff --git a/roles/cord-profile/templates/nbi-net.yaml.j2 b/roles/cord-profile/templates/nbi-net.yaml.j2
deleted file mode 100644
index edc649a..0000000
--- a/roles/cord-profile/templates/nbi-net.yaml.j2
+++ /dev/null
@@ -1,56 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
-   - custom_types/xos.yaml
-   - custom_types/site.yaml
-   - custom_types/slice.yaml
-   - custom_types/flavor.yaml
-   - custom_types/network.yaml
-   - custom_types/networktemplate.yaml
-
-description: network for north bound interface (nbi)
-
-topology_template:
-  node_templates:
-
-# site, fully created in deployment.yaml
-    {{ site_name }}:
-      type: tosca.nodes.Site
-      properties:
-          name: {{ site_name }}
-
-# nbi network
-    nbi_template:
-      type: tosca.nodes.NetworkTemplate
-      properties:
-          name: nbi_template
-          visibility: private
-          translation: none
-          vtn_kind: PRIVATE
-
-    nbi_network:
-      type: tosca.nodes.Network
-      properties:
-          name: nbi_network
-          subnet: 113.0.0.0/24
-          permit_all_slices: true
-      requirements:
-          - template:
-              node: nbi_template
-              relationship: tosca.relationships.BelongsToOne
-          - owner:
-              node: {{ site_name }}_nbi
-              relationship: tosca.relationships.BelongsToOne
-
-    {{ site_name }}_nbi:
-      description: This slice exists solely to own the private network
-      type: tosca.nodes.Slice
-      properties:
-          name: {{ site_name }}_nbi
-          default_isolation: vm
-          network: noauto
-      requirements:
-          - site:
-              node: {{ site_name }}
-              relationship: tosca.relationships.BelongsToOne
-
diff --git a/roles/cord-profile/templates/ng-core.yaml.j2 b/roles/cord-profile/templates/ng-core.yaml.j2
deleted file mode 100644
index 929b65c..0000000
--- a/roles/cord-profile/templates/ng-core.yaml.j2
+++ /dev/null
@@ -1,199 +0,0 @@
-
-{#
-Copyright 2017-present Open Networking Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
-
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: Intel demo configuration at ONS '17
-
-imports:
-  - custom_types/xos.yaml
-
-topology_template:
-  node_templates:
-
-# site, fully created in deployment.yaml
-    {{ site_name }}:
-      type: tosca.nodes.Site
-      properties:
-        no-create: true
-        no-delete: true
-        no-update: true
-
-# management network, fully created in management-net.yaml
-    management:
-      type: tosca.nodes.network.Network.XOS
-      properties:
-        no-create: true
-        no-delete: true
-        no-update: true
-
-# mcord-private network template
-    mcord-private:
-      type: tosca.nodes.NetworkTemplate
-      properties:
-        vtn_kind: PRIVATE
-
-# mcord-access network template
-    mcord-access:
-      type: tosca.nodes.NetworkTemplate
-      properties:
-        vtn_kind: ACCESS_AGENT
-
-# OpenStack flavor
-    m1.large:
-      type: tosca.nodes.Flavor
-
-# compute-node image
-    trusty-server-multi-nic:
-      type: tosca.nodes.Image
-
-# CPDP_1 Network
-    CPDP_1:
-      type: tosca.nodes.network.Network
-      properties:
-        ip_version: 4
-      requirements:
-        - network_template:
-            node: mcord-private
-            relationship: tosca.relationships.UsesNetworkTemplate
-        - owner:
-            node: {{ site_name }}_CP_slice
-            relationship: tosca.relationships.MemberOfSlice
-        - connection:
-            node: {{ site_name }}_CP_slice
-            relationship: tosca.relationships.ConnectsToSlice
-        - connection:
-            node: {{ site_name }}_DP_slice
-            relationship: tosca.relationships.ConnectsToSlice
-
-# S1U_1 Network
-    S1U_1:
-      type: tosca.nodes.network.Network
-      properties:
-        ip_version: 4
-      requirements:
-        - network_template:
-            node: mcord-access
-            relationship: tosca.relationships.UsesNetworkTemplate
-        - owner:
-            node: mysite_DP_slice
-            relationship: tosca.relationships.MemberOfSlice
-        - connection:
-            node: mysite_DP_slice
-            relationship: tosca.relationships.ConnectsToSlice
-
-# S11_1 Network
-    S11_1:
-      type: tosca.nodes.network.Network
-      properties:
-        ip_version: 4
-      requirements:
-        - network_template:
-            node: mcord-access
-            relationship: tosca.relationships.UsesNetworkTemplate
-        - owner:
-            node: {{ site_name }}_CP_slice
-            relationship: tosca.relationships.MemberOfSlice
-        - connection:
-            node: {{ site_name }}_CP_slice
-            relationship: tosca.relationships.ConnectsToSlice
-
-# SGI_1 Network
-    SGI_1:
-      type: tosca.nodes.network.Network
-      properties:
-        ip_version: 4
-      requirements:
-        - network_template:
-            node: mcord-access
-            relationship: tosca.relationships.UsesNetworkTemplate
-        - owner:
-            node: mysite_DP_slice
-            relationship: tosca.relationships.MemberOfSlice
-        - connection:
-            node: mysite_DP_slice
-            relationship: tosca.relationships.ConnectsToSlice
-
-# CP_slice Slice
-    {{ site_name }}_CP_slice:
-      type: tosca.nodes.Slice
-      properties:
-        network: noauto
-      requirements:
-        - slice:
-            node: {{ site_name }}
-            relationship: tosca.relationships.MemberOfSite
-        - image:
-            node: trusty-server-multi-nic
-            relationship: tosca.relationships.DefaultImage
-        - default_flavor:
-            node: m1.large
-            relationship: tosca.relationships.DefaultFlavor 
-        - network_mgmt:
-            node: management
-            relationship: tosca.relationships.ConnectsToNetwork
-
-# DP_slice Slice
-    {{ site_name }}_DP_slice:
-      type: tosca.nodes.Slice
-      properties:
-        network: noauto
-      requirements:
-        - slice:
-            node: mysite
-            relationship: tosca.relationships.MemberOfSite
-        - image:
-            node: trusty-server-multi-nic
-            relationship: tosca.relationships.DefaultImage
-        - default_flavor:
-            node: m1.large
-            relationship: tosca.relationships.DefaultFlavor
-        - network_mgmt:
-            node: management
-            relationship: tosca.relationships.ConnectsToNetwork
-
-## CP_server Compute Node
-#    CP_server:
-#      type: tosca.nodes.Compute
-#      capabilities:
-#        # Host container properties
-#        host: 
-#          properties:
-#            num_cpus: 1
-#            disk_size: 10 GB
-#            mem_size: 256 MB
-#      requirements:
-#        - slice:
-#            node: {{ site_name }}_CP_slice
-#            relationship: tosca.relationships.MemberOfSlice
-#
-## DP_server Compute Node
-#    DP_server:
-#      type: tosca.nodes.Compute
-#      capabilities:
-#        # Host container properties
-#        host:
-#          properties:
-#            num_cpus: 1
-#            disk_size: 10 GB
-#            mem_size: 1024 MB
-#      requirements:
-#        - slice:
-#            node: {{ site_name }}_DP_slice
-#            relationship: tosca.relationships.MemberOfSlice
-
diff --git a/roles/cord-profile/templates/onos-global-service.yaml.j2 b/roles/cord-profile/templates/onos-global-service.yaml.j2
deleted file mode 100644
index 0ba630c..0000000
--- a/roles/cord-profile/templates/onos-global-service.yaml.j2
+++ /dev/null
@@ -1,37 +0,0 @@
-
-{#
-Copyright 2017-present Open Networking Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
-
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
-   - custom_types/onosservice.yaml
-
-description: Configures the global ONOS service
-
-topology_template:
-  node_templates:
-
-    service#ONOS_CORD:
-      type: tosca.nodes.ONOSService
-      requirements:
-      properties:
-          name: ONOS_CORD
-          kind: ecord
-          no_container: true
-          rest_hostname: onos-cord.{{ site_suffix }}
-          rest_port: 8182
diff --git a/roles/cord-profile/templates/public-net.yaml.j2 b/roles/cord-profile/templates/public-net.yaml.j2
deleted file mode 100644
index 610c58b..0000000
--- a/roles/cord-profile/templates/public-net.yaml.j2
+++ /dev/null
@@ -1,117 +0,0 @@
-
-{#
-Copyright 2017-present Open Networking Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
-
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
-  - custom_types/addresspool.yaml
-  - custom_types/addressmanagerservice.yaml
-  - custom_types/addressmanagerserviceinstance.yaml
-  - custom_types/network.yaml
-  - custom_types/networktemplate.yaml
-  - custom_types/serviceinstance.yaml
-  - custom_types/serviceinstancelink.yaml
-  - custom_types/site.yaml
-  - custom_types/slice.yaml
-
-description: public network config, generated by platform-install
-
-topology_template:
-  node_templates:
-
-# site, fully created in deployment.yaml
-    {{ site_name }}:
-      type: tosca.nodes.Site
-      properties:
-        name: {{ site_name }}
-        must-exist: true
-
-
-
-# Address Manager service, fully created in cord-service.yaml
-    service#addressmanager:
-      type: tosca.nodes.AddressManagerService
-      properties:
-        name: addressmanager
-        must-exist: true
-
-# public network
-
-    public_template:
-      type: tosca.nodes.NetworkTemplate
-      properties:
-          name: public_template
-          visibility: public
-          translation: none
-          vtn_kind: PUBLIC
-
-    public:
-      type: tosca.nodes.Network
-      properties:
-          name: public
-          permit_all_slices: true
-          subnet: 10.8.1.0/24 # NOTE same as AddressPool#addresses_public
-          # ip_version: 4
-      requirements:
-          - template:
-              node: public_template
-              relationship: tosca.relationships.BelongsToOne
-          - owner:
-              node: {{ site_name }}_public
-              relationship: tosca.relationships.BelongsToOne
-
-    # Created in cord-services.yaml.j2
-    addresses_public:
-      type: tosca.nodes.AddressPool
-      properties:
-        name: addresses_public
-        must-exist: true
-
-    AddressManagerServiceInstancePublicNetwork:
-      type: tosca.nodes.AddressManagerServiceInstance
-      requirements:
-          - owner:
-              node: service#addressmanager
-              relationship: tosca.relationships.BelongsToOne
-          - address_pool:
-              node: addresses_public
-              relationship: tosca.relationships.BelongsToOne
-      properties:
-          name: AM_public_net
-
-    public_to_address_manager:
-        type: tosca.nodes.ServiceInstanceLink
-        requirements:
-          - provider_service_instance:
-              node: AddressManagerServiceInstancePublicNetwork
-              relationship: tosca.relationships.BelongsToOne
-          - subscriber_network:
-              node: public
-              relationship: tosca.relationships.BelongsToOne
-
-    {{ site_name }}_public:
-      description: This slice exists solely to own the public network
-      type: tosca.nodes.Slice
-      properties:
-          network: noauto
-          name: {{ site_name }}_public
-      requirements:
-          - site:
-              node: {{ site_name }}
-              relationship: tosca.relationships.BelongsToOne
-
diff --git a/roles/cord-profile/templates/s11-net.yaml.j2 b/roles/cord-profile/templates/s11-net.yaml.j2
deleted file mode 100644
index f44b0fd..0000000
--- a/roles/cord-profile/templates/s11-net.yaml.j2
+++ /dev/null
@@ -1,56 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
-   - custom_types/xos.yaml
-   - custom_types/site.yaml
-   - custom_types/slice.yaml
-   - custom_types/flavor.yaml
-   - custom_types/network.yaml
-   - custom_types/networktemplate.yaml
-
-description: network for S11 interface
-
-topology_template:
-  node_templates:
-
-# site, fully created in deployment.yaml
-    {{ site_name }}:
-      type: tosca.nodes.Site
-      properties:
-          name: {{ site_name }}
-
-# s11 network
-    s11_template:
-      type: tosca.nodes.NetworkTemplate
-      properties:
-          name: s11_template
-          visibility: private
-          translation: none
-          vtn_kind: PRIVATE
-
-    s11_network:
-      type: tosca.nodes.Network
-      properties:
-          name: s11_network
-          subnet: 112.0.0.0/24
-          permit_all_slices: true
-      requirements:
-          - template:
-              node: s11_template
-              relationship: tosca.relationships.BelongsToOne
-          - owner:
-              node: {{ site_name }}_s11
-              relationship: tosca.relationships.BelongsToOne
-
-    {{ site_name }}_s11:
-      description: This slice exists solely to own the private network
-      type: tosca.nodes.Slice
-      properties:
-          name: {{ site_name }}_s11
-          default_isolation: vm
-          network: noauto
-      requirements:
-          - site:
-              node: {{ site_name }}
-              relationship: tosca.relationships.BelongsToOne
-
diff --git a/roles/cord-profile/templates/s1mme-net.yaml.j2 b/roles/cord-profile/templates/s1mme-net.yaml.j2
deleted file mode 100644
index b0300ee..0000000
--- a/roles/cord-profile/templates/s1mme-net.yaml.j2
+++ /dev/null
@@ -1,56 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
-   - custom_types/xos.yaml
-   - custom_types/site.yaml
-   - custom_types/slice.yaml
-   - custom_types/flavor.yaml
-   - custom_types/network.yaml
-   - custom_types/networktemplate.yaml
-
-description: network for S1MME interface
-
-topology_template:
-  node_templates:
-
-# site, fully created in deployment.yaml
-    {{ site_name }}:
-      type: tosca.nodes.Site
-      properties:
-          name: {{ site_name }}
-
-# s1mme network
-    s1mme_template:
-      type: tosca.nodes.NetworkTemplate
-      properties:
-          name: s1mme_template
-          visibility: private
-          translation: none
-          vtn_kind: PRIVATE
-
-    s1mme_network:
-      type: tosca.nodes.Network
-      properties:
-          name: s1mme_network
-          subnet: 116.0.0.0/24
-          permit_all_slices: true
-      requirements:
-          - template:
-              node: s1mme_template
-              relationship: tosca.relationships.BelongsToOne
-          - owner:
-              node: {{ site_name }}_s1mme
-              relationship: tosca.relationships.BelongsToOne
-
-    {{ site_name }}_s1mme:
-      description: This slice exists solely to own the private network
-      type: tosca.nodes.Slice
-      properties:
-          name: {{ site_name }}_s1mme
-          default_isolation: vm
-          network: noauto
-      requirements:
-          - site:
-              node: {{ site_name }}
-              relationship: tosca.relationships.BelongsToOne
-
diff --git a/roles/cord-profile/templates/s1u-net.yaml.j2 b/roles/cord-profile/templates/s1u-net.yaml.j2
deleted file mode 100644
index e2bb51c..0000000
--- a/roles/cord-profile/templates/s1u-net.yaml.j2
+++ /dev/null
@@ -1,56 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
-   - custom_types/xos.yaml
-   - custom_types/site.yaml
-   - custom_types/slice.yaml
-   - custom_types/flavor.yaml
-   - custom_types/network.yaml
-   - custom_types/networktemplate.yaml
-
-description: network for S1U interface
-
-topology_template:
-  node_templates:
-
-# site, fully created in deployment.yaml
-    {{ site_name }}:
-      type: tosca.nodes.Site
-      properties:
-          name: {{ site_name }}
-
-# s1u network
-    s1u_template:
-      type: tosca.nodes.NetworkTemplate
-      properties:
-          name: s1u_template
-          visibility: private
-          translation: none
-          vtn_kind: PRIVATE
-
-    s1u_network:
-      type: tosca.nodes.Network
-      properties:
-          name: s1u_network
-          subnet: 111.0.0.0/24
-          permit_all_slices: true
-      requirements:
-          - template:
-              node: s1u_template
-              relationship: tosca.relationships.BelongsToOne
-          - owner:
-              node: {{ site_name }}_s1u
-              relationship: tosca.relationships.BelongsToOne
-
-    {{ site_name }}_s1u:
-      description: This slice exists solely to own the private network
-      type: tosca.nodes.Slice
-      properties:
-          name: {{ site_name }}_s1u
-          default_isolation: vm
-          network: noauto
-      requirements:
-          - site:
-              node: {{ site_name }}
-              relationship: tosca.relationships.BelongsToOne
-
diff --git a/roles/cord-profile/templates/sample.yaml.j2 b/roles/cord-profile/templates/sample.yaml.j2
deleted file mode 100644
index d4e37b1..0000000
--- a/roles/cord-profile/templates/sample.yaml.j2
+++ /dev/null
@@ -1,110 +0,0 @@
-
-{#
-Copyright 2017-present Open Networking Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
-
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: >
-    * Some sample data to populate the demo frontend
-
-imports:
-   - custom_types/xos.yaml
-
-topology_template:
-  node_templates:
-    trusty-server-multi-nic:
-      type: tosca.nodes.Image
-      properties:
-         disk_format: QCOW2
-         container_format: BARE
-
-    {{ deployment_type }}:
-      type: tosca.nodes.Deployment
-      properties:
-          flavors: m1.large, m1.medium, m1.small
-      requirements:
-          - image:
-              node: trusty-server-multi-nic
-              relationship: tosca.relationships.SupportsImage
-
-    CloudLab:
-      type: tosca.nodes.Controller
-      requirements:
-          - deployment:
-              node: {{ deployment_type }}
-              relationship: tosca.relationships.ControllerDeployment
-      properties:
-          backend_type: OpenStack
-          version: Juno
-          auth_url: http://sample/v2
-          admin_user: admin
-          admin_password: adminpassword
-          admin_tenant: admin
-          domain: Default
-
-    {{ site_name }}:
-      type: tosca.nodes.Site
-      properties:
-          display_name: {{ site_name }}
-          site_url: http://opencloud.us/
-      requirements:
-          - deployment:
-               node: {{ deployment_type }}
-               relationship: tosca.relationships.MemberOfDeployment
-          - controller:
-               node: CloudLab
-               relationship: tosca.relationships.UsesController
-
-    Public shared IPv4:
-      type: tosca.nodes.NetworkTemplate
-      properties:
-          visibility: private
-          translation: NAT
-
-    {{ xos_admin_user }}:
-      type: tosca.nodes.User
-      properties:
-        password: {{ xos_admin_pass }}
-        firstname: {{ xos_admin_first }}
-        lastname: {{ xos_admin_last }}
-        is_admin: True
-        is_active: True
-      requirements:
-        - site:
-            node: {{ site_name }}
-            relationship: tosca.relationships.MemberOfSite
-
-    node1.opencloud.us:
-      type: tosca.nodes.Node
-      requirements:
-        - site:
-            node: {{ site_name }}
-            relationship: tosca.relationships.MemberOfSite
-        - deployment:
-            node: {{ deployment_type }}
-            relationship: tosca.relationships.MemberOfDeployment
-
-    node2.opencloud.us:
-      type: tosca.nodes.Node
-      requirements:
-        - site:
-            node: {{ site_name }}
-            relationship: tosca.relationships.MemberOfSite
-        - deployment:
-            node: {{ deployment_type }}
-            relationship: tosca.relationships.MemberOfDeployment
-
diff --git a/roles/cord-profile/templates/sbi-net.yaml.j2 b/roles/cord-profile/templates/sbi-net.yaml.j2
deleted file mode 100644
index fe56d4c..0000000
--- a/roles/cord-profile/templates/sbi-net.yaml.j2
+++ /dev/null
@@ -1,56 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
-   - custom_types/xos.yaml
-   - custom_types/site.yaml
-   - custom_types/slice.yaml
-   - custom_types/flavor.yaml
-   - custom_types/network.yaml
-   - custom_types/networktemplate.yaml
-
-description: network for south bound interface (sbi)
-
-topology_template:
-  node_templates:
-
-# site, fully created in deployment.yaml
-    {{ site_name }}:
-      type: tosca.nodes.Site
-      properties:
-          name: {{ site_name }}
-
-# sbi network
-    sbi_template:
-      type: tosca.nodes.NetworkTemplate
-      properties:
-          name: sbi_template
-          visibility: private
-          translation: none
-          vtn_kind: PRIVATE
-
-    sbi_network:
-      type: tosca.nodes.Network
-      properties:
-          name: sbi_network
-          subnet: 114.0.0.0/24
-          permit_all_slices: true
-      requirements:
-          - template:
-              node: sbi_template
-              relationship: tosca.relationships.BelongsToOne
-          - owner:
-              node: {{ site_name }}_sbi
-              relationship: tosca.relationships.BelongsToOne
-
-    {{ site_name }}_sbi:
-      description: This slice exists solely to own the private network
-      type: tosca.nodes.Slice
-      properties:
-          name: {{ site_name }}_sbi
-          default_isolation: vm
-          network: noauto
-      requirements:
-          - site:
-              node: {{ site_name }}
-              relationship: tosca.relationships.BelongsToOne
-
diff --git a/roles/cord-profile/templates/sdn-controller-service.yaml.j2 b/roles/cord-profile/templates/sdn-controller-service.yaml.j2
deleted file mode 100644
index e0f4b36..0000000
--- a/roles/cord-profile/templates/sdn-controller-service.yaml.j2
+++ /dev/null
@@ -1,173 +0,0 @@
-{#
-Copyright 2017-present Open Networking Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
-
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: created by platform-install, need to add M-CORD services later
-
-imports:
-   - custom_types/xos.yaml
-   - custom_types/slice.yaml
-   - custom_types/site.yaml
-   - custom_types/image.yaml
-   - custom_types/flavor.yaml
-   - custom_types/network.yaml
-   - custom_types/networkslice.yaml
-   - custom_types/sdncontrollerservice.yaml
-   - custom_types/sdncontrollervendor.yaml
-   - custom_types/sdncontrollerserviceinstance.yaml
-
-topology_template:
-  node_templates:
-
-# site, image, fully created in deployment.yaml
-    {{ site_name }}:
-      type: tosca.nodes.Site
-      properties:
-        must-exist: true
-        name: {{ site_name }}
-
-    m1.small:
-      type: tosca.nodes.Flavor
-      properties:
-        name: m1.small
-        must-exist: true
-
-    trusty-server-multi-nic:
-      type: tosca.nodes.Image
-      properties:
-        name: trusty-server-multi-nic
-        must-exist: true
-
-# management networks, fully created in management-net.yaml
-    management:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: management
-
-{% if use_management_hosts %}
-    management_hosts:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: management_hosts
-{% endif %}
-
-# sbi_network is for connectivity between VMs, fully created in sbi-net.yaml
-    sbi_network:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: sbi_network
-
-# nbi_network is for connectivity between VMs, fully created in nbi-net.yaml
-    nbi_network:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: nbi_network
-
-
-# CORD Services
-    service#sdncontroller:
-      type: tosca.nodes.SDNControllerService
-      properties:
-          name: sdncontroller
-          public_key: {{ lookup('file', config_cord_profile_dir + '/key_import/mcord_rsa.pub') }}
-          private_key_fn: /opt/xos/services/sdncontroller/keys/mcord_rsa
-      artifacts:
-          pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
-
-# CORD Slices
-    {{ site_name }}_sdncontroller:
-      description: SDN controller slice
-      type: tosca.nodes.Slice
-      properties:
-          name: {{ site_name }}_sdncontroller
-          default_isolation: vm
-          network: noauto
-      requirements:
-          - site:
-              node: mysite
-              relationship: tosca.relationships.BelongsToOne
-          - service:
-              node: service#sdncontroller
-              relationship: tosca.relationships.BelongsToOne
-          - default_image:
-              node: trusty-server-multi-nic
-              relationship: tosca.relationships.BelongsToOne
-          - default_flavor:
-              node: m1.small
-              relationship: tosca.relationships.BelongsToOne
-
-# CORD Service Instances
-
-    intel_sdncontroller:
-      type: tosca.nodes.SDNControllerVendor
-      properties:
-        name: intel_sdncontroller
-      requirements:
-        - image:
-            node: trusty-server-multi-nic
-            relationship: tosca.relationships.BelongsToOne
-        - flavor:
-            node: m1.small
-            relationship: tosca.relationships.BelongsToOne
-
-    serviceinstance#sdncontroller_instance:
-      type: tosca.nodes.SDNControllerServiceInstance
-      properties:
-          name: sdncontroller_instance1
-      requirements:
-        - sdncontroller_vendor:
-            node: intel_sdncontroller
-            relationship: tosca.relationships.BelongsToOne
-        - owner:
-            node: service#sdncontroller
-            relationship: tosca.relationships.BelongsToOne
-
-# CORD NetworkSlices
-    sdncontroller_slice_management_network:
-      type: tosca.nodes.NetworkSlice
-      requirements:
-        - network:
-            node: management
-            relationship: tosca.relationships.BelongsToOne
-        - slice:
-            node: {{ site_name }}_sdncontroller
-            relationship: tosca.relationships.BelongsToOne
-
-    sdncontroller_slice_sbi_network:
-      type: tosca.nodes.NetworkSlice
-      requirements:
-        - network:
-            node: sbi_network
-            relationship: tosca.relationships.BelongsToOne
-        - slice:
-            node: {{ site_name }}_sdncontroller
-            relationship: tosca.relationships.BelongsToOne
-
-    sdncontroller_slice_nbi_network:
-      type: tosca.nodes.NetworkSlice
-      requirements:
-        - network:
-            node: nbi_network
-            relationship: tosca.relationships.BelongsToOne
-        - slice:
-            node: {{ site_name }}_sdncontroller
-            relationship: tosca.relationships.BelongsToOne
diff --git a/roles/cord-profile/templates/service-graph-constraints.yaml.j2 b/roles/cord-profile/templates/service-graph-constraints.yaml.j2
deleted file mode 100644
index 00fbc4a..0000000
--- a/roles/cord-profile/templates/service-graph-constraints.yaml.j2
+++ /dev/null
@@ -1,14 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
-   - custom_types/servicegraphconstraint.yaml
-
-description: Constraints on the Services position in the graph
-
-topology_template:
-  node_templates:
-
-    constraints:
-      type: tosca.nodes.ServiceGraphConstraint
-      properties:
-        constraints: '{{ xos_gui_service_graph_constraints }}'
diff --git a/roles/cord-profile/templates/services.yaml.j2 b/roles/cord-profile/templates/services.yaml.j2
deleted file mode 100644
index faaa936..0000000
--- a/roles/cord-profile/templates/services.yaml.j2
+++ /dev/null
@@ -1,89 +0,0 @@
-
-{#
-Copyright 2017-present Open Networking Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
-
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: Created by platform-install/roles/cord-profile/templates/services.yaml.j2
-
-imports:
-   - custom_types/xos.yaml
-   - custom_types/vtr.yaml
-   - custom_types/addressmanager.yaml
-
-topology_template:
-  node_templates:
-
-    # CORD Services
-    service#vtr:
-      type: tosca.nodes.VTRService
-      properties:
-          view_url: /admin/vtr/vtrservice/$id$/
-          kind: vTR
-          replaces: service_vtr
-
-    service#volt:
-      type: tosca.nodes.VOLTService
-      requirements:
-          - vsg_tenant:
-              node: service#vsg
-              relationship: tosca.relationships.TenantOfService
-      properties:
-          view_url: /admin/cord/voltservice/$id$/
-          kind: vOLT
-          replaces: service_volt
-
-    addresses_vsg:
-      type: tosca.nodes.AddressPool
-      properties:
-          addresses: 10.168.0.0/24
-          gateway_ip: 10.168.0.1
-          gateway_mac: 02:42:0a:a8:00:01
-
-    addresses_exampleservice-public:
-      type: tosca.nodes.AddressPool
-      properties:
-          addresses: 10.168.1.0/24
-          gateway_ip: 10.168.1.1
-          gateway_mac: 02:42:0a:a8:00:01
-
-    service#vsg:
-      type: tosca.nodes.VSGService
-      requirements:
-          - vrouter_tenant:
-              node: service#vrouter
-              relationship: tosca.relationships.TenantOfService
-      properties:
-          view_url: /admin/cord/vsgservice/$id$/
-          private_key_fn: /opt/xos/synchronizers/vcpe/vcpe_private_key
-          replaces: service_vsg
-
-    service#vrouter:
-      type: tosca.nodes.VRouterService
-      properties:
-          view_url: /admin/vrouter/vrouterservice/$id$/
-          replaces: service_vrouter
-
-    service#addressmanager:
-      type: tosca.nodes.AddressManagerService
-      requirements:
-          - addresses_vsg:
-              node: addresses_vsg
-              relationship: tosca.relationships.ProvidesAddresses
-          - addresses_service1:
-              node: addresses_exampleservice-public
-              relationship: tosca.relationships.ProvidesAddresses
diff --git a/roles/cord-profile/templates/sgi-net.yaml.j2 b/roles/cord-profile/templates/sgi-net.yaml.j2
deleted file mode 100644
index db2779e..0000000
--- a/roles/cord-profile/templates/sgi-net.yaml.j2
+++ /dev/null
@@ -1,56 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
-   - custom_types/xos.yaml
-   - custom_types/site.yaml
-   - custom_types/slice.yaml
-   - custom_types/flavor.yaml
-   - custom_types/network.yaml
-   - custom_types/networktemplate.yaml
-
-description: network for SGI interface
-
-topology_template:
-  node_templates:
-
-# site, fully created in deployment.yaml
-    {{ site_name }}:
-      type: tosca.nodes.Site
-      properties:
-          name: {{ site_name }}
-
-# sgi network
-    sgi_template:
-      type: tosca.nodes.NetworkTemplate
-      properties:
-          name: sgi_template
-          visibility: private
-          translation: none
-          vtn_kind: PRIVATE
-
-    sgi_network:
-      type: tosca.nodes.Network
-      properties:
-          name: sgi_network
-          subnet: 115.0.0.0/24
-          permit_all_slices: true
-      requirements:
-          - template:
-              node: sgi_template
-              relationship: tosca.relationships.BelongsToOne
-          - owner:
-              node: {{ site_name }}_sgi
-              relationship: tosca.relationships.BelongsToOne
-
-    {{ site_name }}_sgi:
-      description: This slice exists solely to own the private network
-      type: tosca.nodes.Slice
-      properties:
-          name: {{ site_name }}_sgi
-          default_isolation: vm
-          network: noauto
-      requirements:
-          - site:
-              node: {{ site_name }}
-              relationship: tosca.relationships.BelongsToOne
-
diff --git a/roles/cord-profile/templates/shared-net.yaml.j2 b/roles/cord-profile/templates/shared-net.yaml.j2
deleted file mode 100644
index 186e69f..0000000
--- a/roles/cord-profile/templates/shared-net.yaml.j2
+++ /dev/null
@@ -1,54 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
-  - custom_types/network.yaml
-  - custom_types/networktemplate.yaml
-  - custom_types/slice.yaml
-  - custom_types/site.yaml
-
-description: shared network config, generated by platform-install
-
-topology_template:
-  node_templates:
-
-# site, fully created in deployment.yaml
-    {{ site_name }}:
-      type: tosca.nodes.Site
-      properties:
-        name: {{ site_name }}
-        must-exist: true
-
-# shared network
-    shared_template:
-      type: tosca.nodes.NetworkTemplate
-      properties:
-          name: shared_template
-          visibility: private
-          translation: none
-          vtn_kind: PRIVATE
-
-    shared_network:
-      type: tosca.nodes.Network
-      properties:
-          name: shared_network
-          subnet: 100.0.0.0/24
-      requirements:
-          - template:
-              node: shared_template
-              relationship: tosca.relationships.BelongsToOne
-          - owner:
-              node: {{ site_name }}_shared
-              relationship: tosca.relationships.BelongsToOne
-
-    {{ site_name }}_shared:
-      description: This slice exists solely to own the private network
-      type: tosca.nodes.Slice
-      properties:
-          name: {{ site_name }}_shared
-          network: noauto
-      requirements:
-          - site:
-              node: {{ site_name }}
-              relationship: tosca.relationships.BelongsToOne
-
-
diff --git a/roles/cord-profile/templates/spgw-net.yaml.j2 b/roles/cord-profile/templates/spgw-net.yaml.j2
deleted file mode 100644
index 0f4739a..0000000
--- a/roles/cord-profile/templates/spgw-net.yaml.j2
+++ /dev/null
@@ -1,56 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
-   - custom_types/xos.yaml
-   - custom_types/site.yaml
-   - custom_types/slice.yaml
-   - custom_types/flavor.yaml
-   - custom_types/network.yaml
-   - custom_types/networktemplate.yaml
-
-description: network for direct communication between SPGW-C and SPGW-U
-
-topology_template:
-  node_templates:
-
-# site, fully created in deployment.yaml
-    {{ site_name }}:
-      type: tosca.nodes.Site
-      properties:
-          name: {{ site_name }}
-
-# spgw network
-    spgw_template:
-      type: tosca.nodes.NetworkTemplate
-      properties:
-          name: spgw_template
-          visibility: private
-          translation: none
-          vtn_kind: PRIVATE
-
-    spgw_network:
-      type: tosca.nodes.Network
-      properties:
-          name: spgw_network
-          subnet: 117.0.0.0/24
-          permit_all_slices: true
-      requirements:
-          - template:
-              node: spgw_template
-              relationship: tosca.relationships.BelongsToOne
-          - owner:
-              node: {{ site_name }}_spgw
-              relationship: tosca.relationships.BelongsToOne
-
-    {{ site_name }}_spgw:
-      description: This slice exists solely to own the private network
-      type: tosca.nodes.Slice
-      properties:
-          name: {{ site_name }}_spgw
-          default_isolation: vm
-          network: noauto
-      requirements:
-          - site:
-              node: {{ site_name }}
-              relationship: tosca.relationships.BelongsToOne
-
diff --git a/roles/cord-profile/templates/vee-service.yaml.j2 b/roles/cord-profile/templates/vee-service.yaml.j2
deleted file mode 100644
index 9fea06d..0000000
--- a/roles/cord-profile/templates/vee-service.yaml.j2
+++ /dev/null
@@ -1,63 +0,0 @@
-
-{#
-Copyright 2017-present Open Networking Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
-
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
-   - custom_types/veeservice.yaml
-   - custom_types/vegservice.yaml
-   - custom_types/networktemplate.yaml
-   - custom_types/servicedependency.yaml
-
-description: vee services, generated by platform-install
-
-topology_template:
-  node_templates:
-
-    service#veg:
-      type: tosca.nodes.VEGService
-      requirements:
-      properties:
-        name: veg
-        must-exist: true
-
-    service#vee:
-      type: tosca.nodes.VEEService
-      properties:
-        name: vee
-
-    veg_vee:
-      type: tosca.nodes.ServiceDependency
-      properties:
-        connect_method: None
-      requirements:
-        - subscriber_service:
-            node: service#veg
-            relationship: tosca.relationships.BelongsToOne
-        - provider_service:
-            node: service#vee
-            relationship: tosca.relationships.BelongsToOne
-
-    template#vee:
-      type: tosca.nodes.NetworkTemplate
-      properties:
-        name: vee
-        visibility: private
-        translation: none
-        vtn_kind: vee
-
diff --git a/roles/cord-profile/templates/vnaasglobal-service-reference.yaml.j2 b/roles/cord-profile/templates/vnaasglobal-service-reference.yaml.j2
deleted file mode 100644
index 25626a7..0000000
--- a/roles/cord-profile/templates/vnaasglobal-service-reference.yaml.j2
+++ /dev/null
@@ -1,138 +0,0 @@
-{#
-Copyright 2017-present Open Networking Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
-   - custom_types/xos.yaml
-   - custom_types/vnaas.yaml
-
-description: vnaasglobal services, generated by platform-install
-
-topology_template:
-  node_templates:
-
-    enterpriselocation#onlab:
-      type: tosca.nodes.EnterpriseLocation
-      requirements:
-      properties:
-        name: onlab
-        cord_site_ip: 127.0.0.1
-        cord_site_port: 8181
-        cord_site_username: onos
-        cord_site_password: rocks
-        cord_site_type: onos
-
-
-    enterpriselocation#onlab1:
-      type: tosca.nodes.EnterpriseLocation
-      requirements:
-      properties:
-        name: onlab1
-        cord_site_ip: 127.0.0.2
-        cord_site_port: 8181
-        cord_site_username: onos
-        cord_site_password: rocks
-        cord_site_type: onos
-
-    onosmodel#onlab:
-      type: tosca.nodes.OnosModel
-      requirements:
-      properties:
-        name: onlabT
-        onos_ip: onos-cord.{{ site_suffix }}
-        onos_port: 8182
-        onos_username: onos
-        onos_password: rocks
-        onos_type: global
-
-    bandwidthprofile#bronze:
-      type: tosca.nodes.BandwidthProfile
-      requirements:
-      properties:
-        cbs: 1000
-        ebs: 1200
-        cir: 1000
-        eir: 1200
-        name: bronze
-
-    bandwidthprofile#silver:
-      type: tosca.nodes.BandwidthProfile
-      requirements:
-      properties:
-        cbs: 1500
-        ebs: 2000
-        cir: 10000
-        eir: 2000
-        name: silver
-
-    bandwidthprofile#gold:
-      type: tosca.nodes.BandwidthProfile
-      requirements:
-      properties:
-        cbs: 2000
-        ebs: 2700
-        cir: 20000
-        eir: 5000
-        name: gold
-
-    bandwidthprofile#platinum:
-      type: tosca.nodes.BandwidthProfile
-      requirements:
-      properties:
-        cbs: 2500
-        ebs: 3200
-        cir: 100000
-        eir: 10000
-        name: platinum
-
-    usernetworkinterface#UserNetworkInterface1:
-      type: tosca.nodes.UserNetworkInterface
-      requirements:
-      properties:
-        tenant: onlab
-        name: uni1
-        latlng: [37.973535, -122.531087]
-        cpe_id: netconf:192.168.56.10:830/0
-
-    usernetworkinterface#UserNetworkInterface2:
-      type: tosca.nodes.UserNetworkInterface
-      requirements:
-      properties:
-        tenant: onlab
-        name: uni2
-        latlng: [37.773972, -122.431297]
-        cpe_id: netconf:192.168.56.20:830/0
-
-    usernetworkinterface#UserNetworkInterface3:
-      type: tosca.nodes.UserNetworkInterface
-      requirements:
-      properties:
-        tenant: onlab
-        name: uni3
-        latlng: [37.871637, -122.259750]
-        cpe_id: netconf:192.168.56.30:830/0
-
-#     eline#testeline:
-#       type: tosca.nodes.ELine
-#       requirements:
-#       properties:
-#         name: testeline
-#         connect_point_1_id: netconf:192.168.56.10:830/0
-#         connect_point_2_id: netconf:192.168.56.20:830/0
-#         vlanids: 100
-#         cord_site_name: onlabT
-#         bwp: gold
diff --git a/roles/cord-profile/templates/vrouter.yaml.j2 b/roles/cord-profile/templates/vrouter.yaml.j2
deleted file mode 100644
index 82c437c..0000000
--- a/roles/cord-profile/templates/vrouter.yaml.j2
+++ /dev/null
@@ -1,39 +0,0 @@
-
-{#
-Copyright 2017-present Open Networking Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
-
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: Onboard the vRouter service
-
-imports:
-   - custom_types/xos.yaml
-   - custom_types/vrouter.yaml
-
-topology_template:
-  node_templates:
-
-    service#vrouter:
-      type: tosca.nodes.VRouterService
-      properties:
-          view_url: /admin/vrouter/
-          no-delete: true
-          no-create: true
-          rest_hostname: onos-fabric.{{ site_suffix }}
-          rest_port: 8181
-          rest_user: onos
-          rest_pass: rocks
diff --git a/roles/cord-profile/templates/vsg-net.yaml.j2 b/roles/cord-profile/templates/vsg-net.yaml.j2
deleted file mode 100644
index 9bcf397..0000000
--- a/roles/cord-profile/templates/vsg-net.yaml.j2
+++ /dev/null
@@ -1,54 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
-  - custom_types/network.yaml
-  - custom_types/networktemplate.yaml
-  - custom_types/slice.yaml
-  - custom_types/site.yaml
-
-description: vsg network config, generated by platform-install
-
-topology_template:
-  node_templates:
-
-# site, fully created in deployment.yaml
-    {{ site_name }}:
-      type: tosca.nodes.Site
-      properties:
-        name: {{ site_name }}
-        must-exist: true
-
-# vsg network
-    vsg_template:
-      type: tosca.nodes.NetworkTemplate
-      properties:
-          name: vsg_template
-          visibility: private
-          translation: none
-          vtn_kind: VSG
-
-    vsg_network:
-      type: tosca.nodes.Network
-      properties:
-          name: vsg_network
-          subnet: 101.0.0.0/24
-      requirements:
-          - template:
-              node: vsg_template
-              relationship: tosca.relationships.BelongsToOne
-          - owner:
-              node: {{ site_name }}_vsg
-              relationship: tosca.relationships.BelongsToOne
-
-    {{ site_name }}_vsg:
-      description: This slice exists solely to own the private network
-      type: tosca.nodes.Slice
-      properties:
-          name: {{ site_name }}_vsg
-          network: noauto
-      requirements:
-          - site:
-              node: {{ site_name }}
-              relationship: tosca.relationships.BelongsToOne
-
-
diff --git a/roles/cord-profile/templates/vspgwc-service.yaml.j2 b/roles/cord-profile/templates/vspgwc-service.yaml.j2
deleted file mode 100644
index 2b9da61..0000000
--- a/roles/cord-profile/templates/vspgwc-service.yaml.j2
+++ /dev/null
@@ -1,173 +0,0 @@
-{#
-Copyright 2017-present Open Networking Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
-
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: created by platform-install, need to add M-CORD services later
-
-imports:
-   - custom_types/xos.yaml
-   - custom_types/slice.yaml
-   - custom_types/site.yaml
-   - custom_types/image.yaml
-   - custom_types/flavor.yaml
-   - custom_types/network.yaml
-   - custom_types/networkslice.yaml
-   - custom_types/vspgwcservice.yaml
-   - custom_types/vspgwcvendor.yaml
-   - custom_types/vspgwctenant.yaml
-
-topology_template:
-  node_templates:
-
-# site, image, fully created in deployment.yaml
-    {{ site_name }}:
-      type: tosca.nodes.Site
-      properties:
-        must-exist: true
-        name: {{ site_name }}
-
-    m1.small:
-      type: tosca.nodes.Flavor
-      properties:
-        name: m1.small
-        must-exist: true
-
-    trusty-server-multi-nic:
-      type: tosca.nodes.Image
-      properties:
-        name: trusty-server-multi-nic
-        must-exist: true
-
-# management networks, fully created in management-net.yaml
-    management:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: management
-
-{% if use_management_hosts %}
-    management_hosts:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: management_hosts
-{% endif %}
-
-# s11_network is for connectivity between VMs, fully created in s11-net.yaml
-    s11_network:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: s11_network
-
-# nbi_network is for connectivity between VMs, fully created in nbi-net.yaml
-    nbi_network:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: nbi_network
-
-
-# CORD Services
-    service#vspgwc:
-      type: tosca.nodes.VSPGWCService
-      properties:
-          name: vspgwc
-          public_key: {{ lookup('file', config_cord_profile_dir + '/key_import/mcord_rsa.pub') }}
-          private_key_fn: /opt/xos/services/vspgwc/keys/mcord_rsa
-      artifacts:
-          pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
-
-# CORD Slices
-    {{ site_name }}_vspgwc:
-      description: SDN controller slice
-      type: tosca.nodes.Slice
-      properties:
-          name: {{ site_name }}_vspgwc
-          default_isolation: vm
-          network: noauto
-      requirements:
-          - site:
-              node: mysite
-              relationship: tosca.relationships.BelongsToOne
-          - service:
-              node: service#vspgwc
-              relationship: tosca.relationships.BelongsToOne
-          - default_image:
-              node: trusty-server-multi-nic
-              relationship: tosca.relationships.BelongsToOne
-          - default_flavor:
-              node: m1.small
-              relationship: tosca.relationships.BelongsToOne
-
-# CORD Service Instances
-
-    intel_vspgwc:
-      type: tosca.nodes.VSPGWCVendor
-      properties:
-        name: intel_vspgwc
-      requirements:
-        - image:
-            node: trusty-server-multi-nic
-            relationship: tosca.relationships.BelongsToOne
-        - flavor:
-            node: m1.small
-            relationship: tosca.relationships.BelongsToOne
-
-    serviceinstance#vspgwc_instance:
-      type: tosca.nodes.VSPGWCTenant
-      properties:
-          name: vspgwc_instance1
-      requirements:
-        - vspgwc_vendor:
-            node: intel_vspgwc
-            relationship: tosca.relationships.BelongsToOne
-        - owner:
-            node: service#vspgwc
-            relationship: tosca.relationships.BelongsToOne
-
-# CORD NetworkSlices
-    vspgwc_slice_management_network:
-      type: tosca.nodes.NetworkSlice
-      requirements:
-        - network:
-            node: management
-            relationship: tosca.relationships.BelongsToOne
-        - slice:
-            node: {{ site_name }}_vspgwc
-            relationship: tosca.relationships.BelongsToOne
-
-    vspgwc_slice_s11_network:
-      type: tosca.nodes.NetworkSlice
-      requirements:
-        - network:
-            node: s11_network
-            relationship: tosca.relationships.BelongsToOne
-        - slice:
-            node: {{ site_name }}_vspgwc
-            relationship: tosca.relationships.BelongsToOne
-
-    vspgwc_slice_nbi_network:
-      type: tosca.nodes.NetworkSlice
-      requirements:
-        - network:
-            node: nbi_network
-            relationship: tosca.relationships.BelongsToOne
-        - slice:
-            node: {{ site_name }}_vspgwc
-            relationship: tosca.relationships.BelongsToOne
\ No newline at end of file
diff --git a/roles/cord-profile/templates/vspgwu-service.yaml.j2 b/roles/cord-profile/templates/vspgwu-service.yaml.j2
deleted file mode 100644
index f6fc2ea..0000000
--- a/roles/cord-profile/templates/vspgwu-service.yaml.j2
+++ /dev/null
@@ -1,189 +0,0 @@
-{#
-Copyright 2017-present Open Networking Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
-
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: created by platform-install, need to add M-CORD services later
-
-imports:
-   - custom_types/xos.yaml
-   - custom_types/slice.yaml
-   - custom_types/site.yaml
-   - custom_types/image.yaml
-   - custom_types/flavor.yaml
-   - custom_types/network.yaml
-   - custom_types/networkslice.yaml
-   - custom_types/vspgwuservice.yaml
-   - custom_types/vspgwuvendor.yaml
-   - custom_types/vspgwutenant.yaml
-
-topology_template:
-  node_templates:
-
-# site, image, fully created in deployment.yaml
-    {{ site_name }}:
-      type: tosca.nodes.Site
-      properties:
-        must-exist: true
-        name: {{ site_name }}
-
-    m1.small:
-      type: tosca.nodes.Flavor
-      properties:
-        name: m1.small
-        must-exist: true
-
-    trusty-server-multi-nic:
-      type: tosca.nodes.Image
-      properties:
-        name: trusty-server-multi-nic
-        must-exist: true
-
-# management networks, fully created in management-net.yaml
-    management:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: management
-
-{% if use_management_hosts %}
-    management_hosts:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: management_hosts
-{% endif %}
-
-# sgi_network is for connectivity between VMs, fully created in sgi-net.yaml
-    sgi_network:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: sgi_network
-
-# sbi_network is for connectivity between VMs, fully created in sbi-net.yaml
-    sbi_network:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: sbi_network
-
-# s1u_network is for connectivity between VMs, fully created in s1u-net.yaml
-    s1u_network:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: s1u_network
-
-# CORD Services
-    service#vspgwu:
-      type: tosca.nodes.VSPGWUService
-      properties:
-          name: vspgwu
-          public_key: {{ lookup('file', config_cord_profile_dir + '/key_import/mcord_rsa.pub') }}
-          private_key_fn: /opt/xos/services/vspgwu/keys/mcord_rsa
-      artifacts:
-          pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
-
-# CORD Slices
-    {{ site_name }}_vspgwu:
-      description: SDN controller slice
-      type: tosca.nodes.Slice
-      properties:
-          name: {{ site_name }}_vspgwu
-          default_isolation: vm
-          network: noauto
-      requirements:
-          - site:
-              node: mysite
-              relationship: tosca.relationships.BelongsToOne
-          - service:
-              node: service#vspgwu
-              relationship: tosca.relationships.BelongsToOne
-          - default_image:
-              node: trusty-server-multi-nic
-              relationship: tosca.relationships.BelongsToOne
-          - default_flavor:
-              node: m1.small
-              relationship: tosca.relationships.BelongsToOne
-
-# CORD Service Instances
-
-    intel_vspgwu:
-      type: tosca.nodes.VSPGWUVendor
-      properties:
-        name: intel_vspgwu
-      requirements:
-        - image:
-            node: trusty-server-multi-nic
-            relationship: tosca.relationships.BelongsToOne
-        - flavor:
-            node: m1.small
-            relationship: tosca.relationships.BelongsToOne
-
-    serviceinstance#vspgwu_instance:
-      type: tosca.nodes.VSPGWUTenant
-      properties:
-          name: vspgwu_instance1
-      requirements:
-        - vspgwu_vendor:
-            node: intel_vspgwu
-            relationship: tosca.relationships.BelongsToOne
-        - owner:
-            node: service#vspgwu
-            relationship: tosca.relationships.BelongsToOne
-
-# CORD NetworkSlices
-    vspgwu_slice_management_network:
-      type: tosca.nodes.NetworkSlice
-      requirements:
-        - network:
-            node: management
-            relationship: tosca.relationships.BelongsToOne
-        - slice:
-            node: {{ site_name }}_vspgwu
-            relationship: tosca.relationships.BelongsToOne
-
-    vspgwu_slice_sgi_network:
-      type: tosca.nodes.NetworkSlice
-      requirements:
-        - network:
-            node: sgi_network
-            relationship: tosca.relationships.BelongsToOne
-        - slice:
-            node: {{ site_name }}_vspgwu
-            relationship: tosca.relationships.BelongsToOne
-
-    vspgwu_slice_sbi_network:
-      type: tosca.nodes.NetworkSlice
-      requirements:
-        - network:
-            node: sbi_network
-            relationship: tosca.relationships.BelongsToOne
-        - slice:
-            node: {{ site_name }}_vspgwu
-            relationship: tosca.relationships.BelongsToOne
-
-    vspgwu_slice_s1u_network:
-      type: tosca.nodes.NetworkSlice
-      requirements:
-        - network:
-            node: s1u_network
-            relationship: tosca.relationships.BelongsToOne
-        - slice:
-            node: {{ site_name }}_vspgwu
-            relationship: tosca.relationships.BelongsToOne
diff --git a/roles/cord-profile/templates/vtn-service.yaml.j2 b/roles/cord-profile/templates/vtn-service.yaml.j2
deleted file mode 100644
index 6a2dbd6..0000000
--- a/roles/cord-profile/templates/vtn-service.yaml.j2
+++ /dev/null
@@ -1,90 +0,0 @@
-{#
-Copyright 2017-present Open Networking Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
-   - custom_types/onosapp.yaml
-   - custom_types/onosservice.yaml
-   - custom_types/serviceinstanceattribute.yaml
-   - custom_types/serviceinstancelink.yaml
-   - custom_types/vtnservice.yaml
-
-description: Configures the VTN ONOS service
-
-topology_template:
-  node_templates:
-
-    service#ONOS_CORD:
-      type: tosca.nodes.ONOSService
-      properties:
-          name: ONOS_CORD
-          kind: platform
-          no_container: true
-          rest_hostname: onos-cord.{{ site_suffix }}
-          rest_port: 8182
-
-    service#vtn:
-      type: tosca.nodes.VTNService
-      properties:
-          name: vtn
-          kind: platform
-          view_url: /admin/vtn/vtnservice/$id$/
-          privateGatewayMac: 00:00:00:00:00:01
-          localManagementIp: {{ management_network_ip }}
-          ovsdbPort: 6641
-          sshUser: root
-          sshKeyFile: /root/node_key
-          sshPort: 22
-          xosEndpoint: xos-chameleon.{{ site_suffix }}:{{ xos_chameleon_port }}
-          xosUser: {{ xos_admin_user }}
-          xosPassword: {{ xos_admin_pass }}
-          vtnAPIVersion: 2
-          controllerPort: onos-cord.{{ site_suffix }}:6654
-          resync: false
-
-    VTN_ONOS_app:
-      type: tosca.nodes.ONOSApp
-      requirements:
-          - owner:
-              node: service#ONOS_CORD
-              relationship: tosca.relationships.BelongsToOne
-      properties:
-          name: VTN_ONOS_app
-          install_dependencies: {{ onos_mavenrepo_url }}/repository/org/opencord/cord-config/{{ cord_config_app_version }}/cord-config-{{ cord_config_app_version }}.oar, {{ onos_mavenrepo_url }}/repository/org/opencord/vtn/{{ cord_vtn_app_version }}/vtn-{{ cord_vtn_app_version }}.oar
-          dependencies: org.onosproject.drivers, org.onosproject.drivers.ovsdb, org.onosproject.openflow-base, org.onosproject.ovsdb-base, org.onosproject.dhcp
-          # autogenerate: vtn-network-cfg
-
-    VTN_ONOS_app_autogenerate:
-        type: tosca.nodes.ServiceInstanceAttribute
-        requirements:
-          - service_instance:
-              node: VTN_ONOS_app
-              relationship: tosca.relationships.BelongsToOne
-        properties:
-            name: autogenerate
-            value: vtn-network-cfg
-
-    VTN_ONOS_app_VTN_Service:
-        type: tosca.nodes.ServiceInstanceLink
-        requirements:
-          - provider_service_instance:
-              node: VTN_ONOS_app
-              relationship: tosca.relationships.BelongsToOne
-          - subscriber_service:
-              node: service#vtn
-              relationship: tosca.relationships.BelongsToOne
-
diff --git a/roles/cord-profile/templates/wan-net.yaml.j2 b/roles/cord-profile/templates/wan-net.yaml.j2
deleted file mode 100644
index 0ada8be..0000000
--- a/roles/cord-profile/templates/wan-net.yaml.j2
+++ /dev/null
@@ -1,54 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
-  - custom_types/network.yaml
-  - custom_types/networktemplate.yaml
-  - custom_types/slice.yaml
-  - custom_types/site.yaml
-
-description: wan network config, generated by platform-install
-
-topology_template:
-  node_templates:
-
-# site, fully created in deployment.yaml
-    {{ site_name }}:
-      type: tosca.nodes.Site
-      properties:
-        name: {{ site_name }}
-        must-exist: true
-
-# wan network
-    wan_template:
-      type: tosca.nodes.NetworkTemplate
-      properties:
-          name: wan_template
-          visibility: private
-          translation: none
-          vtn_kind: PRIVATE
-
-    wan_network:
-      type: tosca.nodes.Network
-      properties:
-          name: wan_network
-          subnet: 102.0.0.0/24
-      requirements:
-          - template:
-              node: wan_template
-              relationship: tosca.relationships.BelongsToOne
-          - owner:
-              node: {{ site_name }}_wan
-              relationship: tosca.relationships.BelongsToOne
-
-    {{ site_name }}_wan:
-      description: This slice exists solely to own the private network
-      type: tosca.nodes.Slice
-      properties:
-          name: {{ site_name }}_wan
-          network: noauto
-      requirements:
-          - site:
-              node: {{ site_name }}
-              relationship: tosca.relationships.BelongsToOne
-
-
diff --git a/roles/cord-profile/templates/xos-gui-extensions.yml.j2 b/roles/cord-profile/templates/xos-gui-extensions.yml.j2
deleted file mode 100644
index f10c695..0000000
--- a/roles/cord-profile/templates/xos-gui-extensions.yml.j2
+++ /dev/null
@@ -1,37 +0,0 @@
-
-{#
-Copyright 2017-present Open Networking Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
-
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: Persist xos-sample-gui-extension
-
-imports:
-   - custom_types/xosguiextension.yaml
-
-topology_template:
-  node_templates:
-
-    # UI Extension
-{% for ext in enabled_gui_extensions %}
-    {{ext.name}}:
-      type: tosca.nodes.XOSGuiExtension
-      properties:
-        name: {{ext.name}}
-        files: /xos/extensions/{{ext.name}}/vendor.js, /xos/extensions/{{ext.name}}/app.js {% if ext.extra_files is defined %}{% for file in ext.extra_files%}, /xos/extensions/{{ext.name}}/{{file}} {% endfor %}{% endif %}
-
-{% endfor %}