diff --git a/metadata/categories.conf b/metadata/categories.conf
index 6b0a963..5e9eeb6 100644
--- a/metadata/categories.conf
+++ b/metadata/categories.conf
@@ -1,7 +1,4 @@
-app-virtualization
 dev-games
-dev-lang
-dev-util
 games-board
 games-engines
 games-rpg
@@ -14,8 +11,5 @@ sci-mathematics
 sci-physics
 sys-apps
 x11-apps
-x11-plugins
 x11-themes
 x11-wm
-xfce-extra
-
diff --git a/packages/app-virtualization/virtualbox-bin/virtualbox-bin-4.3.20_96996.exheres-0 b/packages/app-virtualization/virtualbox-bin/virtualbox-bin-4.3.20_96996.exheres-0
deleted file mode 100644
index 36a4f87..0000000
--- a/packages/app-virtualization/virtualbox-bin/virtualbox-bin-4.3.20_96996.exheres-0
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 2008 Bernd Steinhauser <berniyh@exherbo.org>
-# Copyright 2011, 2013 Ali Polatel <alip@exherbo.org>
-# Distributed under the terms of the GNU General Public License v2
-
-require udev-rules
-
-MY_PN=VirtualBox
-MY_PV=${PV/_/-}
-MY_PNV=${MY_PN}-${MY_PV}
-EXT_PN=Oracle_VM_VirtualBox_Extension_Pack
-# Oracle extension version number is sometimes different from the main version.
-# In that case the following line need tweaking
-EXT_PV=${MY_PV}
-SUMMARY="x86 and AMD64/Intel64 virtualization software"
-DESCRIPTION="
-
-Binary distribution of VirtualBox, a general-purpose full virtualizer for x86
-hardware targeted at server, desktop and embedded use.
-
-VirtualBox supports a large number of guest operating systems including -- but
-not limited to -- Windows (NT 4.0, 2000, XP, Server 2003, Vista, Windows 7),
-DOS/Windows 3.x, Linux (2.4 and 2.6), Solaris and OpenSolaris, and OpenBSD.
-
-Some of the features of VirtualBox are:
- * Modularity
- * Virtual machine descriptions in XML
- * Guest Additions for Windows and Linux
- * Shared folders
- * Virtual USB Controllers
- * Remote Desktop Protocol
- * USB over RDP
-"
-HOMEPAGE="http://www.virtualbox.org/"
-DOWNLOADS="
-listed-only:
-    platform:amd64? ( http://download.virtualbox.org/virtualbox/${PV%_*}/${MY_PNV}-Linux_amd64.run )
-    platform:x86? ( http://download.virtualbox.org/virtualbox/${PV%_*}/${MY_PNV}-Linux_x86.run )
-    http://download.virtualbox.org/virtualbox/${PV%_*}/${EXT_PN}-${EXT_PV}.vbox-extpack -> ${EXT_PN}-${MY_PV}.tar.gz
-"
-
-LICENCES="GPL-2 VirtualBox"
-SLOT="0"
-PLATFORMS="~amd64 ~x86"
-MYOPTIONS="
-    systemd [[ description = [ Autoload virtualbox kernel modules using systemd ] ]]
-    platform:
-        amd64
-        x86
-"
-
-RESTRICT="strip"
-
-DEPENDENCIES="
-    run:
-        !app-virtualization/virtualbox-ose
-        dev-libs/glib:2
-        group/usb
-        group/vboxusers
-        media-libs/SDL[>=1.2.7]
-        media-libs/fontconfig
-        media-libs/freetype:2
-        media-libs/libpng
-        x11-libs/libICE
-        x11-libs/libSM
-        x11-libs/libX11
-        x11-libs/libXcursor
-        x11-libs/libXext
-        x11-libs/libXfixes
-        x11-libs/libXi
-        x11-libs/libXinerama
-        x11-libs/libXmu
-        x11-libs/libXrandr
-        x11-libs/libXrender
-        x11-libs/libXt
-"
-
-pkg_setup() {
-    exdirectory --allow /opt
-    exdirectory --allow /etc/modules-load.d
-}
-
-src_unpack() {
-    edo cp "${FETCHEDDIR}"/${MY_PNV}-Linux_${PLATFORM}.run "${WORKBASE}"
-    edo chmod u+x "${WORKBASE}"/${MY_PNV}-Linux_${PLATFORM}.run
-    edo sh "${WORKBASE}"/${MY_PNV}-Linux_${PLATFORM}.run --noexec --target "${WORK}"
-    edo mkdir "${WORK}"/opt
-    edo cd "${WORK}"/opt
-    edo mv "${WORK}"/${MY_PN}.tar.bz2 "${WORK}"/opt
-    unpack ./${MY_PN}.tar.bz2
-    edo rm ${MY_PN}.tar.bz2
-
-    # Extension Pack
-    edo mkdir "${WORK}"/${EXT_PN}
-    edo pushd "${WORK}"/${EXT_PN}
-    unpack ${EXT_PN}-${MY_PV}.tar.gz
-    edo popd
-}
-
-src_prepare() {
-    # Some things should not be installed to /opt, but to the dirs we should
-    # use for them, so we'll move them to another place.
-    edo mkdir -p "${WORK}"/{doc,apps,icons}
-    edo mv "${WORK}"/opt/virtualbox.desktop "${WORK}"/apps
-    edo mv "${WORK}"/opt/VBox.png "${WORK}"/icons
-    edo mv "${WORK}"/opt/UserManual.pdf "${WORK}"/doc
-    edo mv "${WORK}"/opt/src "${WORK}"
-}
-
-src_install() {
-    insinto /etc/vbox
-    hereins vbox.cfg <<EOF
-# VirtualBox installation directory
-INSTALL_DIR='/opt/${MY_PN}'
-# VirtualBox version
-INSTALL_VER='${PV%_*}'
-EOF
-
-    insinto /usr/share/applications/
-    doins "${WORK}"/apps/virtualbox.desktop
-
-    insinto /usr/share/pixmaps/
-    newins "${WORK}"/icons/VBox.png virtualbox.png
-
-    dodoc "${WORK}"/doc/UserManual.pdf
-
-    insinto /usr/src/${PNV}
-    doins -r "${WORK}"/src/*
-
-    dodir /opt/${MY_PN} /usr/bin
-    edo mv "${WORK}"/opt/* "${IMAGE}"/opt/${MY_PN}
-    for links in {VBoxHeadless,VBoxManage,VBoxSDL,VBoxVRDP,VirtualBox,vboxwebsrv,VBoxBalloonCtrl,VBoxAutostart}; do
-        dosym /opt/${MY_PN}/VBox.sh /usr/bin/${links}
-    done
-    dosym /opt/${MY_PN}/rdesktop-vrdp /usr/bin/rdesktop-vrdp
-
-    # Install Extension Pack
-    edo pushd "${WORK}"/${EXT_PN}
-    insinto /opt/${MY_PN}/ExtensionPacks/${EXT_PN}
-    doins ExtPack* PXE-Intel.rom
-    if option platform:amd64; then
-        doins -r linux.amd64
-    elif option platform:x86; then
-        doins -r linux.x86
-    else
-        die "unsupported platform"
-    fi
-    edo popd
-
-    # VirtualBox needs to be setuid
-    edo chmod 4711 "${IMAGE}"/opt/${MY_PN}/{VirtualBox,VBoxManage}
-    edo chmod 4711 "${IMAGE}"/opt/${MY_PN}/{VBoxNetAdpCtl,VBoxNetDHCP}
-
-    insinto "${UDEVRULESDIR}"
-    hereins 10-vboxdrv.rules <<EOF
-KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="vboxusers", MODE="0660"
-KERNEL=="vboxnetctl", NAME="vboxnetctl", OWNER="root", GROUP="vboxusers", MODE="0660"
-SUBSYSTEM=="usb_device", ACTION=="add", RUN+="/opt/${MY_PN}/VBoxCreateUSBNode.sh \$major \$minor \$attr{bDeviceClass} usb"
-SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="/opt/${MY_PN}/VBoxCreateUSBNode.sh \$major \$minor \$attr{bDeviceClass} usb"
-SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="/opt/${MY_PN}/VBoxCreateUSBNode.sh --remove \$major \$minor"
-SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="/opt/${MY_PN}/VBoxCreateUSBNode.sh --remove \$major \$minor"
-EOF
-
-    if option systemd; then
-        insinto /etc/modules-load.d
-        hereins ${PN}.conf <<EOF
-vboxdrv
-vboxnetflt
-vboxnetadp
-vboxpci
-EOF
-    fi
-
-    # Fix for 2.2.0
-    for symlink in VBox{DDU,REM,RT,VMM,XPCOM}.so; do
-        dosym /opt/${MY_PN}/${symlink} /opt/${MY_PN}/components
-    done
-}
-
-pkg_postinst() {
-    ewarn "This exheres does not build the kernel modules for VirtualBox, you will have to do this"
-    ewarn "on your own. The source code has been installed to /usr/src/${PNV}"
-
-    if [[ -f /etc/udev/rules.d/60-virtualbox.rules ]]; then
-        ewarn "Old rules file /etc/udev/rules.d/60-virtualbox.rules found."
-        ewarn "You should remove this file."
-    fi
-
-    elog "In order to expose USB devices to VirtualBox guests, your user must be a member of"
-    elog "the 'usb' group."
-}
-
diff --git a/packages/dev-util/cunit/cunit-2.1_p2.exheres-0 b/packages/dev-util/cunit/cunit-2.1_p2.exheres-0
deleted file mode 100644
index df5934c..0000000
--- a/packages/dev-util/cunit/cunit-2.1_p2.exheres-0
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2014 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-MY_P=CUnit-${PV/_p/-}
-
-require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.13 1.12 1.11 1.10 ] ]
-# out of source build broken
-require easy-multibuild [ multiunpack=true work=${MY_P} ]
-
-SUMMARY="C Unit Test Framework"
-DOWNLOADS="mirror://sourceforge/cunit/${MY_P}-src.tar.bz2"
-HOMEPAGE="http://cunit.sourceforge.net"
-
-SLOT="0"
-LICENCES="LGPL-2"
-PLATFORMS="~amd64 ~x86"
-MYOPTIONS="
-    ncurses
-    multibuild_c: ( 32 64 )
-"
-
-DEPENDENCIES="
-    build+run:
-        ncurses? ( sys-libs/ncurses[multibuild_c:*(-)?] )
-"
-
-DEFAULT_SRC_CONFIGURE_PARAMS=( --disable-static )
-DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=(
-    'ncurses curses'
-)
-
-prepare_one_multibuild() {
-    # fix docdir messup
-    edo sed -e "/^docdir/d" -i doc/Makefile.am
-    edo sed -e '/^dochdrdir/{s:$(prefix)/doc/@PACKAGE@:$(docdir):}' -i doc/headers/Makefile.am
-
-    edo sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in
-
-    autotools_src_prepare
-}
-
diff --git a/packages/x11-plugins/pidgin-otr/pidgin-otr-4.0.1.exheres-0 b/packages/x11-plugins/pidgin-otr/pidgin-otr-4.0.1.exheres-0
deleted file mode 100644
index 913b6b3..0000000
--- a/packages/x11-plugins/pidgin-otr/pidgin-otr-4.0.1.exheres-0
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2014 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-SUMMARY="Pidgin plugin for OTR encrypted messaging"
-HOMEPAGE="http://www.cypherpunks.ca/otr/"
-DOWNLOADS="http://www.cypherpunks.ca/otr/${PNV}.tar.gz"
-
-LICENCES="GPL-2"
-SLOT="0"
-PLATFORMS="~amd64 ~x86"
-
-DEPENDENCIES="
-    build:
-        dev-util/intltool
-        virtual/pkg-config
-    build+run:
-        dev-libs/libgcrypt:0
-        net-im/pidgin[gtk]
-        net-libs/libotr[>=4.0.0]
-        x11-libs/gtk+:2
-"
-
diff --git a/packages/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.7.7.exheres-0 b/packages/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.7.7.exheres-0
deleted file mode 100644
index 7c0d005..0000000
--- a/packages/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.7.7.exheres-0
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2014 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-require gtk-icon-cache xfce [ module=panel-plugins ]
-
-SUMMARY="Panel sticky notes plugin"
-HOMEPAGE="http://goodies.xfce.org/projects/panel-plugins/${PN}"
-
-SLOT="0"
-PLATFORMS="~amd64"
-MYOPTIONS=""
-
-DEPENDENCIES="
-    build+run:
-        dev-libs/glib:2[>=2.16]
-        dev-libs/unique:1
-        gnome-desktop/librsvg:2[>=2.18]
-        gnome-desktop/libwnck:1[>=2.12]
-        x11-libs/gtk+:2[>=2.6]
-        xfce-base/libxfce4util[>=4.3.90.2]
-        xfce-base/libxfcegui4[>=4.3.90.2]
-        xfce-base/xfce4-panel[>=4.3.20]
-        xfce-base/xfconf[>=4.6]
-"
-