diff --git a/stage2/EXPORT_NOOBS b/stage2/EXPORT_NOOBS
deleted file mode 100644
index e69de29..0000000
diff --git a/stage3/00-install-packages/00-debconf b/stage3/00-install-packages/00-debconf
deleted file mode 100644
index 7dbd12e..0000000
--- a/stage3/00-install-packages/00-debconf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Adobe Flash Player. Copyright 1996-2015. Adobe Systems Incorporated. All Rights Reserved.
-rpi-chromium-mods	rpi-chromium-mods/adobe	note
diff --git a/stage3/00-install-packages/00-packages b/stage3/00-install-packages/00-packages
deleted file mode 100644
index 2ed3b2a..0000000
--- a/stage3/00-install-packages/00-packages
+++ /dev/null
@@ -1,10 +0,0 @@
-gstreamer1.0-x gstreamer1.0-omx gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-alsa gstreamer1.0-libav
-xpdf gtk2-engines alsa-utils
-desktop-base
-git-core rpi-update
-omxplayer
-raspberrypi-artwork
-policykit-1
-gvfs
-rfkill
-chromium-browser rpi-chromium-mods
diff --git a/stage3/00-install-packages/00-packages-nr b/stage3/00-install-packages/00-packages-nr
deleted file mode 100644
index 3915e3a..0000000
--- a/stage3/00-install-packages/00-packages-nr
+++ /dev/null
@@ -1,6 +0,0 @@
-xserver-xorg-video-fbdev xserver-xorg xinit xserver-xorg-video-fbturbo
-epiphany-browser
-lxde lxtask menu-xdg gksu
-netsurf-gtk zenity xdg-utils
-gvfs-backends gvfs-fuse
-lightdm gnome-themes-standard-data gnome-icon-theme
diff --git a/stage3/00-install-packages/01-run.sh b/stage3/00-install-packages/01-run.sh
deleted file mode 100755
index 871f4bc..0000000
--- a/stage3/00-install-packages/01-run.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash -e
-
-on_chroot << EOF
-update-alternatives --install /usr/bin/x-www-browser \
-  x-www-browser /usr/bin/chromium-browser 86
-update-alternatives --install /usr/bin/gnome-www-browser \
-  gnome-www-browser /usr/bin/chromium-browser 86
-EOF
-
diff --git a/stage3/01-tweaks/00-run.sh b/stage3/01-tweaks/00-run.sh
deleted file mode 100755
index f64961c..0000000
--- a/stage3/01-tweaks/00-run.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash -e
-
-rm -f ${ROOTFS_DIR}/etc/systemd/system/dhcpcd.service.d/wait.conf
diff --git a/stage3/prerun.sh b/stage3/prerun.sh
deleted file mode 100755
index a5ea5f4..0000000
--- a/stage3/prerun.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash -e
-if [ ! -d ${ROOTFS_DIR} ]; then
-	copy_previous
-fi
diff --git a/stage4/00-install-packages/00-debconf b/stage4/00-install-packages/00-debconf
deleted file mode 100644
index 9b65dda..0000000
--- a/stage4/00-install-packages/00-debconf
+++ /dev/null
@@ -1,4 +0,0 @@
-# Enable realtime process priority?
-jackd2  jackd/tweak_rt_limits   boolean true
-# Do you accept the Wolfram - Raspberry Pi® Bundle License Agreement?
-wolfram-engine  shared/accepted-wolfram-eula    boolean true
diff --git a/stage4/00-install-packages/00-packages b/stage4/00-install-packages/00-packages
deleted file mode 100644
index 0b5859b..0000000
--- a/stage4/00-install-packages/00-packages
+++ /dev/null
@@ -1,37 +0,0 @@
-java-common oracle-java8-jdk
-libreoffice-sdbc-hsqldb
-sonic-pi
-python idle python3-pygame python-pygame python-tk
-python3 idle3 python3-tk
-python3-pgzero
-python-serial python3-serial
-python-picamera python3-picamera
-debian-reference-en dillo x2x
-wolfram-engine
-raspberrypi-net-mods raspberrypi-ui-mods
-smartsim penguinspuzzle
-python-pip python3-pip
-python3-numpy
-pypy
-python3-pifacecommon python3-pifacedigitalio python3-pifacedigital-scratch-handler python-pifacecommon python-pifacedigitalio
-minecraft-pi python-minecraftpi
-alacarte rc-gui sense-hat
-claws-mail
-tree
-scratch nuscratch
-greenfoot bluej
-nodered
-libgl1-mesa-dri libgles1-mesa libgles2-mesa xcompmgr
-geany
-piclone
-pulseaudio-module-bluetooth
-wiringpi pigpio python-pigpio python3-pigpio raspi-gpio python-gpiozero python3-gpiozero python3-rpi.gpio
-python-spidev python3-spidev
-realvnc-vnc-server realvnc-vnc-viewer
-python-twython python3-twython
-python-smbus python3-smbus
-python-flask python3-flask
-python-picraft python3-picraft
-python3-codebug-tether python3-codebug-i2c-tether
-python-sense-emu python3-sense-emu sense-emu-tools python-sense-emu-doc
-pprompt
diff --git a/stage4/00-install-packages/00-packages-nr b/stage4/00-install-packages/00-packages-nr
deleted file mode 100644
index aac3603..0000000
--- a/stage4/00-install-packages/00-packages-nr
+++ /dev/null
@@ -1,3 +0,0 @@
-libreoffice libreoffice-gtk
-timidity
-pi-package
diff --git a/stage4/00-install-packages/01-run.sh b/stage4/00-install-packages/01-run.sh
deleted file mode 100755
index 8f215d1..0000000
--- a/stage4/00-install-packages/01-run.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash -e
-
-rm -f "${ROOTFS_DIR}/root/.vnc/private.key"
diff --git a/stage4/01-console-autologin/00-run.sh b/stage4/01-console-autologin/00-run.sh
deleted file mode 100755
index 11ee373..0000000
--- a/stage4/01-console-autologin/00-run.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash -e
-
-ln -sf /etc/systemd/system/autologin@.service ${ROOTFS_DIR}/etc/systemd/system/getty.target.wants/getty@tty1.service
diff --git a/stage4/02-extras/00-run.sh b/stage4/02-extras/00-run.sh
deleted file mode 100755
index 23df1d7..0000000
--- a/stage4/02-extras/00-run.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash -e
-
-HASH=`wget https://api.github.com/repos/KenT2/python-games/git/refs/heads/master -qO -| grep \"sha\" | cut -f 2 -d ':' | cut -f 2 -d \"`
-
-if [ -f files/python_games.hash ]; then
-	HASH_LOCAL=`cat files/python_games.hash`
-fi
-
-if [ ! -e files/python_games.tar.gz ] || [ "$HASH" != "$HASH_LOCAL"  ]; then
-	wget "https://github.com/KenT2/python-games/tarball/master" -O files/python_games.tar.gz
-	echo $HASH > files/python_games.hash
-fi
-
-ln -sf pip3 ${ROOTFS_DIR}/usr/bin/pip-3.2
-
-install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/python_games
-tar xvf files/python_games.tar.gz -C ${ROOTFS_DIR}/home/pi/python_games --strip-components=1
-chown 1000:1000 ${ROOTFS_DIR}/home/pi/python_games -Rv
-chmod +x ${ROOTFS_DIR}/home/pi/python_games/launcher.sh
-
-install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/Documents"
-install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/Documents/BlueJ Projects"
-install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/Documents/Greenfoot Projects"
-install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/Documents/Scratch Projects"
-rsync -a --chown=1000:1000 ${ROOTFS_DIR}/usr/share/doc/BlueJ/ "${ROOTFS_DIR}/home/pi/Documents/BlueJ Projects"
-rsync -a --chown=1000:1000 ${ROOTFS_DIR}/usr/share/doc/Greenfoot/ "${ROOTFS_DIR}/home/pi/Documents/Greenfoot Projects"
-rsync -a --chown=1000:1000 ${ROOTFS_DIR}/usr/share/scratch/Projects/Demos/ "${ROOTFS_DIR}/home/pi/Documents/Scratch Projects"
-
-#Alacarte fixes
-install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/.local"
-install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/.local/share"
-install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/.local/share/applications"
-install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/.local/share/desktop-directories"
diff --git a/stage4/02-extras/files/.gitignore b/stage4/02-extras/files/.gitignore
deleted file mode 100644
index 589d776..0000000
--- a/stage4/02-extras/files/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-python_games.hash
-python_games.tar.gz
diff --git a/stage4/03-cleanup/00-run.sh b/stage4/03-cleanup/00-run.sh
deleted file mode 100755
index 071a164..0000000
--- a/stage4/03-cleanup/00-run.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash -e
-
-on_chroot << EOF
-apt-get clean
-EOF
diff --git a/stage4/EXPORT_IMAGE b/stage4/EXPORT_IMAGE
deleted file mode 100644
index e69de29..0000000
diff --git a/stage4/EXPORT_NOOBS b/stage4/EXPORT_NOOBS
deleted file mode 100644
index e69de29..0000000
diff --git a/stage4/prerun.sh b/stage4/prerun.sh
deleted file mode 100755
index a5ea5f4..0000000
--- a/stage4/prerun.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash -e
-if [ ! -d ${ROOTFS_DIR} ]; then
-	copy_previous
-fi