diff --git a/unsafe-update-payload.sh b/unsafe-update-payload.sh
index bd0e942..350d214 100644
--- a/unsafe-update-payload.sh
+++ b/unsafe-update-payload.sh
@@ -1,13 +1,28 @@
 function unsafeUpdate() {
 
+	echo "Running user updates."
+
+	# Clean up after installation.
+	if [[ -f install.sh ]]; then
+		rm install.sh
+	fi
+	if [[ -d chromebook-linux ]]; then
+		rm -rf chromebook-linux
+	fi
+		
 	# Additional updates that require 'user'.
-	true
 }
 
 
 function unsafeUpdateRoot() {
+
+	echo "Running root updates."
+
 	# Handle system updates.
-	apt-get update
+	while : ; do
+		apt-get update
+		[[ $? -ne 0 ]] || break
+	done
 	apt-get -fy upgrade
 	apt-get -fy dist-upgrade
 	apt-get -fy autoremove