diff --git a/podconfig/rcord-controlkube.yml b/podconfig/rcord-controlkube.yml
deleted file mode 100644
index fff6600..0000000
--- a/podconfig/rcord-controlkube.yml
+++ /dev/null
@@ -1,46 +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.
-
-# rcord-controlkube Pod Config
-# Creates a kubernetes enabled controlpod
-
-cord_scenario: controlkube
-cord_profile: rcord
-
-# copy kubespray config to config host
-kubeconfig_localhost: true
-
-# Set the site name
-site_name: mykube
-site_humanname: MyKube
-site_suffix: "{{ site_name }}.cord.lab"
-
-# used when pushing images to secure registry
-docker_registry_ext_port: "5000"
-deploy_docker_registry: "docker-registry.{{ site_suffix }}:{{ docker_registry_ext_port }}"
-
-# Virtual-specific config of network interfaces, for virtual install in Vagrant
-#
-# which network interfaces belong to which bond on nodes
-management_net_interfaces:
-  - eth1
-
-fabric_net_interfaces:
-  - eth2
-
-# Bring up alias interfaces for the vsg and public networks, for forwarding
-# traffic in virtual pod
-use_addresspool_vsg: True
-use_addresspool_public: True
diff --git a/podconfig/rcord-controlpod.yml b/podconfig/rcord-controlpod.yml
deleted file mode 100644
index a910f83..0000000
--- a/podconfig/rcord-controlpod.yml
+++ /dev/null
@@ -1,21 +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.
-
-# rcord-controlpod Pod Config
-# Creates a single-node controlpod with R-CORD services
-
-cord_scenario: controlpod
-cord_profile: rcord
-
diff --git a/podconfig/rcord-local.yml b/podconfig/rcord-local.yml
deleted file mode 100644
index a3df1a6..0000000
--- a/podconfig/rcord-local.yml
+++ /dev/null
@@ -1,23 +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-rcord Pod Config
-# Starts a R-CORD container set in the local environment
-
-cord_scenario: local
-cord_profile: rcord
-
diff --git a/podconfig/rcord-mock.yml b/podconfig/rcord-mock.yml
deleted file mode 100644
index f1b38e6..0000000
--- a/podconfig/rcord-mock.yml
+++ /dev/null
@@ -1,21 +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.
-
-# rcord-mock Pod Config
-# Creates a single-node mock R-CORD pod
-
-cord_scenario: mock
-cord_profile: rcord
-
diff --git a/podconfig/rcord-preppedkube.yml b/podconfig/rcord-preppedkube.yml
deleted file mode 100644
index 2228ed0..0000000
--- a/podconfig/rcord-preppedkube.yml
+++ /dev/null
@@ -1,46 +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.
-
-# rcord-preppedkube Pod Config
-# Creates a kubernetes enabled preppedpod
-
-cord_scenario: preppedkube
-cord_profile: rcord
-
-# copy kubespray config to config host
-kubeconfig_localhost: true
-
-# Set the site name
-site_name: mykube
-site_humanname: MyKube
-site_suffix: "{{ site_name }}.cord.lab"
-
-# used when pushing images to secure registry
-docker_registry_ext_port: "5000"
-deploy_docker_registry: "docker-registry.{{ site_suffix }}:{{ docker_registry_ext_port }}"
-
-# Virtual-specific config of network interfaces, for virtual install in Vagrant
-#
-# which network interfaces belong to which bond on nodes
-management_net_interfaces:
-  - eth1
-
-fabric_net_interfaces:
-  - eth2
-
-# Bring up alias interfaces for the vsg and public networks, for forwarding
-# traffic in virtual pod
-use_addresspool_vsg: True
-use_addresspool_public: True
diff --git a/podconfig/rcord-preppedpod.yml b/podconfig/rcord-preppedpod.yml
deleted file mode 100644
index 397214a..0000000
--- a/podconfig/rcord-preppedpod.yml
+++ /dev/null
@@ -1,36 +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.
-
-# rcord-preppedpod POD Config
-#
-# Creates a multi-node POD on pre-prepared systems (OS installed) with R-CORD
-# services
-
-cord_scenario: preppedpod
-cord_profile: rcord
-
-# Virtual-specific config of network interfaces, for virtual install in Vagrant
-#
-# which network interfaces belong to which bond on nodes
-management_net_interfaces:
-  - eth1
-
-fabric_net_interfaces:
-  - eth2
-
-# Bring up alias interfaces for the vsg and public networks, for forwarding
-# traffic in virtual pod
-use_addresspool_vsg: True
-use_addresspool_public: True
diff --git a/podconfig/rcord-single.yml b/podconfig/rcord-single.yml
deleted file mode 100644
index 7efb1da..0000000
--- a/podconfig/rcord-single.yml
+++ /dev/null
@@ -1,21 +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.
-
-# rcord-single Pod Config
-# Creates a single-node mock R-CORD pod w/synchronizers
-
-cord_scenario: single
-cord_profile: rcord
-
diff --git a/podconfig/rcord-virtual.yml b/podconfig/rcord-virtual.yml
deleted file mode 100644
index 926c266..0000000
--- a/podconfig/rcord-virtual.yml
+++ /dev/null
@@ -1,59 +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.
-
-# rcord-virtual Pod Config
-# Creates a virtual multi-node R-CORD pod, aka "rcord-in-a-box"
-
-cord_scenario: cord
-cord_profile: rcord
-
-vagrant_up_prereqs:
-  - prereqs-check
-  - ciab-ovs
-
-build_targets:
-  - compute1-up
-
-# Virtual-specific config of network interfaces, for virtual install in Vagrant
-#
-# platform-install config variables
-# which network interfaces belong to which bond on nodes
-management_net_interfaces:
-  - eth2
-
-fabric_net_interfaces:
-  - eth3
-
-# Bring up alias interfaces for the vsg and public networks, for forwarding
-# traffic in virtual pod
-use_addresspool_vsg: True
-use_addresspool_public: True
-
-# MaaS config variables
-external_iface: 'eth0'
-
-skipTags:
-  - 'set_compute_node_password'
-  - 'switch_support'
-  - 'reboot'
-  - 'interface_config'
-
-# Other old config carried over
-cord_in_a_box: True  # what is this for?
-fabric_include_names: eth2
-fabric_include_module_types: omit
-fabric_exclude_names: eth0,eth1
-management_include_names: eth1
-management_exclude_names: eth0,eth2
diff --git a/rcord.yml b/rcord.yml
deleted file mode 100644
index a931d11..0000000
--- a/rcord.yml
+++ /dev/null
@@ -1,270 +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
-
-# Profile info located in orchestration/profiles/<cord_use_case>
-cord_use_case: rcord
-
-# 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_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
-
-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: rcord
-    path: orchestration/profiles/rcord
-  - 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
-
-xos_dynamic_services:
-  - 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"]]'
-
-# 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/templates/addressmanager-service.yaml.j2 b/templates/addressmanager-service.yaml.j2
deleted file mode 100644
index 7549c3f..0000000
--- a/templates/addressmanager-service.yaml.j2
+++ /dev/null
@@ -1,57 +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: {{ addresspool_vsg_cidr }}
-        gateway_ip: {{ addresspool_vsg_cidr | ipaddr('1') | ipaddr('address') }}
-        gateway_mac:  {{ fabric_gateway_hwaddr }}
-      requirements:
-        - service:
-            node: service#addressmanager
-            relationship: tosca.relationships.BelongsToOne
-
-    addresses_public:
-      type: tosca.nodes.AddressPool
-      properties:
-        name: addresses_public
-        addresses: {{ addresspool_public_cidr }}
-        gateway_ip: {{ addresspool_public_cidr | ipaddr('1') | ipaddr('address') }}
-        gateway_mac:  {{ fabric_gateway_hwaddr }}
-      requirements:
-        - service:
-            node: service#addressmanager
-            relationship: tosca.relationships.BelongsToOne
-
-    service#addressmanager:
-      type: tosca.nodes.AddressManagerService
-      properties:
-        name: addressmanager
diff --git a/templates/cdn-content.yaml.j2 b/templates/cdn-content.yaml.j2
deleted file mode 100644
index dff1f91..0000000
--- a/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/templates/cord-services.yaml.j2 b/templates/cord-services.yaml.j2
deleted file mode 100644
index 46db7f0..0000000
--- a/templates/cord-services.yaml.j2
+++ /dev/null
@@ -1,369 +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 rcord profile
-
-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/rcordservice.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_vtn_net_management_host %}
-    management_host:
-      type: tosca.nodes.Network
-      properties:
-        name: management_host
-        must-exist: true
-{% endif %}
-
-    service#rcord:
-      type: tosca.nodes.RCORDService
-      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
-        voltha_url: http://does.not.exist/
-        onos_voltha_url: http://does.not.exist/
-
-    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: {{ addresspool_vsg_cidr }}
-        gateway_ip: {{ addresspool_vsg_cidr | ipaddr('1') | ipaddr('address') }}
-        gateway_mac:  {{ fabric_gateway_hwaddr }}
-      requirements:
-        - service:
-            node: service#addressmanager
-            relationship: tosca.relationships.BelongsToOne
-
-    addresses_public:
-      type: tosca.nodes.AddressPool
-      properties:
-        name: addresses_public
-        addresses: {{ addresspool_public_cidr }}
-        gateway_ip: {{ addresspool_public_cidr | ipaddr('1') | ipaddr('address') }}
-        gateway_mac:  {{ fabric_gateway_hwaddr }}
-      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
-
-    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
-
-    vsg_template:
-      type: tosca.nodes.NetworkTemplate
-      properties:
-        name: vsg_template
-        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: vsg_template
-            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_vtn_net_management_host %}
-    networkslice#management_host_to_{{ site_name }}_vsg:
-        type: tosca.nodes.NetworkSlice
-        requirements:
-          - network:
-              node: management_host
-              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
-
diff --git a/templates/fabric-service.yaml.j2 b/templates/fabric-service.yaml.j2
deleted file mode 100644
index 3d3a155..0000000
--- a/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 rcord profile
-
-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: rest_onos/v1/network/configuration/
-          value: '{{ fabric_network_cfg_json | to_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/templates/management-net.yaml.j2 b/templates/management-net.yaml.j2
deleted file mode 100644
index 809e00c..0000000
--- a/templates/management-net.yaml.j2
+++ /dev/null
@@ -1,101 +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 rcord profile
-
-topology_template:
-  node_templates:
-
-# site, fully created in deployment.yaml
-    {{ site_name }}:
-      type: tosca.nodes.Site
-      properties:
-        name: {{ site_name }}
-
-# management (vtn: MANAGEMENT_LOCAL) 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: {{ vtn_net_management_local_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_vtn_net_management_host %}
-# management_host (vtn: MANAGEMENT_HOST) network
-    management_host_template:
-      type: tosca.nodes.NetworkTemplate
-      properties:
-        name: management_host_template
-        visibility: private
-        translation: none
-        vtn_kind: MANAGEMENT_HOST
-
-    management_host:
-      type: tosca.nodes.Network
-      properties:
-        name: management_host
-        # ip_version: 4
-        subnet: {{ vtn_net_management_host_cidr }}
-        start_ip: {{ vtn_net_management_host_range_xos_low }}
-        end_ip: {{ vtn_net_management_host_range_xos_high }}
-        permit_all_slices: true
-      requirements:
-        - template:
-            node: management_host_template
-            relationship: tosca.relationships.BelongsToOne
-        - owner:
-            node: slice#{{ site_name }}_management
-            relationship: tosca.relationships.BelongsToOne
-{% endif %}
-
-# Slice to own management networks
-    slice#{{ site_name }}_management:
-      description: This slice exists solely to own the management network(s)
-      type: tosca.nodes.Slice
-      properties:
-        network: noauto
-        name: {{ site_name }}_management
-      requirements:
-        - site:
-            node: {{ site_name }}
-            relationship: tosca.relationships.BelongsToOne
-
diff --git a/templates/public-net.yaml.j2 b/templates/public-net.yaml.j2
deleted file mode 100644
index cc30e71..0000000
--- a/templates/public-net.yaml.j2
+++ /dev/null
@@ -1,112 +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 rcord profile
-
-topology_template:
-  node_templates:
-
-# site, fully created in deployment.yaml.j2
-    {{ site_name }}:
-      type: tosca.nodes.Site
-      properties:
-        name: {{ site_name }}
-        must-exist: true
-
-    {{ 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
-
-# Address Manager service, fully created in cord-services.yaml.j2
-    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: {{ addresspool_public_cidr }}
-        # 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
-
diff --git a/templates/service-graph-constraints.yaml.j2 b/templates/service-graph-constraints.yaml.j2
deleted file mode 100644
index 00fbc4a..0000000
--- a/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/templates/vsg-net.yaml.j2 b/templates/vsg-net.yaml.j2
deleted file mode 100644
index ef5787e..0000000
--- a/templates/vsg-net.yaml.j2
+++ /dev/null
@@ -1,53 +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 rcord profile
-
-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: {{ addresspool_vsg_cidr }}
-      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/templates/vtn-service.yaml.j2 b/templates/vtn-service.yaml.j2
deleted file mode 100644
index 4f5a419..0000000
--- a/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: {{ vtn_net_management_local_cidr | ipaddr('1') }}
-          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/templates/xos-gui-extensions.yml.j2 b/templates/xos-gui-extensions.yml.j2
deleted file mode 100644
index f10c695..0000000
--- a/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 %}
diff --git a/xos/synchronizer/models/rcord.xproto b/xos/synchronizer/models/rcord.xproto
index ccbff68..6dff24d 100644
--- a/xos/synchronizer/models/rcord.xproto
+++ b/xos/synchronizer/models/rcord.xproto
@@ -22,7 +22,7 @@
     optional bool cdn_enable = 6 [default = False, null = False, db_index = False, blank = True];
     optional int32 uplink_speed = 8 [default = 1000000000, null = False, db_index = False, blank = False];
     optional int32 downlink_speed = 9 [default = 1000000000, null = False, db_index = False, blank = False];
-    optional string status = 11 [default = "enabled", choices = "(('enabled', 'Enabled'), ('suspended', 'Suspended'), ('delinquent', 'Delinquent'), ('copyrightviolation', 'Copyright Violation'))", max_length = 30, content_type = "stripped", blank = False, null = False, db_index = False];
+    optional string status = 11 [default = "enabled", choices = "(('enabled', 'Enabled'), ('disabled', 'Disabled'), ('pre-provisioned', 'Pre Provisioned'))", max_length = 30, content_type = "stripped", blank = False, null = False, db_index = False];
 
     // parameters for r-cord lite
     optional int32 c_tag = 12 [null = True, db_index = False, blank = False];