diff --git a/bin/create_all_releases.sh b/bin/create_all_releases.sh
index 0f489841..cf3991e1 100755
--- a/bin/create_all_releases.sh
+++ b/bin/create_all_releases.sh
@@ -10,9 +10,9 @@ make_release()
 	PLATFORM=$2
 	shift 2
 
-	rm -r build-${RELEASE}
+	rm -rf build-${RELEASE}
 	mkdir -p build-${RELEASE}
-	rm -r deploy/${RELEASE}
+	rm -rf deploy/${RELEASE}
 	mkdir -p deploy/${RELEASE}
 
 	cd  build-${RELEASE}
diff --git a/bin/install_hyperion.sh b/bin/install_hyperion.sh
deleted file mode 100755
index 5903e416..00000000
--- a/bin/install_hyperion.sh
+++ /dev/null
@@ -1,348 +0,0 @@
-#!/bin/sh
-# Script for downloading and installing the latest Hyperion release
-
-# Make sure /sbin is on the path (for service to find sub scripts)
-PATH="/sbin:$PATH"
-
-#Check which arguments are used
-if [ "$1" = "HyperConInstall" ] || [ "$2" = "HyperConInstall" ]; then
-	HCInstall=1
-else HCInstall=0
-fi
-if [ "$1" = "BETA" ] || [ "$2" = "BETA" ]; then
-	BETA=1
-else BETA=0
-fi
-
-#Check, if script is running as root
-if [ $(id -u) != 0 ]; then
-		echo '---> Critical Error: Please run the script as root (sudo sh ./install_hyperion.sh) -> abort' 
-		exit 1
-fi
-
-#Set welcome message
-if [ $BETA -eq 1 ]; then
-	WMESSAGE="echo This script will update Hyperion to the latest BETA"
-else WMESSAGE="echo This script will install/update Hyperion Ambient Light"
-fi
-
-#Welcome message
-echo '*******************************************************************************' 
-$WMESSAGE 
-echo 'Created by brindosch - hyperion-project.org - the official Hyperion source.' 
-echo '*******************************************************************************'
-
-# Find out if we are on OpenElec (Rasplex) / OSMC / Raspbian
-OS_OPENELEC=`grep -m1 -c 'OpenELEC\|RasPlex\|LibreELEC' /etc/issue`
-OS_LIBREELEC=`grep -m1 -c LibreELEC /etc/issue`
-OS_RASPLEX=`grep -m1 -c RasPlex /etc/issue`
-OS_OSMC=`grep -m1 -c OSMC /etc/issue`
-OS_RASPBIAN=`grep -m1 -c 'Raspbian\|RetroPie' /etc/issue`
-
-# Find out which device this script runs on
-CPU_RPI=`grep -m1 -c 'BCM2708\|BCM2709\|BCM2710' /proc/cpuinfo`
-CPU_IMX6=`grep -m1 -c i.MX6 /proc/cpuinfo`
-CPU_WETEK=`grep -m1 -c Amlogic /proc/cpuinfo`
-CPU_X32X64=`uname -m | grep 'x86_32\|i686\|x86_64' | wc -l`
-# Check that we have a known configuration
-if [ $CPU_RPI -ne 1 ] && [ $CPU_IMX6 -ne 1 ] && [ $CPU_WETEK -ne 1 ] && [ $CPU_X32X64 -ne 1 ]; then
-	echo '---> Critical Error: CPU information does not match any known releases -> abort'
-	exit 1
-fi
-
-#Check which RPi we are one (in case)
-RPI_1=`grep -m1 -c BCM2708 /proc/cpuinfo`
-RPI_2=`grep -m1 -c BCM2709 /proc/cpuinfo`
-RPI_3=`grep -m1 -c BCM2710 /proc/cpuinfo`
-
-#Check, if year equals 1970
-DATE=$(date +"%Y")
-if [ "$DATE" -le "2015" ]; then
-        echo "---> Critical Error: Please update your systemtime (Year of your system: ${DATE}) -> abort"
-        exit 1
-fi
-
-# check which init script we should use
-USE_SYSTEMD=`grep -m1 -c systemd /proc/1/comm`
-USE_INITCTL=`which /sbin/initctl | wc -l`
-USE_SERVICE=`which /usr/sbin/service | wc -l`
-
-# Make sure that the boblight daemon is no longer running
-BOBLIGHT_PROCNR=$(pidof boblightd | wc -l)
-if [ $BOBLIGHT_PROCNR -eq 1 ]; then
-	echo '---> Critical Error: Found running instance of boblight. Please stop boblight via Kodi menu before installing hyperion -> abort'
-	exit 1
-fi
-
-#set service script path
-SERVICEL="/usr/share/hyperion/services"
-
-# Stop hyperion daemon if it is running and set service path
-echo '---> Stop Hyperion, if necessary'
-if [ $OS_OPENELEC -eq 1 ]; then
-    killall hyperiond 2>/dev/null
-elif [ $USE_INITCTL -eq 1 ]; then
-	/sbin/initctl stop hyperion 2>/dev/null
-	SERVICEP="/etc/init"
-elif [ $USE_SYSTEMD -eq 1 ]; then
-	service hyperion stop 2>/dev/null
-	SERVICEP="/etc/systemd/system"
-	#many people installed with the official script and this just uses service, if both registered -> dead
-	/usr/sbin/service hyperion stop 2>/dev/null
-	#Bad workaround for Jessie (systemd) users that used the old official script for install
-	update-rc.d -f hyperion remove 2>/dev/null
-	rm /etc/init.d/hyperion 2>/dev/null
-elif [ $USE_SERVICE -eq 1 ]; then
-	/usr/sbin/service hyperion stop 2>/dev/null
-	SERVICEP="/etc/init.d"
-fi
-
-#Install dependencies for Hyperion and setup preperation
-if [ $OS_OPENELEC -ne 1 ]; then
-	echo '---> Install/Update Hyperion dependencies (This may take a while)'
-	apt-get -qq update && apt-get -qq --yes install libqtcore4 libqtgui4 libqt4-network libusb-1.0-0 ca-certificates
-	mkdir /etc/hyperion 2>/dev/null
-fi
-
-#Check, if dtparam=spi=on is in place (not for OPENELEC)
-if [ $CPU_RPI -eq 1 ] && [ $OS_OPENELEC -ne 1 ]; then
-	SPIOK=`grep '^\dtparam=spi=on' /boot/config.txt | wc -l`
-		if [ $SPIOK -ne 1 ]; then
-			echo '---> Raspberry Pi found, but SPI is not set, we write "dtparam=spi=on" to /boot/config.txt'
-			sed -i '$a dtparam=spi=on' /boot/config.txt
-				if [ $HCInstall -ne 1 ]; then
-				REBOOTMESSAGE="echo Please reboot your Raspberry Pi, we inserted dtparam=spi=on to /boot/config.txt"
-				fi
-		fi
-fi
-
-#Check, if dtparam=spi=on is in place (just for OPENELEC/LibreELEC
-if [ $CPU_RPI -eq 1 ] && [ $OS_OPENELEC -eq 1 ]; then
-	SPIOK=`grep '^\dtparam=spi=on' /flash/config.txt | wc -l`
-		if [ $SPIOK -ne 1 ]; then
-			mount -o remount,rw /flash
-			echo '---> RPi with OpenELEC/LibreELEC found, but SPI is not set, we write "dtparam=spi=on" to /flash/config.txt'
-			sed -i '$a dtparam=spi=on' /flash/config.txt
-			mount -o remount,ro /flash
-				if [ $HCInstall -ne 1 ]; then
-				REBOOTMESSAGE="echo Please reboot your OpenELEC/LibreELEC, we inserted dtparam=spi=on to /flash/config.txt"
-				fi
-		fi
-fi
- 
-# compatibility layer to move old configs to new config dir
-if [ -f "/opt/hyperion/bin/hyperiond" ]; then
-	echo '---> Old installation found, move configs to /etc/hyperion/ and move hyperion to /usr/share/hyperion/'
-	mv /opt/hyperion/config/*.json /etc/hyperion 2>/dev/null 
-	
-	sed -i "s|/opt/hyperion/effects||g; s|/usr/share/hyperion/effects||g" /etc/hyperion/*.json
-		CPO1=/etc/hyperion.config.json
-		CPO2=/opt/hyperion/config/hyperion.config.json
-		CPN=/etc/hyperion/hyperion.config.json
-		BPO=/opt/hyperion/bin/hyperiond
-		BPN=/usr/bin/hyperiond
-		if [ $USE_INITCTL -eq 1 ]; then
-			sed -i "s|$BPO|$BPN|g" $SERVICEP/hyperion.conf
-			sed -i "s|$CPO1|$CPN|g" $SERVICEP/hyperion.conf
-			sed -i "s|$CPO2|$CPN|g" $SERVICEP/hyperion.conf
-			initctl reload-configuration
-		elif [ $OS_OPENELEC -eq 1 ]; then
-			sleep 0
-		elif [ $USE_SYSTEMD -eq 1 ]; then
-			sed -i "s|$BPO|$BPN|g" $SERVICEP/hyperion.service
-			sed -i "s|$CPO1|$CPN|g" $SERVICEP/hyperion.service
-			sed -i "s|$CPO2|$CPN|g" $SERVICEP/hyperion.service
-			systemctl -q daemon-reload
-		elif [ $USE_SERVICE -eq 1 ]; then
-			sed -i "s|$BPO|$BPN|g" $SERVICEP/hyperion
-			sed -i "s|$CPO1|$CPN|g" $SERVICEP/hyperion
-			sed -i "s|$CPO2|$CPN|g" $SERVICEP/hyperion
-			update-rc.d hyperion defaults 98 02
-		fi
-fi
-
-# Select the appropriate download path
-if [ $BETA -eq 1 ]; then
-	HYPERION_ADDRESS=https://sourceforge.net/projects/hyperion-project/files/beta
-else HYPERION_ADDRESS=https://sourceforge.net/projects/hyperion-project/files/release
-fi
-# Select the appropriate release
-if [ $CPU_RPI -eq 1 ] && [ $OS_RASPLEX -eq 1 ]; then
-	HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_rpi_rasplex.tar.gz
-	OE_DEPENDECIES=$HYPERION_ADDRESS/hyperion.deps.openelec-rpi.tar.gz
-elif [ $CPU_RPI -eq 1 ] && [ $OS_LIBREELEC -eq 1 ] && [ $RPI_1 -eq 1 ]; then
-	HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_rpi_le.tar.gz
-	OE_DEPENDECIES=$HYPERION_ADDRESS/hyperion.deps.openelec-rpi.tar.gz
-elif [ $CPU_RPI -eq 1 ] && [ $OS_LIBREELEC -eq 1 ] && [ $RPI_2 -eq 1 ]; then
-	HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_rpi2_le.tar.gz
-	OE_DEPENDECIES=$HYPERION_ADDRESS/hyperion.deps.openelec-rpi.tar.gz
-elif [ $CPU_RPI -eq 1 ] && [ $OS_LIBREELEC -eq 1 ] && [ $RPI_3 -eq 1 ]; then
-	HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_rpi3_le.tar.gz
-	OE_DEPENDECIES=$HYPERION_ADDRESS/hyperion.deps.openelec-rpi.tar.gz
-elif [ $CPU_RPI -eq 1 ] && [ $OS_OPENELEC -eq 1 ] && [ $RPI_1 -eq 1 ]; then
-	HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_rpi_oe.tar.gz
-	OE_DEPENDECIES=$HYPERION_ADDRESS/hyperion.deps.openelec-rpi.tar.gz
-elif [ $CPU_RPI -eq 1 ] && [ $OS_OPENELEC -eq 1 ] && [ $RPI_2 -eq 1 ]; then
-	HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_rpi2_oe.tar.gz
-	OE_DEPENDECIES=$HYPERION_ADDRESS/hyperion.deps.openelec-rpi.tar.gz
-elif [ $CPU_RPI -eq 1 ] && [ $OS_OPENELEC -eq 1 ] && [ $RPI_3 -eq 1 ]; then
-	HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_rpi3_oe.tar.gz
-	OE_DEPENDECIES=$HYPERION_ADDRESS/hyperion.deps.openelec-rpi.tar.gz
-elif [ $CPU_RPI -eq 1 ] && [ $OS_OSMC -eq 1 ] && [ $RPI_1 -eq 1 ]; then
-	HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_rpi_osmc.tar.gz
-elif [ $CPU_RPI -eq 1 ] && [ $OS_OSMC -eq 1 ] && [ $RPI_2 -eq 1 ]; then
-	HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_rpi2_osmc.tar.gz
-elif [ $CPU_RPI -eq 1 ] && [ $OS_OSMC -eq 1 ] && [ $RPI_3 -eq 1 ]; then
-	HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_rpi3_osmc.tar.gz
-elif [ $CPU_RPI -eq 1 ] && [ $RPI_1 -eq 1 ]; then
-	HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_rpi.tar.gz
-elif [ $CPU_RPI -eq 1 ] && [ $RPI_2 -eq 1 ]; then
-	HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_rpi2.tar.gz
-elif [ $CPU_RPI -eq 1 ] && [ $RPI_3 -eq 1 ]; then
-	HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_rpi3.tar.gz
-elif [ $CPU_IMX6 -eq 1 ]; then
-	HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_imx6.tar.gz
-	OE_DEPENDECIES=$HYPERION_ADDRESS/hyperion.deps.openelec-imx6.tar.gz
-elif [ $CPU_WETEK -eq 1 ]; then
-	HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_wetek.tar.gz
-	OE_DEPENDECIES=$HYPERION_ADDRESS/hyperion.deps.openelec-rpi.tar.gz
-elif [ $CPU_X32X64 -eq 1 ]; then
-	HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_x86x64.tar.gz
-	OE_DEPENDECIES=$HYPERION_ADDRESS/hyperion.deps.openelec-x86x64.tar.gz
-else
-	echo "---> Critical Error: Target platform unknown -> abort"
-	exit 1
-fi
-
-# Get and extract the Hyperion binaries
-echo '---> Downloading the appropriate Hyperion release'
-if [ $OS_OPENELEC -eq 1 ]; then
-	# OpenELEC has a readonly file system. Use alternative location
-	echo '---> Downloading Hyperion OpenELEC/LibreELEC release'
-	curl -# -L --get $HYPERION_RELEASE | tar -C /storage -xz
-	echo '---> Downloading Hyperion OpenELEC/LibreELEC dependencies'
-	curl -# -L --get $OE_DEPENDECIES | tar -C /storage/hyperion/bin -xz
-	#set the executen bit (failsave)
-	chmod +x -R /storage/hyperion/bin
-else
-	BINSP=/usr/share/hyperion/bin
-	BINTP=/usr/bin
-	wget -nv $HYPERION_RELEASE -O - | tar -C /usr/share -xz	
-	#set the executen bit (failsave) and move config to /etc/hyperion
-	chmod +x -R $BINSP
-	# create links to the binaries
-	ln -fs $BINSP/hyperiond $BINTP/hyperiond
-	ln -fs $BINSP/hyperion-remote $BINTP/hyperion-remote
-	ln -fs $BINSP/hyperion-v4l2 $BINTP/hyperion-v4l2
-	ln -fs $BINSP/hyperion-dispmanx $BINTP/hyperion-dispmanx 2>/dev/null
-	ln -fs $BINSP/hyperion-x11 $BINTP/hyperion-x11 2>/dev/null
-	ln -fs $BINSP/hyperion-xcb $BINTP/hyperion-xcb 2>/dev/null
-	ln -fs $BINSP/hyperion-aml $BINTP/hyperion-aml 2>/dev/null
-fi
-
-# Copy the service control configuration to /etc/init (-n to respect user modified scripts)
-if [ $USE_INITCTL -eq 1 ]; then
-	echo '---> Installing initctl script'
-	cp -n $SERVICEL/hyperion.initctl.sh $SERVICEP/hyperion.conf 2>/dev/null
-	initctl reload-configuration
-elif [ $OS_OPENELEC -eq 1 ]; then
-	#modify all old installs with a logfile output
-	sed -i 's|/dev/null|/storage/logfiles/hyperion.log|g' /storage/.config/autostart.sh 2>/dev/null
-	# only add to start script if hyperion is not present yet
-	mkdir /storage/logfiles 2>/dev/null
-	touch /storage/.config/autostart.sh 2>/dev/null
-	if [ `cat /storage/.config/autostart.sh 2>/dev/null | grep hyperiond | wc -l` -eq 0 ]; then
-		echo '---> Adding Hyperion to OpenELEC/LibreELEC autostart.sh'
-		echo "/storage/hyperion/bin/hyperiond.sh /storage/.config/hyperion.config.json > /storage/logfiles/hyperion.log 2>&1 &" >> /storage/.config/autostart.sh
-		chmod +x /storage/.config/autostart.sh
-	fi
-	# only add hyperion-x11 to startup, if not found and x32x64 detected
-	if [ $CPU_X32X64 -eq 1 ] && [ `cat /storage/.config/autostart.sh 2>/dev/null | grep hyperion-x11 | wc -l` -eq 0 ]; then
-		echo '---> Adding Hyperion-x11 to OpenELEC/LibreELEC autostart.sh'
-		echo "DISPLAY=:0.0 LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/storage/hyperion/bin /storage/hyperion/bin/hyperion-x11 </dev/null >/storage/logfiles/hyperion.log 2>&1 &" >> /storage/.config/autostart.sh		
-	fi
-	# only add hyperion-xcb to startup, if not found and x32x64 detected
-	if [ $CPU_X32X64 -eq 1 ] && [ `cat /storage/.config/autostart.sh 2>/dev/null | grep hyperion-xcb | wc -l` -eq 0 ]; then
-		echo '---> Adding Hyperion-xcb to OpenELEC/LibreELEC autostart.sh'
-		echo "DISPLAY=:0.0 LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/storage/hyperion/bin /storage/hyperion/bin/hyperion-xcb </dev/null >/storage/logfiles/hyperion.log 2>&1 &" >> /storage/.config/autostart.sh
-	fi
-elif [ $USE_SYSTEMD -eq 1 ]; then
-	echo '---> Installing systemd script'
-	#place startup script for systemd and activate
-	cp -n $SERVICEL/hyperion.systemd.sh $SERVICEP/hyperion.service
-	systemctl -q enable hyperion.service
-		if [ $OS_OSMC -eq 1 ]; then
-			echo '---> Modify systemd script for OSMC usage'
-			# Wait until kodi is sarted
-			sed -i '/After = mediacenter.service/d' $SERVICEP/hyperion.service
-			sed -i '/Unit/a After = mediacenter.service' $SERVICEP/hyperion.service
-			systemctl -q daemon-reload
-		fi
-elif [ $USE_SERVICE -eq 1 ]; then
-	echo '---> Installing startup script in init.d'
-	# place startup script in init.d and add it to upstart (-s to respect user modified scripts)
-	rm $SERVICEP/hyperion
-	cp $SERVICEL/hyperion.init.sh $SERVICEP/hyperion 2>/dev/null ; chmod +x $SERVICEP/hyperion
-	update-rc.d hyperion defaults 98 02
-fi
-
-#remove unwanted files/dirs
-if [ $OS_OPENELEC -eq 1 ]; then
-	rm -r /storage/hyperion/services
-else
-	rm -r /usr/share/hyperion/services
-	rm -r /opt/hyperion 2>/dev/null
-fi
-
-#chown the /config/ dir and all configs inside for hypercon config upload for non-root logins
-if [ $OS_OSMC -eq 1 ]; then
-	chown -R osmc:osmc /etc/hyperion
-elif [ $OS_RASPBIAN -eq 1 ]; then
-	chown -R pi:pi /etc/hyperion
-fi
-
-# Start the hyperion daemon
-echo '---> Starting Hyperion'
-if [ $OS_OPENELEC -eq 1 ]; then
-	/storage/.config/autostart.sh > /dev/null 2>&1 &
-elif [ $USE_INITCTL -eq 1 ]; then
-	/sbin/initctl start hyperion
-elif [ $USE_SERVICE -eq 1 ]; then
-	/usr/sbin/service hyperion start
-elif [ $USE_SYSTEMD -eq 1 ]; then
-	service hyperion start
-fi
-
-echo '*******************************************************************************' 
-echo 'Hyperion Installation/Update finished!' 
-echo 'Please download the latest HyperCon version to benefit from new features!' 
-echo 'To create a config, follow the HyperCon Guide at our Wiki (EN/DE)!' 
-echo 'Wiki: wiki.hyperion-project.org Webpage: www.hyperion-project.org' 
-$REBOOTMESSAGE
-echo '*******************************************************************************' 
-## Force reboot and prevent prompt if spi is added during a HyperCon Install
-if [ $HCInstall -eq 1 ] && [ $CPU_RPI -eq 1 ] && [ $SPIOK -ne 1 ]; then
-	echo "Rebooting now, we added dtparam=spi=on to config.txt"
-	reboot
-	exit 0
-fi
-#Prompt for reboot, if spi added to config.txt
-if [ $CPU_RPI -eq 1 ] && [ $SPIOK -ne 1 ]; then
-        while true
-        do
-        echo -n "---> Do you want to reboot your Raspberry Pi now? (y or n) :"
-        read CONFIRM
-        case $CONFIRM in
-        y|Y|YES|yes|Yes) break ;;
-        n|N|no|NO|No)
-        echo "---> No reboot - you entered \"$CONFIRM\""
-        exit
-        ;;
-        *) echo "-> Please enter only y or n"
-        esac
-        done
-        echo "---> You entered \"$CONFIRM\". Rebooting now..."
-        reboot
-fi
-
-exit 0
diff --git a/bin/remove_hyperion.sh b/bin/remove_hyperion.sh
deleted file mode 100644
index 31e928b9..00000000
--- a/bin/remove_hyperion.sh
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/bin/sh
-# Script to remove Hyperion and all services
-
-# Make sure /sbin is on the path (for service to find sub scripts)
-PATH="/sbin:$PATH"
-
-#Check if HyperCon is logged in as root
-if [ $(id -u) != 0 ] && [ "$1" = "HyperConRemove" ]; then
-	echo '---> Critical Error: Please connect as user "root" through HyperCon' 
-	echo '---> We need admin privileges to remove your Hyperion! -> abort'
-	exit 1
-fi
-
-#Check, if script is running as root
-if [ $(id -u) != 0 ]; then
-	echo '---> Critical Error: Please run the script as root (sudo sh ./remove_hyperion.sh)' 
-	exit 1
-fi
-
-#Welcome message
-echo '*******************************************************************************' 
-echo 'This script will remove Hyperion and its services' 
-echo '-----> Please BACKUP your hyperion.config.json if necessary <-----'
-echo 'Created by brindosch - hyperion-project.org - the official Hyperion source.' 
-echo '*******************************************************************************'
-
-#Skip the prompt if HyperCon Remove
-if [ "$1" = "" ]; then
-	#Prompt for confirmation to proceed
-	while true
-	do
-		echo -n "---> Do you really want to remove Hyperion and its services? (y or n) :"
-		read CONFIRM
-		case $CONFIRM in
-			y|Y|YES|yes|Yes) break ;;
-			n|N|no|NO|No)
-				echo "---> Aborting - you entered \"$CONFIRM\""
-				exit
-				;;
-			*) echo "-> Please enter only y or n"
-		esac
-	done
-	echo "---> You entered \"$CONFIRM\". Remove Hyperion!"
-fi
-
-# Find out if we are on OpenElec or RasPlex
-OS_OPENELEC=`grep -m1 -c 'OpenELEC\|RasPlex\|LibreELEC' /etc/issue`
-
-# check which init script we should use
-USE_SYSTEMD=`grep -m1 -c systemd /proc/1/comm`
-USE_INITCTL=`which /sbin/initctl | wc -l`
-USE_SERVICE=`which /usr/sbin/service | wc -l`
-
-# set count for forwarder
-SERVICEC=1
-
-# Stop hyperion daemon if it is running
-echo '---> Stop Hyperion, if necessary'
-if [ $OS_OPENELEC -eq 1 ]; then
-    killall hyperiond 2>/dev/null
-elif [ $USE_INITCTL -eq 1 ]; then
-	/sbin/initctl stop hyperion 2>/dev/null
-elif [ $USE_SERVICE -eq 1 ]; then
-	/usr/sbin/service hyperion stop 2>/dev/null
-elif [ $USE_SYSTEMD -eq 1 ]; then
-	service hyperion stop 2>/dev/null
-fi
-
-#reset count
-SERVICEC=`which /usr/sbin/service | wc -l`
-
-#Disabling and delete service files
-if [ $USE_INITCTL -eq 1 ]; then
-	echo '---> Delete and disable Hyperion initctl script'
-	rm -v /etc/init/hyperion* 2>/dev/null
-	initctl reload-configuration
-elif [ $OS_OPENELEC -eq 1 ]; then
-	# Remove Hyperion from OpenELEC autostart.sh
-	echo "---> Remove Hyperion from OpenELEC autostart.sh"
-	sed -i "/hyperiond/d" /storage/.config/autostart.sh 2>/dev/null
-	sed -i "/hyperion-x11/d" /storage/.config/autostart.sh 2>/dev/null
-	sed -i "/hyperion-xcb/d" /storage/.config/autostart.sh 2>/dev/null
-elif [ $USE_SYSTEMD -eq 1 ]; then
-	# Delete and disable Hyperion systemd script
-	echo '---> Delete and disable Hyperion systemd script'
-	systemctl disable hyperion.service
-	rm -v /etc/systemd/system/hyperion* 2>/dev/null
-elif [ $USE_SERVICE -eq 1 ]; then
-	# Delete and disable Hyperion init.d script
-	echo '---> Delete and disable Hyperion init.d script'
-	update-rc.d -f hyperion remove
-	rm /etc/init.d/hyperion* 2>/dev/null
-fi
-
-# Delete Hyperion binaries
-if [ $OS_OPENELEC -eq 1 ]; then
-	# Remove OpenELEC Hyperion binaries and configs
-	echo '---> Remove the OpenELEC Hyperion binaries and hyperion.config.json'
-	rm -rv /storage/hyperion 2>/dev/null
-	rm -v /storage/.config/hyperion.config.json 2>/dev/null
-else
-	#Remove binaries on all distributions/systems (not OpenELEC)
-	echo "---> Remove links to the binaries"
-	rm -v /usr/bin/hyperiond 2>/dev/null
-	rm -v /usr/bin/hyperion-remote 2>/dev/null
-	rm -v /usr/bin/hyperion-v4l2 2>/dev/null
-	rm -v /usr/bin/hyperion-dispmanx 2>/dev/null
-	rm -v /usr/bin/hyperion-x11 2>/dev/null
-	rm -v /usr/bin/hyperion-xcb 2>/dev/null
-	rm -v /usr/bin/hyperion-aml 2>/dev/null
-	rm -v /etc/hyperion.config.json 2>/dev/null
-	echo "---> Remove binaries"
-	rm -rv /opt/hyperion 2>/dev/null
-	rm -rv /etc/hyperion 2>/dev/null
-	rm -rv /usr/share/hyperion 2>/dev/null
-fi
-echo '*******************************************************************************'
-echo 'Hyperion successful removed!'
-echo '*******************************************************************************'
-exit 0
-