diff --git a/centos_dev_docker_images.inc b/centos_dev_docker_images.inc
index ffd53710..5558d540 100644
--- a/centos_dev_docker_images.inc
+++ b/centos_dev_docker_images.inc
@@ -11,6 +11,5 @@ openstack/python-horizon
 openstack/python-keystone
 openstack/python-neutron
 openstack/python-nova
-openstack/distributedcloud
 openstack/python-openstackclient
 openstack/python-placement
diff --git a/centos_dev_wheels.inc b/centos_dev_wheels.inc
index 60164017..9dd69e8b 100644
--- a/centos_dev_wheels.inc
+++ b/centos_dev_wheels.inc
@@ -1,2 +1 @@
 distributedcloud-client-wheels
-distributedcloud-wheels
diff --git a/centos_iso_image.inc b/centos_iso_image.inc
index 8789d14e..7c668d35 100644
--- a/centos_iso_image.inc
+++ b/centos_iso_image.inc
@@ -43,11 +43,6 @@ starlingx-dashboard
 # openstack-keystone
 openstack-keystone
 
-# distributedcloud
-distributedcloud-dcmanager
-distributedcloud-dcorch
-distributedcloud-dcdbsync
-
 # distributedcloud-client
 distributedcloud-client-dcmanagerclient
 
diff --git a/centos_pkg_dirs b/centos_pkg_dirs
index a5ee8280..918b5120 100644
--- a/centos_pkg_dirs
+++ b/centos_pkg_dirs
@@ -22,5 +22,4 @@ openstack/rabbitmq-server
 openstack/python-openstackclient
 openstack/python-openstacksdk
 openstack/python-wsme
-openstack/distributedcloud
 openstack/distributedcloud-client
diff --git a/centos_stable_docker_images.inc b/centos_stable_docker_images.inc
index 23a95e8e..a41c8e76 100644
--- a/centos_stable_docker_images.inc
+++ b/centos_stable_docker_images.inc
@@ -11,7 +11,6 @@ openstack/python-horizon
 openstack/python-keystone
 openstack/python-neutron
 openstack/python-nova
-openstack/distributedcloud
 openstack/python-openstackclient
 openstack/python-placement
 openstack/python-platformclients
diff --git a/centos_stable_wheels.inc b/centos_stable_wheels.inc
index 60164017..9dd69e8b 100644
--- a/centos_stable_wheels.inc
+++ b/centos_stable_wheels.inc
@@ -1,2 +1 @@
 distributedcloud-client-wheels
