diff --git a/export-noobs/00-release/files/release_notes.txt b/export-noobs/00-release/files/release_notes.txt
index 8137e34..fe247be 100644
--- a/export-noobs/00-release/files/release_notes.txt
+++ b/export-noobs/00-release/files/release_notes.txt
@@ -1,6 +1,8 @@
 UNRELEASED:
   * Set default timezone to 'Europe/London'
   * Add all extra packages back - Mathematica, BlueJ, Greenfoot, NodeRED, Claws Mail and VNC Viewer
+  * Remove python-games from the cutdown Raspbian image.
+  * Instal Libreoffice with with all recommended packages
 2018-10-09:
   * In startup wizard, assign keyboard to country as per Debian installer recommendations
   * In startup wizard, add option to use US keyboard in preference to country-specific option
diff --git a/stage4/02-extras/00-run.sh b/stage4/02-extras/00-run.sh
index 08c6c1e..bd24ad8 100755
--- a/stage4/02-extras/00-run.sh
+++ b/stage4/02-extras/00-run.sh
@@ -1,23 +1,5 @@
 #!/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"
-
 #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"
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/stage5/00-install-extras/00-packages b/stage5/00-install-extras/00-packages
index a79d71e..23e682c 100644
--- a/stage5/00-install-extras/00-packages
+++ b/stage5/00-install-extras/00-packages
@@ -11,3 +11,5 @@ claws-mail
 greenfoot bluej
 nodered
 realvnc-vnc-viewer
+
+python-games
diff --git a/stage5/00-install-libreoffice/01-packages b/stage5/00-install-libreoffice/00-packages
similarity index 65%
rename from stage5/00-install-libreoffice/01-packages
rename to stage5/00-install-libreoffice/00-packages
index 5d1e076..148e7b9 100644
--- a/stage5/00-install-libreoffice/01-packages
+++ b/stage5/00-install-libreoffice/00-packages
@@ -1,3 +1,3 @@
-libreoffice-sdbc-hsqldb
+libreoffice-pi
 libreoffice-help-en-gb
 libreoffice-l10n-en-gb
diff --git a/stage5/00-install-libreoffice/00-packages-nr b/stage5/00-install-libreoffice/00-packages-nr
deleted file mode 100644
index 0249e8e..0000000
--- a/stage5/00-install-libreoffice/00-packages-nr
+++ /dev/null
@@ -1 +0,0 @@
-libreoffice-pi