diff --git a/cleanup.sh b/cleanup.sh
index 3ee9e9b..27437ae 100755
--- a/cleanup.sh
+++ b/cleanup.sh
@@ -21,11 +21,23 @@ done
 sudo updatedb
 
 # Remove unused packages
-sudo apt autoremove --purge -y humanity-icon-theme snapd
+sudo apt autoremove --purge -y humanity-icon-theme snapd lxc.* lxd.*
 
 # Empty packages cache
 sudo apt clean
+sudo apt autoclean
+sudo rm -rf /var/lib/apt/lists/*
+
+# Remove mysql databases (will be recreated by stack.sh
+for db in cinder glance keystone neutron nova nova_api nova_cell0; do
+    echo "drop database $db;" | mysql -uroot -popenstack
+done
+
+# Remove log files
+sudo rm -rf /var/log/*
 
 # Zero out unused space
 dd if=/dev/zero of=~/ZERO bs=1M status=progress
+sync
 rm -rf ~/ZERO
+
diff --git a/create-training-box.sh b/create-training-box.sh
index fda5851..f0dcb26 100755
--- a/create-training-box.sh
+++ b/create-training-box.sh
@@ -15,7 +15,8 @@ VMDK=$(vboxmanage showvminfo upstream-training --machinereadable \
                   | grep SCSI-0-0 \
                   | cut -d'"' -f4)
 
-echo "Schrinking image..."
+echo "Shrinking image..."
+./dist/vmware-vdiskmanager -d "$VMDK"
 ./dist/vmware-vdiskmanager -k "$VMDK"
 
 echo "Creating Virtual Appliance..."
diff --git a/install-devstack.sh b/install-devstack.sh
index 1b702ae..2b1365e 100755
--- a/install-devstack.sh
+++ b/install-devstack.sh
@@ -6,7 +6,8 @@ REPO=$(dirname "$(readlink -f "$0")")/
 sudo mkdir /opt/devstack
 sudo chown -R "$USER:$GROUP" /opt/devstack
 
-git clone https://git.openstack.org/openstack-dev/devstack /opt/devstack
+git clone --depth=1 https://git.openstack.org/openstack-dev/devstack \
+                    /opt/devstack
 cp -ar "$REPO/files/opt" /
 
 /opt/devstack/stack.sh
diff --git a/install-gui.sh b/install-gui.sh
index 69e4d67..da1d787 100755
--- a/install-gui.sh
+++ b/install-gui.sh
@@ -3,7 +3,6 @@
 export DEBIAN_FRONTEND=noninteractive
 
 # Set up a desktop environment
-sudo apt install -y linux-image-extra-virtual
 sudo apt install -y xserver-xorg-input-evdev
 sudo apt install -y adwaita-icon-theme-full gnome-themes-standard \
                     gtk2-engines-pixbuf thunar xfce4-panel xfce4-session \