-distributedcloud-wheels
diff --git a/openstack/distributedcloud/centos/build_srpm.data b/openstack/distributedcloud/centos/build_srpm.data
deleted file mode 100644
index 91d9aa18..00000000
--- a/openstack/distributedcloud/centos/build_srpm.data
+++ /dev/null
@@ -1,6 +0,0 @@
-TAR_NAME="distributedcloud"
-SRC_DIR="$CGCS_BASE/git/distributedcloud"
-COPY_LIST="$FILES_BASE/*"
-
-TIS_BASE_SRCREV=e82c7b43362bceb8d4ae9d121d023e42268204db
-TIS_PATCH_VER=GITREVCOUNT+9
diff --git a/openstack/distributedcloud/centos/distributedcloud.spec b/openstack/distributedcloud/centos/distributedcloud.spec
deleted file mode 100644
index 50a8026e..00000000
--- a/openstack/distributedcloud/centos/distributedcloud.spec
+++ /dev/null
@@ -1,243 +0,0 @@
-%global pypi_name distributedcloud
-
-%global with_doc %{!?_without_doc:1}%{?_without_doc:0}
-%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
-
-%if 0%{?fedora}
-%global with_python3 1
-%{!?python3_shortver: %global python3_shortver %(%{__python3} -c 'import sys; print(str(sys.version_info.major) + "." + str(sys.version_info.minor))')}
-%endif
-
-Name:          %{pypi_name}
-Version:       1.0.0
-Release:       1%{?_tis_dist}.%{tis_patch_ver}
-Summary:       Distributed Cloud Services
-
-License:       ASL 2.0
-URL:           unknown
-Source0:       %{pypi_name}-%{version}.tar.gz
-Source1:       dcmanager-api.service
-Source2:       dcmanager-manager.service
-Source3:       dcorch-api.service
-Source4:       dcorch-engine.service
-Source5:       dcorch-sysinv-api-proxy.service
-Source6:       dcorch-snmp.service
-Source7:       dcorch-identity-api-proxy.service
-Source8:       dcdbsync-api.service
-Source9:       dcdbsync-openstack-api.service
-Source10:      dcmanager.conf
-Source11:      dcorch.conf
-Source12:      dcdbsync.conf
-
-BuildArch:     noarch
-
-BuildRequires: python-crypto
-BuildRequires: python-cryptography
-BuildRequires: python2-devel
-BuildRequires: python-eventlet
-BuildRequires: python-setuptools
-BuildRequires: python2-pip
-BuildRequires: python2-wheel
-BuildRequires: python-jsonschema >= 2.0.0
-BuildRequires: python-keyring
-BuildRequires: python-keystonemiddleware
-BuildRequires: python-keystoneauth1 >= 3.1.0
-BuildRequires: python-netaddr
-BuildRequires: python-oslo-concurrency
-BuildRequires: python-oslo-config
-BuildRequires: python-oslo-context
-BuildRequires: python-oslo-db
-BuildRequires: python-oslo-i18n
-BuildRequires: python-oslo-log
-BuildRequires: python-oslo-messaging
-BuildRequires: python-oslo-middleware
-BuildRequires: python-oslo-policy
-BuildRequires: python-oslo-rootwrap
-BuildRequires: python-oslo-serialization
-BuildRequires: python-oslo-service
-BuildRequires: python-oslo-utils
-BuildRequires: python-oslo-versionedobjects
-BuildRequires: python-pbr >= 1.8
-BuildRequires: python-pecan >= 1.0.0
-BuildRequires: python-routes >= 1.12.3
-BuildRequires: python-sphinx
-BuildRequires: python-sphinxcontrib-httpdomain
-BuildRequires: pyOpenSSL
-BuildRequires: systemd
-# Required to compile translation files
-BuildRequires: python-babel
-
-%description
-Distributed Cloud provides configuration and management of distributed clouds
-
-# DC Manager
-%package dcmanager
-Summary: DC Manager
-
-%description dcmanager
-Distributed Cloud Manager
-
-%package dcorch
-Summary: DC Orchestrator
-# TODO(John): should we add Requires lines?
-Requires: openstack-ras
-
-%description dcorch
-Distributed Cloud Orchestrator
-
-%package dcdbsync
-Summary: DC DCorch DBsync Agent
-
-%description dcdbsync
-Distributed Cloud DCorch DBsync Agent
-
-%prep
-%autosetup -n %{pypi_name}-%{version}
-
-# Remove the requirements file so that pbr hooks don't add it
-# to distutils requires_dist config
-rm -rf {test-,}requirements.txt tools/{pip,test}-requires
-
-%build
-export PBR_VERSION=%{version}
-%{__python2} setup.py build
-%py2_build_wheel
-# Generate sample config and add the current directory to PYTHONPATH so
-# oslo-config-generator doesn't skip heat's entry points.
-PYTHONPATH=. oslo-config-generator --config-file=./dcmanager/config-generator.conf
-PYTHONPATH=. oslo-config-generator --config-file=./dcorch/config-generator.conf
-PYTHONPATH=. oslo-config-generator --config-file=./dcdbsync/config-generator.conf
-
-
-%install
-export PBR_VERSION=%{version}
-%{__python2} setup.py install -O1 --skip-build --root %{buildroot} \
-                                  --single-version-externally-managed
-install -d $RPM_BUILD_ROOT/wheels
-install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/
-install -d -m 755 %{buildroot}%{_tmpfilesdir}
-install -d -m 755 %{buildroot}/var/log/dcmanager
-install -d -m 755 %{buildroot}/var/cache/dcmanager
-install -d -m 755 %{buildroot}%{_sysconfdir}/dcmanager/
-# install systemd unit files
-install -p -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/dcmanager-api.service
-install -p -D -m 644 %{SOURCE2} %{buildroot}%{_unitdir}/dcmanager-manager.service
-install -p -D -m 644 %{SOURCE10} %{buildroot}%{_tmpfilesdir}
-# install default config files
-cd %{_builddir}/%{pypi_name}-%{version} && oslo-config-generator --config-file ./dcmanager/config-generator.conf --output-file %{_builddir}/%{pypi_name}-%{version}%{_sysconfdir}/dcmanager/dcmanager.conf.sample
-install -p -D -m 640 %{_builddir}/%{pypi_name}-%{version}%{_sysconfdir}/dcmanager/dcmanager.conf.sample %{buildroot}%{_sysconfdir}/dcmanager/dcmanager.conf
-
-
-install -d -m 755 %{buildroot}/var/log/dcorch
-install -d -m 755 %{buildroot}/var/cache/dcorch
-install -d -m 755 %{buildroot}%{_sysconfdir}/dcorch/
-# install systemd unit files
-install -p -D -m 644 %{SOURCE3} %{buildroot}%{_unitdir}/dcorch-api.service
-install -p -D -m 644 %{SOURCE4} %{buildroot}%{_unitdir}/dcorch-engine.service
-install -p -D -m 644 %{SOURCE5} %{buildroot}%{_unitdir}/dcorch-sysinv-api-proxy.service
-install -p -D -m 644 %{SOURCE6} %{buildroot}%{_unitdir}/dcorch-snmp.service
-install -p -D -m 644 %{SOURCE7} %{buildroot}%{_unitdir}/dcorch-identity-api-proxy.service
-install -p -D -m 644 %{SOURCE11} %{buildroot}%{_tmpfilesdir}
-
-# install ocf scripts
-install -d -m 755 ${RPM_BUILD_ROOT}/usr/lib/ocf/resource.d/openstack
-install -p -D -m 755 ocf/* ${RPM_BUILD_ROOT}/usr/lib/ocf/resource.d/openstack/
-
-# install default config files
-cd %{_builddir}/%{pypi_name}-%{version} && oslo-config-generator --config-file ./dcorch/config-generator.conf --output-file %{_builddir}/%{pypi_name}-%{version}%{_sysconfdir}/dcorch/dcorch.conf.sample
-install -p -D -m 640 %{_builddir}/%{pypi_name}-%{version}%{_sysconfdir}/dcorch/dcorch.conf.sample %{buildroot}%{_sysconfdir}/dcorch/dcorch.conf
-
-# dc dbsync agent
-install -d -m 755 %{buildroot}/var/log/dcdbsync
-install -d -m 755 %{buildroot}/var/cache/dcdbsync
-install -d -m 755 %{buildroot}%{_sysconfdir}/dcdbsync/
-# install systemd unit files
-install -p -D -m 644 %{SOURCE8} %{buildroot}%{_unitdir}/dcdbsync-api.service
-# install systemd unit files for optional second instance
-install -p -D -m 644 %{SOURCE9} %{buildroot}%{_unitdir}/dcdbsync-openstack-api.service
-install -p -D -m 644 %{SOURCE12} %{buildroot}%{_tmpfilesdir}
-# install default config files
-cd %{_builddir}/%{pypi_name}-%{version} && oslo-config-generator --config-file ./dcdbsync/config-generator.conf --output-file %{_builddir}/%{pypi_name}-%{version}%{_sysconfdir}/dcdbsync/dcdbsync.conf.sample
-install -p -D -m 640 %{_builddir}/%{pypi_name}-%{version}%{_sysconfdir}/dcdbsync/dcdbsync.conf.sample %{buildroot}%{_sysconfdir}/dcdbsync/dcdbsync.conf
-
-# install ansible overrides dir
-install -d -m 600 ${RPM_BUILD_ROOT}/opt/dc/ansible
-
-%files dcmanager
-%license LICENSE
-%{python2_sitelib}/dcmanager*
-%{python2_sitelib}/distributedcloud-*.egg-info
-%exclude %{python2_sitelib}/dcmanager/tests
-%{_bindir}/dcmanager-api
-%{_unitdir}/dcmanager-api.service
-%{_bindir}/dcmanager-manager
-%{_unitdir}/dcmanager-manager.service
-%{_bindir}/dcmanager-manage
-%{_tmpfilesdir}/dcmanager.conf
-%dir %attr(0755,root,root) %{_localstatedir}/log/dcmanager
-%dir %attr(0755,root,root) %{_localstatedir}/cache/dcmanager
-%dir %attr(0755,root,root) %{_sysconfdir}/dcmanager
-%config(noreplace) %attr(-, root, root) %{_sysconfdir}/dcmanager/dcmanager.conf
-%dir %attr(0755,root,root) /usr/lib/ocf/resource.d/openstack
-%dir %attr(0600,root,root) /opt/dc/ansible
-%defattr(-,root,root,-)
-/usr/lib/ocf/resource.d/openstack/dcmanager-*
-
-
-%files dcorch
-%license LICENSE
-%{python2_sitelib}/dcorch*
-%{python2_sitelib}/distributedcloud-*.egg-info
-%exclude %{python2_sitelib}/dcorch/tests
-%{_bindir}/dcorch-api
-%{_unitdir}/dcorch-api.service
-%{_bindir}/dcorch-engine
-%{_unitdir}/dcorch-engine.service
-%{_bindir}/dcorch-api-proxy
-%{_unitdir}/dcorch-sysinv-api-proxy.service
-%{_unitdir}/dcorch-identity-api-proxy.service
-%{_bindir}/dcorch-manage
-%{_bindir}/dcorch-snmp
-%{_unitdir}/dcorch-snmp.service
-%{_tmpfilesdir}/dcorch.conf
-%dir %attr(0755,root,root) %{_localstatedir}/log/dcorch
-%dir %attr(0755,root,root) %{_localstatedir}/cache/dcorch
-%dir %attr(0755,root,root) %{_sysconfdir}/dcorch
-%config(noreplace) %attr(-, dcorch, dcorch) %{_sysconfdir}/dcorch/dcorch.conf
-%dir %attr(0755,root,root) /usr/lib/ocf/resource.d/openstack
-%defattr(-,root,root,-)
-/usr/lib/ocf/resource.d/openstack/dcorch-*
-
-
-%files dcdbsync
-%license LICENSE
-%{python2_sitelib}/dcdbsync*
-%{python2_sitelib}/distributedcloud-*.egg-info
-%exclude %{python2_sitelib}/dcdbsync/tests
-%{_bindir}/dcdbsync-api
-%{_unitdir}/dcdbsync-api.service
-%{_unitdir}/dcdbsync-openstack-api.service
-%{_tmpfilesdir}/dcdbsync.conf
-%dir %attr(0755,root,root) %{_localstatedir}/log/dcdbsync
-%dir %attr(0755,root,root) %{_localstatedir}/cache/dcdbsync
-%dir %attr(0755,root,root) %{_sysconfdir}/dcdbsync
-%config(noreplace) %attr(-, root, root) %{_sysconfdir}/dcdbsync/dcdbsync.conf
-%dir %attr(0755,root,root) /usr/lib/ocf/resource.d/openstack
-%defattr(-,root,root,-)
-/usr/lib/ocf/resource.d/openstack/dcdbsync-*
-
-%pre dcorch
-getent group dcorch >/dev/null || groupadd -r --gid 173 dcorch
-getent passwd dcorch >/dev/null || \
-useradd --uid 173 -r -g dcorch -d /var/lib/dcorch -s /sbin/nologin \
--c "dcorch Daemons" dcorch
-exit 0
-
-%package wheels
-Summary: %{name} wheels
-
-%description wheels
-Contains python wheels for %{name}
-
-%files wheels
-/wheels/*
diff --git a/openstack/distributedcloud/centos/files/dcdbsync-api.service b/openstack/distributedcloud/centos/files/dcdbsync-api.service
deleted file mode 100644
index 019f1d3a..00000000
--- a/openstack/distributedcloud/centos/files/dcdbsync-api.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=DC DBsync Agent API Service
-After=syslog.target network.target postgresql.service
-
-[Service]
-Type=simple
-User=root
-ExecStart=/usr/bin/dcdbsync-api --config-file /etc/dcdbsync/dcdbsync.conf
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/distributedcloud/centos/files/dcdbsync-openstack-api.service b/openstack/distributedcloud/centos/files/dcdbsync-openstack-api.service
deleted file mode 100644
index 01ece786..00000000
--- a/openstack/distributedcloud/centos/files/dcdbsync-openstack-api.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=DC DBsync Agent API Service For Containerized Openstack
-After=syslog.target network.target postgresql.service
-
-[Service]
-Type=simple
-User=root
-ExecStart=/usr/bin/dcdbsync-api --config-file /etc/dcdbsync/dcdbsync_openstack.conf
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/distributedcloud/centos/files/dcdbsync.conf b/openstack/distributedcloud/centos/files/dcdbsync.conf
deleted file mode 100644
index 912d122a..00000000
--- a/openstack/distributedcloud/centos/files/dcdbsync.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /var/run/dcdbsync 0755 root root -
diff --git a/openstack/distributedcloud/centos/files/dcmanager-api.service b/openstack/distributedcloud/centos/files/dcmanager-api.service
deleted file mode 100644
index 6aca790c..00000000
--- a/openstack/distributedcloud/centos/files/dcmanager-api.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=DC Manager API Service
-After=syslog.target network.target mysqld.service
-
-[Service]
-Type=simple
-# TODO(Bart): what user to use?
-User=root
-ExecStart=/usr/bin/dcmanager-api --config-file /etc/dcmanager/dcmanager.conf
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/distributedcloud/centos/files/dcmanager-manager.service b/openstack/distributedcloud/centos/files/dcmanager-manager.service
deleted file mode 100644
index d2575bd5..00000000
--- a/openstack/distributedcloud/centos/files/dcmanager-manager.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=DC Manager Service
-After=syslog.target network.target mysqld.service openstack-keystone.service
-
-[Service]
-Type=simple
-# TODO(Bart): What user?
-User=root
-ExecStart=/usr/bin/dcmanager-manager --config-file /etc/dcmanager/dcmanager.conf
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/distributedcloud/centos/files/dcmanager.conf b/openstack/distributedcloud/centos/files/dcmanager.conf
deleted file mode 100644
index 87d3fa73..00000000
--- a/openstack/distributedcloud/centos/files/dcmanager.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /var/run/dcmanager 0755 root root -
diff --git a/openstack/distributedcloud/centos/files/dcorch-api.service b/openstack/distributedcloud/centos/files/dcorch-api.service
deleted file mode 100644
index 898ec0b9..00000000
--- a/openstack/distributedcloud/centos/files/dcorch-api.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=DC Manager API Service
-After=syslog.target network.target mysqld.service
-
-[Service]
-Type=simple
-# TODO(Bart): what user to use?
-User=root
-ExecStart=/usr/bin/dcorch-api --config-file /etc/dcorch/dcorch.conf
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/distributedcloud/centos/files/dcorch-cinder-api-proxy.service b/openstack/distributedcloud/centos/files/dcorch-cinder-api-proxy.service
deleted file mode 100644
index f583a509..00000000
--- a/openstack/distributedcloud/centos/files/dcorch-cinder-api-proxy.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=DC Orchestrator API Proxy Service
-After=syslog.target network.target mysqld.service
-
-[Service]
-Type=simple
-# TODO(Bart): what user to use?
-User=root
-ExecStart=/usr/bin/dcorch-api-proxy --config-file /etc/dcorch/dcorch.conf --type volume
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/distributedcloud/centos/files/dcorch-engine.service b/openstack/distributedcloud/centos/files/dcorch-engine.service
deleted file mode 100644
index 9c809954..00000000
--- a/openstack/distributedcloud/centos/files/dcorch-engine.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=DC Manager Service
-After=syslog.target network.target mysqld.service openstack-keystone.service
-
-[Service]
-Type=simple
-# TODO(Bart): What user?
-User=root
-ExecStart=/usr/bin/dcorch-engine --config-file /etc/dcorch/dcorch.conf
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/distributedcloud/centos/files/dcorch-identity-api-proxy.service b/openstack/distributedcloud/centos/files/dcorch-identity-api-proxy.service
deleted file mode 100644
index d9e915ab..00000000
--- a/openstack/distributedcloud/centos/files/dcorch-identity-api-proxy.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=DC Orchestrator API Proxy Service
-After=syslog.target network.target mysqld.service
-
-[Service]
-Type=simple
-# TODO(Bart): what user to use?
-User=root
-ExecStart=/usr/bin/dcorch-api-proxy --config-file /etc/dcorch/dcorch.conf --type identity
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/distributedcloud/centos/files/dcorch-neutron-api-proxy.service b/openstack/distributedcloud/centos/files/dcorch-neutron-api-proxy.service
deleted file mode 100644
index 086896c5..00000000
--- a/openstack/distributedcloud/centos/files/dcorch-neutron-api-proxy.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=DC Orchestrator API Proxy Service
-After=syslog.target network.target mysqld.service
-
-[Service]
-Type=simple
-# TODO(Bart): what user to use?
-User=root
-ExecStart=/usr/bin/dcorch-api-proxy --config-file /etc/dcorch/dcorch.conf --type network
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/distributedcloud/centos/files/dcorch-nova-api-proxy.service b/openstack/distributedcloud/centos/files/dcorch-nova-api-proxy.service
deleted file mode 100644
index 0a6d32e3..00000000
--- a/openstack/distributedcloud/centos/files/dcorch-nova-api-proxy.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=DC Orchestrator API Proxy Service
-After=syslog.target network.target mysqld.service
-
-[Service]
-Type=simple
-# TODO(Bart): what user to use?
-User=root
-ExecStart=/usr/bin/dcorch-api-proxy --config-file /etc/dcorch/dcorch.conf --type compute
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/distributedcloud/centos/files/dcorch-snmp.service b/openstack/distributedcloud/centos/files/dcorch-snmp.service
deleted file mode 100644
index bf30d223..00000000
--- a/openstack/distributedcloud/centos/files/dcorch-snmp.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=DC Manager SNMP Service
-After=syslog.target network.target mysqld.service
-
-[Service]
-Type=simple
-# TODO(Bart): what user to use?
-User=root
-ExecStart=/usr/bin/dcorch-snmp --config-file /etc/dcorch/dcorch.conf
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/openstack/distributedcloud/centos/files/dcorch-sysinv-api-proxy.service b/openstack/distributedcloud/centos/files/dcorch-sysinv-api-proxy.service
deleted file mode 100644
index 92b0b235..00000000
--- a/openstack/distributedcloud/centos/files/dcorch-sysinv-api-proxy.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=DC Orchestrator API Proxy Service
-After=syslog.target network.target mysqld.service
-
-[Service]
-Type=simple
-# TODO(Bart): what user to use?
-User=root
-ExecStart=/usr/bin/dcorch-api-proxy --config-file /etc/dcorch/dcorch.conf --type platform
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/distributedcloud/centos/files/dcorch.conf b/openstack/distributedcloud/centos/files/dcorch.conf
deleted file mode 100644
index 7cfc9e23..00000000
--- a/openstack/distributedcloud/centos/files/dcorch.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /var/run/dcorch 0755 root root -
diff --git a/openstack/distributedcloud/centos/stx-keystone-api-proxy.dev_docker_image b/openstack/distributedcloud/centos/stx-keystone-api-proxy.dev_docker_image
deleted file mode 100644
index cedf42b4..00000000
--- a/openstack/distributedcloud/centos/stx-keystone-api-proxy.dev_docker_image
+++ /dev/null
@@ -1,24 +0,0 @@
-BUILDER=loci
-LABEL=stx-keystone-api-proxy
-PROJECT=infra
-PROJECT_REPO=nil
-PIP_PACKAGES="
-        distributedcloud \
-        cgcs-patch \
-        tsconfig \
-        eventlet \
-        pecan \
-        SQLAlchemy \
-        pycrypto \
-        psycopg2 \
-        oslo.concurrency \
-        oslo.config \
-        oslo.db \
-        oslo.log \
-        oslo.messaging \
-        oslo.middleware \
-        oslo.policy \
-        oslo.service \
-        oslo.versionedobjects \
-        keystonemiddleware \
-        "
diff --git a/openstack/distributedcloud/centos/stx-keystone-api-proxy.stable_docker_image b/openstack/distributedcloud/centos/stx-keystone-api-proxy.stable_docker_image
deleted file mode 100644
index 1c7e46cf..00000000
--- a/openstack/distributedcloud/centos/stx-keystone-api-proxy.stable_docker_image
+++ /dev/null
@@ -1,26 +0,0 @@
-BUILDER=loci
-LABEL=stx-keystone-api-proxy
-PROJECT=infra
-PROJECT_REPO=nil
-PIP_PACKAGES="
-        distributedcloud \
-        cgcs-patch \
-        tsconfig \
-        eventlet \
-        pecan \
-        SQLAlchemy \
-        cryptography \
-        cgtsclient \
-        sysinv \
-        psycopg2 \
-        oslo.concurrency \
-        oslo.config \
-        oslo.db \
-        oslo.log \
-        oslo.messaging \
-        oslo.middleware \
-        oslo.policy \
-        oslo.service \
-        oslo.versionedobjects \
-        keystonemiddleware \
-        "