diff --git a/common/ubuntu_cleanup.sh b/common/ubuntu_cleanup.sh
index 4eb9c7f..919f64a 100644
--- a/common/ubuntu_cleanup.sh
+++ b/common/ubuntu_cleanup.sh
@@ -2,9 +2,11 @@
 
 apt-get -y autoremove --purge
 apt-get -y clean
-rm -rf /var/lib/apt/lists/*
 
-rm -f /usr/sbin/policy-rc.d || true
+rm -rf /var/lib/apt/lists/*
+rm -rv /etc/apt/sources.list.d/* || true
+echo > /etc/apt/sources.list  || true
+rm -vf /usr/sbin/policy-rc.d || true
 
 echo "cleaning up hostname"
 sed -i "/.*ubuntu.*/d" /etc/hosts
@@ -15,19 +17,23 @@
 
 echo "cleaning up dhcp leases"
 rm -rf /var/lib/dhcp/* || true
-rm -rf /var/lib/ntp/ntp.conf.dhcp || true
+rm -rfv /var/lib/ntp/ntp.conf.dhcp || true
 
 echo "cleaning up udev rules"
-rm -f /etc/udev/rules.d/70-persistent-net.rules || true
+rm -fv /etc/udev/rules.d/70-persistent-net.rules || true
 rm -rf /dev/.udev/ || true
-rm -f /lib/udev/rules.d/75-persistent-net-generator.rules || true
+rm -fv /lib/udev/rules.d/75-persistent-net-generator.rules || true
 
 echo "cleaning up minion_id for salt"
-rm -f /etc/salt/minion_id || true
+rm -vf /etc/salt/minion_id || true
 
 echo "cleaning up resolvconf"
 sed -i '/172\.18\.208\.44/d' /etc/resolvconf/resolv.conf.d/base
 
+# Remove flags
+rm -v /done_ubuntu_base || true
+rm -v /done_ubuntu_salt_bootstrap || true
+
 # Clear\drop cache's
 sync
 echo 3 > /proc/sys/vm/drop_caches