diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 224e7f0..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.pc/
diff --git a/debian/README.kali b/debian/README.kali
deleted file mode 100644
index b8dff34..0000000
--- a/debian/README.kali
+++ /dev/null
@@ -1,5 +0,0 @@
-Changes to do when we introduce a new release
----------------------------------------------
-* Update functions/releases.sh with the version
-  (via Add-versions-for-Kali-releases.patch)
-* Add the required symlink in debian/live-build.links
diff --git a/debian/live-build.links b/debian/live-build.links
deleted file mode 100644
index dcbe0b6..0000000
--- a/debian/live-build.links
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/share/live/build/data/debian-cd/sid usr/share/live/build/data/debian-cd/moto
-usr/share/live/build/data/debian-cd/sid usr/share/live/build/data/debian-cd/sana
-usr/share/live/build/data/debian-cd/sid usr/share/live/build/data/debian-cd/safi
-usr/share/live/build/data/debian-cd/sid usr/share/live/build/data/debian-cd/kali-current
-usr/share/live/build/data/debian-cd/sid usr/share/live/build/data/debian-cd/kali-dev
-usr/share/live/build/data/debian-cd/sid usr/share/live/build/data/debian-cd/kali-rolling
diff --git a/scripts/build/binary_efi b/scripts/build/binary_efi
deleted file mode 100755
index 139bd11..0000000
--- a/scripts/build/binary_efi
+++ /dev/null
@@ -1,249 +0,0 @@
-#!/bin/sh
-
-## live-build(7) - System Build Scripts
-## Copyright (C) 2014 Raphaël Hertzog <buxy@kali.org>
-##
-## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-## This is free software, and you are welcome to redistribute it
-## under certain conditions; see COPYING for details.
-
-
-set -e
-
-# Including common functions
-[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'prepares and installs EFI support into binary')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-LB_PRIMARY_BOOTLOADER=$(echo "${LB_BOOTLOADERS}" | awk -F, '{ print $1 }')
-
-if [ "${LB_PRIMARY_BOOTLOADER}" != "syslinux" ]
-then
-	exit 0
-fi
-
-Echo_message "Begin preparing EFI support..."
-
-# Requiring stage file
-Require_stagefile .build/config .build/bootstrap
-
-# Checking stage file
-Check_stagefile .build/binary_efi
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Check architecture
-Check_architectures amd64 i386
-Check_crossarchitectures
-
-case "${LB_ARCHITECTURES}" in
-	amd64)
-		_EFI_TYPE=efi64
-		;;
-	i386)
-		_EFI_TYPE=efi32
-		;;
-	*)
-		echo "ERROR: can't provide EFI boot support to architecture ${LB_ARCHITECTURES}" >&2
-		exit 1
-		;;
-esac
-
-# Assembling image specifics
-case "${LIVE_IMAGE_TYPE}" in
-	iso*)
-		_BOOTLOADER="isolinux"
-
-		case "${LB_MODE}" in
-			progress-linux)
-				_CONFDIR="binary/boot"
-				;;
-
-			*)
-				_CONFDIR="binary/isolinux"
-				;;
-		esac
-		;;
-
-	netboot)
-		_BOOTLOADER="pxelinux"
-		_CONFDIR="tftpboot"
-		;;
-
-	hdd*|*)
-		case ${LB_BINARY_FILESYSTEM} in
-			fat*|ntfs)
-				_BOOTLOADER=syslinux
-
-				case "${LB_MODE}" in
-					progress-linux)
-						_CONFDIR="binary/boot"
-						;;
-
-					*)
-						_CONFDIR="binary/syslinux"
-						;;
-				esac
-				;;
-
-			ext[234]|btrfs)
-				_BOOTLOADER=extlinux
-				_CONFDIR="binary/boot/extlinux"
-				;;
-
-			*)
-				Echo_error "syslinux/extlinux doesn't support ${LB_BINARY_FILESYSTEM}"
-				exit 1
-				;;
-		esac
-		;;
-esac
-
-# Checking depends
-Check_package chroot /usr/bin/syslinux syslinux
-Check_package chroot /usr/lib/syslinux syslinux-common
-Check_package chroot /usr/lib/SYSLINUX.EFI syslinux-efi
-Check_package chroot /usr/bin/mcopy mtools
-Check_package chroot /sbin/mkfs.msdos dosfstools
-
-case "${LB_BUILD_WITH_CHROOT}" in
-	true)
-		_CHROOT_DIR="" ## Chroot dir is root dir within the chroot...
-		_SYSLINUX_EFI_DIR="chroot/usr/lib/SYSLINUX.EFI/$_EFI_TYPE"
-		_SYSLINUX_COMMON_DIR="chroot/usr/lib/syslinux/modules/$_EFI_TYPE"
-		;;
-
-	false)
-		_CHROOT_DIR="chroot"
-		_SYSLINUX_EFI_DIR="/usr/lib/syslinux/$_EFI_TYPE"
-		_SYSLINUX_COMMON_DIR="/usr/lib/syslinux/modules/$_EFI_TYPE"
-		;;
-esac
-
-# Restoring cache
-Restore_cache cache/packages.binary
-
-# Installing depends
-Install_package
-
-# Abort if we don't have the required EFI files
-if [ ! -e $_SYSLINUX_EFI_DIR/syslinux.efi ]; then
-	Echo_warning "$_SYSLINUX_EFI_DIR/syslinux.efi missing, no EFI support included."
-	case "${LB_BUILD_WITH_CHROOT}" in
-		true)
-			# Saving cache
-			Save_cache cache/packages.binary
-
-			# Removing depends
-			Remove_package
-			;;
-	esac
-	exit 0
-fi
-
-# Cleanup files that we generate
-rm -rf chroot/efi-temp chroot/efi.img binary/boot/efi.img
-
-# Copy syslinux and its config files in the temporary EFI image
-mkdir -p chroot/efi-temp/live
-mkdir -p chroot/efi-temp/EFI/BOOT
-for _F in $_CONFDIR/*.cfg $_CONFDIR/*.png $_SYSLINUX_COMMON_DIR/*.*32 $_SYSLINUX_COMMON_DIR/*.*64; do
-	if [ -e $_F ]; then
-		cp $_F chroot/efi-temp/EFI/BOOT/
-	else
-		Echo_warning "No file matching $_F, EFI support might be broken."
-	fi
-done
-cp $_SYSLINUX_EFI_DIR/syslinux.efi chroot/efi-temp/EFI/BOOT/BOOTX64.efi
-cp $_SYSLINUX_EFI_DIR/syslinux.efi chroot/efi-temp/EFI/BOOT/syslinux.efi
-
-# Copy the various kernel images
-cp binary/live/vmlinuz* binary/live/initrd.img* chroot/efi-temp/live/
-if [ -d binary/install ]; then
-	cp -r binary/install chroot/efi-temp/
-fi
-
-# Edit the menu to differentiate the EFI version
-if [ -e chroot/efi-temp/EFI/BOOT/menu.cfg ]; then
-	sed -i -e "s/^menu title/menu title EFI/" chroot/efi-temp/EFI/BOOT/menu.cfg
-else
-        Echo_warning "No menu.cfg file that can be edited to indicate that we boot on EFI!"
-fi
-
-# Ensure we have a syslinux.cfg
-if [ ! -e chroot/efi-temp/EFI/BOOT/syslinux.cfg ]; then
-	for _F in isolinux.cfg pxelinux.cfg/default extlinux.conf; do
-		if [ -f chroot/efi-temp/EFI/BOOT/$_F ]; then
-			cp chroot/efi-temp/EFI/BOOT/$_F chroot/efi-temp/EFI/BOOT/syslinux.cfg
-			break
-		fi
-	done
-fi
-
-# Define the EFI filesystem size
-_TOTALSIZE=$(du -sk chroot/efi-temp/ | awk '{print $1}')
-# Add 5% safety margin
-_TOTALSIZE=$(( $_TOTALSIZE * 21 / 20 ))
-# Required size rounded to upper 32kb
-_BLOCKS=$(( ($_TOTALSIZE + 31) / 32 * 32 ))
-Echo "EFI boot image needs $_TOTALSIZE Kb, thus allocating $_BLOCKS blocks."
-
-# Script to generate the EFI boot image
-cat >binary.sh <<END
-#!/bin/sh
-
-set -e
-
-mkfs.msdos -C $_CHROOT_DIR/efi.img $_BLOCKS
-mcopy -s -v -i $_CHROOT_DIR/efi.img $_CHROOT_DIR/efi-temp/* ::
-END
-
-# Copying files
-case "${LB_BUILD_WITH_CHROOT}" in
-	true)
-		mv binary.sh chroot/
-		Chroot chroot "sh binary.sh"
-		rm -f chroot/binary.sh
-
-		# Saving cache
-		Save_cache cache/packages.binary
-
-		# Removing depends
-		Remove_package
-		;;
-
-	false)
-		sh binary.sh
-		rm -f binary.sh
-		;;
-esac
-
-mkdir -p binary/boot
-mv chroot/efi.img binary/boot/
-rm -rf chroot/efi-temp
-
-case "${LB_BUILD_WITH_CHROOT}" in
-        true)
-                # Saving cache
-                Save_cache cache/packages.binary
-
-                # Removing depends
-                Remove_package
-                ;;
-esac
-
-# Creating stage file
-Create_stagefile .build/binary_efi
diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso
index a0b5170..99cae59 100755
--- a/scripts/build/binary_iso
+++ b/scripts/build/binary_iso
@@ -70,23 +70,6 @@
 
 # Handle xorriso generic options
 XORRISO_OPTIONS="-R -r -J -joliet-long -l -cache-inodes -iso-level 3"
-
-case "${LB_BUILD_WITH_CHROOT}" in
-	true)
-		XORRISO_VER=$(Chroot chroot xorriso --version 2>&1 | awk '
-		    /^xorriso version/ {
-			 split($4, ver, ".")
-			 print ver[1]*10000+ver[2]*100+ver[3]
-		    }')
-		;;
-	false)
-		XORRISO_VER=$(xorriso --version 2>&1 | awk '
-		    /^xorriso version/ {
-			 split($4, ver, ".")
-			 print ver[1]*10000+ver[2]*100+ver[3]
-		    }')
-		;;
-esac
 
 # Handle xorriso live-build specific options
 if [ "${LIVE_IMAGE_TYPE}" = "iso-hybrid" ]
@@ -191,26 +174,6 @@
 done
 IFS="$OLDIFS"
 
-if [ -e binary/boot/efi.img ]; then
-	#if [ "$XORRISO_VER" -le 10202 ]; then
-		# 1.2.2 shipping in wheezy
-		Echo "Using older EFI command line for xorriso $XORRISO_VER"
-		# Tell xorriso to create a secondary ElTorito boot record for the
-		# EFI bootloader
-		XORRISO_OPTIONS="${XORRISO_OPTIONS} -eltorito-alt-boot --efi-boot boot/efi.img"
-		# Add the efi image as a FAT partition too, so our CD image will
-		# also boot on a USB key (like isohybrid, just implemented
-		# differently)
-		XORRISO_OPTIONS="${XORRISO_OPTIONS} -append_partition 2 0x01 binary/boot/efi.img"
-	#else
-	#	Echo "Using newer EFI support in xorriso $XORRISO_VER"
-	#	XORRISO_OPTIONS="${XORRISO_OPTIONS} -eltorito-alt-boot -e boot/efi.img -no-emul-boot"
-	#	XORRISO_OPTIONS="${XORRISO_OPTIONS} -isohybrid-gpt-basdat"
-	#fi
-else
-	Echo "No EFI boot code to include in the ISO"
-fi
-
 #if [ "${LB_DEBIAN_INSTALLER}" != "live" ]
 #then
 #	XORRISO_OPTIONS="${XORRISO_OPTIONS} -m ${XORRISO_EXCLUDE}"