diff --git a/bootstrap.d/15-rpi-config.sh b/bootstrap.d/15-rpi-config.sh
index 40c7ada..4328de4 100644
--- a/bootstrap.d/15-rpi-config.sh
+++ b/bootstrap.d/15-rpi-config.sh
@@ -127,8 +127,9 @@ if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then
     install_readonly "${R}/tmp/pi-bluetooth/debian/pi-bluetooth.bthelper@.service" "${ETC_DIR}/systemd/system/pi-bluetooth.bthelper@.service"
     install_readonly "${R}/tmp/pi-bluetooth/debian/pi-bluetooth.hciuart.service" "${ETC_DIR}/systemd/system/pi-bluetooth.hciuart.service"
 	
-    # Remove temporary directory
+    # Remove temporary directories
     rm -fr "${temp_dir}"
+	rm -fr "${R}"/tmp/pi-bluetooth
 	
     # Switch Pi3 Bluetooth function to use the mini-UART (ttyS0) and restore UART0/ttyAMA0 over GPIOs 14 & 15. Slow Bluetooth and slow cpu. Use /dev/ttyS0 instead of /dev/ttyAMA0
     if [ "$ENABLE_MINIUART_OVERLAY" = true ] ; then
diff --git a/bootstrap.d/43-videocore.sh b/bootstrap.d/43-videocore.sh
index b8ff518..344965c 100644
--- a/bootstrap.d/43-videocore.sh
+++ b/bootstrap.d/43-videocore.sh
@@ -50,4 +50,7 @@ if [ "$ENABLE_VIDEOCORE" = true ] ; then
 
   #back to root of scriptdir
   cd "${WORKDIR}"
+  
+  # Remove videocore sources
+  rm -fr "${R}"/tmp/userland/
 fi
diff --git a/bootstrap.d/44-nexmon_monitor_patch.sh b/bootstrap.d/44-nexmon_monitor_patch.sh
index 73faee9..514ce85 100644
--- a/bootstrap.d/44-nexmon_monitor_patch.sh
+++ b/bootstrap.d/44-nexmon_monitor_patch.sh
@@ -101,4 +101,7 @@ if [ "$ENABLE_NEXMON" = true ] && [ "$ENABLE_WIRELESS" = true ]; then
 #Revert to previous directory
 cd "${WORKDIR}" || exit
 
+# Remove nexmon sources
+rm -fr "${NEXMON_ROOT}"
+
 fi
diff --git a/functions.sh b/functions.sh
index 38ac23a..5cb348e 100644
--- a/functions.sh
+++ b/functions.sh
@@ -4,6 +4,17 @@
 cleanup (){
   set +x
   set +e
+  
+  # Remove exports from nexmon
+  unset KERNEL
+  unset ARCH
+  unset SUBARCH
+  unset CCPLUGIN
+  unset ZLIBFLATE
+  unset Q
+  unset NEXMON_SETUP_ENV
+  unset HOSTUNAME
+  unset PLATFORMUNAME
 
   # Identify and kill all processes still using files
   echo "killing processes using mount point ..."