diff --git a/classes/stx-postrun.bbclass b/classes/stx-postrun.bbclass
index eccd087..801a44a 100644
--- a/classes/stx-postrun.bbclass
+++ b/classes/stx-postrun.bbclass
@@ -1,98 +1,14 @@
 # This class is intended to include workarounds and finetuning of the rootfs
 # Most of the stuff in here needs to go else where.
 
-#ROOTFS_POSTPROCESS_COMMAND_append = " stx_postprocess_rootfs;"
-ETHDEV = "enp0s4"
+ROOTFS_POSTPROCESS_COMMAND_append = " stx_postprocess_rootfs;"
+# ETHDEV = "enp0s5"
 
 stx_postprocess_rootfs() {
 
-	# Fix permission issues in python-httpretty
-	chmod -R go+r ${IMAGE_ROOTFS}/usr/lib/python2.7/site-packages/httpretty-0.9.5-py2.7.egg-info
-
-	# Fix paths
-	ln -s /bin/systemctl ${IMAGE_ROOTFS}/${bindir}
-
-	sed -i -e 's/^\(ExecStartPre.*gencert.sh\)/#\1/g' ${IMAGE_ROOTFS}/lib/systemd/system/haproxy.service
-	mkdir -p ${IMAGE_ROOTFS}/usr/share/haproxy
-
-	sed -i -e 's/^physical_.*:eth0/physical_interface_mappings = provider:${ETHDEV}/g' \
-		${IMAGE_ROOTFS}/etc/neutron/plugins/ml2/linuxbridge_agent.ini
-	sed -i -e '/^l .*resolv.conf$/d' ${IMAGE_ROOTFS}/etc/default/volatiles/00_core
-	sed -i -e '/^f .*resolv.conf none$/d' ${IMAGE_ROOTFS}/etc/default/volatiles/00_core
-
-	for srv in $(echo lighttpd kubelet cinder-init glance-api glance-init glance-registry \
-			neutron-init nova-compute nova-consoleauth nova-console nova-init nova-network \
-			nova-xvpvncproxy nova-spicehtml5proxy openvswitch \
-			registry-token-server)
-	do
-		rm -f ${IMAGE_ROOTFS}/etc/systemd/system/multi-user.target.wants/$srv.service
-		ln -s /dev/null ${IMAGE_ROOTFS}/etc/systemd/system/multi-user.target.wants/$srv.service
-	done
-	chown etcd:etcd ${IMAGE_ROOTFS}/var/lib/etcd
-
-	echo 'sysadmin ALL=(ALL) NOPASSWD:ALL' >> ${IMAGE_ROOTFS}/etc/sudoers
-
-	CPWD=$(pwd)
-	cd ${IMAGE_ROOTFS}/etc/rc.d/init.d
-	for srv in $(echo hbsAgent hbsClient runservices mtclog mtcalarm mtcClient \
-			pmon hwmon hostw lmon guestAgent guestServer fm-api \
-			drbd \
-			)
-	do
-		rm -f $srv
-		ln -s /etc/init.d/$srv .
-		sed -i -e 's:^DAEMON="/usr/local/bin:DAEMON="/usr/bin:g' ../../init.d/$srv
-	done
-	cd $CPWD
-
-	# OpenLdap:
-	# To avoid install conflicts, we need to post run a number of 
-	# commands. But openldap packages are getting renamed to libldap-. 
-	# Consequently pkg_postinstall_ontarget_openldap-config fails. 
-	# So this here is really a hack to get the build moving forward. 
-	# Lastly, we need to take a look at the right user and group
-	# permission settings
-
-	cp ${IMAGE_ROOTFS}/usr/share/starlingx/slapd.service ${IMAGE_ROOTFS}/lib/systemd/system/slapd.service
-	cp ${IMAGE_ROOTFS}/usr/share/starlingx/slapd.sysconfig ${IMAGE_ROOTFS}/etc/sysconfig/slapd
-
-	chmod 644 ${IMAGE_ROOTFS}//lib/systemd/system/slapd.service
-	chmod 644 ${IMAGE_ROOTFS}/etc/openldap/*
-	chmod 755 ${IMAGE_ROOTFS}/etc/openldap
-	chmod 755 ${IMAGE_ROOTFS}/etc/openldap/slapd.d
-	chmod 755 ${IMAGE_ROOTFS}/etc/openldap/schema
-
-
-
-	# Issue 11  etcd:
-	# Once the ansible-playbook runs it resets ETCD_DATA_DIR to
-	# /opt/etcd/19.01/controller.etcd in /etc/etcd/etcd.conf
-	# This directory does not exist and consequently etcd fails to 
-	# start. This is a workaround. The actual fix is why does it fail
-	# to create the directory and fix it there.
-
-	mkdir -p ${IMAGE_ROOTFS}/opt/etcd
-	chown etcd:etcd ${IMAGE_ROOTFS}/opt/etcd
-
-	# keystone hacks
-	# Fix python packages' permissions
-	find ${IMAGE_ROOTFS}/${libdir}/python2.7/site-packages/ -name PKG-INFO -exec chmod 644 {} +
-	chmod 644 ${IMAGE_ROOTFS}/${libdir}/python2.7/site-packages/docker_registry_core-2.0.3-py2.7.egg-info/namespace_packages.txt
-	mv ${IMAGE_ROOTFS}/lib/systemd/system/apache2.service ${IMAGE_ROOTFS}/lib/systemd/system/openstack-keystone.service
-	rm -f ${IMAGE_ROOTFS}/etc/systemd/system/multi-user.target.wants/apache2.service
-
-	# Puppet
-	sed -i -e 's:puppet apply : puppet apply --hiera_config=/etc/puppet/hiera.yaml :g' ${IMAGE_ROOTFS}/usr/bin/puppet-manifest-apply.sh 
-
-	# Puppet postgresql
-	mkdir ${IMAGE_ROOTFS}/usr/local/bin
-	rm -f ${IMAGE_ROOTFS}/etc/systemd/system/multi-user.target.wants/postgresql-init.service
-	rm -f ${IMAGE_ROOTFS}/etc/systemd/system/multi-user.target.wants/postgresql.service
-	rm -f ${IMAGE_ROOTFS}/etc/systemd/system/multi-user.target.wants/keystone-init.service
-
-	# We will remove this. Problem is that the puppet modules call service instead of systemctl
-	# This workaround is to be removed and the actual fix is in the puppet modules.
-
+#	# We will remove this. Problem is that the puppet modules call service instead of systemctl
+#	# This workaround is to be removed and the actual fix is in the puppet modules.
+#
 	cat > ${IMAGE_ROOTFS}/usr/bin/service << \EOF
 #!/bin/bash
 
@@ -105,66 +21,4 @@ fi
 systemctl $command $service_name
 EOF
 	chmod 755 ${IMAGE_ROOTFS}/usr/bin/service
-	# Fake being redhat for dev purpose only. This must be removed 
-	cat > ${IMAGE_ROOTFS}/etc/redhat-release << \EOF
-CentOS Linux release 7.3.1611 (Core)
-EOF
-
-	cat > ${IMAGE_ROOTFS}/etc/build.info << \EOF
-OS="poky"
-SW_VERSION="19.01"
-BUILD_TARGET="Host Installer"
-BUILD_TYPE="Formal"
-BUILD_ID="r/stx.2.0"
-
-JOB="STX_BUILD_2.0"
-BUILD_BY="starlingx.build@cengn.ca"
-BUILD_NUMBER="40"
-BUILD_HOST="starlingx_mirror"
-BUILD_DATE="2019-08-26 23:30:00 +0000"
-EOF
-
-	mkdir -p ${IMAGE_ROOTFS}/etc/platform/
-	cat > ${IMAGE_ROOTFS}/etc/platform/platform.conf << \EOF
-nodetype=controller
-subfunction=controller,worker,lowlatency
-system_type=All-in-one
-security_profile=standard
-management_interface=lo
-http_port=8080
-INSTALL_UUID=d0bb64fe-fb55-4996-8382-ce5fd4aa251c
-UUID=e4939a75-c84f-48b5-ad49-af406859d352
-sdn_enabled=no
-region_config=no
-system_mode=simplex
-sw_version=19.08
-security_feature="nopti nospectre_v2"
-vswitch_type=none
-region_config=False
-cluster_host_interface=lo
-oam_interface=enp0s4
-EOF
-
-	cat > ${IMAGE_ROOTFS}/etc/keystone/password-rules.conf << \EOF
-
-[security_compliance]
-
-
-unique_last_password_count = 2
-
-
-password_regex = ^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[!@#$%^&*()<>{}+=_\\\[\]\-?|~`,.;:]).{7,}$
-
-
-password_regex_description = Password must have a minimum length of 7 characters, and must contain at least 1 upper case, 1 lower case, 1 digit, and 1 special character'
-EOF
-
-	cat > ${IMAGE_ROOTFS}/home/root/.vimrc << \EOF
-set background=dark
-set noundofile
-set nobackup
-map b : buffer
-map `r : register
-EOF
-
 }
diff --git a/recipes-core/images/stx-image-aio.bb b/recipes-core/images/stx-image-aio.bb
index 04821a6..eb5451a 100644
--- a/recipes-core/images/stx-image-aio.bb
+++ b/recipes-core/images/stx-image-aio.bb
@@ -36,7 +36,7 @@ IMAGE_FEATURES += " \
 	ssh-server-openssh \
 	"
 
-# inherit stx-postrun
+inherit stx-postrun
 inherit core-image
 inherit distro_features_check
 inherit openstack-base