diff --git a/bin/install_hyperion.new.sh b/bin/install_hyperion.new.sh
deleted file mode 100755
index 09ecb6c5..00000000
--- a/bin/install_hyperion.new.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-# Script for downloading and installing the latest Hyperion release
-
-# Find out if we are on XBian
-IS_XBIAN=`cat /etc/issue | grep XBian | wc -l`
-
-# Make sure that the boblight daemon is no longer running
-BOBLIGHT_PROCNR=$(ps -e | grep "boblight" | wc -l)
-if [ $BOBLIGHT_PROCNR -eq 1 ];
-then
-	echo 'Found running instance of boblight. Please stop boblight via XBMC menu before installing hyperion'
-	exit
-fi
-
-# Stop hyperion daemon if it is running
-/sbin/initctl stop hyperion
-
-# Get and extract the Hyperion binaries and effects to /opt
-wget https://raw.github.com/tvdzwan/hyperion/master/deploy/hyperion.tar.gz -O - | tar -C /opt -xz
-
-# create links to the binaries
-ln -fs /opt/hyperion/bin/hyperiond /usr/bin/hyperiond
-ln -fs /opt/hyperion/bin/hyperion-remote /usr/bin/hyperion-remote
-
-# create link to the gpio changer (gpio->spi)
-if [ $IS_XBIAN -eq 0 ]; then
-	ln -fs /opt/hyperion/bin/gpio2spi /usr/bin/gpio2spi
-fi
-
-# Copy a link to the hyperion configuration file to /etc
-ln -s /opt/hyperion/config/hyperion.config.json /etc/hyperion.config.json
-
-# Copy the service control configuration to /etc/int
-if [ $IS_XBIAN -eq 0 ]; then
-	wget -N https://raw.github.com/tvdzwan/hyperion/master/deploy/hyperion.conf -P /etc/init/
-else
-	wget -N https://raw.github.com/tvdzwan/hyperion/master/deploy/hyperion.xbian.conf -O /etc/init/hyperion.conf
-fi
-
-# Start the hyperion daemon
-/sbin/initctl start hyperion
diff --git a/bin/install_hyperion.sh b/bin/install_hyperion.sh
index a0d6bd5c..09ecb6c5 100755
--- a/bin/install_hyperion.sh
+++ b/bin/install_hyperion.sh
@@ -16,28 +16,26 @@ fi
 # Stop hyperion daemon if it is running
 /sbin/initctl stop hyperion
 
-# Get the Hyperion executable
-wget -N github.com/tvdzwan/hyperion/raw/master/deploy/hyperiond -P /usr/bin/
-chmod +x /usr/bin/hyperiond
+# Get and extract the Hyperion binaries and effects to /opt
+wget https://raw.github.com/tvdzwan/hyperion/master/deploy/hyperion.tar.gz -O - | tar -C /opt -xz
 
-# Get the Hyperion command line utility
-wget -N github.com/tvdzwan/hyperion/raw/master/deploy/hyperion-remote -P /usr/bin/
-chmod +x /usr/bin/hyperion-remote
+# create links to the binaries
+ln -fs /opt/hyperion/bin/hyperiond /usr/bin/hyperiond
+ln -fs /opt/hyperion/bin/hyperion-remote /usr/bin/hyperion-remote
 
-# Copy the gpio changer (gpio->spi) to the /usr/bin
+# create link to the gpio changer (gpio->spi)
 if [ $IS_XBIAN -eq 0 ]; then
-	wget -N github.com/tvdzwan/hyperion/raw/master/deploy/gpio2spi -P /usr/bin/
-	chmod +x /usr/bin/gpio2spi
+	ln -fs /opt/hyperion/bin/gpio2spi /usr/bin/gpio2spi
 fi
 
-# Copy the hyperion configuration file to /etc
-wget -N github.com/tvdzwan/hyperion/raw/master/config/hyperion.config.json -P /etc/
+# Copy a link to the hyperion configuration file to /etc
+ln -s /opt/hyperion/config/hyperion.config.json /etc/hyperion.config.json
 
 # Copy the service control configuration to /etc/int
 if [ $IS_XBIAN -eq 0 ]; then
-	wget -N github.com/tvdzwan/hyperion/raw/master/deploy/hyperion.conf -P /etc/init/
+	wget -N https://raw.github.com/tvdzwan/hyperion/master/deploy/hyperion.conf -P /etc/init/
 else
-	wget -N github.com/tvdzwan/hyperion/raw/master/deploy/hyperion.xbian.conf -O /etc/init/hyperion.conf
+	wget -N https://raw.github.com/tvdzwan/hyperion/master/deploy/hyperion.xbian.conf -O /etc/init/hyperion.conf
 fi
 
 # Start the hyperion daemon
diff --git a/bin/update_hyperion.sh b/bin/update_hyperion.sh
deleted file mode 100755
index 8e1996b5..00000000
--- a/bin/update_hyperion.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-# Script for downloading and installing the latest Hyperion release
-
-# Find out if we are on XBian
-IS_XBIAN=`cat /etc/issue | grep XBian | wc -l`
-
-# Make sure that the boblight daemon is no longer running
-BOBLIGHT_PROCNR=$(ps -e | grep "boblight" | wc -l)
-if [ $BOBLIGHT_PROCNR -eq 1 ];
-then
-	echo 'Found running instance of boblight. Please stop boblight via XBMC menu before installing hyperion'
-	exit
-fi
-
-# Stop hyperion daemon if it is running
-/sbin/initctl stop hyperion
-
-# Get the Hyperion executable
-wget -N github.com/tvdzwan/hyperion/raw/master/deploy/hyperiond -P /usr/bin/
-chmod +x /usr/bin/hyperiond
-
-# Get the Hyperion command line utility
-wget -N github.com/tvdzwan/hyperion/raw/master/deploy/hyperion-remote -P /usr/bin/
-chmod +x /usr/bin/hyperion-remote
-
-# Copy the gpio changer (gpio->spi) to the /usr/bin
-if [ $IS_XBIAN -eq 0 ]; then
-	wget -N github.com/tvdzwan/hyperion/raw/master/deploy/gpio2spi -P /usr/bin/
-	chmod +x /usr/bin/gpio2spi
-fi
-
-# Copy the service control configuration to /etc/int
-if [ $IS_XBIAN -eq 0 ]; then
-	wget -N github.com/tvdzwan/hyperion/raw/master/deploy/hyperion.conf -P /etc/init/
-else
-	wget -N github.com/tvdzwan/hyperion/raw/master/deploy/hyperion.xbian.conf -P /etc/init/ -O hyperion.conf
-fi
-
-# Start the hyperion daemon
-/sbin/initctl start hyperion
diff --git a/deploy/dispmanx2png b/deploy/dispmanx2png
deleted file mode 100755
index deff3974..00000000
Binary files a/deploy/dispmanx2png and /dev/null differ
diff --git a/deploy/gpio2spi b/deploy/gpio2spi
deleted file mode 100755
index f999003f..00000000
Binary files a/deploy/gpio2spi and /dev/null differ
diff --git a/deploy/hyperion-remote b/deploy/hyperion-remote
deleted file mode 100755
index 2d4a01e9..00000000
Binary files a/deploy/hyperion-remote and /dev/null differ
diff --git a/deploy/hyperiond.REMOVED.git-id b/deploy/hyperiond.REMOVED.git-id
deleted file mode 100644
index b969c543..00000000
--- a/deploy/hyperiond.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-cb10b0acda414c8d57cd1cc1bf49c48c142ec6b8
\ No newline at end of file