diff --git a/bootstrap.sh b/bootstrap.sh
index c2a85ac..189d3ad 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -14,6 +14,13 @@
 
 cd /tmp
 
+echo "## Purging annoying crap... ##"
+
+snap remove lxd
+snap remove core18
+apt purge cloud-init
+apt autopurge
+
 
 echo "## Cloning bootstrap repo ##"
 git clone https://isgb.otago.ac.nz/infosci/git/linux_lab/bootstrap.git
@@ -26,7 +33,7 @@
 echo ${hostname}
 
 echo
-echo "About to join domain as ${hostname}"
+echo "About to set hostname to ${hostname} and run bootstrap."
 
 echo "Press Enter to continue or Ctrl+c to abort"
 
@@ -44,6 +51,18 @@
 
 RUBYOPT='-W0' puppet apply --modulepath ${MODULE_PATH} ${SITE_PATH}
 
+echo
+echo "## Cleaning up... ##"
+
+cd ..
+rm -rf /tmp/bootstrap
+
+echo
+echo "## Done. ##"
+
+exit
+
+
 user=$(sed -n 1p ${BASE_PATH}/domain_sekrit)
 domain=$(sed -n 2p ${BASE_PATH}/domain_sekrit)
 pass=$(sed -n 3p ${BASE_PATH}/domain_sekrit)
@@ -57,14 +76,15 @@
 echo ${pass} | realm join --verbose --user=${user} ${domain}
 
 echo
-echo "## Running bootstrap via puppet again (to correct changes made as a result of domain join) ... ##"
-RUBYOPT='-W0' puppet apply --modulepath ${MODULE_PATH} ${SITE_PATH}
+#echo "## Running bootstrap via puppet again (to correct changes made as a result of domain join) ... ##"
+# RUBYOPT='-W0' puppet apply --modulepath ${MODULE_PATH} ${SITE_PATH}
 
 echo
 echo "## Cleaning up... ##"
 
-cd ..
-rm -rf /tmp/bootstrap
+#cd ..
+#rm -rf /tmp/bootstrap
 
 echo
 echo "## Done. ##"
+