diff --git a/deployment/heat/onap-oom/env/gwu/onap-heat-openrc b/deployment/heat/onap-oom/env/gwu/onap-heat-openrc
deleted file mode 100644
index fcad4db..0000000
--- a/deployment/heat/onap-oom/env/gwu/onap-heat-openrc
+++ /dev/null
@@ -1,9 +0,0 @@
-export OS_PROJECT_DOMAIN_NAME=Default
-export OS_USER_DOMAIN_NAME=Default
-export OS_PROJECT_ID=675ca78806b7485e9c96bd70cd5734ac
-export OS_PROJECT_NAME=onap-heat
-export OS_USERNAME=demo
-#export OS_PASSWORD=demo
-export OS_AUTH_URL=http://controller:5000/v3
-export OS_IDENTITY_API_VERSION=3
-export OS_IMAGE_API_VERSION=2
diff --git a/deployment/heat/onap-oom/env/gwu/onap-oom-openrc b/deployment/heat/onap-oom/env/gwu/onap-oom-openrc
deleted file mode 100644
index 63e5311..0000000
--- a/deployment/heat/onap-oom/env/gwu/onap-oom-openrc
+++ /dev/null
@@ -1,9 +0,0 @@
-export OS_PROJECT_DOMAIN_NAME=Default
-export OS_USER_DOMAIN_NAME=Default
-export OS_PROJECT_ID=e6507947d42646ea8045bcf2956b753a
-export OS_PROJECT_NAME=onap-oom
-export OS_USERNAME=demo
-#export OS_PASSWORD=demo
-export OS_AUTH_URL=http://controller:5000/v3
-export OS_IDENTITY_API_VERSION=3
-export OS_IMAGE_API_VERSION=2
diff --git a/deployment/heat/onap-oom/env/gwu/onap-oom.env b/deployment/heat/onap-oom/env/gwu/onap-oom.env
deleted file mode 100644
index e0c57f7..0000000
--- a/deployment/heat/onap-oom/env/gwu/onap-oom.env
+++ /dev/null
@@ -1,50 +0,0 @@
-parameters:
-
-  ubuntu_1604_image: xenial
-
-  apt_proxy: 192.168.1.51:3142
-  docker_proxy: 192.168.2.18:5000
-
-  rancher_vm_flavor: c1.xlarge
-  k8s_vm_flavor: c1.xlarge
-
-  public_net_id: c3352d4c-8452-4172-b09c-15f017673708
-  key_name: onap-key
-
-  oam_network_cidr: 10.0.0.0/16
-
-  integration_override_yaml: >
-    global:
-      repository: __docker_proxy__
-      pullPolicy: IfNotPresent
-    robot:
-      openStackKeyStoneUrl: "http://192.168.1.11:5000"
-      openStackPublicNetId: "__public_net_id__"
-      openStackTenantId: "${OS_PROJECT_ID}"
-      openStackUserName: "${OS_USERNAME}"
-      ubuntu14Image: "trusty"
-      ubuntu16Image: "xenial"
-      openStackPrivateNetId: "__oam_network_id__"
-      openStackPrivateSubnetId: "__oam_subnet_id__"
-      openStackPrivateNetCidr: "__oam_network_cidr__"
-      openStackOamNetworkCidrPrefix: "10.0"
-      dcaeCollectorIp: "__k8s_1_vm_ip__"
-      vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh"
-      demoArtifactsVersion: "1.2.2"
-      scriptVersion: "1.2.1"
-      rancherIpAddress: "__rancher_ip_addr__"
-      config:
-        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
-    so:
-      config:
-        openStackUserName: "${OS_USERNAME}"
-        openStackKeyStoneUrl: "http://192.168.1.11:5000"
-        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
-    appc:
-      replicaCount: 1
-      config:
-        enableClustering: false
-    sdnc:
-      replicaCount: 3
-      config:
-        enableClustering: true
diff --git a/deployment/heat/onap-oom/env/huawei/onap-heat-openrc b/deployment/heat/onap-oom/env/huawei/onap-heat-openrc
deleted file mode 100644
index 301aeee..0000000
--- a/deployment/heat/onap-oom/env/huawei/onap-heat-openrc
+++ /dev/null
@@ -1,9 +0,0 @@
-export OS_PROJECT_DOMAIN_NAME=Default
-export OS_USER_DOMAIN_NAME=Default
-export OS_PROJECT_ID=66a48e4b0a934463bef0bd694f93147a
-export OS_PROJECT_NAME=onap-heat
-export OS_USERNAME=demo
-#export OS_PASSWORD=demo
-export OS_AUTH_URL=http://controller.neo.futurewei.com:5000/v3
-export OS_IDENTITY_API_VERSION=3
-export OS_IMAGE_API_VERSION=2
diff --git a/deployment/heat/onap-oom/env/huawei/onap-oom-openrc b/deployment/heat/onap-oom/env/huawei/onap-oom-openrc
deleted file mode 100644
index cdafe23..0000000
--- a/deployment/heat/onap-oom/env/huawei/onap-oom-openrc
+++ /dev/null
@@ -1,9 +0,0 @@
-export OS_PROJECT_DOMAIN_NAME=Default
-export OS_USER_DOMAIN_NAME=Default
-export OS_PROJECT_ID=13159ba149fa47ea9646902ce5734b89
-export OS_PROJECT_NAME=onap-oom
-export OS_USERNAME=demo
-#export OS_PASSWORD=demo
-export OS_AUTH_URL=http://controller.neo.futurewei.com:5000/v3
-export OS_IDENTITY_API_VERSION=3
-export OS_IMAGE_API_VERSION=2
diff --git a/deployment/heat/onap-oom/env/huawei/onap-oom.env b/deployment/heat/onap-oom/env/huawei/onap-oom.env
deleted file mode 100644
index c02d1a6..0000000
--- a/deployment/heat/onap-oom/env/huawei/onap-oom.env
+++ /dev/null
@@ -1,50 +0,0 @@
-parameters:
-
-  ubuntu_1604_image: xenial
-
-  apt_proxy: 10.145.122.117:8000
-  docker_proxy: 10.145.123.23:5000
-
-  rancher_vm_flavor: m1.xlarge
-  k8s_vm_flavor: m1.xlarge
-
-  public_net_id: 7baa99ac-43a0-4013-9dfb-bbb94fdcd91a
-  key_name: onap-key
-
-  oam_network_cidr: 10.0.0.0/16
-
-  integration_override_yaml: >
-    global:
-      repository: __docker_proxy__
-      pullPolicy: IfNotPresent
-    robot:
-      openStackKeyStoneUrl: "http://10.145.122.118:5000"
-      openStackPublicNetId: "__public_net_id__"
-      openStackTenantId: "${OS_PROJECT_ID}"
-      openStackUserName: "${OS_USERNAME}"
-      ubuntu14Image: "trusty"
-      ubuntu16Image: "xenial"
-      openStackPrivateNetId: "__oam_network_id__"
-      openStackPrivateSubnetId: "__oam_subnet_id__"
-      openStackPrivateNetCidr: "__oam_network_cidr__"
-      openStackOamNetworkCidrPrefix: "10.0"
-      dcaeCollectorIp: "__k8s_1_vm_ip__"
-      vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh"
-      demoArtifactsVersion: "1.2.2"
-      scriptVersion: "1.2.1"
-      rancherIpAddress: "__rancher_ip_addr__"
-      config:
-        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
-    so:
-      config:
-        openStackUserName: "${OS_USERNAME}"
-        openStackKeyStoneUrl: "http://10.145.122.118:5000"
-        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
-    appc:
-      replicaCount: 1
-      config:
-        enableClustering: false
-    sdnc:
-      replicaCount: 3
-      config:
-        enableClustering: true