diff --git a/packages/addons/service/multimedia/Airplayer-Suite/addon b/packages/addons/service/multimedia/Airplayer-Suite/addon
deleted file mode 100755
index 9030a152f5..0000000000
--- a/packages/addons/service/multimedia/Airplayer-Suite/addon
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
-#
-# This Program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This Program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with OpenELEC.tv; see the file COPYING. If not, write to
-# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-# http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib/ao/plugins-4/
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/pylib/
-
- cp $PKG_DIR/config/settings.xml $ADDON_BUILD/$PKG_ADDON_ID/settings-default.xml
-
- cp $BUILD/pybonjour-1.1.1/pybonjour.py $ADDON_BUILD/$PKG_ADDON_ID/pylib/
- cp -R $BUILD/tornado-ap-*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib/
- cp -R $BUILD/simplejson-ap-*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib/
-
- cp -a $BUILD/airplayer-*/airplayer/ $ADDON_BUILD/$PKG_ADDON_ID/bin/
-
- cp $BUILD/libao-*/src/.libs/libao.so.4 $ADDON_BUILD/$PKG_ADDON_ID/lib/
- cp $BUILD/libao-*/src/plugins/alsa/.libs/libalsa.so $ADDON_BUILD/$PKG_ADDON_ID/lib/ao/plugins-4/
- cp $BUILD/libao-*/src/plugins/oss/.libs/liboss.so $ADDON_BUILD/$PKG_ADDON_ID/lib/ao/plugins-4/
-
- cp $BUILD/shairport-*/shairport $ADDON_BUILD/$PKG_ADDON_ID/bin/
- cp $BUILD/shairport-*/hairtunes $ADDON_BUILD/$PKG_ADDON_ID/bin/
diff --git a/packages/addons/service/multimedia/Airplayer-Suite/changelog.txt b/packages/addons/service/multimedia/Airplayer-Suite/changelog.txt
deleted file mode 100755
index 4bace83caf..0000000000
--- a/packages/addons/service/multimedia/Airplayer-Suite/changelog.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-0.99.5
-- initial version airplayer-7776e54 and shairport-346db95
diff --git a/packages/addons/service/multimedia/Airplayer-Suite/config/settings.xml b/packages/addons/service/multimedia/Airplayer-Suite/config/settings.xml
deleted file mode 100755
index 4e9671b6d6..0000000000
--- a/packages/addons/service/multimedia/Airplayer-Suite/config/settings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/packages/addons/service/multimedia/Airplayer-Suite/icon/icon.png b/packages/addons/service/multimedia/Airplayer-Suite/icon/icon.png
deleted file mode 100755
index a0e56d5f54..0000000000
Binary files a/packages/addons/service/multimedia/Airplayer-Suite/icon/icon.png and /dev/null differ
diff --git a/packages/addons/service/multimedia/Airplayer-Suite/meta b/packages/addons/service/multimedia/Airplayer-Suite/meta
deleted file mode 100755
index e1c51358ad..0000000000
--- a/packages/addons/service/multimedia/Airplayer-Suite/meta
+++ /dev/null
@@ -1,36 +0,0 @@
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
-#
-# This Program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This Program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with OpenELEC.tv; see the file COPYING. If not, write to
-# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-# http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="Airplayer-Suite"
-PKG_VERSION="Suite"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="https://github.com/PascalW/Airplayer"
-PKG_URL=""
-PKG_DEPENDS="Python"
-PKG_BUILD_DEPENDS="toolchain Python avahi pybonjour tornado-ap simplejson-ap airplayer libao shairport"
-PKG_PRIORITY="optional"
-PKG_SECTION="service/multimedia"
-PKG_SHORTDESC="Airplayer and ShairPort programs"
-PKG_LONGDESC="Airplayer makes make media playing software Airplay-compatible. Airplayer features pluggable backends, making it possible to support different media players. Send video and pictures from your iDevice to your Airplay enabled media player. Audio streaming is currently not supported. On the iDevice side IOS 4.2 or above is required. ShairPort emulates an AirPort Express for the purpose of streaming music from iTunes and compatible iPods."
-PKG_IS_ADDON="yes"
-PKG_ADDON_TYPE="xbmc.service"
-PKG_AUTORECONF="no"
diff --git a/packages/addons/service/multimedia/Airplayer-Suite/source/asound.conf_ultra_stmlabs b/packages/addons/service/multimedia/Airplayer-Suite/source/asound.conf_ultra_stmlabs
deleted file mode 100755
index d687429de0..0000000000
--- a/packages/addons/service/multimedia/Airplayer-Suite/source/asound.conf_ultra_stmlabs
+++ /dev/null
@@ -1,84 +0,0 @@
- #
- # got from http://stmlabs.com/forum/topic/asoundconf-simultaneous-output#post-896
- # change line pcm "hw:1,7" to suit your box
- #
- #----
- # /etc/asound.conf file designed to expand 2 channels through device 'clone_output'
- # to output 2 channels to multiple devices
- #
- # Use aplay -l to find device numbers
- #
- #----
-
-pcm.!default {
- type plug
- slave.pcm "dmixed_hdmi"
-}
-
- #-----
- # Single channel dmixed. Crossfade works
- #-----
-pcm.hdmiout {
- type plug
- slave.pcm "dmixed_hdmi"
-}
-
-pcm.dmixed_hdmi {
- type dmix
- ipc_key 2024
- slave {
- pcm "hw:1,7" # hdmi
- }
-}
- #-----
- # multiple output portion begin (3 devices) dmix not supported.
- #-----
-
-pcm.clone_output {
- type plug
- slave.pcm "6channel_expander"
-}
-
-pcm.multi_pcm_device {
- type multi;
- slaves.a.pcm "hw:1,7"; # hdmi
- slaves.a.channels 2;
- slaves.b.pcm "hw:0,0"; # analog
- slaves.b.channels 2;
- slaves.c.pcm "hw:0,1"; # spdif
- slaves.c.channels 2;
- bindings.0.slave a;
- bindings.0.channel 0;
- bindings.1.slave a;
- bindings.1.channel 1;
- bindings.2.slave b;
- bindings.2.channel 0;
- bindings.3.slave b;
- bindings.3.channel 1;
- bindings.4.slave c;
- bindings.4.channel 0;
- bindings.5.slave c;
- bindings.5.channel 1;
-}
-
-ctl.multi_pcm_device {
- type hw;
- card 0;
-}
-
- pcm.6channel_expander {
- type route;
- slave.pcm "multi_pcm_device";
- slave.channels 6;
- ttable.0.0 1;
- ttable.1.1 1;
- ttable.0.2 1;
- ttable.1.3 1;
- ttable.0.4 1;
- ttable.1.5 1;
-}
-
-ctl.6channel_expander {
- type hw;
- card 0;
-}
diff --git a/packages/addons/service/multimedia/Airplayer-Suite/source/bin/Airplayer-Suite.service b/packages/addons/service/multimedia/Airplayer-Suite/source/bin/Airplayer-Suite.service
deleted file mode 100755
index d68edb6311..0000000000
--- a/packages/addons/service/multimedia/Airplayer-Suite/source/bin/Airplayer-Suite.service
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/bin/sh
-
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
-#
-# This Program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This Program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with OpenELEC.tv; see the file COPYING. If not, write to
-# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-# http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-# setup functions
-read_xbmcconfig() {
- grep "<$1>" $XBMC_SETTINGS | sed -e "s,[[:space:]]*<$1>,," -e "s,$1>,,"
-}
-
- ADDON_ID="Airplayer-Suite"
- ADDON_DIR="$HOME/.xbmc/addons/service.multimedia.$ADDON_ID"
- ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.$ADDON_ID"
-
- AIRPLAYERSUITE_SETTINGS_XML="$ADDON_HOME/settings.xml"
- AIRPLAYERSUITE_SETTINGS_CONF="/var/config/$ADDON_ID.conf"
- XBMC_SETTINGS="$HOME/.xbmc/userdata/guisettings.xml"
-
- # create default config
- mkdir -p $ADDON_HOME
- if [ ! -f "$AIRPLAYERSUITE_SETTINGS_XML" ]; then
- cp $ADDON_DIR/settings-default.xml $AIRPLAYERSUITE_SETTINGS_XML
- fi
-
- # convert xml file to bash variables and use them
- if [ -f "$AIRPLAYERSUITE_SETTINGS_XML" ]; then
- mkdir -p /var/config/
- awk -F\" '{print $2"=\""$4"\""}' "$AIRPLAYERSUITE_SETTINGS_XML" | sed '/^=/d' > $AIRPLAYERSUITE_SETTINGS_CONF
- . $AIRPLAYERSUITE_SETTINGS_CONF
- # replace spaces with underscore
- SHAIRPORT_NAME=${SHAIRPORT_NAME// /_}
- AIRPLAYER_NAME=${AIRPLAYER_NAME// /_}
- else
- LOG_FILES="true"
- SHAIRPORT_DEVICENAME="default"
- SHAIRPORT_DRIVER="alsa"
- SHAIRPORT_NAME="ShairPort"
- AIRPLAYER_NAME="Airplayer"
- fi
-
- export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ADDON_DIR/lib"
- export PYTHONPATH="$ADDON_DIR/pylib"
-
- if [ "$LOG_FILES" = "true" ]; then
- LOG_FILE_SHAIRPORT="$ADDON_HOME/shairport.log"
- LOG_FILE_AIRPLAYER="$ADDON_HOME/airplayer.log"
- PID_FILE_AIRPLAYER="$ADDON_HOME/airplayer.pid"
-
- ADDON_ARG_SHAIRPORT="-v --apname=$SHAIRPORT_NAME --ao_driver=$SHAIRPORT_DRIVER --ao_devicename=$SHAIRPORT_DEVICENAME"
- ADDON_ARG_AIRPLAYER="-d -p $PID_FILE_AIRPLAYER -l $LOG_FILE_AIRPLAYER"
- else
- LOG_FILE_SHAIRPORT="/dev/null"
- LOG_FILE_AIRPLAYER="/dev/null"
- PID_FILE_AIRPLAYER="$ADDON_HOME/airplayer.pid"
-
- ADDON_ARG_SHAIRPORT="--apname=$SHAIRPORT_NAME --ao_driver=$SHAIRPORT_DRIVER --ao_devicename=$SHAIRPORT_DEVICENAME"
- ADDON_ARG_AIRPLAYER="-d -p $PID_FILE_AIRPLAYER -l $LOG_FILE_AIRPLAYER"
- fi
-
- AIRPLAYER_SETTINGS_TMP="/tmp/airplayer_settings.py"
- AIRPLAYER_SETTINGS_ORIG="$ADDON_DIR/bin/airplayer/settings.py"
-
- # first copy to tmp
- cp "$AIRPLAYER_SETTINGS_ORIG" "$AIRPLAYER_SETTINGS_TMP"
-
- # read xbmc settings
- XBMC_PORT=`read_xbmcconfig webserverport`
- XBMC_USER=`read_xbmcconfig webserverusername`
- XBMC_PWD=`read_xbmcconfig webserverpassword`
-
- # modify with real values
- sed -i "s|MEDIA_BACKEND_PORT = .*|MEDIA_BACKEND_PORT = $XBMC_PORT|g" $AIRPLAYER_SETTINGS_TMP
-
- if [ -n "XBMC_USER" ]; then
- sed -i "s|MEDIA_BACKEND_USERNAME = .*|MEDIA_BACKEND_USERNAME = '$XBMC_USER'|g" $AIRPLAYER_SETTINGS_TMP
- else
- sed -i "s|MEDIA_BACKEND_USERNAME = .*|MEDIA_BACKEND_USERNAME = None|g" $AIRPLAYER_SETTINGS_TMP
- fi
- if [ -n "XBMC_PWD" ]; then
- sed -i "s|MEDIA_BACKEND_PASSWORD = .*|MEDIA_BACKEND_PASSWORD = '$XBMC_PWD'|g" $AIRPLAYER_SETTINGS_TMP
- else
- sed -i "s|MEDIA_BACKEND_PASSWORD = .*|MEDIA_BACKEND_PASSWORD = None|g" $AIRPLAYER_SETTINGS_TMP
- fi
- if [ -n "AIRPLAYER_NAME" ]; then
- sed -i "s|AIRPLAY_HOSTNAME = .*|AIRPLAY_HOSTNAME = '$AIRPLAYER_NAME'|g" $AIRPLAYER_SETTINGS_TMP
- else
- sed -i "s|AIRPLAY_HOSTNAME = .*|AIRPLAY_HOSTNAME = None|g" $AIRPLAYER_SETTINGS_TMP
- fi
-
- # if different copy it back
- if [ "`md5sum "$AIRPLAYER_SETTINGS_TMP" | cut -d ' ' -f 1`" != "`md5sum "$AIRPLAYER_SETTINGS_ORIG" | cut -d ' ' -f 1`" ]; then
- cp "$AIRPLAYER_SETTINGS_TMP" "$AIRPLAYER_SETTINGS_ORIG"
- fi
-
- rm "$AIRPLAYER_SETTINGS_TMP"
-
- # restart avahi daemon because sometimes doesn't start correctly at boot time
- avahi-daemon -k
- /bin/sh /etc/init.d/53_avahi
-
- # run shairport
- if [ ! $(pidof shairport) ]; then
- $ADDON_DIR/bin/shairport $ADDON_ARG_SHAIRPORT >$LOG_FILE_SHAIRPORT 2>&1 &
- fi
-
- # run airplayer
- ps -ef | grep airplayer.py | grep -v grep >/dev/null 2>&1
- if [ "$?" != "0" ]; then
- python $ADDON_DIR/bin/airplayer/airplayer.py $ADDON_ARG_AIRPLAYER
- fi
diff --git a/packages/addons/service/multimedia/Airplayer-Suite/source/default.py b/packages/addons/service/multimedia/Airplayer-Suite/source/default.py
deleted file mode 100755
index cca9fa4207..0000000000
--- a/packages/addons/service/multimedia/Airplayer-Suite/source/default.py
+++ /dev/null
@@ -1,23 +0,0 @@
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
-#
-# This Program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This Program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with OpenELEC.tv; see the file COPYING. If not, write to
-# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-# http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-import xbmc, time, os, subprocess
-
-os.system("Airplayer-Suite.service")
diff --git a/packages/addons/service/multimedia/Airplayer-Suite/source/resources/language/English/strings.xml b/packages/addons/service/multimedia/Airplayer-Suite/source/resources/language/English/strings.xml
deleted file mode 100755
index 966e7e8537..0000000000
--- a/packages/addons/service/multimedia/Airplayer-Suite/source/resources/language/English/strings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
- Airplayer and ShairPort
- Identification
- Airplayer name
- ShairPort name
- ShairPort sound output
- ao driver
- ao device name
- Log files
- Log file
- Enabled
-
diff --git a/packages/addons/service/multimedia/Airplayer-Suite/source/resources/settings.xml b/packages/addons/service/multimedia/Airplayer-Suite/source/resources/settings.xml
deleted file mode 100755
index 100421536b..0000000000
--- a/packages/addons/service/multimedia/Airplayer-Suite/source/resources/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-