diff --git a/platforms/livecd-root/Makefile b/platforms/livecd-root/Makefile
index 60d10b1..34b9df8 100644
--- a/platforms/livecd-root/Makefile
+++ b/platforms/livecd-root/Makefile
@@ -1,8 +1,7 @@
-$(MAKEDIST_TARGET)-livecd-kde4: kppp4 krfb4 ark4 kcalc4 kdf4 kfloppy4 kgpg4 desktop-base-kde4 \
-                       ksnapshot okular desktop-base-kde4 kmix4 \
-                       kopete4 kdebluetooth4 smb4k juk4 lisa4 kwalletmanager4 \
-                       kaffeine libqt4-sqlite kate
-#kitchensync4 kontact4 kmail4 akregator4 kdeplasma-addons amarok
+$(MAKEDIST_TARGET)-livecd-kde4: kppp4 krfb4 ark kcalc kdf kgpg desktop-base-kde4 \
+                       ksnapshot okular desktop-base-kde4 kmix \
+                       bluedevil smb4k juk kwallet dragon kate
+# kopete4
 $(MAKEDIST_TARGET)-livecd-libreoffice: libreoffice-Calc libreoffice-writer libreofice-impress
 
 $(MAKEDIST_TARGET)-livecd-root: \
@@ -18,11 +17,6 @@ $(MAKEDIST_TARGET)-livecd-root: \
                   samba-server \
                   smart-gui cpufreqd mambatray \
                   $(MAKEDIST_TARGET)-livecd-kde4
-#                  libopensync-plugin-syncml libopensync-plugin-google-calendar \
-#                  libopensync-plugin-gnokii libopensync-plugin-synce \
-#                  libopensync-plugin-moto libopensync-plugin-palm \
-#                  foomatic guarddog kpackage
-#                  frozen-bubble tuxracer 
 # Localization targets
 $(MAKEDIST_TARGET)-livecd-root-en: \
                   kde-l10n-en_GB
diff --git a/platforms/livecd-root/post.inc.sh b/platforms/livecd-root/post.inc.sh
index e2fbb9c..95f951d 100644
--- a/platforms/livecd-root/post.inc.sh
+++ b/platforms/livecd-root/post.inc.sh
@@ -43,7 +43,7 @@ echo $timezone > $MOUNTDIR/etc/timezone
 cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
 
 # configure favorites in kde menu
-for f in /usr/share/applications/chromium-devel.desktop /opt/kde/share/applications/kaffeine.desktop; do
+for f in /usr/share/applications/chromium-devel.desktop; do
    chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f || exit 1
 done
 
diff --git a/platforms/livedvd-root/Makefile b/platforms/livedvd-root/Makefile
index e7ae271..28ad5d2 100644
--- a/platforms/livedvd-root/Makefile
+++ b/platforms/livedvd-root/Makefile
@@ -1,9 +1,6 @@
-$(MAKEDIST_TARGET)-livedvd-kde4: kppp4 krfb4 ark4 kcalc4 kdf4 kfloppy4 kgpg4 desktop-base-kde4 \
-                       ksnapshot okular kontact4 kmail4 akregator4 desktop-base-kde4 kmix4 \
-                       kopete4 kdebluetooth4 smb4k amarok lisa4 kwalletmanager4 \
-                       kaffeine libqt4-sqlite kate
-# knemo
-#kitchensync4
+$(MAKEDIST_TARGET)-livedvd-kde4: kppp4 krfb4 ark kcalc kdf kgpg desktop-base-kde4 \
+                       ksnapshot okular kontact kmail akregator desktop-base-kde4 kmix \
+                       kopete4 bluedevil smb4k amarok kwallet dragon kate
 $(MAKEDIST_TARGET)-livedvd-libreoffice: libreoffice-calc libreoffice-writer libreoffice-impress
 
 $(MAKEDIST_TARGET)-livedvd-root: \
