diff --git a/stage3/00-install-packages/00-packages b/stage3/00-install-packages/00-packages
deleted file mode 100644
index fe83adc..0000000
--- a/stage3/00-install-packages/00-packages
+++ /dev/null
@@ -1,8 +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
-udisks
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/01-tweaks/00-patches/01-lightdm.diff b/stage3/01-tweaks/00-patches/01-lightdm.diff
deleted file mode 100644
index b2a8c8b..0000000
--- a/stage3/01-tweaks/00-patches/01-lightdm.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: jessie-stage3/rootfs/etc/lightdm/lightdm-gtk-greeter.conf
-===================================================================
---- jessie-stage3.orig/rootfs/etc/lightdm/lightdm-gtk-greeter.conf
-+++ jessie-stage3/rootfs/etc/lightdm/lightdm-gtk-greeter.conf
-@@ -16,7 +16,7 @@
- # screensaver-timeout = Timeout (in seconds) until the screen blanks when the greeter is called as lockscreen
- # 
- [greeter]
--background=/usr/share/images/desktop-base/login-background.svg
-+background=#ffffff
- theme-name=Adwaita
- #icon-theme-name=
- #font-name=
diff --git a/stage3/01-tweaks/00-patches/series b/stage3/01-tweaks/00-patches/series
deleted file mode 100644
index e8bdcf5..0000000
--- a/stage3/01-tweaks/00-patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01-lightdm.diff
diff --git a/stage3/01-tweaks/00-run.sh b/stage3/01-tweaks/00-run.sh
deleted file mode 100755
index 0b0f1bc..0000000
--- a/stage3/01-tweaks/00-run.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash -e
-
-on_chroot sh -e - <<EOF
-update-alternatives --set libgksu-gconf-defaults /usr/share/libgksu/debian/gconf-defaults.libgksu-sudo
-update-gconf-defaults
-EOF
-
-on_chroot sh -e - <<EOF
-update-alternatives --install /usr/share/images/desktop-base/desktop-background \
-desktop-background /usr/share/raspberrypi-artwork/raspberry-pi-logo.png 100
-EOF
-
-rm -f							${ROOTFS_DIR}/etc/systemd/system/dhcpcd.service.d/wait.conf
-install -m 644 files/55-storage.pkla			${ROOTFS_DIR}/etc/polkit-1/localauthority/50-local.d/
-install -m 644 files/75source-profile		${ROOTFS_DIR}/etc/X11/Xsession.d/
diff --git a/stage3/01-tweaks/files/55-storage.pkla b/stage3/01-tweaks/files/55-storage.pkla
deleted file mode 100644
index 2428d77..0000000
--- a/stage3/01-tweaks/files/55-storage.pkla
+++ /dev/null
@@ -1,6 +0,0 @@
-[Storage Permissions]
-Identity=unix-group:plugdev
-Action=org.freedesktop.udisks.filesystem-mount;org.freedesktop.udisks.drive-eject;org.freedesktop.udisks.drive-detach;org.freedesktop.udisks.luks-unlock;org.freedesktop.udisks.inhibit-polling;org.freedesktop.udisks.drive-set-spindown
-ResultAny=yes
-ResultActive=yes
-ResultInactive=no
diff --git a/stage3/01-tweaks/files/75source-profile b/stage3/01-tweaks/files/75source-profile
deleted file mode 100644
index d93828b..0000000
--- a/stage3/01-tweaks/files/75source-profile
+++ /dev/null
@@ -1,2 +0,0 @@
-[ -f /etc/profile ] && . /etc/profile
-[ -f "$HOME/.profile" ] && . "$HOME/.profile"
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 f8b3ea4..0000000
--- a/stage4/00-install-packages/00-packages
+++ /dev/null
@@ -1,27 +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-rpi.gpio
-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
-python-gpiozero python3-gpiozero
-raspi-gpio
-libgl1-mesa-dri libgles1-mesa libgles2-mesa xcompmgr
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/01-tweaks/00-run.sh b/stage4/01-tweaks/00-run.sh
deleted file mode 100755
index 6026b5c..0000000
--- a/stage4/01-tweaks/00-run.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash -e
-
-ln -sf /etc/systemd/system/autologin@.service ${ROOTFS_DIR}/etc/systemd/system/getty.target.wants/getty@tty1.service
-
-install -v -m 644 files/40-scratch.rules ${ROOTFS_DIR}/etc/udev/rules.d/
diff --git a/stage4/01-tweaks/files/40-scratch.rules b/stage4/01-tweaks/files/40-scratch.rules
deleted file mode 100644
index 4a9ecbe..0000000
--- a/stage4/01-tweaks/files/40-scratch.rules
+++ /dev/null
@@ -1 +0,0 @@
-ATTRS{idVendor}=="0694", ATTRS{idProduct}=="0003", SUBSYSTEMS=="usb", ACTION=="add", MODE="0666", GROUP="plugdev"
diff --git a/stage4/02-extras/00-patches/0-autologin.diff b/stage4/02-extras/00-patches/0-autologin.diff
deleted file mode 100644
index 8455d65..0000000
--- a/stage4/02-extras/00-patches/0-autologin.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: jessie-stage4/rootfs/etc/lightdm/lightdm.conf
-===================================================================
---- jessie-stage4.orig/rootfs/etc/lightdm/lightdm.conf
-+++ jessie-stage4/rootfs/etc/lightdm/lightdm.conf
-@@ -114,7 +114,7 @@
- #session-setup-script=
- #session-cleanup-script=
- #autologin-guest=false
--#autologin-user=
-+autologin-user=pi
- #autologin-user-timeout=0
- #autologin-in-background=false
- #autologin-session=UNIMPLEMENTED
diff --git a/stage4/02-extras/00-patches/series b/stage4/02-extras/00-patches/series
deleted file mode 100644
index 45ef42e..0000000
--- a/stage4/02-extras/00-patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0-autologin.diff
diff --git a/stage4/02-extras/00-run.sh b/stage4/02-extras/00-run.sh
deleted file mode 100755
index a4a64ab..0000000
--- a/stage4/02-extras/00-run.sh
+++ /dev/null
@@ -1,54 +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 \"`
-HASH_LOCAL=`cat files/python_games.hash`
-
-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"
-
-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"
-
-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"
-
-install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.config
-install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.config/pcmanfm
-install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.config/pcmanfm/LXDE-pi
-install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.config/openbox
-install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.config/lxsession
-install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.themes
-install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.config/gtk-3.0
-install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.config/lxpanel
-install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/Desktop
-
-install -v -m 644 -o 1000 -g 1000 ${ROOTFS_DIR}/etc/xdg/pcmanfm/LXDE-pi/pcmanfm.conf ${ROOTFS_DIR}/home/pi/.config/pcmanfm/LXDE-pi/
-install -v -m 644 -o 1000 -g 1000 ${ROOTFS_DIR}/etc/xdg/pcmanfm/LXDE-pi/desktop-items-0.conf ${ROOTFS_DIR}/home/pi/.config/pcmanfm/LXDE-pi/
-
-install -v -m 644 -o 1000 -g 1000 ${ROOTFS_DIR}/etc/xdg/openbox/lxde-pi-rc.xml ${ROOTFS_DIR}/home/pi/.config/openbox/
-
-rsync -a --chown=1000:1000 ${ROOTFS_DIR}/etc/xdg/lxsession/LXDE-pi ${ROOTFS_DIR}/home/pi/.config/lxsession/
-rsync -a --chown=1000:1000 ${ROOTFS_DIR}/usr/share/themes/PiX ${ROOTFS_DIR}/home/pi/.themes/
-
-install -v -m 644 -o 1000 -g 1000 ${ROOTFS_DIR}/usr/share/raspi-ui-overrides/gtk.css ${ROOTFS_DIR}/home/pi/.config/gtk-3.0/
-
-install -v -m 644 -o 1000 -g 1000 ${ROOTFS_DIR}/usr/share/raspi-ui-overrides/Trolltech.conf ${ROOTFS_DIR}/home/pi/.config/
-
-install -v -m 644 -o 1000 -g 1000 ${ROOTFS_DIR}/etc/xdg/lxpanel/launchtaskbar.cfg ${ROOTFS_DIR}/home/pi/.config/lxpanel/
-rsync -a --chown=1000:1000 ${ROOTFS_DIR}/etc/xdg/lxpanel/profile/LXDE-pi ${ROOTFS_DIR}/home/pi/.config/lxpanel/
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 97bfb08..0000000
--- a/stage4/03-cleanup/00-run.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash -e
-
-on_chroot sh -e - <<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