diff --git a/conf/portage/make.conf b/conf/portage/make.conf
deleted file mode 100644
index de9507f..0000000
--- a/conf/portage/make.conf
+++ /dev/null
@@ -1,82 +0,0 @@
-# These settings were set by the catalyst build script that automatically
-# built this stage.
-# Please consult /usr/share/portage/config/make.conf.example for a more
-# detailed example.
-# CFLAGS="-march=amdfam10 -O2 -pipe"
-CFLAGS="-O2 -pipe -march=native"
-CXXFLAGS="${CFLAGS}"
-LDFLAGS="-Wl,-O1 -Wl,--as-needed"
-
-# _ARCH=`uname -m`
-# WARNING: Changing your CHOST is not something that should be done lightly.
-# Please consult http://www.gentoo.org/doc/en/change-chost.xml before changing.
-CHOST="x86_64-pc-linux-gnu"
-# These are the USE flags that were used in addition to what is provided by the
-# profile used for building.
-
-# All other CPU related USE flags are set via /etc/profile.d/portage_env.sh
-DO_USE="smp"
-
-# X
-DO_USE="${DO_USE} cairo gtk gtk3 gtkstyle gles2 gstreamer g3dvl imlib libkms nvidia qt4 qt3support vaapi vdpau libkms X xcb opencl opengl s3tc truetype vaapi xcomposite"
-
-# Multimedia
-DO_USE="${DO_USE} apng raw pdf exif gif tiff png jpeg xvid lcms xmp avi dvd dvdr ffmpeg dvdread quicktime svg mpeg x264 theora"
-
-# Sound 
-DO_USE="${DO_USE} pulseaudio alsa openal"
-DO_USE="${DO_USE} flac id3tag mpd mp3 m3u mpg123 ogg opus vorbis mad aac cdr lame libsamplerate taglib"
-
-# Middleware
-DO_USE="${DO_USE} acpi cryptsetup curl cups dbus git java keymap lm_sensors device-mapper gnutls net threads icu nsplugin lvm nfs libnotify python resolvconf sql sqlite spice syslog system-sqlite unicode udev xfs xml"
-
-# Wireless / Network / Misc
-DO_USE="${DO_USE} bluetooth usb wifi"
-
-# Disable IPv6 for now
-USE_NOT="-ipv6 -ppp"
-
-# No SystemD and friends
-USE_NOT="${USE_NOT} -systemd -consolekit -policykit -networkmanager -udisks"
-
-# PORTDIR_OVERLAY="/mnt/portage/overlays/layman/pentoo"
-PORTDIR_OVERLAY="${PORTDIR_OVERLAY} /mnt/portage/overlays/quarks"
-# PORTDIR_OVERLAY="${PORTDIR_OVERLAY} /mnt/portage/overlays/layman/steam"
-# PORTDIR_OVERLAY="${PORTDIR_OVERLAY} /mnt/portage/overlays/layman/DuPol"
-# PORTDIR_OVERLAY="${PORTDIR_OVERLAY} /mnt/portage/overlays/mv"
-# PORTDIR_OVERLAY="${PORTDIR_OVERLAY} /mnt/portage/overlays/layman/x11"
-
-DISTDIR="/mnt/portage/distfiles"
-PORTDIR="/mnt/portage/portage"
-PKGDIR="/mnt/portage/packages"
-PORT_LOGDIR="/var/log/portage"
-
-# Requires pbzip2 being installed
-PORTAGE_BZIP2_COMMAND="pbzip2"
-PORTAGE_COMPRESS="${PORTAGE_BZIP2_COMMAND}"
-
-DRACUT_MODULES="btrfs caps crypt crypt-gpg dmsquash-live lvm mdraid nfs syslog iscsi plymouth"
-#GRUB_PLATFORMS="coreboot efi-32 efi-64 pc qemu"
-
-# FEATURES="skiprocheck userfetch parallel-fetch strict ccache"
-FEATURES="clean-logs fail-clean parallel-install skiprocheck userfetch parallel-fetch strict"
-CCACHE_DIR="/root/.ccache"
-CCACHE_SIZE="4G"
-
-#VIDEO_CARDS="intel nvidia fbdev radeon radeonsi vesa vga"
-VIDEO_CARDS="intel nvidia fbdev vesa vga"
-INPUT_DEVICES="keyboard mouse evdev synaptics wacom"
-
-QEMU_SOFTMMU_TARGETS="i386 x86_64"
-QEMU_USER_TARGETS="i386 x86_64"
-# RUBY_TARGETS="ruby19"
-
-PORTAGE_TMPDIR="/tmp"
-PORTAGE_NICENESS=10
-CLEAN_DELAY="3"
-
-LINGUAS="en en_CA de de_DE"
-
-USE="${DO_USE} ${USE_NOT}"
-SYNC="rsync://rsync.ca.gentoo.org/gentoo-portage"
-GENTOO_MIRRORS="rsync://gentoo.gossamerhost.com/gentoo-distfiles/ ftp://mirror.csclub.uwaterloo.ca/gentoo-distfiles/ ftp://mirror.datapipe.net/gentoo http://gentoo.netnitco.net http://gentoo.mirrors.easynews.com/linux/gentoo/"
diff --git a/conf/portage/package.keywords b/conf/portage/package.keywords
deleted file mode 100644
index c9fd13d..0000000
--- a/conf/portage/package.keywords
+++ /dev/null
@@ -1,109 +0,0 @@
-# Base 
-sys-kernel/dracut
-sys-fs/cryptsetup
-app-crypt/efitools
-=sys-boot/plymouth-openrc-plugin-0.1.2 ~amd64
-# sys-boot/os-prober
-# sys-kernel/hardened-sources
-app-admin/paxtest
-# Laptop WLAN
-sys-firmware/iwl6030-ucode
-
-# sys-fs/bcache-tools
-
-# GPUs
-# Intel - https://01.org/linuxgraphics/downloads/2013/2013q2-intel-graphics-stack-release
-#media-libs/mesa
-#x11-libs/libva
-#x11-libs/libva-intel-driver
-#=x11-drivers/xf86-video-intel-2.21.9
-#=sys-devel/llvm-3.3-r1 ~amd64
-#=dev-libs/libclc-0.0.1_pre20130819 ~amd64
-#=sys-devel/clang-3.3-r100 ~amd64
-
-# x11-drivers/ati-drivers 
-x11-drivers/nvidia-drivers
-# media-video/nvidia-settings
-# app-admin/eselect-opencl
-
-# AMD overclock
-sys-power/tpc
-# sys-power/cpupower
-
-# Gaming
-app-emulation/wine
-app-emulation/uae
-games-emulation/advancemame
-virtual/opencl
-
-# Video capture
-media-video/glc
-
-# Color Management
-# media-gfx/colorhug-client
-media-gfx/dispcalgui
-
-www-client/firefox
-media-libs/libpng
-
-# EVE
-games-util/gtkevemon **
-games-util/pyfa
-# required by games-util/pyfa-1.1.15[graph]
-# required by pyfa (argument)
-=dev-python/matplotlib-1.3.0 ~amd64
-# required by games-util/pyfa-1.1.15
-# required by pyfa (argument)
-=dev-python/sqlalchemy-0.8.2 ~amd64
-
-x11-misc/tint2
-
-# Android
-dev-util/android-sdk-update-manager
-
-# PenTesting/ Hacking
-#net-analyzer/metasploit
-#dev-ruby/kissfft
-#dev-ruby/msgpack
-#net-analyzer/fierce
-#net-analyzer/theHarvester
-# net-analyzer/dnsrecon
-#app-forensics/regripper
-
-# Wireless
-net-wireless/aircrack-ng
-# required by net-wireless/aircrack-ng-1.2_beta1[airdrop-ng]
-# required by @selected
-# required by @world (argument)
-=net-wireless/lorcon-0.0_p20130212 ~amd64
-
-# Video player + editing
-media-video/ffmpeg
-media-video/avidemux
-media-libs/avidemux-core
-media-libs/avidemux-plugins
-
-media-video/rtmpdump **
-
-# Console calendar
-app-misc/gcalcli
-# required by dev-python/google-api-python-client-1.1
-# required by app-misc/gcalcli-2.4.2
-# required by gcalcli (argument)
-=dev-python/python-gflags-2.0 ~amd64
-# required by app-misc/gcalcli-2.4.2
-# required by gcalcli (argument)
-=dev-python/google-api-python-client-1.1 ~amd64
-# required by dev-python/google-api-python-client-1.1
-# required by app-misc/gcalcli-2.4.2
-# required by gcalcli (argument)
-=dev-python/httplib2-0.8 ~amd64
-
-# Graphics
-media-gfx/gimp
-
-# Disk Imaging
-sys-block/partclone
-
-# Neccessary evil
-net-im/skype
diff --git a/conf/portage/package.license b/conf/portage/package.license
deleted file mode 100644
index 55093db..0000000
--- a/conf/portage/package.license
+++ /dev/null
@@ -1,8 +0,0 @@
-net-im/skype skype-4.0.0.7-copyright
-www-plugins/adobe-flash AdobeFlash-11.x
-games-fps/quake3-data Q3AEULA
-games-fps/quake3-teamarena Q3AEULA
-games-fps/ut2004-bonuspack-ece ut2003
-games-fps/ut2004-bonuspack-mega ut2003
-games-fps/ut2004-data ut2003
-games-fps/ut2004 ut2003
diff --git a/conf/portage/package.mask b/conf/portage/package.mask
deleted file mode 100644
index f479a85..0000000
--- a/conf/portage/package.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-sys-apps/systemd
-sys-fs/udev
-sys-auth/polkit
-gnome-extra/polkit-gnome
-lxde-base/lxpolkit
-sys-auth/consolekit
-sys-auth/rtkit
-sys-fs/udisks
diff --git a/conf/portage/package.unmask b/conf/portage/package.unmask
deleted file mode 100644
index b4c8e8c..0000000
--- a/conf/portage/package.unmask
+++ /dev/null
@@ -1 +0,0 @@
-net-im/skype
diff --git a/conf/portage/package.use b/conf/portage/package.use
deleted file mode 100644
index 957e4a9..0000000
--- a/conf/portage/package.use
+++ /dev/null
@@ -1,56 +0,0 @@
-# sys-fs/cryptsetup dynamic
-dev-libs/libgcrypt static-libs
-dev-libs/libgpg-error static-libs
-dev-libs/popt static-libs
-sys-apps/util-linux static-libs
-
-virtual/udev gudev
-sys-fs/eudev gudev hwdb kmod
-
-app-emulation/wine -win64 -gstreamer -realtime
-virtual/opencl abi_x86_32 
-
-net-fs/cifs-utils upcall ads
-net-fs/samba winbind
-
-dev-python/matplotlib wxwidgets
-
-app-emulation/libvirt qemu virt-network
-net-misc/spice-gtk -gstreamer
-
-app-admin/conky eve
-x11-misc/tint2 battery tint2conf
-
-media-libs/libgpod ios
-
-#required by app-text/gnome-doc-utils-0.20.6, required by gnome-doc-utils (argument)
-dev-libs/libxml2 python
-
-dev-db/sqlite secure-delete unlock-notify
-
-net-analyzer/nmap lua
-# Use gtk3 
-net-analyzer/wireshark -gtk2 -qt4
-
-media-sound/pulseaudio gnome -realtime 
-media-sound/audacity vamp sbsms
-
-dev-lang/php pcntl gd zip
-
-sys-kernel/hardened-sources injection symlink
-media-libs/mesa r600-llvm-compiler gbm
-sys-devel/llvm clang
-
-#required by media-video/vlc-2.0.1, required by vlc (argument)
-sys-libs/zlib minizip
-
-www-client/firefox system-cairo system-jpeg 
-app-office/libreoffice -java
-
-net-misc/openvpn iproute2
-
-# Games
-games-fps/quake3-data cdinstall
-
-sys-block/partclone fat ntfs 
-sys-fs/xfsprogs libxfs-dev
diff --git a/scripts/make_kernel.sh b/scripts/make_kernel.sh
deleted file mode 100755
index 24becc1..0000000
--- a/scripts/make_kernel.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-set -e
-
-[ "x$NEW" == "x" ] && NEW=$(grep "Kernel Configuration" /usr/src/linux/.config | awk '{print $3}')
-echo $NEW
-
-cd /usr/src/linux-${NEW} 
-# make clean
-# make oldconfig
-make menuconfig
-make all ${MAKEOPTS}
-make modules_install
-
-for f in initrd vmlinuz System.map config; do
-	[ -e "/boot/$f-${NEW}" ] && mv "/boot/$f-${NEW}" "/boot/$f-${NEW}.previous"
-done
-
-dracut --xz -H --force --strip /boot/initrd-${NEW} ${NEW}
-#dracut --no-compress -H --force --strip /usr/src/linux/initrd.cpio ${NEW}
-make all ${MAKEOPTS}
-
-make install
-
-grub2-mkconfig -o /boot/grub2/grub.cfg
-
-echo "Building tools from within kernel sources..."
-echo "  cpupower:"
-cd /usr/src/linux/tools/power/cpupower && make
-cp -a cpupower /usr/local/bin
-cp -a libcpupower.so* /usr/lib
-
-echo "After successful boot of new kernel run:"
-echo "   root # module-rebuild rebuild"
-# eselect opengl set ati
-
-cp /usr/src/linux/.config  /etc/kernel/kernel-config-${NEW} 
diff --git a/scripts/portage_env.sh b/scripts/portage_env.sh
deleted file mode 100644
index a350656..0000000
--- a/scripts/portage_env.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-# use as many cores as available
-export MAKEOPTS="-j$(nproc)"
-
-# USE
-# Look at CPU and return all actually available USE flags
-get_cpu_use() {
-        AVAILABLE_USE="mmx mmxext sse sse2 sse3 ssse3 sse4 sse4_1 avx 3dnow 3dnowext"
-        CPU_FLAGS=$(cat /proc/cpuinfo | grep flags | cut -d\  -f2- | uniq)
-
-        _USE=""
-        for f in ${AVAILABLE_USE}; do
-                if [ "$CPU_FLAGS" != "${CPU_FLAGS/$f/}" ]; then
-                        _USE="$_USE $f"
-                fi
-        done
-        echo $_USE
-}
-
-export USE=$(get_cpu_use)
diff --git a/scripts/setup_box.sh b/scripts/setup_box.sh
deleted file mode 100755
index 69573a0..0000000
--- a/scripts/setup_box.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-set -x
-
-# Sets up all kinds of softlinks and scripts to share all gentoo/portage 
-# across multiple machines backed by git repository
-
-link() {
-	FROM=$1
-	TO=$2
-	PREFIX=$3
-	pushd $PREFIX > /dev/null
-	for i in $FROM; do
-		[ -e $i ] || ln -s $TO/$i $i
-	done
-	popd > /dev/null
-}
-
-link "update_portage.sh update_box.sh make_kernel.sh" "/mnt/portage/overlays/quarks/scripts" "/usr/local/sbin"
-link "make.conf package.use package.keywords package.license package.mask package.unmask" "/mnt/portage/overlays/quarks/conf/portage" "/etc/portage"
diff --git a/scripts/update_box.sh b/scripts/update_box.sh
deleted file mode 100755
index a1fb7d7..0000000
--- a/scripts/update_box.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-set -e
-
-
-# Trigger mount
-# ls /mnt/portage/distfiles /mnt/portage/portage > /dev/null
-
-# Half as many emerge as CPUs, to speed up configure runs
-CPUS=$(nproc)
-emerge --ask --update --deep --newuse --keep-going --accept-properties=-interactive --jobs $((CPUS/2)) world
-
-# echo "Fixing pax flags..."
-# ${SCRIPT_DIR}/fix_grsec.sh
-
-echo "Going to remove unneeded packages ..."
-emerge --depclean
-
-if [ -x $(which localepurge) ]; then
-	echo "Removing unneeded locales..."
-	localepurge
-fi
-
-echo "Fixing dependencies..."
-revdep-rebuild -i
-
-echo "Updating eix cache..."
-eix-update -q
diff --git a/scripts/update_portage.sh b/scripts/update_portage.sh
deleted file mode 100755
index 9a4f80a..0000000
--- a/scripts/update_portage.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# set -x
-
-PORTAGE=/mnt/portage/portage
-
-emerge -q --sync 
-layman -q -S
-
-# Delete any package mask
-[ -f ${PORTAGE}/profiles/hardened/linux/amd64/package.mask ] && rm -f ${PORTAGE}/profiles/hardened/linux/amd64/package.mask
-# Reenable nvidia
-perl -i -p -e 's/^(app-admin\/conky nvidia|x11-drivers\/nvidia|nvidia|video_cards_nvidia|vdpau|cuda|opencl)/# $1/;' ${PORTAGE}/profiles/hardened/linux/use.mask ${PORTAGE}/profiles/hardened/linux/amd64/use.mask ${PORTAGE}/profiles/hardened/linux/amd64/package.use.mask
-
-# echo "Cleaning up archives.."
-eclean -q packages
-eclean -q distfiles