@@ -18,11 +15,6 @@ $(MAKEDIST_TARGET)-livedvd-root: \
                   Mesa-tools driconf parted testdisk samba-server \
                   smart-gui cpufreqd mambatray \
                   $(MAKEDIST_TARGET)-livedvd-kde4 toptray testdisk photorec
-#                  libopensync-plugin-syncml libopensync-plugin-google-calendar \
-#                  libopensync-plugin-gnokii libopensync-plugin-synce \
-#                  libopensync-plugin-moto libopensync-plugin-palm \
-#                  foomatic guarddog kpackage
-#                  frozen-bubble tuxracer 
 # Localization targets
 $(MAKEDIST_TARGET)-livedvd-root-en: \
                   kde-l10n-en_GB
diff --git a/platforms/livedvd-root/post.inc.sh b/platforms/livedvd-root/post.inc.sh
index 6e830d1..cbc0c81 100644
--- a/platforms/livedvd-root/post.inc.sh
+++ b/platforms/livedvd-root/post.inc.sh
@@ -43,8 +43,7 @@ echo $timezone > $MOUNTDIR/etc/timezone
 cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
 
 # configure favorites in kde menu
-for f in /usr/share/applications/chromium-devel.desktop \
-         /opt/kde/share/applications/kaffeine.desktop /opt/kde/share/applications/amarok.desktop; do
+for f in /usr/share/applications/chromium-devel.desktop /opt/kde/share/applications/amarok.desktop; do
    chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f
 done
 
diff --git a/platforms/testcd-root/Makefile b/platforms/testcd-root/Makefile
index 74cb574..9f3e550 100644
--- a/platforms/testcd-root/Makefile
+++ b/platforms/testcd-root/Makefile
@@ -1,9 +1,6 @@
-$(MAKEDIST_TARGET)-testcd-kde4: kppp4 krfb4 ark4 kcalc4 kdf4 kfloppy4 kgpg4 desktop-base-kde4 \
-                       ksnapshot okular kontact4 kmail4 akregator4 desktop-base-kde4 kmix4 \
-                       kopete4 kdebluetooth4 smb4k juk4 lisa4 kwalletmanager4 \
-                       kaffeine libqt4-sqlite kate
-# knemo kdeplasma-addons
-#kitchensync4
+$(MAKEDIST_TARGET)-testcd-kde4: kppp4 krfb4 ark kcalc kdf kgpg desktop-base-kde4 \
+                       ksnapshot okular kontact kmail akregator desktop-base-kde4 kmix \
+                       kopete bluedevil smb4k juk kwallet dragon kate
 $(MAKEDIST_TARGET)-testcd-libreoffice: libreoffice-calc libreoffice-writer libreoffice-impress
 
 $(MAKEDIST_TARGET)-testcd-root: \
@@ -19,11 +16,6 @@ $(MAKEDIST_TARGET)-testcd-root: \
                   samba-server \
                   smart-gui cpufreqd mambatray \
                   $(MAKEDIST_TARGET)-testcd-kde4 openssh-server
-#                  libopensync-plugin-syncml libopensync-plugin-google-calendar \
-#                  libopensync-plugin-gnokii libopensync-plugin-synce \
-#                  libopensync-plugin-moto libopensync-plugin-palm \
-#                  foomatic guarddog kpackage
-#                  frozen-bubble tuxracer 
 # Localization targets
 $(MAKEDIST_TARGET)-testcd-root-en: \
                   kde-l10n-en_GB
diff --git a/platforms/testcd-root/post.inc.sh b/platforms/testcd-root/post.inc.sh
index cf9d30d..ac865d7 100644
--- a/platforms/testcd-root/post.inc.sh
+++ b/platforms/testcd-root/post.inc.sh
@@ -43,7 +43,7 @@ echo $timezone > $MOUNTDIR/etc/timezone
 cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
 
 # configure favorites in kde menu
-for f in /usr/share/applications/chromium-devel.desktop /opt/kde/share/applications/kaffeine.desktop; do
+for f in /usr/share/applications/chromium-devel.desktop; do
    chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f
 done