diff --git a/centos_build_layer.cfg b/centos_build_layer.cfg
deleted file mode 100644
index c581999..0000000
--- a/centos_build_layer.cfg
+++ /dev/null
@@ -1 +0,0 @@
-flock
diff --git a/centos_iso_image.inc b/centos_iso_image.inc
deleted file mode 100644
index cbc31be..0000000
--- a/centos_iso_image.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-
-# collectd-extensions
-collectd-extensions
-
-# monitor-tools
-monitor-tools
-
-# vm-topology
-vm-topology
-
-# kube-cpusets
-kube-cpusets
-
-# kube-memory
-kube-memory
diff --git a/centos_pkg_dirs b/centos_pkg_dirs
deleted file mode 100644
index d2e83aa..0000000
--- a/centos_pkg_dirs
+++ /dev/null
@@ -1,5 +0,0 @@
-collectd-extensions
-monitor-tools
-vm-topology
-kube-cpusets
-kube-memory
diff --git a/collectd-extensions/centos/build_srpm.data b/collectd-extensions/centos/build_srpm.data
deleted file mode 100644
index 45dd4d3..0000000
--- a/collectd-extensions/centos/build_srpm.data
+++ /dev/null
@@ -1,29 +0,0 @@
-SRC_DIR="$PKG_BASE"
-
-COPY_LIST="$PKG_BASE/src/LICENSE \
-  $PKG_BASE/src/README \
-  $PKG_BASE/src/collectd.conf.pmon \
-  $PKG_BASE/src/collectd.service \
-  $PKG_BASE/src/fm_notifier.py \
-  $PKG_BASE/src/plugin_common.py \
-  $PKG_BASE/src/python_plugins.conf \
-  $PKG_BASE/src/cpu.py \
-  $PKG_BASE/src/cpu.conf \
-  $PKG_BASE/src/memory.py \
-  $PKG_BASE/src/memory.conf \
-  $PKG_BASE/src/df.conf \
-  $PKG_BASE/src/ntpq.py \
-  $PKG_BASE/src/ntpq.conf \
-  $PKG_BASE/src/interface.py \
-  $PKG_BASE/src/interface.conf \
-  $PKG_BASE/src/remotels.py \
-  $PKG_BASE/src/remotels.conf \
-  $PKG_BASE/src/ptp.py \
-  $PKG_BASE/src/ptp.conf \
-  $PKG_BASE/src/ovs_interface.py \
-  $PKG_BASE/src/ovs_interface.conf \
-  $PKG_BASE/src/example.py \
-  $PKG_BASE/src/example.conf \
-  $PKG_BASE/src/service_res.py  \
-  $PKG_BASE/src/service_res.conf"
-TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/collectd-extensions/centos/collectd-extensions.spec b/collectd-extensions/centos/collectd-extensions.spec
deleted file mode 100644
index b564279..0000000
--- a/collectd-extensions/centos/collectd-extensions.spec
+++ /dev/null
@@ -1,121 +0,0 @@
-Summary: Titanuim Server collectd Package
-Name: collectd-extensions
-Version: 1.0
-Release: 0%{?_tis_dist}.%{tis_patch_ver}
-License: ASL 2.0
-Group: base
-Packager: Wind River <info@windriver.com>
-URL: unknown
-
-# create the files tarball
-Source0: %{name}-%{version}.tar.gz
-Source1: collectd.service
-Source2: collectd.conf.pmon
-
-# collectd python plugin files - notifiers
-Source3: fm_notifier.py
-Source5: plugin_common.py
-Source6: README
-
-# collectd python plugin files - resource plugins
-Source11: cpu.py
-Source12: memory.py
-Source15: ntpq.py
-Source16: interface.py
-Source17: remotels.py
-Source18: ptp.py
-Source19: ovs_interface.py
-Source20: service_res.py
-
-# collectd plugin conf files into /etc/collectd.d
-Source100: python_plugins.conf
-Source101: cpu.conf
-Source102: memory.conf
-Source103: df.conf
-Source105: ntpq.conf
-Source106: interface.conf
-Source107: remotels.conf
-Source108: ptp.conf
-Source109: ovs_interface.conf
-Source110: service_res.conf
-
-BuildRequires: systemd-devel
-
-Requires: systemd
-Requires: collectd
-Requires: collectd-python
-Requires: fm-api
-Requires: python-httplib2
-Requires: python-oslo-concurrency
-Requires: python-oslo-utils
-Requires: tsconfig
-Requires: /bin/systemctl
-
-%description
-StarlingX collectd extensions
-
-%define debug_package %{nil}
-%define local_unit_dir %{_sysconfdir}/systemd/system
-%define local_default_plugin_dir %{_sysconfdir}/collectd.d
-%define local_starlingx_plugin_dir %{_sysconfdir}/collectd.d/starlingx
-%define local_python_extensions_dir /opt/collectd/extensions/python
-%define local_config_extensions_dir /opt/collectd/extensions/config
-
-%prep
-%setup
-
-%build
-
-%install
-install -m 755 -d %{buildroot}%{_sysconfdir}
-install -m 755 -d %{buildroot}%{local_unit_dir}
-install -m 755 -d %{buildroot}%{local_default_plugin_dir}
-install -m 755 -d %{buildroot}%{local_starlingx_plugin_dir}
-install -m 755 -d %{buildroot}%{local_config_extensions_dir}
-install -m 755 -d %{buildroot}%{local_python_extensions_dir}
-
-# support files ; service and pmon conf
-install -m 644 %{SOURCE1} %{buildroot}%{local_unit_dir}
-install -m 600 %{SOURCE2} %{buildroot}%{local_config_extensions_dir}
-
-# collectd python plugin files - notifiers
-install -m 700 %{SOURCE3} %{buildroot}%{local_python_extensions_dir}
-install -m 700 %{SOURCE5} %{buildroot}%{local_python_extensions_dir}
-
-# install README file into /etc/collectd.d
-install -m 644 %{SOURCE6} %{buildroot}%{local_default_plugin_dir}
-
-# collectd python plugin files - resource plugins
-install -m 700 %{SOURCE11} %{buildroot}%{local_python_extensions_dir}
-install -m 700 %{SOURCE12} %{buildroot}%{local_python_extensions_dir}
-install -m 700 %{SOURCE15} %{buildroot}%{local_python_extensions_dir}
-install -m 700 %{SOURCE16} %{buildroot}%{local_python_extensions_dir}
-install -m 700 %{SOURCE17} %{buildroot}%{local_python_extensions_dir}
-install -m 700 %{SOURCE18} %{buildroot}%{local_python_extensions_dir}
-install -m 700 %{SOURCE19} %{buildroot}%{local_python_extensions_dir}
-install -m 700 %{SOURCE20} %{buildroot}%{local_python_extensions_dir}
-
-
-# collectd plugin conf files into /etc/collectd.d/starlingx
-install -m 600 %{SOURCE100} %{buildroot}%{local_starlingx_plugin_dir}
-install -m 600 %{SOURCE101} %{buildroot}%{local_starlingx_plugin_dir}
-install -m 600 %{SOURCE102} %{buildroot}%{local_starlingx_plugin_dir}
-install -m 600 %{SOURCE103} %{buildroot}%{local_starlingx_plugin_dir}
-install -m 600 %{SOURCE105} %{buildroot}%{local_starlingx_plugin_dir}
-install -m 600 %{SOURCE106} %{buildroot}%{local_starlingx_plugin_dir}
-install -m 600 %{SOURCE107} %{buildroot}%{local_starlingx_plugin_dir}
-install -m 600 %{SOURCE108} %{buildroot}%{local_starlingx_plugin_dir}
-install -m 600 %{SOURCE109} %{buildroot}%{local_starlingx_plugin_dir}
-install -m 600 %{SOURCE110} %{buildroot}%{local_starlingx_plugin_dir}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root,-)
-%config(noreplace) %{local_unit_dir}/collectd.service
-%{local_default_plugin_dir}/*
-%dir %{local_starlingx_plugin_dir}
-%{local_starlingx_plugin_dir}/*
-%{local_config_extensions_dir}/*
-%{local_python_extensions_dir}/*
diff --git a/kube-cpusets/centos/build_srpm.data b/kube-cpusets/centos/build_srpm.data
deleted file mode 100644
index 8d7bf17..0000000
--- a/kube-cpusets/centos/build_srpm.data
+++ /dev/null
@@ -1,4 +0,0 @@
-PACKAGE_NAME=kube-cpusets
-VERSION=1.0
-SRC_DIR=$PKG_BASE/$PACKAGE_NAME
-TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/kube-cpusets/centos/kube-cpusets.spec b/kube-cpusets/centos/kube-cpusets.spec
deleted file mode 100644
index f9dc613..0000000
--- a/kube-cpusets/centos/kube-cpusets.spec
+++ /dev/null
@@ -1,67 +0,0 @@
-%global pypi_name kube-cpusets
-
-Summary: Display kubernetes containers cpusets per numa node
-Name: kube-cpusets
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: Apache-2.0
-Group: base
-Packager: Wind River <info@windriver.com>
-
-URL: unknown
-Source0:        %{pypi_name}-%{version}.tar.gz
-
-BuildArch:      noarch
-
-BuildRequires: python
-BuildRequires: python-setuptools
-BuildRequires: python2-pip
-BuildRequires: python2-wheel
-
-Requires: python
-Requires: python-devel
-Requires: /usr/bin/env
-Requires: /bin/bash
-
-%define debug_package %{nil}
-
-%description
-Display kubernetes containers cpusets per numa node
-
-%define pythonroot /usr/lib64/python2.7/site-packages
-
-%prep
-%autosetup -p 1 -n %{pypi_name}-%{version}
-# Remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
-# Let RPM handle the dependencies
-rm -f requirements.txt
-rm -f test-requirements.txt
-
-%build
-%{__python2} setup.py build
-%py2_build_wheel
-
-%install
-%{__python2} setup.py install --skip-build --root %{buildroot}
-mkdir -p $RPM_BUILD_ROOT/wheels
-install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/
-
-%files
-%defattr(-,root,root,-)
-%doc LICENSE
-%{_bindir}/kube-cpusets
-%{python2_sitelib}/kube_cpusets
-%{python2_sitelib}/*.egg-info
-
-%package wheels
-Summary: %{name} wheels
-
-%description wheels
-Contains python wheels for %{name}
-
-%files wheels
-/wheels/*
-
-%clean
-rm -rf $RPM_BUILD_ROOT
diff --git a/kube-memory/centos/build_srpm.data b/kube-memory/centos/build_srpm.data
deleted file mode 100644
index 7cde07e..0000000
--- a/kube-memory/centos/build_srpm.data
+++ /dev/null
@@ -1,4 +0,0 @@
-PACKAGE_NAME=kube-memory
-VERSION=1.0
-SRC_DIR=$PKG_BASE/$PACKAGE_NAME
-TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/kube-memory/centos/kube-memory.spec b/kube-memory/centos/kube-memory.spec
deleted file mode 100644
index 7eac184..0000000
--- a/kube-memory/centos/kube-memory.spec
+++ /dev/null
@@ -1,71 +0,0 @@
-%global pypi_name kube-memory
-
-Summary: Display services and kubernetes containers memory usage
-Name: kube-memory
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: Apache-2.0
-Group: base
-Packager: Wind River <info@windriver.com>
-
-URL: unknown
-Source0:        %{pypi_name}-%{version}.tar.gz
-
-BuildArch:      noarch
-
-BuildRequires: python
-BuildRequires: python-setuptools
-BuildRequires: python2-pip
-BuildRequires: python2-wheel
-
-Requires: python
-Requires: python-devel
-Requires: /usr/bin/env
-Requires: /bin/bash
-
-%define debug_package %{nil}
-
-%description
-Display services and kubernetes containers memory usage
-
-%define pythonroot /usr/lib64/python2.7/site-packages
-
-%prep
-%autosetup -p 1 -n %{pypi_name}-%{version}
-# Remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
-# Let RPM handle the dependencies
-rm -f requirements.txt
-rm -f test-requirements.txt
-
-%build
-%{__python2} setup.py build
-%py2_build_wheel
-
-%install
-%{__python2} setup.py install --skip-build --root %{buildroot}
-mkdir -p $RPM_BUILD_ROOT/wheels
-install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/
-mkdir -p %{buildroot}
-install -d 755 -d %{buildroot}%{_sysconfdir}/collect.d
-install -m 755 collect_kube_memory.sh %{buildroot}%{_sysconfdir}/collect.d/collect_kube_memory
-
-%files
-%defattr(-,root,root,-)
-%doc LICENSE
-%{_bindir}/kube-memory
-%{python2_sitelib}/kube_memory
-%{python2_sitelib}/*.egg-info
-%{_sysconfdir}/collect.d/*
-
-%package wheels
-Summary: %{name} wheels
-
-%description wheels
-Contains python wheels for %{name}
-
-%files wheels
-/wheels/*
-
-%clean
-rm -rf $RPM_BUILD_ROOT
diff --git a/monitor-tools/centos/build_srpm.data b/monitor-tools/centos/build_srpm.data
deleted file mode 100644
index 617479c..0000000
--- a/monitor-tools/centos/build_srpm.data
+++ /dev/null
@@ -1,2 +0,0 @@
-SRC_DIR=scripts
-TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/monitor-tools/centos/monitor-tools.spec b/monitor-tools/centos/monitor-tools.spec
deleted file mode 100644
index 84322e0..0000000
--- a/monitor-tools/centos/monitor-tools.spec
+++ /dev/null
@@ -1,42 +0,0 @@
-Summary: Monitor tools package
-Name: monitor-tools
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: Apache-2.0
-Group: base
-Packager: Wind River <info@windriver.com>
-URL: unknown
-BuildArch: noarch
-Source: %name-%version.tar.gz
-
-Requires: initscripts-config
-
-%description
-This package contains data collection tools to monitor host performance.
-Tools are general purpose engineering and debugging related. Includes
-overall memory, cpu occupancy, per-task cpu, per-task scheduling, per-task
-io.
-
-%prep
-%autosetup
-
-%install
-rm -rf $RPM_BUILD_ROOT 
-%global _buildsubdir %{_builddir}/%{name}-%{version}
-install -d %{buildroot}/usr/bin
-install %{_buildsubdir}/memtop %{buildroot}/usr/bin
-install %{_buildsubdir}/schedtop %{buildroot}/usr/bin
-install %{_buildsubdir}/occtop %{buildroot}/usr/bin
-
-%files
-%license LICENSE
-%defattr(-,root,root,-)
-/usr/bin/*
-
-%post
-grep schedstats /etc/sysctl.conf
-if [ $? -ne 0 ]; then
-  echo -e "\nkernel.sched_schedstats=1" >> /etc/sysctl.conf
-  sysctl -p &>/dev/null
-fi
-exit 0
diff --git a/vm-topology/centos/build_srpm.data b/vm-topology/centos/build_srpm.data
deleted file mode 100644
index 06d3d1c..0000000
--- a/vm-topology/centos/build_srpm.data
+++ /dev/null
@@ -1,4 +0,0 @@
-PACKAGE_NAME=vm-topology
-VERSION=1.0
-SRC_DIR=$PKG_BASE/$PACKAGE_NAME
-TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/vm-topology/centos/vm-topology.spec b/vm-topology/centos/vm-topology.spec
deleted file mode 100644
index d844a4d..0000000
--- a/vm-topology/centos/vm-topology.spec
+++ /dev/null
@@ -1,61 +0,0 @@
-%global pypi_name vm-topology
-
-Summary: vm_topology
-Name: vm-topology
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: Apache-2.0
-Group: base
-Packager: Wind River <info@windriver.com>
-
-URL: unknown
-Source0:        %{pypi_name}-%{version}.tar.gz
-
-BuildArch:      noarch
-
-BuildRequires: python
-BuildRequires: python-setuptools
-BuildRequires: python2-pip
-BuildRequires: python2-wheel
-BuildRequires: python-keyring
-BuildRequires: libvirt
-
-Requires: python
-Requires: python-keyring
-Requires: /usr/bin/env
-Requires: libvirt
-
-%description
-Show compute resources and VM topology
-
-%prep
-%autosetup -p 1 -n %{pypi_name}-%{version}
-# Remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
-# Let RPM handle the dependencies
-rm -f requirements.txt
-
-%build
-%{__python2} setup.py build
-%py2_build_wheel
-
-%install
-%{__python2} setup.py install --skip-build --root %{buildroot}
-mkdir -p $RPM_BUILD_ROOT/wheels
-install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/
-
-%files
-%defattr(-,root,root,-)
-%license LICENSE
-%{_bindir}/vm-topology
-%{python2_sitelib}/vm_topology
-%{python2_sitelib}/*.egg-info
-
-%package wheels
-Summary: %{name} wheels
-
-%description wheels
-Contains python wheels for %{name}
-
-%files wheels
-/wheels/*