diff --git a/config/pentest-distro-builder.chroot b/config/pentest-distro-builder.chroot
index b7db3952..427b48d6 100644
--- a/config/pentest-distro-builder.chroot
+++ b/config/pentest-distro-builder.chroot
@@ -18,4 +18,5 @@ systemctl enable apache2
 systemctl enable mysql
 systemctl enable postgresql
 systemctl enable tor
-systemctl enable cockpit.socket
\ No newline at end of file
+systemctl enable cockpit.socket
+systemctl disable firewalld
diff --git a/config/software.list.chroot b/config/software.list.chroot
index e9766ff6..6ddb25a9 100644
--- a/config/software.list.chroot
+++ b/config/software.list.chroot
@@ -7,6 +7,7 @@ htop
 apt-file
 cockpit
 libpam-google-authenticator
+xrdp
 
 #Printing
 cups
diff --git a/modules/live-build-config/.getopt.sh b/modules/live-build-config/.getopt.sh
deleted file mode 100644
index 8e7cbc9c..00000000
--- a/modules/live-build-config/.getopt.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-# Supported options are:
-# -d | --distribution <distro>
-# -p | --proposed-updates
-# -a | --arch <architecture>
-#      --subdir <directory-name>
-#      --version <version>
-#      --variant <variant>
-# -v | --verbose
-# -s | --salt
-BUILD_OPTS_SHORT="d:pa:vs"
-BUILD_OPTS_LONG="distribution:,proposed-updates,arch:,subdir:,version:,variant:,verbose,salt"
diff --git a/modules/live-build-config/README b/modules/live-build-config/README
deleted file mode 100644
index 43d23d4b..00000000
--- a/modules/live-build-config/README
+++ /dev/null
@@ -1,8 +0,0 @@
-
-Some Debian bugs filed for issues encountered in Kali:
-
-#684865: live-build: lb_binary_syslinux fails to include flavour in menu entry
-#684891: live-build: add a config parameter to define the project name
-#684893: live-build: fails to find bootloaders files when running from git checkout
-#684896: live-build: loading of build.sh does not work as expected in various scripts
-
diff --git a/modules/live-build-config/auto/clean b/modules/live-build-config/auto/clean
deleted file mode 100755
index 8221855f..00000000
--- a/modules/live-build-config/auto/clean
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-lb clean noauto "$@"
-rm -f config/binary config/bootstrap \
-      config/chroot config/common config/source \
-      config/package-lists/live.list.chroot
-find config/hooks/ -type l | xargs --no-run-if-empty rm -f
diff --git a/modules/live-build-config/auto/config b/modules/live-build-config/auto/config
deleted file mode 100755
index 991eadac..00000000
--- a/modules/live-build-config/auto/config
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/bin/bash
-
-set -e
-set -o pipefail # Bashism
-
-# You can put a local mirror here if you want (or you can set
-# it in .mirror)
-if [ -e .mirror ]; then
-    kali_mirror=$(cat .mirror)
-else
-    kali_mirror=http://archive.kali.org/kali
-fi
-
-### DO NOT EDIT THE REST OF THIS FILE ###
-
-public_kali_mirror=http://http.kali.org/kali
-
-# Detect target architecture and filter args
-temp=""
-arch=$(dpkg --print-architecture)
-dist="kali-rolling"
-lb_opts=""
-while [ $# -gt 0 ]; do
-   	arg="$1"
-	case "$arg" in
-        -a|--arch|--architecture|--architectures)
-		arch="$2"
-		temp="$temp "'"'"$arg"'"'
-		temp="$temp "'"'"$2"'"'
-		shift
-		;;
-	--distribution)
-		dist="$2"
-		shift
-		;;
-	--variant)
-		variant="$2"
-		shift
-		;;
-	-p|--proposed-updates)
-		enable_pu="1"
-		;;
-	--)
-		# Skip the separator, it was added so that "lb config"
-		# doesn't barf on our own options, but now we are
-		# filtering them away assuming that the remaining ones
-		# are intended for lb config !
-		;;
-	*)
-		temp="$temp "'"'"$arg"'"'
-		;;
-	esac
-	shift
-done
-eval set -- "$temp"
-
-# Resolve release name
-dist=$(curl -s $kali_mirror/dists/$dist/Release | awk '/^Codename:/ {print $2}')
-
-# live-build doesn't work if --parent-debian-distribution is unknown of
-# debian-cd => we have to put a symlink so that it deals with kali like sid
-if [ ! -e ${LIVE_BUILD:-/usr/share/live/build}/data/debian-cd/$dist ]; then
-	if [ -w ${LIVE_BUILD:-/usr/share/live/build}/data/debian-cd ]; then
-		ln -sf sid ${LIVE_BUILD:-/usr/share/live/build}/data/debian-cd/$dist
-	else
-		echo "ERROR: Run this first:"
-		echo "ln -sf sid ${LIVE_BUILD:-/usr/share/live/build}/data/debian-cd/$dist"
-		exit 1
-	fi
-fi
-
-# Define options that vary across architectures
-case "$arch" in
-    amd64)
-	lb_opts="$lb_opts --debian-installer live"
-    ;;
-    i386)
-	lb_opts="$lb_opts --debian-installer live --linux-flavours 686-pae"
-    ;;
-    armel|armhf)
-	lb_opts="$lb_opts --binary-images hdd --binary-filesystem ext4 --chroot-filesystem none"
-    ;;
-    *)
-	echo "WARNING: configuration not tested on arch $arch" >&2
-    ;;
-esac
-
-# Define options that vary across distributions
-case "$dist" in
-    kali-last-snapshot)
-	# We don't want kali-last-snapshot to end up in the image, it
-	# should be replaced with kali-rolling
-	lb_opts="$lb_opts --distribution-binary kali-rolling"
-	lb_opts="$lb_opts --debootstrap-script /usr/share/debootstrap/scripts/kali-rolling"
-    ;;
-esac
-
-# Setup configuration files from variant and options
-
-# Drop all files that a former run might have put into place
-for file in $(cd kali-config && find . -type f); do
-    file=${file#./*/}
-    rm -f config/$file
-done
-rm -f config/archives/kali-proposed-updates.list.*
-
-# Copy over all files from official kali configuration
-cp -rT kali-config/common config
-[ ! -d kali-config/release-$dist ] || cp -rTL kali-config/release-$dist config
-[ ! -d kali-config/variant-$variant ] || cp -rTL kali-config/variant-$variant config
-
-if [ -n "$enable_pu" ]; then
-	mkdir -p config/archives
-	echo "deb $kali_mirror $dist-proposed-updates main contrib non-free" \
-		> config/archives/kali-proposed-updates.list.chroot
-	echo "deb $public_kali_mirror $dist-proposed-updates main contrib non-free" \
-		> config/archives/kali-proposed-updates.list.binary
-fi
-
-lb config noauto \
-	--distribution "$dist" \
-	--debian-installer-distribution "$dist" \
-	--archive-areas "main contrib non-free" \
-	--debootstrap-options "--keyring=/usr/share/keyrings/kali-archive-keyring.gpg" \
-	--keyring-packages kali-archive-keyring \
-	--updates false \
-	--backports false \
-	--source false \
-	--firmware-binary true \
-	--firmware-chroot true \
-	--mirror-bootstrap "$kali_mirror" \
-	--mirror-debian-installer "$kali_mirror" \
-	--mirror-binary "$public_kali_mirror" \
-	--iso-application "Kali Linux" \
-	--iso-publisher "Kali" \
-	--iso-volume "Kali Live" \
-	--linux-packages linux-image \
-	--memtest memtest86 \
-	--bootappend-live "boot=live components splash username=root hostname=kali" \
-	--bootappend-live-failsafe "boot=live components username=root hostname=kali memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal" \
-	--bootappend-install "net.ifnames=0" \
-	--security false \
-	$lb_opts \
-	"$@"
diff --git a/modules/live-build-config/build.sh b/modules/live-build-config/build.sh
deleted file mode 100755
index f939e343..00000000
--- a/modules/live-build-config/build.sh
+++ /dev/null
@@ -1,186 +0,0 @@
-#!/bin/bash
-
-set -e
-set -o pipefail  # Bashism
-
-KALI_DIST="kali-rolling"
-KALI_VERSION=""
-KALI_VARIANT="default"
-TARGET_DIR="$(dirname $0)/images"
-TARGET_SUBDIR=""
-SUDO="sudo"
-VERBOSE=""
-HOST_ARCH=$(dpkg --print-architecture)
-
-image_name() {
-	local arch=$1
-
-	case "$arch" in
-		i386|amd64)
-			IMAGE_TEMPLATE="live-image-ARCH.hybrid.iso"
-		;;
-		armel|armhf)
-			IMAGE_TEMPLATE="live-image-ARCH.img"
-		;;
-	esac
-	echo $IMAGE_TEMPLATE | sed -e "s/ARCH/$arch/"
-}
-
-target_image_name() {
-	local arch=$1
-
-	IMAGE_NAME="$(image_name $arch)"
-	IMAGE_EXT="${IMAGE_NAME##*.}"
-	if [ "$IMAGE_EXT" = "$IMAGE_NAME" ]; then
-		IMAGE_EXT="img"
-	fi
-	if [ "$KALI_VARIANT" = "default" ]; then
-		echo "${TARGET_SUBDIR:+$TARGET_SUBDIR/}kali-linux-$KALI_VERSION-$KALI_ARCH.$IMAGE_EXT"
-	else
-		echo "${TARGET_SUBDIR:+$TARGET_SUBDIR/}kali-linux-$KALI_VARIANT-$KALI_VERSION-$KALI_ARCH.$IMAGE_EXT"
-	fi
-}
-
-target_build_log() {
-	TARGET_IMAGE_NAME=$(target_image_name $1)
-	echo ${TARGET_IMAGE_NAME%.*}.log
-}
-
-default_version() {
-	case "$1" in
-	    kali-*)
-		echo "${1#kali-}"
-		;;
-	    *)
-		echo "$1"
-		;;
-	esac
-}
-
-failure() {
-	# Cleanup update-kali-menu that might stay around so that the
-	# build chroot can be properly unmounted
-	$SUDO pkill -f update-kali-menu || true
-	echo "Build of $KALI_DIST/$KALI_VARIANT/$KALI_ARCH live image failed (see build.log for details)" >&2
-	exit 2
-}
-
-run_and_log() {
-	if [ -n "$VERBOSE" ]; then
-		"$@" 2>&1 | tee -a build.log
-	else
-		"$@" >>build.log 2>&1
-	fi
-	return $?
-}
-
-. $(dirname $0)/.getopt.sh
-
-# Parsing command line options
-temp=$(getopt -o "$BUILD_OPTS_SHORT" -l "$BUILD_OPTS_LONG,get-image-path" -- "$@")
-eval set -- "$temp"
-while true; do
-	case "$1" in
-		-d|--distribution) KALI_DIST="$2"; shift 2; ;;
-		-p|--proposed-updates) OPT_pu="1"; shift 1; ;;
-		-a|--arch) KALI_ARCHES="${KALI_ARCHES:+$KALI_ARCHES } $2"; shift 2; ;;
-		-v|--verbose) VERBOSE="1"; shift 1; ;;
-		-s|--salt) shift; ;;
-		--variant) KALI_VARIANT="$2"; shift 2; ;;
-		--version) KALI_VERSION="$2"; shift 2; ;;
-		--subdir) TARGET_SUBDIR="$2"; shift 2; ;;
-		--get-image-path) ACTION="get-image-path"; shift 1; ;;
-		--) shift; break; ;;
-		*) echo "ERROR: Invalid command-line option: $1" >&2; exit 1; ;;
-        esac
-done
-
-# Set default values
-KALI_ARCHES=${KALI_ARCHES:-$HOST_ARCH}
-if [ -z "$KALI_VERSION" ]; then
-	KALI_VERSION="$(default_version $KALI_DIST)"
-fi
-
-# Check parameters
-for arch in $KALI_ARCHES; do
-	if [ "$arch" = "$HOST_ARCH" ]; then
-		continue
-	fi
-	case "$HOST_ARCH/$arch" in
-		amd64/i386|i386/amd64)
-		;;
-		*)
-			echo "Can't build $arch image on $HOST_ARCH system." >&2
-			exit 1
-		;;
-	esac
-done
-if [ ! -d "$(dirname $0)/kali-config/variant-$KALI_VARIANT" ]; then
-	echo "ERROR: Unknown variant of Kali configuration: $KALI_VARIANT" >&2
-fi
-
-# Build parameters for lb config
-KALI_CONFIG_OPTS="--distribution $KALI_DIST -- --variant $KALI_VARIANT"
-if [ -n "$OPT_pu" ]; then
-	KALI_CONFIG_OPTS="$KALI_CONFIG_OPTS --proposed-updates"
-	KALI_DIST="$KALI_DIST+pu"
-fi
-
-# Set sane PATH (cron seems to lack /sbin/ dirs)
-export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-
-# Either we use a git checkout of live-build
-# export LIVE_BUILD=/srv/cdimage.kali.org/live/live-build
-
-# Or we ensure we have proper version installed
-ver_live_build=$(dpkg-query -f '${Version}' -W live-build)
-if dpkg --compare-versions "$ver_live_build" lt 1:20151215kali1; then
-	echo "ERROR: You need live-build (>= 1:20151215kali1), you have $ver_live_build" >&2
-	exit 1
-fi
-
-# Check we have a good debootstrap
-ver_debootstrap=$(dpkg-query -f '${Version}' -W debootstrap)
-if dpkg --compare-versions "$ver_debootstrap" lt "1.0.97"; then
-	if ! echo "$ver_debootstrap" | grep -q kali; then
-		echo "ERROR: You need debootstrap >= 1.0.97 (or a Kali patched debootstrap). Your current version: $ver_debootstrap" >&2
-		#exit 1
-	fi
-fi
-
-# We need root rights at some point
-if [ "$(whoami)" != "root" ]; then
-	if ! which $SUDO >/dev/null; then
-		echo "ERROR: $0 is not run as root and $SUDO is not available" >&2
-		exit 1
-	fi
-else
-	SUDO="" # We're already root
-fi
-
-if [ "$ACTION" = "get-image-path" ]; then
-	for KALI_ARCH in $KALI_ARCHES; do
-		echo $(target_image_name $KALI_ARCH)
-	done
-	exit 0
-fi
-
-cd $(dirname $0)
-mkdir -p $TARGET_DIR/$TARGET_SUBDIR
-
-for KALI_ARCH in $KALI_ARCHES; do
-	IMAGE_NAME="$(image_name $KALI_ARCH)"
-	set +e
-	: > build.log
-	run_and_log $SUDO lb clean --purge
-	[ $? -eq 0 ] || failure
-	run_and_log lb config -a $KALI_ARCH $KALI_CONFIG_OPTS "$@"
-	[ $? -eq 0 ] || failure
-	run_and_log $SUDO lb build
-	if [ $? -ne 0 ] || [ ! -e $IMAGE_NAME ]; then
-		failure
-	fi
-	set -e
-	mv -f $IMAGE_NAME $TARGET_DIR/$(target_image_name $KALI_ARCH)
-	mv -f build.log $TARGET_DIR/$(target_build_log $KALI_ARCH)
-done
diff --git a/modules/live-build-config/build_all.sh b/modules/live-build-config/build_all.sh
deleted file mode 120000
index c07a74de..00000000
--- a/modules/live-build-config/build_all.sh
+++ /dev/null
@@ -1 +0,0 @@
-build.sh
\ No newline at end of file
diff --git a/modules/live-build-config/kali-config/common/bootloaders/grub-pc/dejavu-bold-14.pf2 b/modules/live-build-config/kali-config/common/bootloaders/grub-pc/dejavu-bold-14.pf2
deleted file mode 100644
index 9b093b20..00000000
Binary files a/modules/live-build-config/kali-config/common/bootloaders/grub-pc/dejavu-bold-14.pf2 and /dev/null differ
diff --git a/modules/live-build-config/kali-config/common/bootloaders/grub-pc/dejavu-bold-16.pf2 b/modules/live-build-config/kali-config/common/bootloaders/grub-pc/dejavu-bold-16.pf2
deleted file mode 100644
index 11e7f7ab..00000000
Binary files a/modules/live-build-config/kali-config/common/bootloaders/grub-pc/dejavu-bold-16.pf2 and /dev/null differ
diff --git a/modules/live-build-config/kali-config/common/bootloaders/grub-pc/grub.cfg b/modules/live-build-config/kali-config/common/bootloaders/grub-pc/grub.cfg
deleted file mode 100644
index d9bfb741..00000000
--- a/modules/live-build-config/kali-config/common/bootloaders/grub-pc/grub.cfg
+++ /dev/null
@@ -1,62 +0,0 @@
-set default=0
-
-loadfont $prefix/dejavu-bold-16.pf2
-loadfont $prefix/dejavu-bold-14.pf2
-loadfont $prefix/unicode.pf2
-set gfxmode=auto
-insmod all_video
-insmod gfxterm
-insmod png
-
-set color_normal=light-gray/black
-set color_highlight=white/black
-
-if [ -e /isolinux/splash.png ]; then
-    # binary_syslinux modifies the theme file to point to the correct
-    # background picture
-    set theme=/boot/grub/live-theme/theme.txt
-elif [ -e /boot/grub/splash.png ]; then
-    set theme=/boot/grub/live-theme/theme.txt
-else
-    set menu_color_normal=cyan/blue
-    set menu_color_highlight=white/blue
-fi
-
-terminal_output gfxterm
-
-insmod play
-play 960 440 1 0 4 440 1
-
-# Live boot
-LINUX_LIVE
-
-menuentry "Live system (forensic mode)" {
-	linux KERNEL_LIVE APPEND_LIVE noswap noautomount
-	initrd INITRD_LIVE
-}
-menuentry "Live system (persistence, check kali.org/prst)" {
-	linux KERNEL_LIVE APPEND_LIVE persistence
-	initrd INITRD_LIVE
-}
-menuentry "Live system (encrypted persistence, check kali.org/prst)" {
-	linux KERNEL_LIVE APPEND_LIVE persistent=cryptsetup persistence-encryption=luks persistence
-	initrd INITRD_LIVE
-}
-
-# Installer (if any)
-LINUX_INSTALL
-
-menuentry "Start installer with speech synthesis" {
-	linux KERNEL_GI speakup.synth=soft APPEND_GI 
-	initrd INITRD_GI
-}
-
-submenu 'Advanced options...' {
-
-# More installer entries (if any)
-LINUX_ADVANCED_INSTALL
-
-# Memtest (if any)
-MEMTEST
-
-}
diff --git a/modules/live-build-config/kali-config/common/bootloaders/grub-pc/live-theme/theme.txt b/modules/live-build-config/kali-config/common/bootloaders/grub-pc/live-theme/theme.txt
deleted file mode 100644
index 28fcc751..00000000
--- a/modules/live-build-config/kali-config/common/bootloaders/grub-pc/live-theme/theme.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-desktop-image: "../splash.png"
-title-color: "#ffffff"
-title-font: "DejaVu Sans Bold 16"
-title-text: ""
-message-font: "Unifont Regular 16"
-terminal-font: "Unifont Regular 16"
-
-#help bar at the bottom
-+ label {
-        top = 100%-50
-        left = 0
-        width = 100%
-        height = 20
-        text = "@KEYMAP_SHORT@"
-        align = "center"
-        color = "#ffffff"
-        font = "DejaVu Sans Bold 14"
-}
-
-# Title in the middle box
-+ label {
-        top = 38%
-        left = 0
-        width = 100%
-        height = 35
-        align = "center"
-        color = "#ffffff"
-        text = "Kali Linux Live Boot Menu"
-        font = "DejaVu Sans Bold 16"
-}
-
-#boot menu
-+ boot_menu {
-        left = 13%
-        width = 74%
-        top = 38%+35
-        height = 170
-        item_color = "#a8a8a8"
-        item_font = "DejaVu Sans Bold 14"
-        selected_item_color= "#ffffff"
-        selected_item_font = "DejaVu Sans Bold 14"
-        item_height = 16
-        item_padding = 0
-        item_spacing = 4
-        icon_width = 0
-        icon_heigh = 0
-        item_icon_space = 0
-}
-
-#progress bar
-+ progress_bar {
-        id = "__timeout__"
-        left = 13%
-        top = 100%-80
-        height = 16
-        width = 74%
-        font = "DejaVu Sans Bold 14"
-        text_color = "#000000"
-        fg_color = "#ffffff"
-        bg_color = "#a8a8a8"
-        border_color = "#ffffff"
-        text = "@TIMEOUT_NOTIFICATION_LONG@"
-}
diff --git a/modules/live-build-config/kali-config/common/bootloaders/grub-pc/splash.png b/modules/live-build-config/kali-config/common/bootloaders/grub-pc/splash.png
deleted file mode 100644
index 0b92d506..00000000
Binary files a/modules/live-build-config/kali-config/common/bootloaders/grub-pc/splash.png and /dev/null differ
diff --git a/modules/live-build-config/kali-config/common/hooks/live/accessibility-menu.binary b/modules/live-build-config/kali-config/common/hooks/live/accessibility-menu.binary
deleted file mode 100755
index 75cebb7e..00000000
--- a/modules/live-build-config/kali-config/common/hooks/live/accessibility-menu.binary
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-if [ ! -d isolinux ]; then
-    cd binary
-fi
-
-cat >>isolinux/install.cfg <<END
-
-label installspk
-	menu label Install with ^speech synthesis
-	linux /install/gtk/vmlinuz
-	initrd /install/gtk/initrd.gz
-	append video=vesa:ywrap,mtrr vga=788 speakup.synth=soft -- quiet
-END
-
diff --git a/modules/live-build-config/kali-config/common/hooks/live/forensic-menu.binary b/modules/live-build-config/kali-config/common/hooks/live/forensic-menu.binary
deleted file mode 100755
index d0c764bf..00000000
--- a/modules/live-build-config/kali-config/common/hooks/live/forensic-menu.binary
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-if [ ! -d isolinux ]; then
-    cd binary
-fi
-
-cat >>isolinux/live.cfg <<END
-
-label live-forensic
-	menu label Live (^forensic mode)
-	linux /live/vmlinuz
-	initrd /live/initrd.img
-	append boot=live noconfig=sudo username=root hostname=kali noswap noautomount
-END
-
diff --git a/modules/live-build-config/kali-config/common/hooks/live/kali-hacks.chroot b/modules/live-build-config/kali-config/common/hooks/live/kali-hacks.chroot
deleted file mode 100755
index c6812a54..00000000
--- a/modules/live-build-config/kali-config/common/hooks/live/kali-hacks.chroot
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-# Handle systems where /lib is not merged in /usr/lib
-if [ ! -h /lib ]; then
-    mv /usr/lib/live/config/* /lib/live/config/
-fi
-
-# Manually enabling pulseaudio for root since autospawning does
-# not work for root
-# See https://bugs.kali.org/view.php?id=2392
-systemctl --user enable pulseaudio.service || true
-
-# Disable the udev rules renaming the network interfaces (can also be
-# achieved with kernel command line net.ifnames=0 but we don't have a nice
-# way to set it on the installed system)
-mkdir -p /etc/systemd/network /etc/udev/rules.d
-ln -sf /dev/null /etc/systemd/network/90-mac-for-usb.link
-ln -sf /dev/null /etc/systemd/network/99-default.link
-echo > /etc/udev/rules.d/73-special-net-names.rules
-update-initramfs -u
-
-# Run updatedb to initialize the database for the locate command
-if [ -x "$(which updatedb 2>/dev/null)" ]; then
-    updatedb
-fi
diff --git a/modules/live-build-config/kali-config/common/hooks/live/persistence-menu.binary b/modules/live-build-config/kali-config/common/hooks/live/persistence-menu.binary
deleted file mode 100755
index 30a398bd..00000000
--- a/modules/live-build-config/kali-config/common/hooks/live/persistence-menu.binary
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-if [ ! -d isolinux ]; then
-    cd binary
-fi
-
-cat >>isolinux/live.cfg <<END
-
-label live-persistence
-    menu label ^Live USB Persistence              (check kali.org/prst)
-    linux /live/vmlinuz
-    initrd /live/initrd.img
-    append boot=live noconfig=sudo username=root hostname=kali persistence
-
-label live-encrypted-persistence
-    menu label ^Live USB Encrypted Persistence    (check kali.org/prst)
-    linux /live/vmlinuz
-    initrd /live/initrd.img
-    append boot=live persistent=cryptsetup persistence-encryption=luks noconfig=sudo username=root hostname=kali persistence
-
-END
-
diff --git a/modules/live-build-config/kali-config/common/hooks/live/sleep.chroot b/modules/live-build-config/kali-config/common/hooks/live/sleep.chroot
deleted file mode 100755
index 3ba3a76b..00000000
--- a/modules/live-build-config/kali-config/common/hooks/live/sleep.chroot
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-kali_menu_version=$(dpkg-query -W -f'${Version}\n' kali-menu)
-kali_menu_pidfile="/var/lock/kali-menu"
-
-# Wait until update-kali-menu is over
-if dpkg --compare-versions "$kali_menu_version" ge 2015.3.0; then
-    # This version puts the PID in its lock file
-    if [ -s $kali_menu_pidfile ]; then
-	pid=$(cat $kali_menu_pidfile)
-	while [ -n "$pid" ] && [ -e /proc/$pid ]; do
-	    echo "Sleeping 10 seconds as update-kali-menu is still running (pid $pid)..."
-	    sleep 10
-	done
-    fi
-else
-    # This version lacks PID info, we match on process name instead
-    while pgrep -f update-kali-menu >/dev/null; do
-	echo "Sleeping 10 seconds as update-kali-menu is still running..."
-	sleep 10
-    done
-fi
diff --git a/modules/live-build-config/kali-config/common/includes.binary/isolinux/splash.png b/modules/live-build-config/kali-config/common/includes.binary/isolinux/splash.png
deleted file mode 100644
index 0b92d506..00000000
Binary files a/modules/live-build-config/kali-config/common/includes.binary/isolinux/splash.png and /dev/null differ
diff --git a/modules/live-build-config/kali-config/common/includes.binary/isolinux/stdmenu.cfg b/modules/live-build-config/kali-config/common/includes.binary/isolinux/stdmenu.cfg
deleted file mode 100644
index f7a40122..00000000
--- a/modules/live-build-config/kali-config/common/includes.binary/isolinux/stdmenu.cfg
+++ /dev/null
@@ -1,18 +0,0 @@
-menu background 	splash.png
-menu color title        * #FFFFFFFF *
-menu color border       * #00000000 #00000000 none
-menu color sel          * #ffffffff #76a1d0ff *
-menu color hotsel       1;7;37;40 #ffffffff #76a1d0ff *
-menu color tabmsg       * #ffffffff #00000000 *
-menu color help         37;40 #ffdddd00 #00000000 none
-menu vshift 10
-menu hshift 4
-menu width 70
-menu margin 5
-menu rows 10
-menu helpmsgrow 15
-# The command line must be at least one line from the bottom.
-menu cmdlinerow 16
-menu timeoutrow 16
-menu tabmsgrow 18
-menu tabmsg Press ENTER to boot or TAB to edit a menu entry
diff --git a/modules/live-build-config/kali-config/common/includes.chroot/root/.bashrc b/modules/live-build-config/kali-config/common/includes.chroot/root/.bashrc
deleted file mode 100644
index 14eaf223..00000000
--- a/modules/live-build-config/kali-config/common/includes.chroot/root/.bashrc
+++ /dev/null
@@ -1,110 +0,0 @@
-# ~/.bashrc: executed by bash(1) for non-login shells.
-# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
-# for examples
-
-# If not running interactively, don't do anything
-case $- in
-    *i*) ;;
-      *) return;;
-esac
-
-# don't put duplicate lines or lines starting with space in the history.
-# See bash(1) for more options
-HISTCONTROL=ignoreboth
-
-# append to the history file, don't overwrite it
-shopt -s histappend
-
-# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
-HISTSIZE=1000
-HISTFILESIZE=2000
-
-# check the window size after each command and, if necessary,
-# update the values of LINES and COLUMNS.
-shopt -s checkwinsize
-
-# If set, the pattern "**" used in a pathname expansion context will
-# match all files and zero or more directories and subdirectories.
-#shopt -s globstar
-
-# make less more friendly for non-text input files, see lesspipe(1)
-#[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
-
-# set variable identifying the chroot you work in (used in the prompt below)
-if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
-    debian_chroot=$(cat /etc/debian_chroot)
-fi
-
-# set a fancy prompt (non-color, unless we know we "want" color)
-case "$TERM" in
-    xterm-color) color_prompt=yes;;
-esac
-
-# uncomment for a colored prompt, if the terminal has the capability; turned
-# off by default to not distract the user: the focus in a terminal window
-# should be on the output of commands, not on the prompt
-force_color_prompt=yes
-
-if [ -n "$force_color_prompt" ]; then
-    if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
-	# We have color support; assume it's compliant with Ecma-48
-	# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
-	# a case would tend to support setf rather than setaf.)
-	color_prompt=yes
-    else
-	color_prompt=
-    fi
-fi
-
-if [ "$color_prompt" = yes ]; then
-    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;31m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
-else
-    PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
-fi
-unset color_prompt force_color_prompt
-
-# If this is an xterm set the title to user@host:dir
-case "$TERM" in
-xterm*|rxvt*)
-    PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
-    ;;
-*)
-    ;;
-esac
-
-# enable color support of ls and also add handy aliases
-if [ -x /usr/bin/dircolors ]; then
-    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
-    alias ls='ls --color=auto'
-    #alias dir='dir --color=auto'
-    #alias vdir='vdir --color=auto'
-
-    #alias grep='grep --color=auto'
-    #alias fgrep='fgrep --color=auto'
-    #alias egrep='egrep --color=auto'
-fi
-
-# some more ls aliases
-#alias ll='ls -l'
-#alias la='ls -A'
-#alias l='ls -CF'
-
-# Alias definitions.
-# You may want to put all your additions into a separate file like
-# ~/.bash_aliases, instead of adding them here directly.
-# See /usr/share/doc/bash-doc/examples in the bash-doc package.
-
-if [ -f ~/.bash_aliases ]; then
-    . ~/.bash_aliases
-fi
-
-# enable programmable completion features (you don't need to enable
-# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
-# sources /etc/bash.bashrc).
-if ! shopt -oq posix; then
-  if [ -f /usr/share/bash-completion/bash_completion ]; then
-    . /usr/share/bash-completion/bash_completion
-  elif [ -f /etc/bash_completion ]; then
-    . /etc/bash_completion
-  fi
-fi
diff --git a/modules/live-build-config/kali-config/common/includes.chroot/usr/lib/live/config/0031-root-password b/modules/live-build-config/kali-config/common/includes.chroot/usr/lib/live/config/0031-root-password
deleted file mode 100755
index 02bdc52c..00000000
--- a/modules/live-build-config/kali-config/common/includes.chroot/usr/lib/live/config/0031-root-password
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-# Set "toor" as root password
-usermod -p 'X014elvznJq7E' root
-
diff --git a/modules/live-build-config/kali-config/common/includes.chroot/usr/lib/live/config/1165-fix-openssh-server b/modules/live-build-config/kali-config/common/includes.chroot/usr/lib/live/config/1165-fix-openssh-server
deleted file mode 100755
index 69df58e1..00000000
--- a/modules/live-build-config/kali-config/common/includes.chroot/usr/lib/live/config/1165-fix-openssh-server
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# Allow PasswordAuthentification in sshd config
-sed -i -e 's|#\?\(PasswordAuthentication\) no|\1 yes|' /etc/ssh/sshd_config
-
-# Allow root login with password
-sed -i -e 's|#\?\(PermitRootLogin\) prohibit-password|\1 yes|' /etc/ssh/sshd_config
diff --git a/modules/live-build-config/kali-config/common/includes.installer/02-unattended-boot.binary b/modules/live-build-config/kali-config/common/includes.installer/02-unattended-boot.binary
deleted file mode 100755
index bbac3189..00000000
--- a/modules/live-build-config/kali-config/common/includes.installer/02-unattended-boot.binary
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-cat >>binary/isolinux/install.cfg < label install
-menu label ^Unattended Install
-menu default
-linux /install/vmlinuz
-initrd /install/initrd.gz
-append vga=788 — quiet file=/cdrom/install/preseed.cfg locale=en_US keymap=us hostname=kali domain=local.lan
-END
diff --git a/modules/live-build-config/kali-config/common/includes.installer/preseed.cfg b/modules/live-build-config/kali-config/common/includes.installer/preseed.cfg
deleted file mode 100755
index 71b5f496..00000000
--- a/modules/live-build-config/kali-config/common/includes.installer/preseed.cfg
+++ /dev/null
@@ -1,79 +0,0 @@
-d-i debian-installer/locale string en_US.UTF-8
-d-i console-keymaps-at/keymap select us
-d-i mirror/country string enter information manually
-d-i mirror/http/hostname string http.kali.org
-d-i mirror/http/directory string /kali
-d-i keyboard-configuration/xkb-keymap select us
-d-i mirror/http/proxy string
-d-i mirror/suite string kali-rolling
-d-i mirror/codename string kali-rolling
-
-d-i clock-setup/utc boolean true
-d-i time/zone string US/Mountain
-
-# Disable security, volatile and backports
-d-i apt-setup/services-select multiselect 
-
-# Enable contrib and non-free
-d-i apt-setup/non-free boolean true
-d-i apt-setup/contrib boolean true
-
-# Disable source repositories too
-d-i apt-setup/enable-source-repositories boolean false
-
-# Partitioning
-d-i partman-auto/method string regular
-d-i partman-lvm/device_remove_lvm boolean true
-d-i partman-md/device_remove_md boolean true
-d-i partman-lvm/confirm boolean true
-d-i partman-auto/choose_recipe select atomic
-d-i partman-auto/disk string /dev/sda
-d-i partman/confirm_write_new_label boolean true
-d-i partman/choose_partition select finish
-d-i partman/confirm boolean true
-d-i partman/confirm_nooverwrite boolean true
-d-i partman-partitioning/confirm_write_new_label boolean true
-
-# Disable CDROM entries after install
-d-i apt-setup/disable-cdrom-entries boolean true
-
-# Upgrade installed packages
-d-i pkgsel/upgrade select full-upgrade
-
-# Change default hostname
-d-i netcfg/get_hostname string Kali
-d-i netcfg/get_domain string unassigned-domain
-#d-i netcfg/choose_interface select auto
-d-i netcfg/choose_interface select eth0
-d-i netcfg/dhcp_timeout string 60
-
-d-i hw-detect/load_firmware boolean false
-
-# Do not create a normal user account
-d-i passwd/make-user boolean false
-d-i passwd/root-password password toor
-d-i passwd/root-password-again password toor
-
-d-i apt-setup/use_mirror boolean true
-d-i grub-installer/only_debian boolean true
-d-i grub-installer/with_other_os boolean false
-d-i grub-installer/bootdev string /dev/sda
-d-i finish-install/reboot_in_progress note
-
-# Disable popularity-contest
-popularity-contest popularity-contest/participate boolean false
-
-kismet kismet/install-setuid boolean false
-kismet kismet/install-users string
-
-sslh sslh/inetd_or_standalone select standalone
-
-mysql-server-5.5 mysql-server/root_password_again password
-mysql-server-5.5 mysql-server/root_password password
-mysql-server-5.5 mysql-server/error_setting_password error
-mysql-server-5.5 mysql-server-5.5/postrm_remove_databases boolean false
-mysql-server-5.5 mysql-server-5.5/start_on_boot boolean true
-mysql-server-5.5 mysql-server-5.5/nis_warning note
-mysql-server-5.5 mysql-server-5.5/really_downgrade boolean false
-mysql-server-5.5 mysql-server/password_mismatch error
-mysql-server-5.5 mysql-server/no_upgrade_when_using_ndb error
diff --git a/modules/live-build-config/kali-config/common/package-lists/firmware.list.chroot b/modules/live-build-config/kali-config/common/package-lists/firmware.list.chroot
deleted file mode 100644
index 6b77d197..00000000
--- a/modules/live-build-config/kali-config/common/package-lists/firmware.list.chroot
+++ /dev/null
@@ -1,29 +0,0 @@
-##
-## Add all known firmwares
-##
-#if ARCHITECTURES i386 amd64
-firmware-b43legacy-installer 
-firmware-b43-installer
-#endif
-zd1211-firmware
-firmware-linux
-firmware-netxen
-firmware-ralink
-firmware-realtek
-firmware-iwlwifi
-firmware-intelwimax
-firmware-ipw2x00
-firmware-atheros
-firmware-bnx2
-firmware-libertas
-bluez-firmware
-firmware-brcm80211
-firmware-amd-graphics
-firmware-cavium
-firmware-intel-sound
-firmware-misc-nonfree
-firmware-myricom
-firmware-qlogic
-firmware-samsung
-firmware-siano
-firmware-ti-connectivity
diff --git a/modules/live-build-config/kali-config/common/package-lists/kali.list.binary b/modules/live-build-config/kali-config/common/package-lists/kali.list.binary
deleted file mode 100644
index 39ba5abc..00000000
--- a/modules/live-build-config/kali-config/common/package-lists/kali.list.binary
+++ /dev/null
@@ -1,14 +0,0 @@
-# ensure eatmydata is available for eatmydata.udeb
-eatmydata
-
-# EFI support, ensure we have the required .deb in the ISO available for
-# installation
-
-#if ARCHITECTURES i386
-grub-efi
-grub-efi-ia32
-#endif
-#if ARCHITECTURES amd64
-grub-efi
-grub-efi-amd64
-#endif
diff --git a/modules/live-build-config/kali-config/common/package-lists/linux-headers.chroot b/modules/live-build-config/kali-config/common/package-lists/linux-headers.chroot
deleted file mode 100644
index cd8eacb1..00000000
--- a/modules/live-build-config/kali-config/common/package-lists/linux-headers.chroot
+++ /dev/null
@@ -1,20 +0,0 @@
-##
-## Add linux headers to build DKMS packages even after the kernel
-## used to build the live images is gone from kali-rolling.
-##
-#if ARCHITECTURES i386
-linux-headers-686-pae
-#endif
-#if ARCHITECTURES amd64
-linux-headers-amd64
-#endif
-#if ARCHITECTURES arm64
-linux-headers-arm64
-#endif
-#if ARCHITECTURES armel
-linux-headers-marvell
-#endif
-#if ARCHITECTURES armhf
-linux-headers-armmp
-linux-headers-armmp-lpae
-#endif
diff --git a/modules/live-build-config/kali-config/common/package-lists/standard.list.chroot b/modules/live-build-config/kali-config/common/package-lists/standard.list.chroot
deleted file mode 100644
index f17ce401..00000000
--- a/modules/live-build-config/kali-config/common/package-lists/standard.list.chroot
+++ /dev/null
@@ -1 +0,0 @@
-! Packages Priority standard
diff --git a/modules/live-build-config/kali-config/common/preseed/kali.cfg.chroot b/modules/live-build-config/kali-config/common/preseed/kali.cfg.chroot
deleted file mode 100644
index e3d3e954..00000000
--- a/modules/live-build-config/kali-config/common/preseed/kali.cfg.chroot
+++ /dev/null
@@ -1,5 +0,0 @@
-# Various preseeding for auto-installed packages
-
-# Do not register it in inetd so that its status can be controlled
-# individually
-atftpd atftpd/use_inetd boolean false
diff --git a/modules/live-build-config/kali-config/variant-cinnamon/package-lists/kali.list.chroot b/modules/live-build-config/kali-config/variant-cinnamon/package-lists/kali.list.chroot
deleted file mode 100644
index 44bf10f1..00000000
--- a/modules/live-build-config/kali-config/variant-cinnamon/package-lists/kali.list.chroot
+++ /dev/null
@@ -1,25 +0,0 @@
-# You always want those
-kali-linux
-kali-desktop-live
-
-# Kali applications
-
-# You can customize the set of Kali applications to install
-# (-full is the default, -all is absolutely everything, the rest
-# corresponds to various subsets)
-kali-linux-full
-# kali-linux-all
-# kali-linux-sdr
-# kali-linux-gpu
-# kali-linux-wireless
-# kali-linux-web
-# kali-linux-forensic
-# kali-linux-voip
-# kali-linux-pwtools
-# kali-linux-top10
-# kali-linux-rfid
-
-# Graphical desktop
-cinnamon-desktop-environment
-file-roller
-gdm3
diff --git a/modules/live-build-config/kali-config/variant-default b/modules/live-build-config/kali-config/variant-default
deleted file mode 120000
index 2ef8d92c..00000000
--- a/modules/live-build-config/kali-config/variant-default
+++ /dev/null
@@ -1 +0,0 @@
-variant-gnome
\ No newline at end of file
diff --git a/modules/live-build-config/kali-config/variant-e17/hooks/live/tweak-enlightenment-config.chroot b/modules/live-build-config/kali-config/variant-e17/hooks/live/tweak-enlightenment-config.chroot
deleted file mode 100755
index 8b6ca882..00000000
--- a/modules/live-build-config/kali-config/variant-e17/hooks/live/tweak-enlightenment-config.chroot
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# Inject default background in e17 configuration (for all known profiles)
-for profile in mobile standard; do
-    dpkg-divert --local --add /usr/share/enlightenment/data/config/$profile/e.cfg
-    eet -d /usr/share/enlightenment/data/config/$profile/e.cfg config /tmp/e.src
-    awk '/value "desktop_default_name"/ {print "    value \"desktop_default_background\" string: \"/usr/share/enlightenment/data/backgrounds/kali-wallpaper_1920x1200.edj\";"}; {print}' /tmp/e.src >/tmp/e2.src
-    eet -e /usr/share/enlightenment/data/config/$profile/e.cfg config /tmp/e2.src 1
-    rm -f /tmp/e.src /tmp/e2.src
-done
diff --git a/modules/live-build-config/kali-config/variant-e17/includes.chroot/usr/share/enlightenment/data/backgrounds/kali-wallpaper_1920x1200.edj b/modules/live-build-config/kali-config/variant-e17/includes.chroot/usr/share/enlightenment/data/backgrounds/kali-wallpaper_1920x1200.edj
deleted file mode 100644
index 351dc11d..00000000
Binary files a/modules/live-build-config/kali-config/variant-e17/includes.chroot/usr/share/enlightenment/data/backgrounds/kali-wallpaper_1920x1200.edj and /dev/null differ
diff --git a/modules/live-build-config/kali-config/variant-e17/package-lists/kali.list.chroot b/modules/live-build-config/kali-config/variant-e17/package-lists/kali.list.chroot
deleted file mode 100644
index 42e66614..00000000
--- a/modules/live-build-config/kali-config/variant-e17/package-lists/kali.list.chroot
+++ /dev/null
@@ -1,27 +0,0 @@
-# You always want those
-kali-linux
-kali-desktop-live
-
-# Kali applications
-
-# You can customize the set of Kali applications to install
-# (-full is the default, -all is absolutely everything, the rest
-# corresponds to various subsets)
-kali-linux-full
-# kali-linux-all
-# kali-linux-sdr
-# kali-linux-gpu
-# kali-linux-wireless
-# kali-linux-web
-# kali-linux-forensic
-# kali-linux-voip
-# kali-linux-pwtools
-# kali-linux-top10
-# kali-linux-rfid
-
-# Graphical desktop
-kali-desktop-common
-xorg
-e17
-# To tweak default configuration with help of /usr/bin/eet
-libeet-bin
diff --git a/modules/live-build-config/kali-config/variant-gnome/package-lists/kali.list.chroot b/modules/live-build-config/kali-config/variant-gnome/package-lists/kali.list.chroot
deleted file mode 100644
index eb643c5f..00000000
--- a/modules/live-build-config/kali-config/variant-gnome/package-lists/kali.list.chroot
+++ /dev/null
@@ -1,23 +0,0 @@
-# You always want those
-kali-linux
-kali-desktop-live
-
-# Kali applications
-
-# You can customize the set of Kali applications to install
-# (-full is the default, -all is absolutely everything, the rest
-# corresponds to various subsets)
-kali-linux-full
-# kali-linux-all
-# kali-linux-sdr
-# kali-linux-gpu
-# kali-linux-wireless
-# kali-linux-web
-# kali-linux-forensic
-# kali-linux-voip
-# kali-linux-pwtools
-# kali-linux-top10
-# kali-linux-rfid
-
-# Graphical desktop
-kali-desktop-gnome
diff --git a/modules/live-build-config/kali-config/variant-i3wm/package-lists/kali.list.chroot b/modules/live-build-config/kali-config/variant-i3wm/package-lists/kali.list.chroot
deleted file mode 100644
index 36220287..00000000
--- a/modules/live-build-config/kali-config/variant-i3wm/package-lists/kali.list.chroot
+++ /dev/null
@@ -1,27 +0,0 @@
-# You always want those
-kali-linux
-kali-desktop-live
-
-# Kali applications
-
-# You can customize the set of Kali applications to install
-# (-full is the default, -all is absolutely everything, the rest
-# corresponds to various subsets)
-kali-linux-full
-# kali-linux-all
-# kali-linux-sdr
-# kali-linux-gpu
-# kali-linux-wireless
-# kali-linux-web
-# kali-linux-forensic
-# kali-linux-voip
-# kali-linux-pwtools
-# kali-linux-top10
-# kali-linux-rfid
-
-# Graphical desktop
-kali-desktop-common
-xorg
-dmenu
-conky
-i3
diff --git a/modules/live-build-config/kali-config/variant-kde/package-lists/kali.list.chroot b/modules/live-build-config/kali-config/variant-kde/package-lists/kali.list.chroot
deleted file mode 100644
index 6eb3741c..00000000
--- a/modules/live-build-config/kali-config/variant-kde/package-lists/kali.list.chroot
+++ /dev/null
@@ -1,23 +0,0 @@
-# You always want those
-kali-linux
-kali-desktop-live
-
-# Kali applications
-
-# You can customize the set of Kali applications to install
-# (-full is the default, -all is absolutely everything, the rest
-# corresponds to various subsets)
-kali-linux-full
-# kali-linux-all
-# kali-linux-sdr
-# kali-linux-gpu
-# kali-linux-wireless
-# kali-linux-web
-# kali-linux-forensic
-# kali-linux-voip
-# kali-linux-pwtools
-# kali-linux-top10
-# kali-linux-rfid
-
-# Graphical desktop
-kali-desktop-kde
diff --git a/modules/live-build-config/kali-config/variant-light/package-lists/kali.list.chroot b/modules/live-build-config/kali-config/variant-light/package-lists/kali.list.chroot
deleted file mode 100644
index 5dfc12ba..00000000
--- a/modules/live-build-config/kali-config/variant-light/package-lists/kali.list.chroot
+++ /dev/null
@@ -1,13 +0,0 @@
-# You always want those
-kali-desktop-live
-
-# Kali applications
-iceweasel
-openssh-server
-nmap
-ncrack
-sqlmap
-aircrack-ng
-
-# A light desktop
-kali-desktop-xfce
diff --git a/modules/live-build-config/kali-config/variant-lxde/package-lists/kali.list.chroot b/modules/live-build-config/kali-config/variant-lxde/package-lists/kali.list.chroot
deleted file mode 100644
index 0614b463..00000000
--- a/modules/live-build-config/kali-config/variant-lxde/package-lists/kali.list.chroot
+++ /dev/null
@@ -1,23 +0,0 @@
-# You always want those
-kali-linux
-kali-desktop-live
-
-# Kali applications
-
-# You can customize the set of Kali applications to install
-# (-full is the default, -all is absolutely everything, the rest
-# corresponds to various subsets)
-kali-linux-full
-# kali-linux-all
-# kali-linux-sdr
-# kali-linux-gpu
-# kali-linux-wireless
-# kali-linux-web
-# kali-linux-forensic
-# kali-linux-voip
-# kali-linux-pwtools
-# kali-linux-top10
-# kali-linux-rfid
-
-# Graphical desktop
-kali-desktop-lxde
diff --git a/modules/live-build-config/kali-config/variant-mate/package-lists/kali.list.chroot b/modules/live-build-config/kali-config/variant-mate/package-lists/kali.list.chroot
deleted file mode 100644
index 4d63b199..00000000
--- a/modules/live-build-config/kali-config/variant-mate/package-lists/kali.list.chroot
+++ /dev/null
@@ -1,33 +0,0 @@
-# You always want those
-kali-linux
-kali-desktop-live
-
-# Kali applications
-
-# You can customize the set of Kali applications to install
-# (-full is the default, -all is absolutely everything, the rest
-# corresponds to various subsets)
-kali-linux-full
-# kali-linux-all
-# kali-linux-sdr
-# kali-linux-gpu
-# kali-linux-wireless
-# kali-linux-web
-# kali-linux-forensic
-# kali-linux-voip
-# kali-linux-pwtools
-# kali-linux-top10
-# kali-linux-rfid
-
-# Graphical desktop
-# | NOTE: With Kali 1.x, the mate desktop requires other changes to the live config.
-# | See http://docs.kali.org/live-build/customize-the-kali-desktop-environment
-# | for details
-kali-desktop-common
-xorg
-#if DISTRIBUTION moto
-mate-archive-keyring
-#endif
-mate-desktop-environment
-gdm3
-mate-tweak
diff --git a/modules/live-build-config/kali-config/variant-xfce/package-lists/kali.list.chroot b/modules/live-build-config/kali-config/variant-xfce/package-lists/kali.list.chroot
deleted file mode 100644
index 7deb419d..00000000
--- a/modules/live-build-config/kali-config/variant-xfce/package-lists/kali.list.chroot
+++ /dev/null
@@ -1,23 +0,0 @@
-# You always want those
-kali-linux
-kali-desktop-live
-
-# Kali applications
-
-# You can customize the set of Kali applications to install
-# (-full is the default, -all is absolutely everything, the rest
-# corresponds to various subsets)
-kali-linux-full
-# kali-linux-all
-# kali-linux-sdr
-# kali-linux-gpu
-# kali-linux-wireless
-# kali-linux-web
-# kali-linux-forensic
-# kali-linux-voip
-# kali-linux-pwtools
-# kali-linux-top10
-# kali-linux-rfid
-
-# Graphical desktop
-kali-desktop-xfce
diff --git a/modules/parrot-build/README b/modules/parrot-build/README
deleted file mode 100644
index bf155110..00000000
--- a/modules/parrot-build/README
+++ /dev/null
@@ -1,7 +0,0 @@
-Parrot Build config scripts
-
-
-this configuration folder for live-build is used
-to build our official ISO images
-
-the arm build scripts will be replaced with the official one of the ARM team
diff --git a/modules/parrot-build/auto/build b/modules/parrot-build/auto/build
deleted file mode 100755
index 50298b85..00000000
--- a/modules/parrot-build/auto/build
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-lb build noauto "$@" 2>&1 | tee logfile.log
diff --git a/modules/parrot-build/auto/clean b/modules/parrot-build/auto/clean
deleted file mode 100755
index 3fa73dfc..00000000
--- a/modules/parrot-build/auto/clean
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-lb clean noauto "$@"
diff --git a/modules/parrot-build/auto/config b/modules/parrot-build/auto/config
deleted file mode 100755
index a2b5e3d7..00000000
--- a/modules/parrot-build/auto/config
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/bin/bash
-
-set -e
-set -o pipefail # Bashism
-
-parrot_mirror=http://archive.parrotsec.org/parrot
-public_mirror=http://archive.parrotsec.org/parrot
-
-#public_mirror=http://deb.parrotsec.org/parrot
-
-
-# Detect target architecture and filter args
-if [ ! $arch ]; then
-	arch=$(dpkg --print-architecture)
-fi
-if [ ! $variant ]; then
-	variant="home"
-fi
-dist="parrot"
-lb_opts=""
-while [ $# -gt 0 ]; do
-   	arg="$1"
-	case "$arg" in
-        -a|--arch|--architecture|--architectures)
-		arch="$2"
-		temp="$temp "'"'"$arg"'"'
-		temp="$temp "'"'"$2"'"'
-		shift
-		;;
-	--distribution)
-		dist="$2"
-		shift
-		;;
-	--variant)
-		variant="$2"
-		shift
-		;;
-	-p|--proposed-updates)
-		enable_pu="1"
-		;;
-	--)
-		;;
-	*)
-		temp="$temp "'"'"$arg"'"'
-		;;
-	esac
-	shift
-done
-eval set -- "$temp"
-
-# live-build doesn't work if --parent-debian-distribution is unknown of
-# debian-cd => we have to put a symlink so that it deals with kali like sid
-if [ ! -e ${LIVE_BUILD:-/usr/share/live/build}/data/debian-cd/$dist ]; then
-	if [ -w ${LIVE_BUILD:-/usr/share/live/build}/data/debian-cd ]; then
-		ln -sf sid ${LIVE_BUILD:-/usr/share/live/build}/data/debian-cd/$dist
-	else
-		echo "ERROR: Run this first:"
-		echo "ln -sf sid ${LIVE_BUILD:-/usr/share/live/build}/data/debian-cd/$dist"
-		exit 1
-	fi
-fi
-
-case "$arch" in
-    amd64)
-	lb_opts="$lb_opts --binary-images iso-hybrid --architecture amd64 --debian-installer live --linux-flavours amd64"
-    ;;
-    i386)
-	lb_opts="$lb_opts --binary-images iso-hybrid --architecture i386 --debian-installer live --linux-flavours 686-pae"
-    ;;
-    486)
-	lb_opts="$lb_opts --binary-images iso-hybrid --architecture i386 --debian-installer live --linux-flavours 486"
-    ;;
-    armel|armhf|arm64)
-	lb_opts="$lb_opts --binary-images hdd --binary-filesystem ext4 --chroot-filesystem none"
-    ;;
-    *)
-	echo "WARNING: configuration not tested on arch $arch" >&2
-    ;;
-esac
-
-# Setup configuration files from variant and options
-
-# Drop all files that a former run might have put into place
-for file in $(cd config && find . -type f); do
-    file=${file#./*/}
-    rm -f config/$file || true
-done
-
-cp -rT templates/common config
-[ ! -d templates/parrot-$variant ] || cp -rTL templates/parrot-$variant config
-
-[ ! $arch ] || sed -i "s/ISO_ARCH/$arch/g" config/includes.binary/isolinux/menu.cfg
-[ ! $arch ] || sed -i "s/ISO_ARCH/$arch/g" config/includes.binary/boot/grub/live-theme/theme.txt
-[ ! $version ] || sed -i "s/ISO_VERSION/$version/g" config/includes.binary/isolinux/menu.cfg
-[ ! $version ] || sed -i "s/ISO_VERSION/$version/g" config/includes.binary/boot/grub/live-theme/theme.txt
-[ ! $variant ] || sed -i "s/ISO_TITLE/Parrot $variant/g" config/includes.binary/isolinux/menu.cfg
-[ ! $variant ] || sed -i "s/ISO_TITLE/Parrot $variant/g" config/includes.binary/boot/grub/live-theme/theme.txt
-
-lb config noauto \
-	--distribution "$dist" \
-	--debian-installer-distribution "$dist" \
-	--archive-areas "main contrib non-free" \
-	--debootstrap-options "--include=ca-certificates,parrot-archive-keyring,gnupg --keyring=templates/common/archives/parrot.key" \
-	--keyring-packages parrot-archive-keyring \
-	--updates false \
-	--security false \
-	--backports false \
-	--firmware-binary false \
-	--firmware-chroot false \
-	--compression xz \
-	--mirror-bootstrap "$parrot_mirror" \
-	--mirror-chroot "$parrot_mirror" \
-	--mirror-debian-installer "$parrot_mirror" \
-	--mirror-binary "$public_mirror" \
-	--iso-application "Parrot" \
-	--iso-publisher "Parrot Project" \
-	--iso-volume "ParrotSec" \
-	--linux-packages linux-image \
-	--bootappend-live "boot=live hostname=parrot splash noautomount" \
-	--source false \
-	$lb_opts \
-	"$@"
-
-#use overlay instead of aufs as union filesystem support for squashfs
-sed -i "s/LB_UNION_FILESYSTEM=\"aufs\"/LB_UNION_FILESYSTEM=\"overlay\"/g" config/chroot
diff --git a/modules/parrot-build/build.sh b/modules/parrot-build/build.sh
deleted file mode 100755
index 8e3f8bb8..00000000
--- a/modules/parrot-build/build.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-
-set -e
-set -o pipefail  # Bashism
-
-export variant=$2
-export arch=$3
-export version=$4
-
-
-function helper() {
-	echo -e "Parrot Build System
-
-
-USAGE
- 	 ./build.sh <action> [<variant> <arch> <version>]
-
-EXPLAINATION
-
-      action  - help, build
-                the action to be performed by this program
-                help will show this message, build will start
-                the build if correctly combined with variant, arch and version
-
-      variant - full, lite, studio, libre,
-                variant-gnome, variant-kde,
-                variant-lxde, variant-xfce,
-		variant-cinnamon
-
-                the edition of parrot that is going to
-                be taken from the templates folder
-
-      arch    - i386, amd64, armhf, arm64
-                the architecture that will be built
-
-      version - the version of parrot that has to be
-                written in the live boot menu
-
-EXAMPLE
- 	 ./build.sh build home amd64 4.2-CUSTOM
-"
-}
-
-function build() {
-	lb clean
-	rm -rf config || true
-	lb config
-	lb build
-	mv live-image-*.hybrid.iso ../Parrot-$variant-$version\_$arch.iso
-}
-
-case $1 in
-	build)
-		build
-	;;
-	help)
-		helper
-	;;
-	*)
-		helper
-	;;
-esac
diff --git a/modules/parrot-build/templates/common/archives/parrot.key b/modules/parrot-build/templates/common/archives/parrot.key
deleted file mode 100644
index 2ed50863..00000000
Binary files a/modules/parrot-build/templates/common/archives/parrot.key and /dev/null differ
diff --git a/modules/parrot-build/templates/common/archives/parrot.list b/modules/parrot-build/templates/common/archives/parrot.list
deleted file mode 100644
index 881a08fd..00000000
--- a/modules/parrot-build/templates/common/archives/parrot.list
+++ /dev/null
@@ -1,3 +0,0 @@
-## stable repository
-deb http://deb.parrotsec.org/parrot stable main contrib non-free
-#deb-src http://archive.parrotsec.org/parrot stable main contrib non-free
diff --git a/modules/parrot-build/templates/common/bootloaders/grub-pc/dejavu-bold-14.pf2 b/modules/parrot-build/templates/common/bootloaders/grub-pc/dejavu-bold-14.pf2
deleted file mode 100644
index 9b093b20..00000000
Binary files a/modules/parrot-build/templates/common/bootloaders/grub-pc/dejavu-bold-14.pf2 and /dev/null differ
diff --git a/modules/parrot-build/templates/common/bootloaders/grub-pc/dejavu-bold-16.pf2 b/modules/parrot-build/templates/common/bootloaders/grub-pc/dejavu-bold-16.pf2
deleted file mode 100644
index 11e7f7ab..00000000
Binary files a/modules/parrot-build/templates/common/bootloaders/grub-pc/dejavu-bold-16.pf2 and /dev/null differ
diff --git a/modules/parrot-build/templates/common/bootloaders/grub-pc/grub.cfg b/modules/parrot-build/templates/common/bootloaders/grub-pc/grub.cfg
deleted file mode 100644
index 9f3486f2..00000000
--- a/modules/parrot-build/templates/common/bootloaders/grub-pc/grub.cfg
+++ /dev/null
@@ -1,94 +0,0 @@
-set default=0
-
-loadfont $prefix/dejavu-bold-16.pf2
-loadfont $prefix/dejavu-bold-14.pf2
-loadfont $prefix/unicode.pf2
-set gfxmode=auto
-insmod all_video
-insmod gfxterm
-insmod png
-
-set color_normal=cyan/black
-set color_highlight=white/blue
-
-if [ -e /isolinux/splash.png ]; then
-    # binary_syslinux modifies the theme file to point to the correct
-    # background picture
-    set theme=/boot/grub/live-theme/theme.txt
-elif [ -e /boot/grub/splash.png ]; then
-    set theme=/boot/grub/live-theme/theme.txt
-else
-    set menu_color_normal=cyan/blue
-    set menu_color_highlight=white/blue
-fi
-
-terminal_output gfxterm
-
-insmod play
-play 960 440 1 0 4 440 1
-
-# Live boot
-menuentry "Live" {
-	linux KERNEL_LIVE APPEND_LIVE
-	initrd INITRD_LIVE
-}
-
-menuentry "Text" {
-	linux KERNEL_LIVE APPEND_LIVE systemd.unit=multi-user.target
-	initrd INITRD_LIVE
-}
-
-menuentry "RAM mode" {
-	linux KERNEL_LIVE APPEND_LIVE toram
-	initrd INITRD_LIVE
-}
-
-menuentry "Forensics mode" {
-	linux KERNEL_LIVE APPEND_LIVE noswap noautomount
-	initrd INITRD_LIVE
-}
-menuentry "Persistence" {
-	linux KERNEL_LIVE APPEND_LIVE persistence
-	initrd INITRD_LIVE
-}
-menuentry "Encrypted persistence" {
-	linux KERNEL_LIVE APPEND_LIVE persistent=cryptsetup persistence-encryption=luks persistence
-	initrd INITRD_LIVE
-}
-
-menuentry "Failsafe (nomodeset)" {
-	linux KERNEL_LIVE APPEND_LIVE nomodeset
-	initrd INITRD_LIVE
-}
-
-menuentry "Failsafe (disable nvdia/amd gpu)" {
-	linux KERNEL_LIVE APPEND_LIVE nouveau.modeset=0 nvidia.modeset=0 radeon.modeset=0
-	initrd INITRD_LIVE
-}
-
-menuentry "Failsafe (strong errors prevention)" {
-	linux KERNEL_LIVE APPEND_LIVE config memtest noapic noapm nodma nomce nolapic nomodeset nosplash vga=normal
-	initrd INITRD_LIVE
-}
-
-# Installer
-menuentry "Installer" {
-	linux /install/vmlinuz vga=normal quiet
-	initrd /install/initrd.gz
-}
-
-menuentry "GTK Installer" {
-	linux /install//gtk/vmlinuz video=vesa:ywrap,mtrr vga=768 quiet
-	initrd /install/gtk/initrd.gz
-}
-
-
-submenu 'Advanced options...' {
-
-# More installer entries (if any)
-LINUX_ADVANCED_INSTALL
-
-# Memtest (if any)
-MEMTEST
-
-}
diff --git a/modules/parrot-build/templates/common/bootloaders/grub-pc/live-theme/theme.txt b/modules/parrot-build/templates/common/bootloaders/grub-pc/live-theme/theme.txt
deleted file mode 100644
index b9213c36..00000000
--- a/modules/parrot-build/templates/common/bootloaders/grub-pc/live-theme/theme.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-desktop-image: "../splash.png"
-title-color: "#00BEFE"
-title-font: "DejaVu Sans Bold 16"
-title-text: ""
-message-font: "Unifont Regular 16"
-terminal-font: "Unifont Regular 16"
-
-#help bar at the bottom
-+ label {
-        top = 100%-50
-        left = 0
-        width = 100%
-        height = 20
-        text = "@KEYMAP_SHORT@"
-        align = "center"
-        color = "#00BEFE"
-        font = "DejaVu Sans Bold 14"
-}
-
-# Title in the middle box
-+ label {
-        top = 20%
-        left = 0
-        width = 100%
-        height = 35
-        align = "center"
-        color = "#00BEFE"
-        text = "Parrot Project"
-        font = "DejaVu Sans Bold 16"
-}
-
-#boot menu
-+ boot_menu {
-        left = 13%
-        width = 74%
-        top = 20%+35
-        height = 230
-        item_color = "#a8a8a8"
-        item_font = "DejaVu Sans Bold 14"
-        selected_item_color= "#00BEFE"
-        selected_item_font = "DejaVu Sans Bold 14"
-        item_height = 16
-        item_padding = 0
-        item_spacing = 4
-        icon_width = 0
-        icon_heigh = 0
-        item_icon_space = 0
-}
-
-#progress bar
-+ progress_bar {
-        id = "__timeout__"
-        left = 13%
-        top = 100%-80
-        height = 16
-        width = 74%
-        font = "DejaVu Sans Bold 14"
-        text_color = "#000000"
-        fg_color = "#00BEFE"
-        bg_color = "#a8a8a8"
-        border_color = "#00BEFE"
-        text = "@TIMEOUT_NOTIFICATION_LONG@"
-}
diff --git a/modules/parrot-build/templates/common/bootloaders/grub-pc/splash.png b/modules/parrot-build/templates/common/bootloaders/grub-pc/splash.png
deleted file mode 100644
index 3f16015d..00000000
Binary files a/modules/parrot-build/templates/common/bootloaders/grub-pc/splash.png and /dev/null differ
diff --git a/modules/parrot-build/templates/common/bootloaders/grub-pc/splash4.2.png b/modules/parrot-build/templates/common/bootloaders/grub-pc/splash4.2.png
deleted file mode 100644
index 7a2e7414..00000000
Binary files a/modules/parrot-build/templates/common/bootloaders/grub-pc/splash4.2.png and /dev/null differ
diff --git a/modules/parrot-build/templates/common/bootloaders/grub-pc/splash4.3.png b/modules/parrot-build/templates/common/bootloaders/grub-pc/splash4.3.png
deleted file mode 100644
index b3c465b5..00000000
Binary files a/modules/parrot-build/templates/common/bootloaders/grub-pc/splash4.3.png and /dev/null differ
diff --git a/modules/parrot-build/templates/common/hooks/normal/parrot-hooks.hook.chroot b/modules/parrot-build/templates/common/hooks/normal/parrot-hooks.hook.chroot
deleted file mode 100755
index b883cf3d..00000000
--- a/modules/parrot-build/templates/common/hooks/normal/parrot-hooks.hook.chroot
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/bash
-set -e
-export DEBIAN_FRONTEND=noninteractive
-
-echo "Removing useless stuff"
-apt-get purge -y seclists firefox-esr qt4-designer qttools5-dev-tools texlive-latex-extra-doc texlive-pstricks-doc texlive-pictures-doc texlive-latex-recommended-doc texlive-latex-base-doc texlive-fonts-recommended-doc texlive-pstricks-doc python-mpltoolkits.basemap-data android-sdk libandroid* arduino leafpad xpra ferret minicom xpdf gvim imagemagick vega samba openjdk-9-* || true
-
-
-echo "Manually enabling pulseaudio"
-systemctl --user enable pulseaudio.service || true
-
-echo "Manually enabling live-config"
-systemctl enable live-config || true
-
-echo "Doing some magic on networking stuff"
-systemctl enable NetworkManager || true
-systemctl enable resolvconf || true
-#rm /etc/resolv.conf || true
-#ln -s etc/resolvconf/run/resolv.conf etc/resolv.conf || true
-mkdir -p /etc/systemd/network /etc/udev/rules.d
-ln -sf /dev/null "/etc/systemd/network/90-mac-for-usb.link"
-ln -sf /dev/null "/etc/systemd/network/99-default.link"
-echo > "/etc/udev/rules.d/73-special-net-names.rules"
-
-echo "Manually disabling inetd"
-systemctl disable inetd || true
-
-echo "Manually disabling couchdb"
-systemctl disable couchdb || true
-
-echo "Manually disabling mariadb"
-systemctl disable mariadb || true
-
-echo "Manually disabling openvpn"
-systemctl disable openvpn || true
-
-echo "Manualy disabling redis-server"
-systemctl disable redis-server || true
-
-echo "Manually disabling nginx"
-systemctl disable nginx || true
-
-echo "Manually disabling samba"
-systemctl disable smbd samba || true
-
-echo "Manually disabling snmpd"
-systemctl disable snmpd || true
-
-echo "Manually disabling nmbd"
-systemctl disable nmbd || true
-
-echo "Manually disabling snapd"
-systemctl disable snapd || true
-
-echo "Manually disabling openvas services"
-systemctl disable openvas-scanner.service || true
-systemctl disable openvas-manager.service || true
-systemctl disable greenbone-security-assistant || true
-
-echo "Manually disabling redsocks"
-systemctl disable redsocks || true
-
-echo "Manually disabling dradis"
-systemctl disable dradis || true
-
-echo "Manually disabling packagekit"
-systemctl disable packagekit || true
-
-echo "Manually disabling avahi-daemon"
-systemctl disable avahi-daemon.socket || true
-systemctl disable avahi-daemon.service || true
-
-echo "Manually disabling colord-sane"
-systemctl disable colord-sane.service || true
-
-echo "Manually disaling phpsessionclean"
-sudo systemctl disable phpsessionclean.timer || true
-
-echo "Manually disabling apt-daily systemd timers"
-sudo systemctl disable apt-daily-upgrade.timer || true
-sudo systemctl disable apt-daily.time || true
-
-echo "Purging the shit out of systemd"
-sed -i "s/WantedBy=multi-user.target//g" /lib/systemd/system/redis-server.service || true
-sed -i "s/WantedBy=multi-user.target//g" /lib/systemd/system/smbd.service || true
-sed -i "s/WantedBy=multi-user.target//g" /lib/systemd/system/nmbd.service || true
-sed -i "s/WantedBy=multi-user.target//g" /lib/systemd/system/snmp.service || true
-sed -i "s/WantedBy=multi-user.target//g" /lib/systemd/system/openvas-scanner.service || true
-sed -i "s/WantedBy=multi-user.target//g" /lib/systemd/system/openvas-manager.service || true
-sed -i "s/WantedBy=multi-user.target//g" /lib/systemd/system/redsocks.service || true
-
-echo "cleaning locales"
-bleachbit -c system.localizations apt.autoclean apt.autoremove apt.package_lists deepscan.backup deepscan.ds_store deepscan.thumbs_db deepscan.tmp system.cache system.rotated_logs thumbnails.cache &> /dev/null && echo "done"
-
-
-parrot-mirror-selector default
-
-echo "adding additional modules to initramfs"
-apt -y install initramfs-tools || true
-echo "nls_ascii" >> /etc/initramfs-tools/modules
-echo "ext4" >> /etc/initramfs-tools/modules
-echo "btrfs" >> /etc/initramfs-tools/modules
-#echo "zfs" >> /etc/initramfs-tools/modules
-
-echo "Enabling cryptsetup initramfs support"
-sed -i "s/#CRYPTSETUP=/CRYPTSETUP=y/" /etc/cryptsetup-initramfs/conf-hook || true
-
-update-initramfs -c -u -t -k all || true
-
-mv /etc/apt/sources.list.d/parrot.list /etc/apt/sources.list.d/parrot.list.orig
-
-echo "## stable repository" >> /etc/apt/sources.list.d/parrot.list
-echo "deb http://172.30.0.240/parrot stable main contrib non-free" >> /etc/apt/sources.list.d/parrot.list
-echo "#deb-src http://archive.parrotsec.org/parrot stable main contrib non-free" >> /etc/apt/sources.list.d/parrot.list
diff --git a/modules/parrot-build/templates/common/hooks/normal/sleep.hook.chroot b/modules/parrot-build/templates/common/hooks/normal/sleep.hook.chroot
deleted file mode 120000
index 6a053346..00000000
--- a/modules/parrot-build/templates/common/hooks/normal/sleep.hook.chroot
+++ /dev/null
@@ -1 +0,0 @@
-../sleep.hook.chroot
\ No newline at end of file
diff --git a/modules/parrot-build/templates/common/hooks/parrot-hooks.hook.chroot b/modules/parrot-build/templates/common/hooks/parrot-hooks.hook.chroot
deleted file mode 120000
index da93c952..00000000
--- a/modules/parrot-build/templates/common/hooks/parrot-hooks.hook.chroot
+++ /dev/null
@@ -1 +0,0 @@
-normal/parrot-hooks.hook.chroot
\ No newline at end of file
diff --git a/modules/parrot-build/templates/common/hooks/sleep.hook.chroot b/modules/parrot-build/templates/common/hooks/sleep.hook.chroot
deleted file mode 100755
index a829bb8b..00000000
--- a/modules/parrot-build/templates/common/hooks/sleep.hook.chroot
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-sleep 60
-while pgrep -f update-parrot-menu >/dev/null; do
-	echo "Sleeping 60 seconds as update-parrot-menu is still running..."
-	sleep 60
-done
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/efi.img b/modules/parrot-build/templates/common/includes.binary/boot/efi.img
deleted file mode 100644
index 9ea55df2..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/efi.img and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/dejavu-bold-14.pf2 b/modules/parrot-build/templates/common/includes.binary/boot/grub/dejavu-bold-14.pf2
deleted file mode 100644
index 9b093b20..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/dejavu-bold-14.pf2 and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/dejavu-bold-16.pf2 b/modules/parrot-build/templates/common/includes.binary/boot/grub/dejavu-bold-16.pf2
deleted file mode 100644
index 11e7f7ab..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/dejavu-bold-16.pf2 and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/efi.img b/modules/parrot-build/templates/common/includes.binary/boot/grub/efi.img
deleted file mode 100644
index 9ea55df2..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/efi.img and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/grub.cfg b/modules/parrot-build/templates/common/includes.binary/boot/grub/grub.cfg
deleted file mode 100644
index b999cff8..00000000
--- a/modules/parrot-build/templates/common/includes.binary/boot/grub/grub.cfg
+++ /dev/null
@@ -1,126 +0,0 @@
-set default=0
-
-loadfont $prefix/dejavu-bold-16.pf2
-loadfont $prefix/dejavu-bold-14.pf2
-loadfont $prefix/unicode.pf2
-set gfxmode=auto
-insmod all_video
-insmod gfxterm
-insmod png
-
-set color_normal=cyan/black
-set color_highlight=white/blue
-
-if [ -e /isolinux/splash.png ]; then
-    # binary_syslinux modifies the theme file to point to the correct
-    # background picture
-    set theme=/boot/grub/live-theme/theme.txt
-elif [ -e /boot/grub/splash.png ]; then
-    set theme=/boot/grub/live-theme/theme.txt
-else
-    set menu_color_normal=cyan/blue
-    set menu_color_highlight=white/blue
-fi
-
-terminal_output gfxterm
-
-insmod play
-play 960 440 1 0 4 440 1
-
-# Live boot
-menuentry "Live" {
-	linux /live/vmlinuz boot=live hostname=parrot splash noautomount apparmor=0
-	initrd /live/initrd.img
-}
-
-menuentry "Text" {
-	linux /live/vmlinuz boot=live hostname=parrot splash noautomount systemd.unit=multi-user.target apparmor=0
-	initrd /live/initrd.img
-}
-
-menuentry "RAM mode" {
-	linux /live/vmlinuz boot=live hostname=parrot splash noautomount toram apparmor=0
-	initrd /live/initrd.img
-}
-
-menuentry "Forensics mode" {
-	linux /live/vmlinuz boot=live hostname=parrot splash noautomount noswap noautomount apparmor=0
-	initrd /live/initrd.img
-}
-menuentry "Persistence" {
-	linux /live/vmlinuz boot=live hostname=parrot splash noautomount persistence apparmor=0
-	initrd /live/initrd.img
-}
-menuentry "Encrypted persistence" {
-	linux /live/vmlinuz boot=live hostname=parrot splash noautomount persistent=cryptsetup persistence-encryption=luks persistence apparmor=0
-	initrd /live/initrd.img
-}
-
-menuentry "Failsafe (nomodeset)" {
-	linux /live/vmlinuz boot=live hostname=parrot splash noautomount nomodeset apparmor=0
-	initrd /live/initrd.img
-}
-
-menuentry "Failsafe (disable nvdia/amd gpu)" {
-	linux /live/vmlinuz boot=live hostname=parrot splash noautomount nouveau.modeset=0 nvidia.modeset=0 radeon.modeset=0 apparmor=0
-	initrd /live/initrd.img
-}
-
-menuentry "Failsafe (strong errors prevention)" {
-	linux /live/vmlinuz boot=live hostname=parrot splash noautomount config memtest noapic noapm nodma nomce nolapic nomodeset nosplash vga=normal apparmor=0
-	initrd /live/initrd.img
-}
-
-# Installer (if any)
-menuentry "Installer" {
-	linux /install/vmlinuz vga=normal quiet
-	initrd /install/initrd.gz
-}
-
-menuentry "GTK Installer" {
-	linux /install/gtk/vmlinuz video=vesa:ywrap,mtrr vga=768 quiet
-	initrd /install/gtk/initrd.gz
-}
-
-
-submenu 'Advanced options...' {
-
-# More installer entries (if any)
-menuentry "Install in graphical mode" {
-	linux	/install/gtk/vmlinuz video=vesa:ywrap,mtrr vga=788 quiet
-	initrd  /nstall/gtk/initrd.gz
-}
-menuentry "Install in text mode" {
-	linux	/install/vmlinuz vga=normal quiet
-	initrd  /nstall/initrd.gz
-}
-menuentry "Expert install in graphical mode" {
-	linux	/install/gtk/vmlinuz priority=low video=vesa:ywrap,mtrr vga=788 quiet
-	initrd  /nstall/gtk/initrd.gz
-}
-menuentry "Expert install in text mode" {
-	linux	/install/vmlinuz priority=low vga=normal quiet
-	initrd  /nstall/initrd.gz
-}
-menuentry "Automatic install in graphical mode" {
-	linux	/install/gtk/vmlinuz auto=true priority=critical video=vesa:ywrap,mtrr vga=788 quiet
-	initrd  /nstall/gtk/initrd.gz
-}
-menuentry "Automatic install in text mode" {
-	linux	/install/vmlinuz auto=true priority=critical vga=normal quiet
-	initrd  /nstall/initrd.gz
-}
-menuentry "Rescue system in graphical mode" {
-	linux	/install/gtk/vmlinuz rescue/enable=true video=vesa:ywrap,mtrr vga=788
-	initrd  /nstall/gtk/initrd.gz
-}
-menuentry "Rescue system in text mode" {
-	linux	/install/vmlinuz rescue/enable=true vga=normal
-	initrd  /nstall/initrd.gz
-}
-
-
-# Memtest (if any)
-
-
-}
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/acpi.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/acpi.mod
deleted file mode 100644
index b59d248f..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/acpi.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/adler32.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/adler32.mod
deleted file mode 100644
index 68360bd1..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/adler32.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/ahci.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/ahci.mod
deleted file mode 100644
index 86ad1cc8..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/ahci.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/all_video.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/all_video.mod
deleted file mode 100644
index d435f903..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/all_video.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/aout.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/aout.mod
deleted file mode 100644
index 3d2d121d..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/aout.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/appleldr.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/appleldr.mod
deleted file mode 100644
index deed09a6..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/appleldr.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/archelp.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/archelp.mod
deleted file mode 100644
index 2be0ab79..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/archelp.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/at_keyboard.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/at_keyboard.mod
deleted file mode 100644
index 0a6f4cdf..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/at_keyboard.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/ata.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/ata.mod
deleted file mode 100644
index f6d9d4e9..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/ata.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/backtrace.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/backtrace.mod
deleted file mode 100644
index ec2ab711..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/backtrace.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/bfs.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/bfs.mod
deleted file mode 100644
index 6a3992f5..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/bfs.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/bitmap.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/bitmap.mod
deleted file mode 100644
index 59c83d37..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/bitmap.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/bitmap_scale.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/bitmap_scale.mod
deleted file mode 100644
index c411feaa..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/bitmap_scale.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/blocklist.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/blocklist.mod
deleted file mode 100644
index 251c98c7..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/blocklist.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/boot.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/boot.mod
deleted file mode 100644
index b98173ae..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/boot.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/bsd.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/bsd.mod
deleted file mode 100644
index 2fa7c489..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/bsd.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/bswap_test.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/bswap_test.mod
deleted file mode 100644
index 89c21142..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/bswap_test.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/btrfs.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/btrfs.mod
deleted file mode 100644
index d8b2d06b..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/btrfs.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/bufio.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/bufio.mod
deleted file mode 100644
index 2ffc57a2..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/bufio.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cat.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cat.mod
deleted file mode 100644
index 42336424..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cat.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cbfs.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cbfs.mod
deleted file mode 100644
index 4dbd6f4d..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cbfs.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cbls.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cbls.mod
deleted file mode 100644
index 0510150d..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cbls.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cbmemc.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cbmemc.mod
deleted file mode 100644
index 55d4403d..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cbmemc.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cbtable.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cbtable.mod
deleted file mode 100644
index 544645aa..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cbtable.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cbtime.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cbtime.mod
deleted file mode 100644
index a2d44fd2..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cbtime.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/chain.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/chain.mod
deleted file mode 100644
index 4ad935b7..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/chain.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cmdline_cat_test.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cmdline_cat_test.mod
deleted file mode 100644
index 95d5d9ae..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cmdline_cat_test.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cmp.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cmp.mod
deleted file mode 100644
index 799ea980..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cmp.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cmp_test.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cmp_test.mod
deleted file mode 100644
index f9d6d874..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cmp_test.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/command.lst b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/command.lst
deleted file mode 100644
index 1f2ff86b..00000000
--- a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/command.lst
+++ /dev/null
@@ -1,193 +0,0 @@
-*acpi: acpi
-*all_functional_test: functional_test
-*background_image: gfxterm_background
-*cat: cat
-*cpuid: cpuid
-*crc: hashsum
-*cryptomount: cryptodisk
-*echo: echo
-*extract_syslinux_entries_configfile: syslinuxcfg
-*extract_syslinux_entries_source: syslinuxcfg
-*file: file
-*functional_test: functional_test
-*gettext: gettext
-*hashsum: hashsum
-*hdparm: hdparm
-*hello: hello
-*help: help
-*hexdump: hexdump
-*inb: iorw
-*inl: iorw
-*inw: iorw
-*keystatus: keystatus
-*kfreebsd: bsd
-*knetbsd: bsd
-*kopenbsd: bsd
-*list_env: loadenv
-*load_env: loadenv
-*loopback: loopback
-*ls: ls
-*lsacpi: lsacpi
-*lspci: lspci
-*md5sum: hashsum
-*menuentry: normal
-*pcidump: pcidump
-*probe: probe
-*read_byte: memrw
-*read_dword: memrw
-*read_word: memrw
-*regexp: regexp
-*save_env: loadenv
-*search: search
-*serial: serial
-*setpci: setpci
-*sha1sum: hashsum
-*sha256sum: hashsum
-*sha512sum: hashsum
-*sleep: sleep
-*submenu: normal
-*syslinux_configfile: syslinuxcfg
-*syslinux_source: syslinuxcfg
-*terminfo: terminfo
-*test_blockarg: test_blockarg
-*testspeed: testspeed
-*tr: tr
-*trust: verify
-*verify_detached: verify
-*xnu_splash: xnu
-*zfskey: zfscrypt
-.: configfile
-[: test
-appleloader: appleldr
-authenticate: normal
-background_color: gfxterm_background
-backtrace: backtrace
-badram: mmap
-blocklist: blocklist
-boot: boot
-break: normal
-cat: minicmd
-cbmemc: cbmemc
-chainloader: chain
-clear: normal
-cmp: cmp
-configfile: configfile
-continue: normal
-coreboot_boottime: cbtime
-cutmem: mmap
-date: date
-distrust: verify
-dump: minicmd
-eval: eval
-exit: minicmd
-export: normal
-extract_entries_configfile: configfile
-extract_entries_source: configfile
-extract_legacy_entries_configfile: legacycfg
-extract_legacy_entries_source: legacycfg
-fakebios: loadbios
-false: true
-fix_video: fixvideo
-fwsetup: efifwsetup
-gdbstub: gdb
-gdbstub_break: gdb
-gdbstub_stop: gdb
-gptsync: gptsync
-halt: halt
-help: minicmd
-hexdump_random: random
-initrd16: linux16
-initrd: linux
-initrdefi: linuxefi
-keymap: keylayouts
-kfreebsd_loadenv: bsd
-kfreebsd_module: bsd
-kfreebsd_module_elf: bsd
-knetbsd_module: bsd
-knetbsd_module_elf: bsd
-kopenbsd_ramdisk: bsd
-legacy_check_password: legacycfg
-legacy_configfile: legacycfg
-legacy_initrd: legacycfg
-legacy_initrd_nounzip: legacycfg
-legacy_kernel: legacycfg
-legacy_password: legacycfg
-legacy_source: legacycfg
-linux16: linux16
-linux: linux
-linuxefi: linuxefi
-list_trusted: verify
-loadbios: loadbios
-loadfont: font
-lscoreboot: cbls
-lsefi: lsefi
-lsefimmap: lsefimmap
-lsefisystab: lsefisystab
-lsfonts: font
-lsmmap: lsmmap
-lsmod: minicmd
-lssal: lssal
-macppcbless: macbless
-mactelbless: macbless
-module2: multiboot2
-module: multiboot
-multiboot2: multiboot2
-multiboot: multiboot
-nativedisk: nativedisk
-net_add_addr: net
-net_add_dns: net
-net_add_route: net
-net_bootp6: net
-net_bootp: net
-net_del_addr: net
-net_del_dns: net
-net_del_route: net
-net_get_dhcp_option: net
-net_ipv6_autoconf: net
-net_ls_addr: net
-net_ls_cards: net
-net_ls_dns: net
-net_ls_routes: net
-net_nslookup: net
-normal: normal
-normal_exit: normal
-outb: iorw
-outl: iorw
-outw: iorw
-parttool: parttool
-password: password
-password_pbkdf2: password_pbkdf2
-play: play
-read: read
-reboot: reboot
-return: normal
-rmmod: minicmd
-search.file: search_fs_file
-search.fs_label: search_label
-search.fs_uuid: search_fs_uuid
-setparams: normal
-shift: normal
-source: configfile
-terminal_input: terminal
-terminal_output: terminal
-test: test
-testload: testload
-time: time
-true: true
-usb: usbtest
-videoinfo: videoinfo
-videotest: videotest
-write_byte: memrw
-write_dword: memrw
-write_word: memrw
-xnu_devprop_load: xnu
-xnu_kernel64: xnu
-xnu_kernel: xnu
-xnu_kext: xnu
-xnu_kextdir: xnu
-xnu_mkext: xnu
-xnu_ramdisk: xnu
-xnu_resume: xnu
-xnu_uuid: xnu_uuid
-zfs-bootfs: zfsinfo
-zfsinfo: zfsinfo
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cpio.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cpio.mod
deleted file mode 100644
index e6b2f8f6..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cpio.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cpio_be.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cpio_be.mod
deleted file mode 100644
index 47bd5f71..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cpio_be.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cpuid.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cpuid.mod
deleted file mode 100644
index 7ab9c4bf..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cpuid.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/crc64.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/crc64.mod
deleted file mode 100644
index 38a88ce7..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/crc64.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/crypto.lst b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/crypto.lst
deleted file mode 100644
index 77d9efc0..00000000
--- a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/crypto.lst
+++ /dev/null
@@ -1,45 +0,0 @@
-RIJNDAEL: gcry_rijndael
-RIJNDAEL192: gcry_rijndael
-RIJNDAEL256: gcry_rijndael
-AES128: gcry_rijndael
-AES-128: gcry_rijndael
-AES-192: gcry_rijndael
-AES-256: gcry_rijndael
-ADLER32: adler32
-CRC64: crc64
-ARCFOUR: gcry_arcfour
-BLOWFISH: gcry_blowfish
-CAMELLIA128: gcry_camellia
-CAMELLIA192: gcry_camellia
-CAMELLIA256: gcry_camellia
-CAST5: gcry_cast5
-CRC32: gcry_crc
-CRC32RFC1510: gcry_crc
-CRC24RFC2440: gcry_crc
-DES: gcry_des
-3DES: gcry_des
-DSA: gcry_dsa
-IDEA: gcry_idea
-MD4: gcry_md4
-MD5: gcry_md5
-RFC2268_40: gcry_rfc2268
-AES: gcry_rijndael
-AES192: gcry_rijndael
-AES256: gcry_rijndael
-RIPEMD160: gcry_rmd160
-RSA: gcry_rsa
-SEED: gcry_seed
-SERPENT128: gcry_serpent
-SERPENT192: gcry_serpent
-SERPENT256: gcry_serpent
-SHA1: gcry_sha1
-SHA224: gcry_sha256
-SHA256: gcry_sha256
-SHA512: gcry_sha512
-SHA384: gcry_sha512
-TIGER192: gcry_tiger
-TIGER: gcry_tiger
-TIGER2: gcry_tiger
-TWOFISH: gcry_twofish
-TWOFISH128: gcry_twofish
-WHIRLPOOL: gcry_whirlpool
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/crypto.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/crypto.mod
deleted file mode 100644
index 0bdb4671..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/crypto.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cryptodisk.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cryptodisk.mod
deleted file mode 100644
index 7cdf4de1..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cryptodisk.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cs5536.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cs5536.mod
deleted file mode 100644
index 82eff392..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/cs5536.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/ctz_test.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/ctz_test.mod
deleted file mode 100644
index 1fdbaeb4..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/ctz_test.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/date.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/date.mod
deleted file mode 100644
index cce886b3..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/date.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/datehook.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/datehook.mod
deleted file mode 100644
index b501b02a..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/datehook.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/datetime.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/datetime.mod
deleted file mode 100644
index 0994e52a..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/datetime.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/disk.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/disk.mod
deleted file mode 100644
index 8150c1e8..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/disk.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/diskfilter.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/diskfilter.mod
deleted file mode 100644
index c73ee6fc..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/diskfilter.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/div.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/div.mod
deleted file mode 100644
index 1102fa22..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/div.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/div_test.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/div_test.mod
deleted file mode 100644
index aeddd718..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/div_test.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/dm_nv.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/dm_nv.mod
deleted file mode 100644
index 3d1757d8..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/dm_nv.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/echo.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/echo.mod
deleted file mode 100644
index d99bf328..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/echo.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/efi_gop.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/efi_gop.mod
deleted file mode 100644
index 4b05e32b..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/efi_gop.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/efi_uga.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/efi_uga.mod
deleted file mode 100644
index 8bed98d0..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/efi_uga.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/efifwsetup.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/efifwsetup.mod
deleted file mode 100644
index 36de227f..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/efifwsetup.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/efinet.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/efinet.mod
deleted file mode 100644
index 74dd3f4e..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/efinet.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/ehci.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/ehci.mod
deleted file mode 100644
index 60b7403d..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/ehci.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/elf.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/elf.mod
deleted file mode 100644
index 1a7257ea..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/elf.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/eval.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/eval.mod
deleted file mode 100644
index e509ab82..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/eval.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/exfat.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/exfat.mod
deleted file mode 100644
index 0f8cab63..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/exfat.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/exfctest.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/exfctest.mod
deleted file mode 100644
index 65b54a95..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/exfctest.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/ext2.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/ext2.mod
deleted file mode 100644
index 0e116370..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/ext2.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/extcmd.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/extcmd.mod
deleted file mode 100644
index d6e24cbb..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/extcmd.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/fat.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/fat.mod
deleted file mode 100644
index 71de34f3..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/fat.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/file.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/file.mod
deleted file mode 100644
index 352ec152..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/file.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/fixvideo.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/fixvideo.mod
deleted file mode 100644
index bf314582..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/fixvideo.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/font.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/font.mod
deleted file mode 100644
index 512ea062..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/font.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/fs.lst b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/fs.lst
deleted file mode 100644
index a069ccc6..00000000
--- a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/fs.lst
+++ /dev/null
@@ -1,36 +0,0 @@
-affs
-afs
-bfs
-btrfs
-cbfs
-cpio
-cpio_be
-exfat
-ext2
-fat
-hfs
-hfsplus
-iso9660
-jfs
-minix
-minix2
-minix2_be
-minix3
-minix3_be
-minix_be
-newc
-nilfs2
-ntfs
-odc
-procfs
-reiserfs
-romfs
-sfs
-squash4
-tar
-udf
-ufs1
-ufs1_be
-ufs2
-xfs
-zfs
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_arcfour.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_arcfour.mod
deleted file mode 100644
index 708920a4..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_arcfour.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_blowfish.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_blowfish.mod
deleted file mode 100644
index 0e1f2d0c..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_blowfish.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_camellia.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_camellia.mod
deleted file mode 100644
index d0458e77..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_camellia.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_cast5.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_cast5.mod
deleted file mode 100644
index 045089a7..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_cast5.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_crc.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_crc.mod
deleted file mode 100644
index 14f64e14..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_crc.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_des.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_des.mod
deleted file mode 100644
index d2dd8a0d..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_des.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_dsa.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_dsa.mod
deleted file mode 100644
index 8e9a932f..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_dsa.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_idea.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_idea.mod
deleted file mode 100644
index b77118ea..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_idea.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_md4.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_md4.mod
deleted file mode 100644
index 8774971f..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_md4.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_md5.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_md5.mod
deleted file mode 100644
index 9ca1a62e..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_md5.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_rfc2268.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_rfc2268.mod
deleted file mode 100644
index fc670b16..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_rfc2268.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_rijndael.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_rijndael.mod
deleted file mode 100644
index e31009dc..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_rijndael.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_rmd160.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_rmd160.mod
deleted file mode 100644
index 290299e4..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_rmd160.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_rsa.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_rsa.mod
deleted file mode 100644
index 1709a2a6..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_rsa.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_seed.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_seed.mod
deleted file mode 100644
index 1ee13756..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_seed.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_serpent.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_serpent.mod
deleted file mode 100644
index 8a4632da..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_serpent.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_sha1.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_sha1.mod
deleted file mode 100644
index ae68798e..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_sha1.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_sha256.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_sha256.mod
deleted file mode 100644
index f7f1566b..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_sha256.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_sha512.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_sha512.mod
deleted file mode 100644
index ff5980e2..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_sha512.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_tiger.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_tiger.mod
deleted file mode 100644
index 8bf28855..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_tiger.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_twofish.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_twofish.mod
deleted file mode 100644
index 8b28367c..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_twofish.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_whirlpool.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_whirlpool.mod
deleted file mode 100644
index 5ba60a9f..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gcry_whirlpool.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gdb.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gdb.mod
deleted file mode 100644
index f4f1fdc9..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gdb.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/geli.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/geli.mod
deleted file mode 100644
index 3a3c2afd..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/geli.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gettext.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gettext.mod
deleted file mode 100644
index dda84ca9..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gettext.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gfxmenu.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gfxmenu.mod
deleted file mode 100644
index 595e6df0..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gfxmenu.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gfxterm.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gfxterm.mod
deleted file mode 100644
index 9a619196..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gfxterm.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gfxterm_background.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gfxterm_background.mod
deleted file mode 100644
index 95b6e74a..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gfxterm_background.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gfxterm_menu.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gfxterm_menu.mod
deleted file mode 100644
index 3cd9ec09..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gfxterm_menu.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gptsync.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gptsync.mod
deleted file mode 100644
index c681073c..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gptsync.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/grub.cfg b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/grub.cfg
deleted file mode 100644
index fcf488c1..00000000
--- a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/grub.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-insmod part_acorn
-insmod part_amiga
-insmod part_apple
-insmod part_bsd
-insmod part_dfly
-insmod part_dvh
-insmod part_gpt
-insmod part_msdos
-insmod part_plan
-insmod part_sun
-insmod part_sunpc
-source /boot/grub/grub.cfg
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gzio.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gzio.mod
deleted file mode 100644
index 4eb2ac71..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/gzio.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/halt.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/halt.mod
deleted file mode 100644
index 569be0ea..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/halt.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/hashsum.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/hashsum.mod
deleted file mode 100644
index 82834886..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/hashsum.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/hdparm.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/hdparm.mod
deleted file mode 100644
index 0ccda583..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/hdparm.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/help.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/help.mod
deleted file mode 100644
index 9bd82c14..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/help.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/hexdump.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/hexdump.mod
deleted file mode 100644
index 96011bed..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/hexdump.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/hfs.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/hfs.mod
deleted file mode 100644
index 8d4246ec..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/hfs.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/hfsplus.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/hfsplus.mod
deleted file mode 100644
index 0fa5680d..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/hfsplus.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/hfspluscomp.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/hfspluscomp.mod
deleted file mode 100644
index 7b0fb8e4..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/hfspluscomp.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/http.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/http.mod
deleted file mode 100644
index 3d768e80..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/http.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/iorw.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/iorw.mod
deleted file mode 100644
index 89b30c6e..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/iorw.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/jfs.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/jfs.mod
deleted file mode 100644
index 440d486e..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/jfs.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/jpeg.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/jpeg.mod
deleted file mode 100644
index 25ed462c..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/jpeg.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/keylayouts.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/keylayouts.mod
deleted file mode 100644
index 0348d451..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/keylayouts.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/keystatus.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/keystatus.mod
deleted file mode 100644
index 8ba33ed6..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/keystatus.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/ldm.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/ldm.mod
deleted file mode 100644
index 9bb92b27..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/ldm.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/legacy_password_test.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/legacy_password_test.mod
deleted file mode 100644
index b3a3c025..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/legacy_password_test.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/legacycfg.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/legacycfg.mod
deleted file mode 100644
index 36fae8b1..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/legacycfg.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/linux.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/linux.mod
deleted file mode 100644
index d3638f5f..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/linux.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/linux16.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/linux16.mod
deleted file mode 100644
index 9e3a8591..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/linux16.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/linuxefi.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/linuxefi.mod
deleted file mode 100644
index a1b82e1e..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/linuxefi.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/loadbios.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/loadbios.mod
deleted file mode 100644
index 427e2009..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/loadbios.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/loadenv.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/loadenv.mod
deleted file mode 100644
index fb0169ba..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/loadenv.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/loopback.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/loopback.mod
deleted file mode 100644
index bce5a35b..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/loopback.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/ls.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/ls.mod
deleted file mode 100644
index 8986f88e..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/ls.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/lsacpi.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/lsacpi.mod
deleted file mode 100644
index 2031534d..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/lsacpi.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/lsefi.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/lsefi.mod
deleted file mode 100644
index 0f987df9..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/lsefi.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/lsefimmap.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/lsefimmap.mod
deleted file mode 100644
index 910b8d89..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/lsefimmap.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/lsefisystab.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/lsefisystab.mod
deleted file mode 100644
index d0429ed3..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/lsefisystab.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/lsmmap.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/lsmmap.mod
deleted file mode 100644
index 9dd19968..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/lsmmap.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/lspci.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/lspci.mod
deleted file mode 100644
index af16a559..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/lspci.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/lssal.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/lssal.mod
deleted file mode 100644
index cb4183fa..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/lssal.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/luks.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/luks.mod
deleted file mode 100644
index 9cbbc117..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/luks.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/lvm.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/lvm.mod
deleted file mode 100644
index 110c2b99..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/lvm.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/lzopio.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/lzopio.mod
deleted file mode 100644
index 1a52595a..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/lzopio.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/macbless.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/macbless.mod
deleted file mode 100644
index ca874d67..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/macbless.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/macho.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/macho.mod
deleted file mode 100644
index a72f5fbd..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/macho.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/mdraid09.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/mdraid09.mod
deleted file mode 100644
index de7489ff..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/mdraid09.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/mdraid09_be.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/mdraid09_be.mod
deleted file mode 100644
index 42705b91..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/mdraid09_be.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/mdraid1x.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/mdraid1x.mod
deleted file mode 100644
index d4e1d624..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/mdraid1x.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/memrw.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/memrw.mod
deleted file mode 100644
index f1b2f382..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/memrw.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/minicmd.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/minicmd.mod
deleted file mode 100644
index 0d2cb6a5..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/minicmd.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/minix2.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/minix2.mod
deleted file mode 100644
index c4b93d46..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/minix2.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/minix2_be.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/minix2_be.mod
deleted file mode 100644
index 56dfe080..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/minix2_be.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/minix3.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/minix3.mod
deleted file mode 100644
index 2547b28c..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/minix3.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/minix3_be.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/minix3_be.mod
deleted file mode 100644
index 5e031279..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/minix3_be.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/minix_be.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/minix_be.mod
deleted file mode 100644
index 0c1b06f4..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/minix_be.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/mmap.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/mmap.mod
deleted file mode 100644
index 8c30e8f3..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/mmap.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/moddep.lst b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/moddep.lst
deleted file mode 100644
index 689a5d4b..00000000
--- a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/moddep.lst
+++ /dev/null
@@ -1,258 +0,0 @@
-squash4: xzio gzio lzopio fshelp
-search_fs_uuid:
-lssal:
-legacycfg: gcry_md5 crypto password normal
-date: datetime normal
-bfs: fshelp
-uhci: usb
-multiboot2: boot video net acpi relocator mmap
-gcry_twofish: crypto
-cpio_be: archelp
-priority_queue:
-gcry_rijndael: crypto
-echo: extcmd
-cpio: archelp
-xzio: crypto
-part_sun:
-hfspluscomp: gzio hfsplus
-gcry_sha512: crypto
-gcry_cast5: crypto
-efi_gop: video video_fb
-ctz_test: functional_test
-boot:
-setjmp_test: setjmp functional_test
-odc: archelp
-ls: extcmd normal
-gzio:
-cbmemc: cbtable terminfo normal
-video:
-test_blockarg: extcmd normal
-linuxefi: boot
-gfxterm: video font
-cbtable:
-mul_test: functional_test
-gcry_tiger: crypto
-gcry_serpent: crypto
-aout:
-macbless: disk
-gcry_blowfish: crypto
-appleldr: boot
-trig:
-extcmd:
-at_keyboard: boot keylayouts
-videoinfo: video
-testspeed: extcmd normal
-minix:
-keylayouts:
-xnu_uuid: gcry_md5
-usbtest: usb
-usbms: usb scsi
-reboot: relocator
-morse:
-help: extcmd normal
-part_msdos:
-http: net
-gdb: backtrace serial
-gcry_rsa: mpi verify
-cbtime: cbtable
-blocklist:
-probe: extcmd
-pbkdf2: crypto
-lsefisystab:
-gcry_rfc2268: crypto
-ufs1_be:
-nativedisk:
-gcry_camellia: crypto
-fat: fshelp
-exfctest: functional_test
-parttool: normal
-lzopio: crypto
-linux: boot video relocator mmap
-gcry_md4: crypto
-zfsinfo: zfs
-usb_keyboard: keylayouts usb
-gcry_md5: crypto
-fshelp:
-ehci: boot usb cs5536
-datetime:
-bitmap_scale: bitmap
-ata: scsi
-usbserial_common: usb serial
-syslinuxcfg: extcmd normal
-net: priority_queue boot datetime bufio
-gcry_des: crypto
-div_test: div functional_test
-time:
-reiserfs: fshelp
-dm_nv: diskfilter
-datehook: datetime normal
-mdraid09_be: diskfilter
-cmp_test: functional_test
-backtrace:
-ahci: boot ata
-kernel:
-video_cirrus: video video_fb
-part_plan:
-gcry_seed: crypto
-minix_be:
-crypto:
-video_colors:
-test:
-terminal:
-part_dvh:
-lsacpi: extcmd acpi
-jpeg: bufio bitmap
-bsd: boot video aout extcmd gcry_md5 crypto cpuid elf relocator serial mmap
-memdisk:
-gfxmenu: video gfxterm trig bitmap_scale video_colors bitmap normal font
-cmp:
-acpi: extcmd mmap
-xfs: fshelp
-elf:
-div:
-cpuid: extcmd
-affs: fshelp
-usb:
-videotest: video gfxmenu font
-tr: extcmd
-testload:
-relocator: mmap
-play:
-gfxterm_menu: video_fb functional_test procfs normal font
-cbfs: archelp
-adler32: crypto
-progress: normal
-password: crypto normal
-part_sunpc:
-video_fb:
-tftp: priority_queue net
-sleep: extcmd normal
-serial: extcmd terminfo
-search_fs_file:
-gcry_sha256: crypto
-gcry_rmd160: crypto
-exfat: fshelp
-search: search_fs_uuid extcmd search_fs_file search_label
-mdraid09: diskfilter
-chain: boot net efinet
-mpi: crypto
-memrw: extcmd
-cs5536:
-password_pbkdf2: gcry_sha512 pbkdf2 crypto normal
-mdraid1x: diskfilter
-linux16: boot video relocator mmap
-gcry_crc: crypto
-configfile: normal
-zfscrypt: gcry_rijndael extcmd pbkdf2 crypto zfs gcry_sha1
-signature_test: functional_test procfs
-raid5rec: diskfilter
-pcidump: extcmd
-gcry_arcfour: crypto
-part_dfly:
-minix2_be:
-gettext:
-pbkdf2_test: pbkdf2 gcry_sha1 functional_test
-hello: extcmd
-usbserial_pl2303: usbserial_common usb serial
-hashsum: extcmd crypto normal
-xnu_uuid_test: functional_test
-regexp: extcmd normal
-part_gpt:
-ohci: boot usb cs5536
-gptsync: disk
-zfs: gzio
-part_apple:
-hdparm: extcmd
-bufio:
-btrfs: gzio lzopio
-bitmap:
-true:
-terminfo: extcmd
-romfs: fshelp
-ntfscomp: ntfs
-lsefi:
-hfs: fshelp
-gcry_dsa: mpi verify
-cmdline_cat_test: video_fb functional_test procfs normal font
-ufs1:
-offsetio:
-legacy_password_test: legacycfg functional_test
-setjmp:
-ufs2:
-nilfs2: fshelp
-lsmmap: mmap
-gcry_sha1: crypto
-mmap:
-tar: archelp
-png: bufio bitmap
-lspci: extcmd
-hfsplus: fshelp
-cbls: cbtable
-tga: bufio bitmap
-random: hexdump
-minix2:
-setpci: extcmd
-scsi:
-pata: ata
-minix3:
-lvm: diskfilter
-functional_test: video extcmd video_fb btrfs
-eval: normal
-iso9660: fshelp
-crc64: crypto
-udf: fshelp
-search_label:
-raid6rec: diskfilter
-msdospart: parttool disk
-archelp:
-procfs: archelp
-minix3_be:
-halt: acpi
-xnu: boot video extcmd bitmap_scale relocator bitmap mmap random macho
-read:
-multiboot: boot video net relocator mmap
-keystatus: extcmd
-cryptodisk: extcmd crypto procfs
-shift_test: functional_test
-normal: boot extcmd crypto terminal gettext bufio
-lsefimmap:
-loadbios:
-geli: gcry_sha512 pbkdf2 crypto gcry_sha256 cryptodisk
-spkmodem: terminfo
-gcry_idea: crypto
-bswap_test: functional_test
-video_bochs: video video_fb
-verify: extcmd crypto mpi gcry_sha1
-sfs: fshelp
-part_amiga:
-luks: pbkdf2 crypto cryptodisk
-loopback: extcmd
-jfs:
-gfxterm_background: gfxterm video extcmd bitmap_scale video_colors bitmap
-efifwsetup: reboot
-usbserial_usbdebug: usbserial_common usb serial
-part_acorn:
-newc: archelp
-macho:
-iorw: extcmd
-cat: extcmd
-afs: fshelp
-sleep_test: datetime functional_test
-ldm: part_msdos part_gpt diskfilter
-hexdump: extcmd
-efinet: net
-disk:
-usbserial_ftdi: usbserial_common usb serial
-minicmd:
-loadenv: extcmd disk
-gcry_whirlpool: crypto
-fixvideo:
-part_bsd: part_msdos
-font: video bufio
-ext2: fshelp
-diskfilter:
-videotest_checksum: video_fb functional_test font
-file: extcmd elf offsetio macho
-ntfs: fshelp
-efi_uga: video video_fb
-all_video: efi_gop efi_uga video_bochs video_cirrus
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/morse.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/morse.mod
deleted file mode 100644
index a44a6872..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/morse.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/mpi.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/mpi.mod
deleted file mode 100644
index a97c9597..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/mpi.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/msdospart.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/msdospart.mod
deleted file mode 100644
index 67c8fe9c..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/msdospart.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/mul_test.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/mul_test.mod
deleted file mode 100644
index 112ec8da..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/mul_test.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/multiboot.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/multiboot.mod
deleted file mode 100644
index 72f0d5bc..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/multiboot.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/multiboot2.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/multiboot2.mod
deleted file mode 100644
index 37b89b1a..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/multiboot2.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/nativedisk.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/nativedisk.mod
deleted file mode 100644
index 39fd0f2b..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/nativedisk.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/net.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/net.mod
deleted file mode 100644
index 789ef1b0..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/net.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/newc.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/newc.mod
deleted file mode 100644
index 74872fef..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/newc.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/normal.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/normal.mod
deleted file mode 100644
index 147aca80..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/normal.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/ntfs.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/ntfs.mod
deleted file mode 100644
index efc89fac..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/ntfs.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/ntfscomp.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/ntfscomp.mod
deleted file mode 100644
index 725cf4d7..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/ntfscomp.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/odc.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/odc.mod
deleted file mode 100644
index 24aa624f..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/odc.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/offsetio.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/offsetio.mod
deleted file mode 100644
index 469219f8..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/offsetio.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/ohci.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/ohci.mod
deleted file mode 100644
index 2235396a..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/ohci.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/part_acorn.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/part_acorn.mod
deleted file mode 100644
index 24266a70..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/part_acorn.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/part_amiga.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/part_amiga.mod
deleted file mode 100644
index 139fd09c..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/part_amiga.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/part_apple.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/part_apple.mod
deleted file mode 100644
index b30fcc07..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/part_apple.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/part_bsd.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/part_bsd.mod
deleted file mode 100644
index 4b9665db..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/part_bsd.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/part_dfly.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/part_dfly.mod
deleted file mode 100644
index 7c36ed9b..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/part_dfly.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/part_dvh.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/part_dvh.mod
deleted file mode 100644
index bccd4f5b..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/part_dvh.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/part_gpt.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/part_gpt.mod
deleted file mode 100644
index db2d3de4..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/part_gpt.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/part_msdos.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/part_msdos.mod
deleted file mode 100644
index e3ed41b1..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/part_msdos.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/part_plan.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/part_plan.mod
deleted file mode 100644
index 329f0e0e..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/part_plan.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/part_sun.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/part_sun.mod
deleted file mode 100644
index c39d72cc..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/part_sun.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/part_sunpc.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/part_sunpc.mod
deleted file mode 100644
index e011a4e3..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/part_sunpc.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/partmap.lst b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/partmap.lst
deleted file mode 100644
index 761233aa..00000000
--- a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/partmap.lst
+++ /dev/null
@@ -1,11 +0,0 @@
-part_acorn
-part_amiga
-part_apple
-part_bsd
-part_dfly
-part_dvh
-part_gpt
-part_msdos
-part_plan
-part_sun
-part_sunpc
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/parttool.lst b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/parttool.lst
deleted file mode 100644
index 68b4b5c4..00000000
--- a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/parttool.lst
+++ /dev/null
@@ -1 +0,0 @@
-msdos: msdospart
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/parttool.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/parttool.mod
deleted file mode 100644
index 6ea76e2a..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/parttool.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/password.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/password.mod
deleted file mode 100644
index cba377c5..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/password.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/password_pbkdf2.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/password_pbkdf2.mod
deleted file mode 100644
index 174d74be..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/password_pbkdf2.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/pata.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/pata.mod
deleted file mode 100644
index 44af949e..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/pata.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/pbkdf2.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/pbkdf2.mod
deleted file mode 100644
index 73389128..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/pbkdf2.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/pbkdf2_test.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/pbkdf2_test.mod
deleted file mode 100644
index 8be22c59..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/pbkdf2_test.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/pcidump.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/pcidump.mod
deleted file mode 100644
index 23ad5086..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/pcidump.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/play.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/play.mod
deleted file mode 100644
index c3783203..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/play.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/png.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/png.mod
deleted file mode 100644
index d5c9294d..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/png.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/priority_queue.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/priority_queue.mod
deleted file mode 100644
index 26777a34..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/priority_queue.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/probe.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/probe.mod
deleted file mode 100644
index 754ca474..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/probe.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/procfs.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/procfs.mod
deleted file mode 100644
index 1165f60d..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/procfs.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/progress.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/progress.mod
deleted file mode 100644
index c17c5b54..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/progress.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/raid5rec.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/raid5rec.mod
deleted file mode 100644
index 0d56b23b..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/raid5rec.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/raid6rec.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/raid6rec.mod
deleted file mode 100644
index ca93f01b..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/raid6rec.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/random.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/random.mod
deleted file mode 100644
index b48b0563..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/random.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/read.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/read.mod
deleted file mode 100644
index 47d4c50f..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/read.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/reboot.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/reboot.mod
deleted file mode 100644
index 28ecf23b..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/reboot.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/regexp.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/regexp.mod
deleted file mode 100644
index 23224c19..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/regexp.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/reiserfs.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/reiserfs.mod
deleted file mode 100644
index 10686cfe..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/reiserfs.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/relocator.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/relocator.mod
deleted file mode 100644
index 60bbd01f..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/relocator.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/romfs.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/romfs.mod
deleted file mode 100644
index 203b4b16..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/romfs.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/scsi.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/scsi.mod
deleted file mode 100644
index 6518e44a..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/scsi.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/serial.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/serial.mod
deleted file mode 100644
index a53ab191..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/serial.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/setjmp.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/setjmp.mod
deleted file mode 100644
index 2d35023b..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/setjmp.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/setjmp_test.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/setjmp_test.mod
deleted file mode 100644
index d33d6f46..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/setjmp_test.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/setpci.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/setpci.mod
deleted file mode 100644
index 929e2cc9..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/setpci.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/shift_test.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/shift_test.mod
deleted file mode 100644
index 12dda71b..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/shift_test.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/signature_test.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/signature_test.mod
deleted file mode 100644
index 4faf0d44..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/signature_test.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/sleep.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/sleep.mod
deleted file mode 100644
index 1bf43c73..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/sleep.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/sleep_test.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/sleep_test.mod
deleted file mode 100644
index 52eb7d19..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/sleep_test.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/spkmodem.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/spkmodem.mod
deleted file mode 100644
index ec4c9708..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/spkmodem.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/squash4.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/squash4.mod
deleted file mode 100644
index b94c8cad..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/squash4.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/syslinuxcfg.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/syslinuxcfg.mod
deleted file mode 100644
index be2ba381..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/syslinuxcfg.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/terminal.lst b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/terminal.lst
deleted file mode 100644
index 3c9a5a34..00000000
--- a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/terminal.lst
+++ /dev/null
@@ -1,9 +0,0 @@
-iat_keyboard: at_keyboard
-iserial: serial
-iserial_*: serial
-oaudio: morse
-ocbmemc: cbmemc
-ogfxterm: gfxterm
-oserial: serial
-oserial_*: serial
-ospkmodem: spkmodem
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/terminal.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/terminal.mod
deleted file mode 100644
index d31937a2..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/terminal.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/terminfo.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/terminfo.mod
deleted file mode 100644
index 85a4baa5..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/terminfo.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/test.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/test.mod
deleted file mode 100644
index fcdb6d08..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/test.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/test_blockarg.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/test_blockarg.mod
deleted file mode 100644
index d22bac43..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/test_blockarg.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/testload.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/testload.mod
deleted file mode 100644
index fc73ffe4..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/testload.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/testspeed.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/testspeed.mod
deleted file mode 100644
index 79bab708..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/testspeed.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/tftp.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/tftp.mod
deleted file mode 100644
index 4950fedf..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/tftp.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/tga.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/tga.mod
deleted file mode 100644
index f577ba8a..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/tga.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/time.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/time.mod
deleted file mode 100644
index 215413df..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/time.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/tr.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/tr.mod
deleted file mode 100644
index 1567d69f..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/tr.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/trig.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/trig.mod
deleted file mode 100644
index b58e3458..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/trig.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/true.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/true.mod
deleted file mode 100644
index 66c42b09..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/true.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/udf.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/udf.mod
deleted file mode 100644
index 03d2696c..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/udf.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/ufs1.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/ufs1.mod
deleted file mode 100644
index a4ec899d..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/ufs1.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/ufs1_be.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/ufs1_be.mod
deleted file mode 100644
index 8426beea..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/ufs1_be.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/ufs2.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/ufs2.mod
deleted file mode 100644
index 70e356ab..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/ufs2.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/uhci.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/uhci.mod
deleted file mode 100644
index 88482e30..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/uhci.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/usb.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/usb.mod
deleted file mode 100644
index 79b8289a..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/usb.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/usb_keyboard.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/usb_keyboard.mod
deleted file mode 100644
index 1e497a98..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/usb_keyboard.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/usbms.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/usbms.mod
deleted file mode 100644
index 5b959130..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/usbms.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/usbserial_common.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/usbserial_common.mod
deleted file mode 100644
index 8de863de..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/usbserial_common.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/usbserial_ftdi.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/usbserial_ftdi.mod
deleted file mode 100644
index 73ff0e04..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/usbserial_ftdi.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/usbserial_pl2303.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/usbserial_pl2303.mod
deleted file mode 100644
index e9b58ec8..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/usbserial_pl2303.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/usbserial_usbdebug.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/usbserial_usbdebug.mod
deleted file mode 100644
index 798d77c0..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/usbserial_usbdebug.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/usbtest.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/usbtest.mod
deleted file mode 100644
index f1ba7af2..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/usbtest.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/verify.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/verify.mod
deleted file mode 100644
index b34437f5..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/verify.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/video.lst b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/video.lst
deleted file mode 100644
index ae9ba23e..00000000
--- a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/video.lst
+++ /dev/null
@@ -1,4 +0,0 @@
-efi_gop
-efi_uga
-video_bochs
-video_cirrus
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/video.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/video.mod
deleted file mode 100644
index 46565851..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/video.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/video_bochs.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/video_bochs.mod
deleted file mode 100644
index d9a70c2d..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/video_bochs.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/video_cirrus.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/video_cirrus.mod
deleted file mode 100644
index 6ef46a46..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/video_cirrus.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/video_colors.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/video_colors.mod
deleted file mode 100644
index 070b9663..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/video_colors.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/video_fb.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/video_fb.mod
deleted file mode 100644
index 8c5e1a57..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/video_fb.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/videoinfo.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/videoinfo.mod
deleted file mode 100644
index 003fe5d7..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/videoinfo.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/videotest.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/videotest.mod
deleted file mode 100644
index 41aa08eb..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/videotest.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/videotest_checksum.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/videotest_checksum.mod
deleted file mode 100644
index 707fcd1d..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/videotest_checksum.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/xfs.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/xfs.mod
deleted file mode 100644
index a725f3d3..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/xfs.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/xnu.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/xnu.mod
deleted file mode 100644
index e74087be..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/xnu.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/xnu_uuid.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/xnu_uuid.mod
deleted file mode 100644
index 70c7a478..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/xnu_uuid.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/xnu_uuid_test.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/xnu_uuid_test.mod
deleted file mode 100644
index f01872b1..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/xnu_uuid_test.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/xzio.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/xzio.mod
deleted file mode 100644
index 7e060195..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/xzio.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/zfscrypt.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/zfscrypt.mod
deleted file mode 100644
index 056a6b81..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/i386-efi/zfscrypt.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/live-theme/theme.txt b/modules/parrot-build/templates/common/includes.binary/boot/grub/live-theme/theme.txt
deleted file mode 100644
index f298c008..00000000
--- a/modules/parrot-build/templates/common/includes.binary/boot/grub/live-theme/theme.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-desktop-image: "/isolinux/splash.png"
-title-color: "#00BEFE"
-title-font: "DejaVu Sans Bold 16"
-title-text: ""
-message-font: "Unifont Regular 16"
-terminal-font: "Unifont Regular 16"
-
-#help bar at the bottom
-+ label {
-        top = 100%-50
-        left = 0
-        width = 100%
-        height = 20
-        text = "@KEYMAP_SHORT@"
-        align = "center"
-        color = "#00BEFE"
-        font = "DejaVu Sans Bold 14"
-}
-
-# Title in the middle box
-+ label {
-        top = 20%
-        left = 0
-        width = 100%
-        height = 35
-        align = "center"
-        color = "#00BEFE"
-        text = "ISO_TITLE - ISO_VERSION ISO_ARCH"
-        font = "DejaVu Sans Bold 16"
-}
-
-#boot menu
-+ boot_menu {
-        left = 13%
-        width = 74%
-        top = 20%+35
-        height = 230
-        item_color = "#a8a8a8"
-        item_font = "DejaVu Sans Bold 14"
-        selected_item_color= "#00BEFE"
-        selected_item_font = "DejaVu Sans Bold 14"
-        item_height = 16
-        item_padding = 0
-        item_spacing = 4
-        icon_width = 0
-        icon_heigh = 0
-        item_icon_space = 0
-}
-
-#progress bar
-+ progress_bar {
-        id = "__timeout__"
-        left = 13%
-        top = 100%-80
-        height = 16
-        width = 74%
-        font = "DejaVu Sans Bold 14"
-        text_color = "#000000"
-        fg_color = "#00BEFE"
-        bg_color = "#a8a8a8"
-        border_color = "#00BEFE"
-        text = "@TIMEOUT_NOTIFICATION_LONG@"
-}
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/loopback.cfg b/modules/parrot-build/templates/common/includes.binary/boot/grub/loopback.cfg
deleted file mode 100644
index e94c44d2..00000000
--- a/modules/parrot-build/templates/common/includes.binary/boot/grub/loopback.cfg
+++ /dev/null
@@ -1 +0,0 @@
-source /boot/grub/grub.cfg
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/splash.png b/modules/parrot-build/templates/common/includes.binary/boot/grub/splash.png
deleted file mode 100644
index b3c465b5..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/splash.png and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/unicode.pf2 b/modules/parrot-build/templates/common/includes.binary/boot/grub/unicode.pf2
deleted file mode 100644
index 635e9cec..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/unicode.pf2 and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/acpi.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/acpi.mod
deleted file mode 100644
index 531af70c..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/acpi.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/adler32.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/adler32.mod
deleted file mode 100644
index 107384f1..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/adler32.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/ahci.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/ahci.mod
deleted file mode 100644
index fc6e13a9..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/ahci.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/all_video.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/all_video.mod
deleted file mode 100644
index 100483fc..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/all_video.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/aout.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/aout.mod
deleted file mode 100644
index f0d437b7..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/aout.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/appleldr.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/appleldr.mod
deleted file mode 100644
index dddd9b6b..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/appleldr.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/archelp.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/archelp.mod
deleted file mode 100644
index d9f62c52..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/archelp.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/at_keyboard.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/at_keyboard.mod
deleted file mode 100644
index 13c51a18..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/at_keyboard.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/ata.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/ata.mod
deleted file mode 100644
index 5e7638a7..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/ata.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/backtrace.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/backtrace.mod
deleted file mode 100644
index 317091bf..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/backtrace.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/bfs.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/bfs.mod
deleted file mode 100644
index 27688efa..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/bfs.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/bitmap.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/bitmap.mod
deleted file mode 100644
index a345af5e..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/bitmap.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/bitmap_scale.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/bitmap_scale.mod
deleted file mode 100644
index f28c72e5..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/bitmap_scale.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/blocklist.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/blocklist.mod
deleted file mode 100644
index d674d6b1..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/blocklist.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/boot.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/boot.mod
deleted file mode 100644
index b50031a5..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/boot.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/bsd.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/bsd.mod
deleted file mode 100644
index c8c62084..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/bsd.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/bswap_test.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/bswap_test.mod
deleted file mode 100644
index 25d9cf13..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/bswap_test.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/btrfs.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/btrfs.mod
deleted file mode 100644
index ccfd41a1..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/btrfs.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/bufio.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/bufio.mod
deleted file mode 100644
index 12713599..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/bufio.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cat.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cat.mod
deleted file mode 100644
index a2f5fdd7..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cat.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cbfs.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cbfs.mod
deleted file mode 100644
index 229b7bd3..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cbfs.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cbls.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cbls.mod
deleted file mode 100644
index f40f5e3e..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cbls.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cbmemc.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cbmemc.mod
deleted file mode 100644
index 3c7ee9fb..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cbmemc.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cbtable.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cbtable.mod
deleted file mode 100644
index faf8c9f5..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cbtable.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cbtime.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cbtime.mod
deleted file mode 100644
index f2214d90..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cbtime.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/chain.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/chain.mod
deleted file mode 100644
index 507e06dd..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/chain.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cmdline_cat_test.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cmdline_cat_test.mod
deleted file mode 100644
index 3fa3772d..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cmdline_cat_test.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cmp.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cmp.mod
deleted file mode 100644
index fc21ad8b..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cmp.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cmp_test.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cmp_test.mod
deleted file mode 100644
index 09c53648..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cmp_test.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/command.lst b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/command.lst
deleted file mode 100644
index d7814a84..00000000
--- a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/command.lst
+++ /dev/null
@@ -1,190 +0,0 @@
-*acpi: acpi
-*all_functional_test: functional_test
-*background_image: gfxterm_background
-*cat: cat
-*cpuid: cpuid
-*crc: hashsum
-*cryptomount: cryptodisk
-*echo: echo
-*extract_syslinux_entries_configfile: syslinuxcfg
-*extract_syslinux_entries_source: syslinuxcfg
-*file: file
-*functional_test: functional_test
-*gettext: gettext
-*hashsum: hashsum
-*hdparm: hdparm
-*hello: hello
-*help: help
-*hexdump: hexdump
-*inb: iorw
-*inl: iorw
-*inw: iorw
-*keystatus: keystatus
-*kfreebsd: bsd
-*knetbsd: bsd
-*kopenbsd: bsd
-*list_env: loadenv
-*load_env: loadenv
-*loopback: loopback
-*ls: ls
-*lsacpi: lsacpi
-*lspci: lspci
-*md5sum: hashsum
-*menuentry: normal
-*pcidump: pcidump
-*probe: probe
-*read_byte: memrw
-*read_dword: memrw
-*read_word: memrw
-*regexp: regexp
-*save_env: loadenv
-*search: search
-*serial: serial
-*setpci: setpci
-*sha1sum: hashsum
-*sha256sum: hashsum
-*sha512sum: hashsum
-*sleep: sleep
-*submenu: normal
-*syslinux_configfile: syslinuxcfg
-*syslinux_source: syslinuxcfg
-*terminfo: terminfo
-*test_blockarg: test_blockarg
-*testspeed: testspeed
-*tr: tr
-*trust: verify
-*verify_detached: verify
-*xnu_splash: xnu
-*zfskey: zfscrypt
-.: configfile
-[: test
-appleloader: appleldr
-authenticate: normal
-background_color: gfxterm_background
-backtrace: backtrace
-badram: mmap
-blocklist: blocklist
-boot: boot
-break: normal
-cat: minicmd
-cbmemc: cbmemc
-chainloader: chain
-clear: normal
-cmp: cmp
-configfile: configfile
-continue: normal
-coreboot_boottime: cbtime
-cutmem: mmap
-date: date
-distrust: verify
-dump: minicmd
-eval: eval
-exit: minicmd
-export: normal
-extract_entries_configfile: configfile
-extract_entries_source: configfile
-extract_legacy_entries_configfile: legacycfg
-extract_legacy_entries_source: legacycfg
-fakebios: loadbios
-false: true
-fix_video: fixvideo
-fwsetup: efifwsetup
-gptsync: gptsync
-halt: halt
-help: minicmd
-hexdump_random: random
-initrd16: linux16
-initrd: linux
-initrdefi: linuxefi
-keymap: keylayouts
-kfreebsd_loadenv: bsd
-kfreebsd_module: bsd
-kfreebsd_module_elf: bsd
-knetbsd_module: bsd
-knetbsd_module_elf: bsd
-kopenbsd_ramdisk: bsd
-legacy_check_password: legacycfg
-legacy_configfile: legacycfg
-legacy_initrd: legacycfg
-legacy_initrd_nounzip: legacycfg
-legacy_kernel: legacycfg
-legacy_password: legacycfg
-legacy_source: legacycfg
-linux16: linux16
-linux: linux
-linuxefi: linuxefi
-list_trusted: verify
-loadbios: loadbios
-loadfont: font
-lscoreboot: cbls
-lsefi: lsefi
-lsefimmap: lsefimmap
-lsefisystab: lsefisystab
-lsfonts: font
-lsmmap: lsmmap
-lsmod: minicmd
-lssal: lssal
-macppcbless: macbless
-mactelbless: macbless
-module2: multiboot2
-module: multiboot
-multiboot2: multiboot2
-multiboot: multiboot
-nativedisk: nativedisk
-net_add_addr: net
-net_add_dns: net
-net_add_route: net
-net_bootp6: net
-net_bootp: net
-net_del_addr: net
-net_del_dns: net
-net_del_route: net
-net_get_dhcp_option: net
-net_ipv6_autoconf: net
-net_ls_addr: net
-net_ls_cards: net
-net_ls_dns: net
-net_ls_routes: net
-net_nslookup: net
-normal: normal
-normal_exit: normal
-outb: iorw
-outl: iorw
-outw: iorw
-parttool: parttool
-password: password
-password_pbkdf2: password_pbkdf2
-play: play
-read: read
-reboot: reboot
-return: normal
-rmmod: minicmd
-search.file: search_fs_file
-search.fs_label: search_label
-search.fs_uuid: search_fs_uuid
-setparams: normal
-shift: normal
-source: configfile
-terminal_input: terminal
-terminal_output: terminal
-test: test
-testload: testload
-time: time
-true: true
-usb: usbtest
-videoinfo: videoinfo
-videotest: videotest
-write_byte: memrw
-write_dword: memrw
-write_word: memrw
-xnu_devprop_load: xnu
-xnu_kernel64: xnu
-xnu_kernel: xnu
-xnu_kext: xnu
-xnu_kextdir: xnu
-xnu_mkext: xnu
-xnu_ramdisk: xnu
-xnu_resume: xnu
-xnu_uuid: xnu_uuid
-zfs-bootfs: zfsinfo
-zfsinfo: zfsinfo
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cpio.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cpio.mod
deleted file mode 100644
index 8eb3ef27..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cpio.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cpio_be.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cpio_be.mod
deleted file mode 100644
index 928825e1..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cpio_be.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cpuid.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cpuid.mod
deleted file mode 100644
index effabd1b..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cpuid.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/crc64.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/crc64.mod
deleted file mode 100644
index 63f69238..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/crc64.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/crypto.lst b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/crypto.lst
deleted file mode 100644
index 77d9efc0..00000000
--- a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/crypto.lst
+++ /dev/null
@@ -1,45 +0,0 @@
-RIJNDAEL: gcry_rijndael
-RIJNDAEL192: gcry_rijndael
-RIJNDAEL256: gcry_rijndael
-AES128: gcry_rijndael
-AES-128: gcry_rijndael
-AES-192: gcry_rijndael
-AES-256: gcry_rijndael
-ADLER32: adler32
-CRC64: crc64
-ARCFOUR: gcry_arcfour
-BLOWFISH: gcry_blowfish
-CAMELLIA128: gcry_camellia
-CAMELLIA192: gcry_camellia
-CAMELLIA256: gcry_camellia
-CAST5: gcry_cast5
-CRC32: gcry_crc
-CRC32RFC1510: gcry_crc
-CRC24RFC2440: gcry_crc
-DES: gcry_des
-3DES: gcry_des
-DSA: gcry_dsa
-IDEA: gcry_idea
-MD4: gcry_md4
-MD5: gcry_md5
-RFC2268_40: gcry_rfc2268
-AES: gcry_rijndael
-AES192: gcry_rijndael
-AES256: gcry_rijndael
-RIPEMD160: gcry_rmd160
-RSA: gcry_rsa
-SEED: gcry_seed
-SERPENT128: gcry_serpent
-SERPENT192: gcry_serpent
-SERPENT256: gcry_serpent
-SHA1: gcry_sha1
-SHA224: gcry_sha256
-SHA256: gcry_sha256
-SHA512: gcry_sha512
-SHA384: gcry_sha512
-TIGER192: gcry_tiger
-TIGER: gcry_tiger
-TIGER2: gcry_tiger
-TWOFISH: gcry_twofish
-TWOFISH128: gcry_twofish
-WHIRLPOOL: gcry_whirlpool
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/crypto.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/crypto.mod
deleted file mode 100644
index 663c8246..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/crypto.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cryptodisk.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cryptodisk.mod
deleted file mode 100644
index 316a0fff..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cryptodisk.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cs5536.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cs5536.mod
deleted file mode 100644
index 05f54db9..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/cs5536.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/ctz_test.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/ctz_test.mod
deleted file mode 100644
index 4806997a..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/ctz_test.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/date.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/date.mod
deleted file mode 100644
index c37e4c55..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/date.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/datehook.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/datehook.mod
deleted file mode 100644
index 0f69b279..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/datehook.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/datetime.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/datetime.mod
deleted file mode 100644
index 14fe14f1..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/datetime.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/disk.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/disk.mod
deleted file mode 100644
index eed4f2d7..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/disk.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/diskfilter.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/diskfilter.mod
deleted file mode 100644
index 4945cc8a..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/diskfilter.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/div.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/div.mod
deleted file mode 100644
index 78763676..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/div.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/div_test.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/div_test.mod
deleted file mode 100644
index 24cd5973..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/div_test.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/dm_nv.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/dm_nv.mod
deleted file mode 100644
index f3d6854b..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/dm_nv.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/echo.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/echo.mod
deleted file mode 100644
index a269e307..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/echo.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/efi_gop.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/efi_gop.mod
deleted file mode 100644
index 5509d267..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/efi_gop.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/efi_uga.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/efi_uga.mod
deleted file mode 100644
index 55f8d222..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/efi_uga.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/efifwsetup.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/efifwsetup.mod
deleted file mode 100644
index c034c64c..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/efifwsetup.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/efinet.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/efinet.mod
deleted file mode 100644
index 41830d46..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/efinet.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/ehci.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/ehci.mod
deleted file mode 100644
index 121335a1..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/ehci.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/elf.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/elf.mod
deleted file mode 100644
index e899c470..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/elf.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/eval.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/eval.mod
deleted file mode 100644
index 59c05cf5..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/eval.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/exfat.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/exfat.mod
deleted file mode 100644
index 7dc06191..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/exfat.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/exfctest.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/exfctest.mod
deleted file mode 100644
index ff59bd01..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/exfctest.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/ext2.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/ext2.mod
deleted file mode 100644
index 551529b9..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/ext2.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/extcmd.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/extcmd.mod
deleted file mode 100644
index 0d0cad4c..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/extcmd.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/fat.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/fat.mod
deleted file mode 100644
index c976e748..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/fat.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/file.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/file.mod
deleted file mode 100644
index 8c94a60c..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/file.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/fixvideo.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/fixvideo.mod
deleted file mode 100644
index dbeba025..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/fixvideo.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/font.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/font.mod
deleted file mode 100644
index 307c9880..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/font.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/fs.lst b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/fs.lst
deleted file mode 100644
index a069ccc6..00000000
--- a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/fs.lst
+++ /dev/null
@@ -1,36 +0,0 @@
-affs
-afs
-bfs
-btrfs
-cbfs
-cpio
-cpio_be
-exfat
-ext2
-fat
-hfs
-hfsplus
-iso9660
-jfs
-minix
-minix2
-minix2_be
-minix3
-minix3_be
-minix_be
-newc
-nilfs2
-ntfs
-odc
-procfs
-reiserfs
-romfs
-sfs
-squash4
-tar
-udf
-ufs1
-ufs1_be
-ufs2
-xfs
-zfs
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_arcfour.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_arcfour.mod
deleted file mode 100644
index 44f6ca00..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_arcfour.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_blowfish.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_blowfish.mod
deleted file mode 100644
index f2ef8200..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_blowfish.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_camellia.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_camellia.mod
deleted file mode 100644
index 618f52b4..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_camellia.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_cast5.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_cast5.mod
deleted file mode 100644
index a36adfe8..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_cast5.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_crc.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_crc.mod
deleted file mode 100644
index 97617777..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_crc.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_des.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_des.mod
deleted file mode 100644
index 36c99d6f..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_des.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_dsa.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_dsa.mod
deleted file mode 100644
index 86e27f26..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_dsa.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_idea.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_idea.mod
deleted file mode 100644
index 9e344d1d..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_idea.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_md4.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_md4.mod
deleted file mode 100644
index ba801adf..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_md4.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_md5.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_md5.mod
deleted file mode 100644
index 3709dc4f..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_md5.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_rfc2268.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_rfc2268.mod
deleted file mode 100644
index 98170258..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_rfc2268.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_rijndael.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_rijndael.mod
deleted file mode 100644
index b9860114..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_rijndael.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_rmd160.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_rmd160.mod
deleted file mode 100644
index bb173da3..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_rmd160.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_rsa.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_rsa.mod
deleted file mode 100644
index 13c700fd..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_rsa.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_seed.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_seed.mod
deleted file mode 100644
index 176fb942..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_seed.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_serpent.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_serpent.mod
deleted file mode 100644
index 132d406f..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_serpent.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_sha1.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_sha1.mod
deleted file mode 100644
index f3a72a5f..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_sha1.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_sha256.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_sha256.mod
deleted file mode 100644
index 326b1bb4..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_sha256.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_sha512.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_sha512.mod
deleted file mode 100644
index aa40e153..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_sha512.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_tiger.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_tiger.mod
deleted file mode 100644
index 3dacb864..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_tiger.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_twofish.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_twofish.mod
deleted file mode 100644
index d15c86f3..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_twofish.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_whirlpool.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_whirlpool.mod
deleted file mode 100644
index b2bdc095..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gcry_whirlpool.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/geli.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/geli.mod
deleted file mode 100644
index 6762c88b..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/geli.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gettext.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gettext.mod
deleted file mode 100644
index d899660f..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gettext.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gfxmenu.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gfxmenu.mod
deleted file mode 100644
index 6cc60298..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gfxmenu.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gfxterm.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gfxterm.mod
deleted file mode 100644
index aec4ba4d..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gfxterm.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gfxterm_background.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gfxterm_background.mod
deleted file mode 100644
index e275f7f1..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gfxterm_background.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gfxterm_menu.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gfxterm_menu.mod
deleted file mode 100644
index 621c4358..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gfxterm_menu.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gptsync.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gptsync.mod
deleted file mode 100644
index ac2c9dc4..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gptsync.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/grub.cfg b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/grub.cfg
deleted file mode 100644
index fcf488c1..00000000
--- a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/grub.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-insmod part_acorn
-insmod part_amiga
-insmod part_apple
-insmod part_bsd
-insmod part_dfly
-insmod part_dvh
-insmod part_gpt
-insmod part_msdos
-insmod part_plan
-insmod part_sun
-insmod part_sunpc
-source /boot/grub/grub.cfg
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gzio.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gzio.mod
deleted file mode 100644
index e7337fdb..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/gzio.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/halt.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/halt.mod
deleted file mode 100644
index 916c9ba3..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/halt.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/hashsum.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/hashsum.mod
deleted file mode 100644
index 28c93489..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/hashsum.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/hdparm.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/hdparm.mod
deleted file mode 100644
index 2d85ba62..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/hdparm.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/help.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/help.mod
deleted file mode 100644
index 8885eaca..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/help.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/hexdump.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/hexdump.mod
deleted file mode 100644
index 103342c9..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/hexdump.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/hfs.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/hfs.mod
deleted file mode 100644
index fb1c2f0f..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/hfs.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/hfsplus.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/hfsplus.mod
deleted file mode 100644
index e49db4b7..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/hfsplus.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/hfspluscomp.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/hfspluscomp.mod
deleted file mode 100644
index ea4ecde1..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/hfspluscomp.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/http.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/http.mod
deleted file mode 100644
index c2f18a73..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/http.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/iorw.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/iorw.mod
deleted file mode 100644
index 145b3e73..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/iorw.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/jfs.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/jfs.mod
deleted file mode 100644
index 750913b1..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/jfs.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/jpeg.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/jpeg.mod
deleted file mode 100644
index 8f64c413..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/jpeg.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/keylayouts.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/keylayouts.mod
deleted file mode 100644
index fb5c5f77..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/keylayouts.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/keystatus.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/keystatus.mod
deleted file mode 100644
index c3277df8..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/keystatus.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/ldm.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/ldm.mod
deleted file mode 100644
index 901dd2c0..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/ldm.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/legacy_password_test.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/legacy_password_test.mod
deleted file mode 100644
index eb8ad7a6..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/legacy_password_test.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/legacycfg.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/legacycfg.mod
deleted file mode 100644
index f3c895f4..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/legacycfg.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/linux.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/linux.mod
deleted file mode 100644
index cc5775ee..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/linux.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/linux16.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/linux16.mod
deleted file mode 100644
index a6ac73ff..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/linux16.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/linuxefi.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/linuxefi.mod
deleted file mode 100644
index 983f8156..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/linuxefi.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/loadbios.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/loadbios.mod
deleted file mode 100644
index cc8684d3..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/loadbios.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/loadenv.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/loadenv.mod
deleted file mode 100644
index 58b517a5..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/loadenv.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/loopback.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/loopback.mod
deleted file mode 100644
index 9a815538..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/loopback.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/ls.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/ls.mod
deleted file mode 100644
index cd6c691a..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/ls.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/lsacpi.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/lsacpi.mod
deleted file mode 100644
index 347d3c78..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/lsacpi.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/lsefi.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/lsefi.mod
deleted file mode 100644
index dc753962..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/lsefi.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/lsefimmap.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/lsefimmap.mod
deleted file mode 100644
index 52796db5..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/lsefimmap.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/lsefisystab.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/lsefisystab.mod
deleted file mode 100644
index ebe26de2..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/lsefisystab.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/lsmmap.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/lsmmap.mod
deleted file mode 100644
index 4d78f6ed..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/lsmmap.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/lspci.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/lspci.mod
deleted file mode 100644
index 7c890e61..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/lspci.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/lssal.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/lssal.mod
deleted file mode 100644
index 3e8e131c..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/lssal.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/luks.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/luks.mod
deleted file mode 100644
index aa259b84..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/luks.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/lvm.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/lvm.mod
deleted file mode 100644
index 509ab11a..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/lvm.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/lzopio.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/lzopio.mod
deleted file mode 100644
index b8cdb825..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/lzopio.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/macbless.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/macbless.mod
deleted file mode 100644
index 08414f5e..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/macbless.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/macho.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/macho.mod
deleted file mode 100644
index 94360503..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/macho.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/mdraid09.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/mdraid09.mod
deleted file mode 100644
index ddd837e2..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/mdraid09.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/mdraid09_be.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/mdraid09_be.mod
deleted file mode 100644
index bb178e94..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/mdraid09_be.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/mdraid1x.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/mdraid1x.mod
deleted file mode 100644
index d1464eed..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/mdraid1x.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/memrw.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/memrw.mod
deleted file mode 100644
index 7a1c3c85..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/memrw.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/minicmd.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/minicmd.mod
deleted file mode 100644
index 14dc4dd9..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/minicmd.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/minix2.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/minix2.mod
deleted file mode 100644
index 22a2953a..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/minix2.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/minix2_be.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/minix2_be.mod
deleted file mode 100644
index d27f9bd0..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/minix2_be.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/minix3.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/minix3.mod
deleted file mode 100644
index 4bd937f7..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/minix3.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/minix3_be.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/minix3_be.mod
deleted file mode 100644
index 1d48e2e9..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/minix3_be.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/minix_be.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/minix_be.mod
deleted file mode 100644
index 7b6ecd69..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/minix_be.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/mmap.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/mmap.mod
deleted file mode 100644
index aa7cad46..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/mmap.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/moddep.lst b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/moddep.lst
deleted file mode 100644
index 093b1a61..00000000
--- a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/moddep.lst
+++ /dev/null
@@ -1,257 +0,0 @@
-squash4: xzio gzio lzopio fshelp
-search_fs_uuid:
-lssal:
-legacycfg: gcry_md5 crypto password normal
-date: datetime normal
-bfs: fshelp
-uhci: usb
-multiboot2: boot video net acpi relocator mmap
-gcry_twofish: crypto
-cpio_be: archelp
-priority_queue:
-gcry_rijndael: crypto
-echo: extcmd
-cpio: archelp
-xzio: crypto
-part_sun:
-hfspluscomp: gzio hfsplus
-gcry_sha512: crypto
-gcry_cast5: crypto
-efi_gop: video video_fb
-ctz_test: functional_test
-boot:
-setjmp_test: setjmp functional_test
-odc: archelp
-ls: extcmd normal
-gzio:
-cbmemc: cbtable terminfo normal
-video:
-test_blockarg: extcmd normal
-linuxefi: boot
-gfxterm: video font
-cbtable:
-mul_test: functional_test
-gcry_tiger: crypto
-gcry_serpent: crypto
-aout:
-macbless: disk
-gcry_blowfish: crypto
-appleldr: boot
-trig:
-extcmd:
-at_keyboard: boot keylayouts
-videoinfo: video
-testspeed: extcmd normal
-minix:
-keylayouts:
-xnu_uuid: gcry_md5
-usbtest: usb
-usbms: usb scsi
-reboot:
-morse:
-help: extcmd normal
-part_msdos:
-http: net
-gcry_rsa: mpi verify
-cbtime: cbtable
-blocklist:
-probe: extcmd
-pbkdf2: crypto
-lsefisystab:
-gcry_rfc2268: crypto
-ufs1_be:
-nativedisk:
-gcry_camellia: crypto
-fat: fshelp
-exfctest: functional_test
-parttool: normal
-lzopio: crypto
-linux: boot video relocator mmap
-gcry_md4: crypto
-zfsinfo: zfs
-usb_keyboard: keylayouts usb
-gcry_md5: crypto
-fshelp:
-ehci: boot usb cs5536
-datetime:
-bitmap_scale: bitmap
-ata: scsi
-usbserial_common: usb serial
-syslinuxcfg: extcmd normal
-net: priority_queue boot datetime bufio
-gcry_des: crypto
-div_test: div functional_test
-time:
-reiserfs: fshelp
-dm_nv: diskfilter
-datehook: datetime normal
-mdraid09_be: diskfilter
-cmp_test: functional_test
-backtrace:
-ahci: boot ata
-kernel:
-video_cirrus: video video_fb
-part_plan:
-gcry_seed: crypto
-minix_be:
-crypto:
-video_colors:
-test:
-terminal:
-part_dvh:
-lsacpi: extcmd acpi
-jpeg: bufio bitmap
-bsd: boot video aout extcmd gcry_md5 crypto cpuid elf relocator serial mmap
-memdisk:
-gfxmenu: video gfxterm trig bitmap_scale video_colors bitmap normal font
-cmp:
-acpi: extcmd mmap
-xfs: fshelp
-elf:
-div:
-cpuid: extcmd
-affs: fshelp
-usb:
-videotest: video gfxmenu font
-tr: extcmd
-testload:
-relocator: mmap
-play:
-gfxterm_menu: video_fb functional_test procfs normal font
-cbfs: archelp
-adler32: crypto
-progress: normal
-password: crypto normal
-part_sunpc:
-video_fb:
-tftp: priority_queue net
-sleep: extcmd normal
-serial: extcmd terminfo
-search_fs_file:
-gcry_sha256: crypto
-gcry_rmd160: crypto
-exfat: fshelp
-search: search_fs_uuid extcmd search_fs_file search_label
-mdraid09: diskfilter
-chain: boot net efinet
-mpi: crypto
-memrw: extcmd
-cs5536:
-password_pbkdf2: gcry_sha512 pbkdf2 crypto normal
-mdraid1x: diskfilter
-linux16: boot video relocator mmap
-gcry_crc: crypto
-configfile: normal
-zfscrypt: gcry_rijndael extcmd pbkdf2 crypto zfs gcry_sha1
-signature_test: functional_test procfs
-raid5rec: diskfilter
-pcidump: extcmd
-gcry_arcfour: crypto
-part_dfly:
-minix2_be:
-gettext:
-pbkdf2_test: pbkdf2 gcry_sha1 functional_test
-hello: extcmd
-usbserial_pl2303: usbserial_common usb serial
-hashsum: extcmd crypto normal
-xnu_uuid_test: functional_test
-regexp: extcmd normal
-part_gpt:
-ohci: boot usb cs5536
-gptsync: disk
-zfs: gzio
-part_apple:
-hdparm: extcmd
-bufio:
-btrfs: gzio lzopio
-bitmap:
-true:
-terminfo: extcmd
-romfs: fshelp
-ntfscomp: ntfs
-lsefi:
-hfs: fshelp
-gcry_dsa: mpi verify
-cmdline_cat_test: video_fb functional_test procfs normal font
-ufs1:
-offsetio:
-legacy_password_test: legacycfg functional_test
-setjmp:
-ufs2:
-nilfs2: fshelp
-lsmmap: mmap
-gcry_sha1: crypto
-mmap:
-tar: archelp
-png: bufio bitmap
-lspci: extcmd
-hfsplus: fshelp
-cbls: cbtable
-tga: bufio bitmap
-random: hexdump
-minix2:
-setpci: extcmd
-scsi:
-pata: ata
-minix3:
-lvm: diskfilter
-functional_test: video extcmd video_fb btrfs
-eval: normal
-iso9660: fshelp
-crc64: crypto
-udf: fshelp
-search_label:
-raid6rec: diskfilter
-msdospart: parttool disk
-archelp:
-procfs: archelp
-minix3_be:
-halt: acpi
-xnu: boot video extcmd bitmap_scale relocator bitmap mmap random macho
-read:
-multiboot: boot video net relocator mmap
-keystatus: extcmd
-cryptodisk: extcmd crypto procfs
-shift_test: functional_test
-normal: boot extcmd crypto terminal gettext bufio
-lsefimmap:
-loadbios:
-geli: gcry_sha512 pbkdf2 crypto gcry_sha256 cryptodisk
-spkmodem: terminfo
-gcry_idea: crypto
-bswap_test: functional_test
-video_bochs: video video_fb
-verify: extcmd crypto mpi gcry_sha1
-sfs: fshelp
-part_amiga:
-luks: pbkdf2 crypto cryptodisk
-loopback: extcmd
-jfs:
-gfxterm_background: gfxterm video extcmd bitmap_scale video_colors bitmap
-efifwsetup: reboot
-usbserial_usbdebug: usbserial_common usb serial
-part_acorn:
-newc: archelp
-macho:
-iorw: extcmd
-cat: extcmd
-afs: fshelp
-sleep_test: datetime functional_test
-ldm: part_msdos part_gpt diskfilter
-hexdump: extcmd
-efinet: net
-disk:
-usbserial_ftdi: usbserial_common usb serial
-minicmd:
-loadenv: extcmd disk
-gcry_whirlpool: crypto
-fixvideo:
-part_bsd: part_msdos
-font: video bufio
-ext2: fshelp
-diskfilter:
-videotest_checksum: video_fb functional_test font
-file: extcmd elf offsetio macho
-ntfs: fshelp
-efi_uga: video video_fb
-all_video: efi_gop efi_uga video_bochs video_cirrus
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/morse.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/morse.mod
deleted file mode 100644
index fb2d81e6..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/morse.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/mpi.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/mpi.mod
deleted file mode 100644
index 01c05f72..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/mpi.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/msdospart.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/msdospart.mod
deleted file mode 100644
index 34e49255..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/msdospart.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/mul_test.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/mul_test.mod
deleted file mode 100644
index c110ab0c..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/mul_test.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/multiboot.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/multiboot.mod
deleted file mode 100644
index 1996d3f4..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/multiboot.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/multiboot2.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/multiboot2.mod
deleted file mode 100644
index 67e2936c..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/multiboot2.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/nativedisk.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/nativedisk.mod
deleted file mode 100644
index 07c32fc4..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/nativedisk.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/net.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/net.mod
deleted file mode 100644
index d4b5c1f2..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/net.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/newc.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/newc.mod
deleted file mode 100644
index 592f6875..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/newc.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/normal.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/normal.mod
deleted file mode 100644
index ed11b01f..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/normal.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/ntfs.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/ntfs.mod
deleted file mode 100644
index a3fa4c66..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/ntfs.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/ntfscomp.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/ntfscomp.mod
deleted file mode 100644
index 877bf8b7..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/ntfscomp.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/odc.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/odc.mod
deleted file mode 100644
index d842cc2a..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/odc.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/offsetio.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/offsetio.mod
deleted file mode 100644
index 338e33ed..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/offsetio.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/ohci.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/ohci.mod
deleted file mode 100644
index 3ca97389..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/ohci.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/part_acorn.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/part_acorn.mod
deleted file mode 100644
index 86728e6e..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/part_acorn.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/part_amiga.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/part_amiga.mod
deleted file mode 100644
index 33e58302..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/part_amiga.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/part_apple.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/part_apple.mod
deleted file mode 100644
index 768ae83e..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/part_apple.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/part_bsd.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/part_bsd.mod
deleted file mode 100644
index 9db236cd..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/part_bsd.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/part_dfly.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/part_dfly.mod
deleted file mode 100644
index 9be813c0..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/part_dfly.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/part_dvh.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/part_dvh.mod
deleted file mode 100644
index 5e3717b8..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/part_dvh.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/part_gpt.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/part_gpt.mod
deleted file mode 100644
index c310512e..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/part_gpt.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/part_msdos.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/part_msdos.mod
deleted file mode 100644
index 7751112b..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/part_msdos.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/part_plan.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/part_plan.mod
deleted file mode 100644
index 40d3d968..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/part_plan.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/part_sun.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/part_sun.mod
deleted file mode 100644
index 769cb424..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/part_sun.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/part_sunpc.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/part_sunpc.mod
deleted file mode 100644
index 5355b7f9..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/part_sunpc.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/partmap.lst b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/partmap.lst
deleted file mode 100644
index 761233aa..00000000
--- a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/partmap.lst
+++ /dev/null
@@ -1,11 +0,0 @@
-part_acorn
-part_amiga
-part_apple
-part_bsd
-part_dfly
-part_dvh
-part_gpt
-part_msdos
-part_plan
-part_sun
-part_sunpc
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/parttool.lst b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/parttool.lst
deleted file mode 100644
index 68b4b5c4..00000000
--- a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/parttool.lst
+++ /dev/null
@@ -1 +0,0 @@
-msdos: msdospart
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/parttool.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/parttool.mod
deleted file mode 100644
index 4fc5de4f..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/parttool.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/password.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/password.mod
deleted file mode 100644
index 9a1b890a..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/password.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/password_pbkdf2.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/password_pbkdf2.mod
deleted file mode 100644
index 61b63570..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/password_pbkdf2.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/pata.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/pata.mod
deleted file mode 100644
index 37a8f3f6..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/pata.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/pbkdf2.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/pbkdf2.mod
deleted file mode 100644
index e869b6a7..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/pbkdf2.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/pbkdf2_test.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/pbkdf2_test.mod
deleted file mode 100644
index 9f120dcc..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/pbkdf2_test.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/pcidump.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/pcidump.mod
deleted file mode 100644
index 5ac14124..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/pcidump.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/play.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/play.mod
deleted file mode 100644
index 2c1e5233..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/play.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/png.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/png.mod
deleted file mode 100644
index 1da4f6d6..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/png.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/priority_queue.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/priority_queue.mod
deleted file mode 100644
index 3b81d33c..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/priority_queue.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/probe.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/probe.mod
deleted file mode 100644
index c0aad07b..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/probe.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/procfs.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/procfs.mod
deleted file mode 100644
index ce1865d1..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/procfs.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/progress.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/progress.mod
deleted file mode 100644
index a64f20b0..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/progress.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/raid5rec.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/raid5rec.mod
deleted file mode 100644
index dba44088..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/raid5rec.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/raid6rec.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/raid6rec.mod
deleted file mode 100644
index 711ae62f..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/raid6rec.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/random.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/random.mod
deleted file mode 100644
index 61b9e891..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/random.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/read.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/read.mod
deleted file mode 100644
index c55b43df..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/read.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/reboot.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/reboot.mod
deleted file mode 100644
index c1fe0e6b..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/reboot.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/regexp.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/regexp.mod
deleted file mode 100644
index b2f61f2a..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/regexp.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/reiserfs.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/reiserfs.mod
deleted file mode 100644
index e266a7ab..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/reiserfs.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/relocator.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/relocator.mod
deleted file mode 100644
index eaee4616..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/relocator.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/romfs.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/romfs.mod
deleted file mode 100644
index 936cdc4d..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/romfs.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/scsi.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/scsi.mod
deleted file mode 100644
index 5c6de13c..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/scsi.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/serial.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/serial.mod
deleted file mode 100644
index 259ad618..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/serial.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/setjmp.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/setjmp.mod
deleted file mode 100644
index a0b4e571..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/setjmp.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/setjmp_test.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/setjmp_test.mod
deleted file mode 100644
index e6d68dc7..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/setjmp_test.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/setpci.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/setpci.mod
deleted file mode 100644
index 01bf1894..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/setpci.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/shift_test.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/shift_test.mod
deleted file mode 100644
index e9ffd084..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/shift_test.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/signature_test.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/signature_test.mod
deleted file mode 100644
index a60fbf67..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/signature_test.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/sleep.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/sleep.mod
deleted file mode 100644
index 18fd278b..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/sleep.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/sleep_test.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/sleep_test.mod
deleted file mode 100644
index 5ba82db5..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/sleep_test.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/spkmodem.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/spkmodem.mod
deleted file mode 100644
index f856a41c..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/spkmodem.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/squash4.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/squash4.mod
deleted file mode 100644
index f55ca8e9..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/squash4.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/syslinuxcfg.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/syslinuxcfg.mod
deleted file mode 100644
index d23f6733..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/syslinuxcfg.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/terminal.lst b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/terminal.lst
deleted file mode 100644
index 3c9a5a34..00000000
--- a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/terminal.lst
+++ /dev/null
@@ -1,9 +0,0 @@
-iat_keyboard: at_keyboard
-iserial: serial
-iserial_*: serial
-oaudio: morse
-ocbmemc: cbmemc
-ogfxterm: gfxterm
-oserial: serial
-oserial_*: serial
-ospkmodem: spkmodem
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/terminal.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/terminal.mod
deleted file mode 100644
index 7f4de6fb..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/terminal.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/terminfo.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/terminfo.mod
deleted file mode 100644
index e3e71a7b..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/terminfo.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/test.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/test.mod
deleted file mode 100644
index 7add04fd..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/test.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/test_blockarg.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/test_blockarg.mod
deleted file mode 100644
index 0eb1e3e2..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/test_blockarg.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/testload.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/testload.mod
deleted file mode 100644
index ec90e098..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/testload.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/testspeed.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/testspeed.mod
deleted file mode 100644
index e0b44f08..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/testspeed.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/tftp.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/tftp.mod
deleted file mode 100644
index d63c608a..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/tftp.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/tga.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/tga.mod
deleted file mode 100644
index be0bbc6c..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/tga.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/time.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/time.mod
deleted file mode 100644
index 64050471..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/time.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/tr.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/tr.mod
deleted file mode 100644
index fb511d05..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/tr.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/trig.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/trig.mod
deleted file mode 100644
index 3b8a51c9..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/trig.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/true.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/true.mod
deleted file mode 100644
index 253c5e2e..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/true.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/udf.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/udf.mod
deleted file mode 100644
index e8d96196..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/udf.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/ufs1.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/ufs1.mod
deleted file mode 100644
index ae9747a5..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/ufs1.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/ufs1_be.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/ufs1_be.mod
deleted file mode 100644
index b3acc193..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/ufs1_be.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/ufs2.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/ufs2.mod
deleted file mode 100644
index e3e6436b..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/ufs2.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/uhci.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/uhci.mod
deleted file mode 100644
index 30b30288..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/uhci.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/usb.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/usb.mod
deleted file mode 100644
index 377497d8..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/usb.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/usb_keyboard.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/usb_keyboard.mod
deleted file mode 100644
index 33380136..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/usb_keyboard.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/usbms.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/usbms.mod
deleted file mode 100644
index 8287fef2..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/usbms.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/usbserial_common.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/usbserial_common.mod
deleted file mode 100644
index 83203c29..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/usbserial_common.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/usbserial_ftdi.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/usbserial_ftdi.mod
deleted file mode 100644
index 2fc43b18..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/usbserial_ftdi.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/usbserial_pl2303.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/usbserial_pl2303.mod
deleted file mode 100644
index a4aa4d22..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/usbserial_pl2303.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/usbserial_usbdebug.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/usbserial_usbdebug.mod
deleted file mode 100644
index 9ef4513d..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/usbserial_usbdebug.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/usbtest.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/usbtest.mod
deleted file mode 100644
index 5fb6b558..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/usbtest.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/verify.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/verify.mod
deleted file mode 100644
index e8a94ecc..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/verify.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/video.lst b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/video.lst
deleted file mode 100644
index ae9ba23e..00000000
--- a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/video.lst
+++ /dev/null
@@ -1,4 +0,0 @@
-efi_gop
-efi_uga
-video_bochs
-video_cirrus
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/video.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/video.mod
deleted file mode 100644
index 9dda4ab6..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/video.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/video_bochs.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/video_bochs.mod
deleted file mode 100644
index f9b477b3..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/video_bochs.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/video_cirrus.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/video_cirrus.mod
deleted file mode 100644
index 2388562c..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/video_cirrus.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/video_colors.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/video_colors.mod
deleted file mode 100644
index efe09cc3..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/video_colors.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/video_fb.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/video_fb.mod
deleted file mode 100644
index 366fa39a..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/video_fb.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/videoinfo.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/videoinfo.mod
deleted file mode 100644
index 308a2522..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/videoinfo.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/videotest.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/videotest.mod
deleted file mode 100644
index e3ee09d2..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/videotest.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/videotest_checksum.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/videotest_checksum.mod
deleted file mode 100644
index b4382b67..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/videotest_checksum.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/xfs.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/xfs.mod
deleted file mode 100644
index 51642227..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/xfs.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/xnu.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/xnu.mod
deleted file mode 100644
index d8833b98..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/xnu.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/xnu_uuid.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/xnu_uuid.mod
deleted file mode 100644
index 5ad6dc48..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/xnu_uuid.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/xnu_uuid_test.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/xnu_uuid_test.mod
deleted file mode 100644
index 207c5244..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/xnu_uuid_test.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/xzio.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/xzio.mod
deleted file mode 100644
index fef83d54..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/xzio.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/zfscrypt.mod b/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/zfscrypt.mod
deleted file mode 100644
index 25aff7de..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/boot/grub/x86_64-efi/zfscrypt.mod and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/efi/boot/bootia32.efi b/modules/parrot-build/templates/common/includes.binary/efi/boot/bootia32.efi
deleted file mode 100644
index 3246b8ec..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/efi/boot/bootia32.efi and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/efi/boot/bootx64.efi b/modules/parrot-build/templates/common/includes.binary/efi/boot/bootx64.efi
deleted file mode 100644
index 32982635..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/efi/boot/bootx64.efi and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/isolinux/advanced.cfg b/modules/parrot-build/templates/common/includes.binary/isolinux/advanced.cfg
deleted file mode 100644
index 7a329705..00000000
--- a/modules/parrot-build/templates/common/includes.binary/isolinux/advanced.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-label hdt
-	menu label ^Hardware Detection Tool (HDT)
-		com32 /isolinux/hdt.c32
-	
-	menu label Load system to RAM
-		linux /live/vmlinuz
-		initrd /live/initrd.img
-		append boot=live hostname=parrot quiet splash toram
diff --git a/modules/parrot-build/templates/common/includes.binary/isolinux/install.cfg b/modules/parrot-build/templates/common/includes.binary/isolinux/install.cfg
deleted file mode 100644
index 6db08734..00000000
--- a/modules/parrot-build/templates/common/includes.binary/isolinux/install.cfg
+++ /dev/null
@@ -1,26 +0,0 @@
-menu begin install
-	menu title Install
-	include stdmenu.cfg
-	label mainmenu
-		menu label ^Back..
-		menu exit
-		
-	label install
-		menu label Standard Installer
-		linux /install/vmlinuz
-		initrd /install/initrd.gz
-		append hostname=parrot pci=nommconf ide=nodma vga=788  -- quiet
-
-	label installgui
-		menu label Install with GTK GUI
-		linux /install/gtk/vmlinuz
-		initrd /install/gtk/initrd.gz
-		append hostname=parrot video=vesa:ywrap,mtrr pci=nommconf ide=nodma vga=788  -- quiet
-	
-	label installspk
-	menu label Install with speech synthesys
-	linux /install/gtk/vmlinuz
-	initrd /install/gtk/initrd.gz
-	append video=vesa:ywrap,mtrr vga=788 speakup.synth=soft -- quiet
-		
-menu end
diff --git a/modules/parrot-build/templates/common/includes.binary/isolinux/isolinux.cfg b/modules/parrot-build/templates/common/includes.binary/isolinux/isolinux.cfg
deleted file mode 100644
index 92c9e701..00000000
--- a/modules/parrot-build/templates/common/includes.binary/isolinux/isolinux.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-include menu.cfg
-default vesamenu.c32
-prompt 0
-timeout 300
diff --git a/modules/parrot-build/templates/common/includes.binary/isolinux/live.cfg b/modules/parrot-build/templates/common/includes.binary/isolinux/live.cfg
deleted file mode 100644
index f84a457b..00000000
--- a/modules/parrot-build/templates/common/includes.binary/isolinux/live.cfg
+++ /dev/null
@@ -1,54 +0,0 @@
-label ^live
-	menu label ^Live Mode
-	menu default
-	linux /live/vmlinuz
-	initrd /live/initrd.img
-	append boot=live hostname=parrot locales=en_US.UTF-8 keyboard-layouts=us quiet splash apparmor=0
-	
-label text
-	menu label Terminal mode
-	linux /live/vmlinuz
-	initrd /live/initrd.img
-	append boot=live hostname=parrot locales=en_US.UTF-8 keyboard-layouts=en quiet splash systemd.unit=multi-user.target apparmor=0
-
-label toram
-	menu label RAM mode
-	linux /live/vmlinuz
-	initrd /live/initrd.img
-	append boot=live hostname=parrot quiet splash toram apparmor=0
-
-label Persistence
-	menu label Persistence
-	linux /live/vmlinuz
-	initrd /live/initrd.img
-	append boot=live hostname=parrot locales=en_US.UTF-8 keyboard-layouts=en quiet persistence apparmor=0
-
-label live-encrypted-persistence
-    menu label Encrypted Persistence
-    linux /live/vmlinuz
-    initrd /live/initrd.img
-    append boot=live persistent=cryptsetup persistence-encryption=luks hostname=parrot locales=en_US.UTF-8 keyboard-layouts=en quiet persistence apparmor=0
-
-label Forensic
-	menu label Forensics
-	linux /live/vmlinuz
-	initrd /live/initrd.img
-	append boot=live hostname=parrot locales=en_US.UTF-8 keyboard-layouts=en noswap noautomount apparmor=0
-
-label Failsafe Nomodeset
-	menu label Failsafe (nomodeset)
-	linux /live/vmlinuz
-	initrd /live/initrd.img
-	append boot=live hostname=parrot locales=en_US.UTF-8 keyboard-layouts=en nomodeset apparmor=0
-
-label Failsafe gpu
-	menu label Failsafe (disable nvidia/amd gpu)
-	linux /live/vmlinuz
-	initrd /live/initrd.img
-	append boot=live hostname=parrot locales=en_US.UTF-8 keyboard-layouts=en modprobe.blacklist=nouveau,nvidia,radeon,drm apparmor=0
-
-label Failsafe2
-	menu label Failsafe (prevent errors)
-	linux /live/vmlinuz
-	initrd /live/initrd.img
-	append boot=live config memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal hostname=parrot locales=en_US.UTF-8 keyboard-layouts=en apparmor=0
diff --git a/modules/parrot-build/templates/common/includes.binary/isolinux/live.de.cfg b/modules/parrot-build/templates/common/includes.binary/isolinux/live.de.cfg
deleted file mode 100644
index 5c0c3108..00000000
--- a/modules/parrot-build/templates/common/includes.binary/isolinux/live.de.cfg
+++ /dev/null
@@ -1,59 +0,0 @@
-	include stdmenu.cfg
-	label mainmenu
-		menu label ^Back..
-		menu exit
-
-	label ^live
-		menu label ^Live
-		menu default
-		linux /live/vmlinuz
-		initrd /live/initrd.img
-		append boot=live hostname=parrot locales=de_DE.UTF-8 keyboard-layouts=de pkeys=de setxkbmap=de quiet splash apparmor=0
-
-	label Terminal
-		menu label Terminal mode
-		linux /live/vmlinuz
-		initrd /live/initrd.img
-		append boot=live hostname=parrot locales=de_DE.UTF-8 keyboard-layouts=de pkeys=de setxkbmap=de quiet splash systemd.unit=multi-user.target apparmor=0
-	
-	label toram
-		menu label RAM mode
-		linux /live/vmlinuz
-		initrd /live/initrd.img
-		append boot=live hostname=parrot locales=de_DE.UTF-8 keyboard-layouts=de pkeys=de setxkbmap=de quiet splash toram apparmor=0
-
-	label Persistence
-		menu label Live with persistence
-		linux /live/vmlinuz
-		initrd /live/initrd.img
-		append boot=live hostname=parrot locales=de_DE.UTF-8 keyboard-layouts=de pkeys=de setxkbmap=de quiet persistence apparmor=0
-
-	label live-encrypted-persistence
-		menu label Live with Encrypted persistence
-    	linux /live/vmlinuz
-    	initrd /live/initrd.img
-    	append boot=live persistent=cryptsetup persistence-encryption=luks hostname=parrot locales=de_DE.UTF-8 keyboard-layouts=de pkeys=de setxkbmap=de quiet persistence apparmor=0
-
-	label Forensics
-		menu label Forensics
-		linux /live/vmlinuz
-		initrd /live/initrd.img
-		append boot=live hostname=parrot noswap noautomount locales=de_DE.UTF-8 keyboard-layouts=de pkeys=de setxkbmap=de apparmor=0
-
-	label Failsafe Nomodeset
-		menu label Failsafe (Nomodeset)
-		linux /live/vmlinuz
-		initrd /live/initrd.img
-		append boot=live hostname=parrot locales=de_DE.UTF-8 keyboard-layouts=de pkeys=de setxkbmap=de nomodeset apparmor=0
-
-	label Failsafe gpu
-		menu label Failsafe (disable nvidia/amd gpu)
-		linux /live/vmlinuz
-		initrd /live/initrd.img
-		append boot=live hostname=parrot locales=de_DE.UTF-8 keyboard-layouts=de pkeys=de setxkbmap=de modprobe.blacklist=nouveau,nvidia,radeon,drm apparmor=0
-
-	label Failsafe2
-		menu label Failsafe (prevent errors)
-		linux /live/vmlinuz
-		initrd /live/initrd.img
-		append boot=live config memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal hostname=parrot locales=de_DE.UTF-8 keyboard-layouts=de pkeys=de setxkbmap=de apparmor=0
diff --git a/modules/parrot-build/templates/common/includes.binary/isolinux/live.es.cfg b/modules/parrot-build/templates/common/includes.binary/isolinux/live.es.cfg
deleted file mode 100644
index 10113489..00000000
--- a/modules/parrot-build/templates/common/includes.binary/isolinux/live.es.cfg
+++ /dev/null
@@ -1,59 +0,0 @@
-	include stdmenu.cfg
-	label mainmenu
-		menu label ^Back..
-		menu exit
-
-	label ^live
-		menu label ^Modalidad Live
-		menu default
-		linux /live/vmlinuz
-		initrd /live/initrd.img
-		append boot=live hostname=parrot locales=es_ES.UTF-8 keyboard-layouts=es pkeys=es setxkbmap=es quiet splash apparmor=0
-
-	label text
-		menu label Terminal
-		linux /live/vmlinuz
-		initrd /live/initrd.img
-		append boot=live hostname=parrot locales=es_ES.UTF-8 keyboard-layouts=es pkeys=es setxkbmap=es quiet splash systemd.unit=multi-user.target apparmor=0
-
-	label toram
-		menu label RAM mode
-		linux /live/vmlinuz
-		initrd /live/initrd.img
-		append boot=live hostname=parrot locales=es_ES.UTF-8 keyboard-layouts=es pkeys=es setxkbmap=es quiet splash toram apparmor=0
-
-	label Persistence
-		menu label Moda'lidad Persistente (para establecer previamente)
-		linux /live/vmlinuz
-		initrd /live/initrd.img
-		append boot=live hostname=parrot locales=es_ES.UTF-8 keyboard-layouts=es pkeys=es setxkbmap=es quiet persistence apparmor=0
-
-	label live-encrypted-persistence
-		menu label Moda'lidad Persistente Cifrada (para establecer previamente)
-    	linux /live/vmlinuz
-    	initrd /live/initrd.img
-    	append boot=live persistent=cryptsetup persistence-encryption=luks hostname=parrot locales=es_ES.UTF-8 keyboard-layouts=es pkeys=es setxkbmap=es quiet persistence apparmor=0
-
-	label Forensic
-		menu label Ana'lisis Forense (moda'lidad forense no invasiva)
-		linux /live/vmlinuz
-		initrd /live/initrd.img
-		append boot=live hostname=parrot noswap noautomount locales=es_ES.UTF-8 keyboard-layouts=es pkeys=es setxkbmap=es apparmor=0
-
-	label Failsafe Nomodeset
-		menu label Moda'lidad Segura Nomodeset (por los errores de tarjeta de vi'deo)
-		linux /live/vmlinuz
-		initrd /live/initrd.img
-		append boot=live hostname=parrot locales=es_ES.UTF-8 keyboard-layouts=es pkeys=es setxkbmap=es nomodeset apparmor=0
-
-	label Failsafe gpu
-		menu label Moda'lidad Segura Nomodeset (por los errores de gpu nvidia/amd)
-		linux /live/vmlinuz
-		initrd /live/initrd.img
-		append boot=live hostname=parrot locales=es_ES.UTF-8 keyboard-layouts=es pkeys=es setxkbmap=es modprobe.blacklist=nouveau,nvidia,radeon,drm apparmor=0
-
-	label Failsafe2
-		menu label Moda'lidad Segura avanzada (prevencio'n de errores)
-		linux /live/vmlinuz
-		initrd /live/initrd.img
-		append boot=live config memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal hostname=parrot locales=es_ES.UTF-8 keyboard-layouts=es pkeys=es setxkbmap=es apparmor=0
diff --git a/modules/parrot-build/templates/common/includes.binary/isolinux/live.fr.cfg b/modules/parrot-build/templates/common/includes.binary/isolinux/live.fr.cfg
deleted file mode 100644
index 85fb5265..00000000
--- a/modules/parrot-build/templates/common/includes.binary/isolinux/live.fr.cfg
+++ /dev/null
@@ -1,59 +0,0 @@
-	include stdmenu.cfg
-	label mainmenu
-		menu label ^Back..
-		menu exit
-
-	label ^live
-		menu label ^Live Mode
-		menu default
-		linux /live/vmlinuz
-		initrd /live/initrd.img
-		append boot=live hostname=parrot locales=fr_FR.UTF-8 keyboard-layouts=fr pkeys=fr setxkbmap=fr quiet splash apparmor=0
-
-	label text
-		menu label Termianl Mode
-		linux /live/vmlinuz
-		initrd /live/initrd.img
-		append boot=live hostname=parrot locales=fr_FR.UTF-8 keyboard-layouts=fr pkeys=fr setxkbmap=fr quiet splash systemd.unit=multi-user.target apparmor=0
-
-	label toram
-		menu label RAM mode
-		linux /live/vmlinuz
-		initrd /live/initrd.img
-		append boot=live hostname=parrot locales=fr_FR.UTF-8 keyboard-layouts=fr pkeys=fr setxkbmap=fr quiet splash toram apparmor=0
-
-	label Persistence
-		menu label Live with persistence (configure it before)
-		linux /live/vmlinuz
-		initrd /live/initrd.img
-		append boot=live hostname=parrot locales=fr_FR.UTF-8 keyboard-layouts=fr pkeys=fr setxkbmap=fr quiet persistence apparmor=0
-
-	label live-encrypted-persistence
-		menu label Live with Encrypted persistence (configure it before)
-    	linux /live/vmlinuz
-    	initrd /live/initrd.img
-    	append boot=live persistent=cryptsetup persistence-encryption=luks hostname=parrot locales=fr_FR.UTF-8 keyboard-layouts=fr pkeys=fr setxkbmap=fr quiet persistence apparmor=0
-
-	label Forensic
-		menu label Forensic (Non-invasive forensic mode)
-		linux /live/vmlinuz
-		initrd /live/initrd.img
-		append boot=live hostname=parrot noswap noautomount locales=fr_FR.UTF-8 keyboard-layouts=fr pkeys=fr setxkbmap=fr apparmor=0
-
-	label Failsafe Nomodeset
-		menu label Failsafe Nomodeset (for simple GPU errors)
-		linux /live/vmlinuz
-		initrd /live/initrd.img
-		append boot=live hostname=parrot locales=fr_FR.UTF-8 keyboard-layouts=fr pkeys=fr setxkbmap=fr nomodeset apparmor=0
-
-	label Failsafe gpu
-		menu label Failsafe Nomodeset (disable nvidia/amd gpu)
-		linux /live/vmlinuz
-		initrd /live/initrd.img
-		append boot=live hostname=parrot locales=fr_FR.UTF-8 keyboard-layouts=fr pkeys=fr setxkbmap=fr modprobe.blacklist=nouveau,nvidia,radeon,drm apparmor=0
-
-	label Failsafe2
-		menu label Failsafe Extreme (prevent errors)
-		linux /live/vmlinuz
-		initrd /live/initrd.img
-		append boot=live config memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal hostname=parrot locales=fr_FR.UTF-8 keyboard-layouts=fr pkeys=fr setxkbmap=fr apparmor=0
diff --git a/modules/parrot-build/templates/common/includes.binary/isolinux/live.it.cfg b/modules/parrot-build/templates/common/includes.binary/isolinux/live.it.cfg
deleted file mode 100644
index 756621b6..00000000
--- a/modules/parrot-build/templates/common/includes.binary/isolinux/live.it.cfg
+++ /dev/null
@@ -1,59 +0,0 @@
-	include stdmenu.cfg
-	label mainmenu
-		menu label ^Back..
-		menu exit
-
-	label ^live
-		menu label ^Modalita' live
-		menu default
-		linux /live/vmlinuz
-		initrd /live/initrd.img
-		append boot=live hostname=parrot locales=it_IT.UTF-8 keyboard-layouts=it pkeys=it setxkbmap=it quiet splash apparmor=0
-
-	label text
-		menu label ^Modalita' Terminale
-		linux /live/vmlinuz
-		initrd /live/initrd.img
-		append boot=live hostname=parrot locales=it_IT.UTF-8 keyboard-layouts=it pkeys=it setxkbmap=it quiet splash systemd.unit=multi-user.target apparmor=0
-
-	label toram
-		menu label RAM mode
-		linux /live/vmlinuz
-		initrd /live/initrd.img
-		append boot=live hostname=parrot locales=it_IT.UTF-8 keyboard-layouts=it pkeys=it setxkbmap=it quiet splash toram apparmor=0
-
-	label Persistence
-		menu label Persistenza
-		linux /live/vmlinuz
-		initrd /live/initrd.img
-		append boot=live hostname=parrot locales=it_IT.UTF-8 keyboard-layouts=it pkeys=it setxkbmap=it quiet persistence apparmor=0
-
-	label live-encrypted-persistence
-		menu label Persistenza Criptata
-    	linux /live/vmlinuz
-    	initrd /live/initrd.img
-    	append boot=live persistent=cryptsetup persistence-encryption=luks hostname=parrot locales=it_IT.UTF-8 keyboard-layouts=it pkeys=it setxkbmap=it quiet persistence apparmor=0
-
-	label Forensics
-		menu label Analisi Forense
-		linux /live/vmlinuz
-		initrd /live/initrd.img
-		append boot=live hostname=parrot noswap noautomount locales=it_IT.UTF-8 keyboard-layouts=it pkeys=it setxkbmap=it apparmor=0
-
-	label Failsafe Nomodeset
-		menu label Modalita' Sicura (nomodeset)
-		linux /live/vmlinuz
-		initrd /live/initrd.img
-		append boot=live hostname=parrot locales=it_IT.UTF-8 keyboard-layouts=it pkeys=it setxkbmap=it nomodeset apparmor=0
-
-	label Failsafe gpu
-		menu label Modalita' Sicura (disabilita gpu nvidia/amd)
-		linux /live/vmlinuz
-		initrd /live/initrd.img
-		append boot=live hostname=parrot locales=it_IT.UTF-8 keyboard-layouts=it pkeys=it setxkbmap=it modprobe.blacklist=nouveau,nvidia,radeon,drm apparmor=0
-
-	label Failsafe2
-		menu label Modalita' Sicura Avanzata (prevenzione errori)
-		linux /live/vmlinuz
-		initrd /live/initrd.img
-		append boot=live config memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal hostname=parrot locales=it_IT.UTF-8 keyboard-layouts=it pkeys=it setxkbmap=it apparmor=0
diff --git a/modules/parrot-build/templates/common/includes.binary/isolinux/menu.cfg b/modules/parrot-build/templates/common/includes.binary/isolinux/menu.cfg
deleted file mode 100644
index 49a21af7..00000000
--- a/modules/parrot-build/templates/common/includes.binary/isolinux/menu.cfg
+++ /dev/null
@@ -1,35 +0,0 @@
-menu hshift 0
-menu width 82
-
-menu title ISO_TITLE - ISO_VERSION ISO_ARCH
-include stdmenu.cfg
-include live.cfg
-label ..
-menu begin italian
-	menu title Italiano
-	include live.it.cfg
-menu end
-menu begin spanish
-	menu title Espanol
-	include live.es.cfg
-menu end
-menu begin german
-	menu title Deutsch
-	include live.de.cfg
-menu end
-menu begin french
-	menu title Francais
-	include live.fr.cfg
-menu end
-label ..
-include install.cfg
-menu begin advanced
-	menu title Advanced options
-	include stdmenu.cfg
-	label mainmenu
-		menu label ^Back..
-		menu exit
-	include advanced.cfg
-menu end
-
-menu clear
diff --git a/modules/parrot-build/templates/common/includes.binary/isolinux/splash.png b/modules/parrot-build/templates/common/includes.binary/isolinux/splash.png
deleted file mode 100644
index b3c465b5..00000000
Binary files a/modules/parrot-build/templates/common/includes.binary/isolinux/splash.png and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.binary/isolinux/stdmenu.cfg b/modules/parrot-build/templates/common/includes.binary/isolinux/stdmenu.cfg
deleted file mode 100644
index 329c5d31..00000000
--- a/modules/parrot-build/templates/common/includes.binary/isolinux/stdmenu.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-menu background splash.png
-menu color title	* #3AAEFBff *
-menu color border	* #00000000 #00000000 none
-menu color sel		* #ffffffff #76a1d0ff *
-menu color hotsel	1;7;37;40 #ffffffff #76a1d0ff *
-menu color tabmsg	* #46ADDDff #00000000 *
-menu color help		37;40 #ffddddaa #00000000 none
-menu vshift 4
-menu rows 21
-menu tabmsg ENTER (boot) - TAB (edit) - Arrows (select)
-# The command line must be at least one line from the bottom.
-menu cmdlinerow 21
-menu timeoutrow 22
-menu tabmsgrow 30
diff --git a/modules/parrot-build/templates/common/includes.chroot/etc/resolv.conf b/modules/parrot-build/templates/common/includes.chroot/etc/resolv.conf
deleted file mode 120000
index ae228ef7..00000000
--- a/modules/parrot-build/templates/common/includes.chroot/etc/resolv.conf
+++ /dev/null
@@ -1 +0,0 @@
-/etc/resolvconf/run/resolv.conf
\ No newline at end of file
diff --git a/modules/parrot-build/templates/common/includes.chroot/lib/live/config/0031-user-password b/modules/parrot-build/templates/common/includes.chroot/lib/live/config/0031-user-password
deleted file mode 100755
index 374a8dd6..00000000
--- a/modules/parrot-build/templates/common/includes.chroot/lib/live/config/0031-user-password
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-# Set "toor" as user password
-usermod -p 'X014elvznJq7E' user
-
diff --git a/modules/parrot-build/templates/common/includes.chroot/root/.config/bleachbit/bleachbit.ini b/modules/parrot-build/templates/common/includes.chroot/root/.config/bleachbit/bleachbit.ini
deleted file mode 100755
index 2a97f29b..00000000
--- a/modules/parrot-build/templates/common/includes.chroot/root/.config/bleachbit/bleachbit.ini
+++ /dev/null
@@ -1,36 +0,0 @@
-[bleachbit]
-auto_start = False
-check_beta = False
-check_online_updates = True
-
-
-[preserve_languages]
-en = True
-es = True
-id = True
-it = True
-pt = True
-fr = True
-de = True
-
-[tree]
-bash = True
-bash.history = True
-deepscan = True
-deepscan.ds_store = True
-deepscan.backup = True
-deepscan.tmp = True
-deepscan.thumbs_db = True
-system = True
-system.desktop_entry = True
-system.cache = True
-system.clipboard = True
-system.custom = True
-system.localizations = True
-system.recent_documents = True
-system.rotated_logs = True
-system.tmp = True
-system.trash = True
-x11 = True
-x11.debug_logs = True
-
diff --git a/modules/parrot-build/templates/common/includes.chroot/usr/share/applications/debian-installer-launcher.desktop b/modules/parrot-build/templates/common/includes.chroot/usr/share/applications/debian-installer-launcher.desktop
deleted file mode 100644
index 30335c07..00000000
--- a/modules/parrot-build/templates/common/includes.chroot/usr/share/applications/debian-installer-launcher.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Install Parrot
-Comment=Install this system permanently to your hard disk
-Exec=menuexec mate-terminal --hide-menubar --name="Parrot Installer" -e '/usr/sbin/debian-installer-launcher'
-Icon=debian-installer-launcher
-Type=Application
-Categories=Application;System;
-StartupNotify=true
-Terminal=false
diff --git a/modules/parrot-build/templates/common/includes.installer/etc/hostname b/modules/parrot-build/templates/common/includes.installer/etc/hostname
deleted file mode 100644
index 2785d83b..00000000
--- a/modules/parrot-build/templates/common/includes.installer/etc/hostname
+++ /dev/null
@@ -1 +0,0 @@
-parrot
diff --git a/modules/parrot-build/templates/common/includes.installer/preseed.cfg b/modules/parrot-build/templates/common/includes.installer/preseed.cfg
deleted file mode 100644
index 0253bfba..00000000
--- a/modules/parrot-build/templates/common/includes.installer/preseed.cfg
+++ /dev/null
@@ -1,102 +0,0 @@
-d-i debian-installer/locale string en_US.UTF-8
-d-i console-keymaps-at/keymap select us
-d-i mirror/country string enter information manually
-d-i keyboard-configuration/xkb-keymap select us
-
-d-i clock-setup/utc boolean true
-d-i time/zone string US/Mountain
-
-# Disable volatile and security
-d-i apt-setup/services-select multiselect
-
-# Enable contrib and non-free
-d-i apt-setup/non-free boolean true
-d-i apt-setup/contrib boolean true
-
-# Disable CDROM entries after install
-d-i apt-setup/disable-cdrom-entries boolean true
-
-### Network configuration
-# Disable network configuration entirely. This is useful for cdrom
-# installations on non-networked devices where the network questions,
-# warning and long timeouts are a nuisance.
-d-i netcfg/enable boolean false
-
-# If non-free firmware is needed for the network or other hardware, you can
-# configure the installer to always try to load it, without prompting. Or
-# change to false to disable asking.
-d-i hw-detect/load_firmware boolean false
-
-
-# If you prefer to configure the network manually, uncomment this line and
-# the static network configuration below.
-d-i netcfg/disable_dhcp boolean true
-
-#disabling mirrors selection
-d-i apt-setup/use_mirror boolean false
-
-# Disable CDROM entries after install
-d-i apt-setup/disable-cdrom-entries boolean true
-
-# Partitioning
-d-i partman-auto/method string regular
-d-i partman-lvm/device_remove_lvm boolean true
-d-i partman-md/device_remove_md boolean true
-d-i partman-lvm/confirm boolean true
-d-i partman-auto/choose_recipe select atomic
-d-i partman-auto/disk string /dev/sda
-d-i partman/confirm_write_new_label boolean true
-d-i partman/choose_partition select finish
-d-i partman/confirm boolean true
-d-i partman/confirm_nooverwrite boolean true
-d-i partman-partitioning/confirm_write_new_label boolean true
-
-# Packages
-#d-i pkgsel/upgrade select full-upgrade
-# install Parrot Security
-#d-i pkgsel/include string parrot-core parrot-interface parrot-tools
-# install Parrot Cloud
-#d-i pkgsel/include string parrot-core parrot-cloud parrot-tools-cloud
-
-# Change default hostname
-d-i netcfg/get_hostname string parrot
-# d-i netcfg/get_hostname seen false
-
-# user creation
-d-i passwd/root-login boolean true
-d-i passwd/make-user boolean false
-d-i passwd/root-password password toor
-d-i passwd/root-password-again password toor
-#d-i passwd/user-default-groups string audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth debian-tor sudo libvirt fuse dialout
-
-# Use the following option to add additional boot parameters for the
-# installed system (if supported by the bootloader installer).
-# Note: options passed to the installer will be added automatically.
-#d-i debian-installer/add-kernel-opts string noautomount nouveau.blacklist=1 splash
-
-# Disable popularity-contest
-popularity-contest popularity-contest/participate boolean false
-
-# Select udeb for installation to allow exiting the installer
-d-i anna/choose_modules string di-utils-exit-installer
-
-# Ask question regardless from that it's preseeded above
-d-i anna/choose_modules seen false
-
-# When disk encryption is enabled, skip wiping the partitions beforehand.
-d-i partman-auto-crypto/erase_disks boolean false
-
-d-i grub-installer/only_debian boolean true
-d-i grub-installer/with_other_os boolean false
-d-i grub-installer/bootdev string /dev/sda
-d-i finish-install/reboot_in_progress note
-
-# Skip the exit timeout
-#d-i di-utils-reboot/really_reboot boolean false
-#d-i finish-install/reboot_in_progress note
-
-
-
-#### Advanced options
-### Running custom commands during the installation
-#d-i preseed/late_command string in-target "rm /root/Desktop/debian-installer-launcher.desktop"
diff --git a/modules/parrot-build/templates/common/includes.installer/preseed.cfg.kali b/modules/parrot-build/templates/common/includes.installer/preseed.cfg.kali
deleted file mode 100755
index 71b5f496..00000000
--- a/modules/parrot-build/templates/common/includes.installer/preseed.cfg.kali
+++ /dev/null
@@ -1,79 +0,0 @@
-d-i debian-installer/locale string en_US.UTF-8
-d-i console-keymaps-at/keymap select us
-d-i mirror/country string enter information manually
-d-i mirror/http/hostname string http.kali.org
-d-i mirror/http/directory string /kali
-d-i keyboard-configuration/xkb-keymap select us
-d-i mirror/http/proxy string
-d-i mirror/suite string kali-rolling
-d-i mirror/codename string kali-rolling
-
-d-i clock-setup/utc boolean true
-d-i time/zone string US/Mountain
-
-# Disable security, volatile and backports
-d-i apt-setup/services-select multiselect 
-
-# Enable contrib and non-free
-d-i apt-setup/non-free boolean true
-d-i apt-setup/contrib boolean true
-
-# Disable source repositories too
-d-i apt-setup/enable-source-repositories boolean false
-
-# Partitioning
-d-i partman-auto/method string regular
-d-i partman-lvm/device_remove_lvm boolean true
-d-i partman-md/device_remove_md boolean true
-d-i partman-lvm/confirm boolean true
-d-i partman-auto/choose_recipe select atomic
-d-i partman-auto/disk string /dev/sda
-d-i partman/confirm_write_new_label boolean true
-d-i partman/choose_partition select finish
-d-i partman/confirm boolean true
-d-i partman/confirm_nooverwrite boolean true
-d-i partman-partitioning/confirm_write_new_label boolean true
-
-# Disable CDROM entries after install
-d-i apt-setup/disable-cdrom-entries boolean true
-
-# Upgrade installed packages
-d-i pkgsel/upgrade select full-upgrade
-
-# Change default hostname
-d-i netcfg/get_hostname string Kali
-d-i netcfg/get_domain string unassigned-domain
-#d-i netcfg/choose_interface select auto
-d-i netcfg/choose_interface select eth0
-d-i netcfg/dhcp_timeout string 60
-
-d-i hw-detect/load_firmware boolean false
-
-# Do not create a normal user account
-d-i passwd/make-user boolean false
-d-i passwd/root-password password toor
-d-i passwd/root-password-again password toor
-
-d-i apt-setup/use_mirror boolean true
-d-i grub-installer/only_debian boolean true
-d-i grub-installer/with_other_os boolean false
-d-i grub-installer/bootdev string /dev/sda
-d-i finish-install/reboot_in_progress note
-
-# Disable popularity-contest
-popularity-contest popularity-contest/participate boolean false
-
-kismet kismet/install-setuid boolean false
-kismet kismet/install-users string
-
-sslh sslh/inetd_or_standalone select standalone
-
-mysql-server-5.5 mysql-server/root_password_again password
-mysql-server-5.5 mysql-server/root_password password
-mysql-server-5.5 mysql-server/error_setting_password error
-mysql-server-5.5 mysql-server-5.5/postrm_remove_databases boolean false
-mysql-server-5.5 mysql-server-5.5/start_on_boot boolean true
-mysql-server-5.5 mysql-server-5.5/nis_warning note
-mysql-server-5.5 mysql-server-5.5/really_downgrade boolean false
-mysql-server-5.5 mysql-server/password_mismatch error
-mysql-server-5.5 mysql-server/no_upgrade_when_using_ndb error
diff --git a/modules/parrot-build/templates/common/includes.installer/preseed.cfg.orig b/modules/parrot-build/templates/common/includes.installer/preseed.cfg.orig
deleted file mode 100644
index b12f0239..00000000
--- a/modules/parrot-build/templates/common/includes.installer/preseed.cfg.orig
+++ /dev/null
@@ -1,76 +0,0 @@
-# Disable volatile and security
-d-i apt-setup/services-select multiselect
-
-# Enable contrib and non-free
-d-i apt-setup/non-free boolean true
-d-i apt-setup/contrib boolean true
-
-# Disable CDROM entries after install
-d-i apt-setup/disable-cdrom-entries boolean true
-
-### Network configuration
-# Disable network configuration entirely. This is useful for cdrom
-# installations on non-networked devices where the network questions,
-# warning and long timeouts are a nuisance.
-d-i netcfg/enable boolean false
-
-# If non-free firmware is needed for the network or other hardware, you can
-# configure the installer to always try to load it, without prompting. Or
-# change to false to disable asking.
-d-i hw-detect/load_firmware boolean false
-
-
-# If you prefer to configure the network manually, uncomment this line and
-# the static network configuration below.
-d-i netcfg/disable_dhcp boolean true
-
-#disabling mirrors selection
-d-i apt-setup/use_mirror boolean false
-
-# Disable CDROM entries after install
-d-i apt-setup/disable-cdrom-entries boolean true
-
-# Packages
-#d-i pkgsel/upgrade select full-upgrade
-# install Parrot Security
-#d-i pkgsel/include string parrot-core parrot-interface parrot-tools
-# install Parrot Cloud
-#d-i pkgsel/include string parrot-core parrot-cloud parrot-tools-cloud
-
-# Change default hostname
-d-i netcfg/get_hostname string parrot
-# d-i netcfg/get_hostname seen false
-
-# user creation
-d-i passwd/root-login boolean false
-d-i passwd/make-user boolean true
-d-i passwd/user-default-groups string audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth debian-tor sudo libvirt fuse dialout
-
-# Use the following option to add additional boot parameters for the
-# installed system (if supported by the bootloader installer).
-# Note: options passed to the installer will be added automatically.
-#d-i debian-installer/add-kernel-opts string noautomount nouveau.blacklist=1 splash
-
-# Disable popularity-contest
-popularity-contest popularity-contest/participate boolean false
-
-# Select udeb for installation to allow exiting the installer
-d-i anna/choose_modules string di-utils-exit-installer
-
-# Ask question regardless from that it's preseeded above
-d-i anna/choose_modules seen false
-
-# When disk encryption is enabled, skip wiping the partitions beforehand.
-d-i partman-auto-crypto/erase_disks boolean false
-
-
-
-# Skip the exit timeout
-#d-i di-utils-reboot/really_reboot boolean false
-#d-i finish-install/reboot_in_progress note
-
-
-
-#### Advanced options
-### Running custom commands during the installation
-#d-i preseed/late_command string in-target "rm /root/Desktop/debian-installer-launcher.desktop"
diff --git a/modules/parrot-build/templates/common/includes.installer/usr/share/graphics/logo_debian.png b/modules/parrot-build/templates/common/includes.installer/usr/share/graphics/logo_debian.png
deleted file mode 100644
index 418bf8fd..00000000
Binary files a/modules/parrot-build/templates/common/includes.installer/usr/share/graphics/logo_debian.png and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.installer/usr/share/graphics/logo_installer.png b/modules/parrot-build/templates/common/includes.installer/usr/share/graphics/logo_installer.png
deleted file mode 100644
index 7c95d9e5..00000000
Binary files a/modules/parrot-build/templates/common/includes.installer/usr/share/graphics/logo_installer.png and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.installer/usr/share/graphics/logo_installer_dark.png b/modules/parrot-build/templates/common/includes.installer/usr/share/graphics/logo_installer_dark.png
deleted file mode 100644
index 7c95d9e5..00000000
Binary files a/modules/parrot-build/templates/common/includes.installer/usr/share/graphics/logo_installer_dark.png and /dev/null differ
diff --git a/modules/parrot-build/templates/common/includes.installer/usr/share/graphics/logo_parrot.png b/modules/parrot-build/templates/common/includes.installer/usr/share/graphics/logo_parrot.png
deleted file mode 100644
index 7c95d9e5..00000000
Binary files a/modules/parrot-build/templates/common/includes.installer/usr/share/graphics/logo_parrot.png and /dev/null differ
diff --git a/modules/parrot-build/templates/common/package-lists/standard.list.chroot b/modules/parrot-build/templates/common/package-lists/standard.list.chroot
deleted file mode 100644
index 802e72ab..00000000
--- a/modules/parrot-build/templates/common/package-lists/standard.list.chroot
+++ /dev/null
@@ -1,79 +0,0 @@
-#standard packages
-! Packages Priority standard
-eatmydata
-
-#installer
-debian-installer-launcher
-
-#if ARCHITECTURES amd64
- linux-image-amd64
- linux-headers-amd64
-#endif
-
-#if ARCHITECTURES i386
- linux-image-686-pae
- linux-headers-686-pae
-#endif
-
-# virtualization
-open-vm-tools
-
-# parrot metapackages
-apt-parrot
-parrot-core
-
-# provide l10n for everybody
-locales-all
-console-setup
-
-#if ARCHITECTURES armel armhf
- cgpt
- vboot-utils
- vboot-kernel-utils
-#endif
-
-#important stuff
-cowsay
-cryptsetup
-ethtool
-iw
-lvm2
-mdadm
-openvpn
-parted
-bash-completion
-resolvconf
-initramfs-tools
-rng-tools
-haveged
-live-config
-
-#security
-apparmor
-apparmor-profiles
-apparmor-profiles-extra
-apparmor-utils
-firejail
-
-#filesystem support
-jfsutils
-hfsplus
-hfsutils
-hfsprogs
-btrfs-tools
-btrfs-progs
-e2fsprogs
-dosfstools
-mtools
-reiser4progs
-reiserfsprogs
-xfsprogs
-xfsdump
-
-#additional stuff
-xserver-xorg-video-all
-xserver-xorg-video-cirrus
-xserver-xorg-video-mga
-vim-nox
-plymouth
-plymouth-themes
diff --git a/modules/parrot-build/templates/common/package-lists/uefi.list.binary b/modules/parrot-build/templates/common/package-lists/uefi.list.binary
deleted file mode 100644
index e7635d1f..00000000
--- a/modules/parrot-build/templates/common/package-lists/uefi.list.binary
+++ /dev/null
@@ -1,6 +0,0 @@
-#if ARCHITECTURES i386
-grub-pc
-#endif
-#if ARCHITECTURES amd64
-grub-efi
-#endif
diff --git a/modules/parrot-build/templates/common/preseed/firmware b/modules/parrot-build/templates/common/preseed/firmware
deleted file mode 100644
index d80ef863..00000000
--- a/modules/parrot-build/templates/common/preseed/firmware
+++ /dev/null
@@ -1,4 +0,0 @@
-b43-fwcutter	b43-fwcutter/cut_firmware	boolean	true
-firmware-ipw2x00	firmware-ipw2x00/license/accepted	boolean	true
-firmware-iwlwifi	firmware-iwlwifi/license/accepted	boolean	true
-firmware-ralink	firmware-ralink/license/accepted	boolean	true
diff --git a/modules/parrot-build/templates/common/preseed/inetd.cfg.chroot b/modules/parrot-build/templates/common/preseed/inetd.cfg.chroot
deleted file mode 100644
index dd393390..00000000
--- a/modules/parrot-build/templates/common/preseed/inetd.cfg.chroot
+++ /dev/null
@@ -1,3 +0,0 @@
-# Do not register it in inetd so that its status can be controlled
-# individually
-atftpd atftpd/use_inetd boolean false
diff --git a/modules/parrot-build/templates/common/preseed/live-boot b/modules/parrot-build/templates/common/preseed/live-boot
deleted file mode 100644
index 4db3bb90..00000000
--- a/modules/parrot-build/templates/common/preseed/live-boot
+++ /dev/null
@@ -1,2 +0,0 @@
-live-boot	live-boot/smem	boolean	true
-live-boot	live-boot/sdmem	boolean	true
diff --git a/modules/parrot-build/templates/common/preseed/wireshark b/modules/parrot-build/templates/common/preseed/wireshark
deleted file mode 100644
index 20916621..00000000
--- a/modules/parrot-build/templates/common/preseed/wireshark
+++ /dev/null
@@ -1 +0,0 @@
-wireshark	wireshark-common/install-setuid: true
diff --git a/modules/parrot-build/templates/parrot-home/hooks/home-hooks.hook.chroot b/modules/parrot-build/templates/parrot-home/hooks/home-hooks.hook.chroot
deleted file mode 120000
index 2a44a02d..00000000
--- a/modules/parrot-build/templates/parrot-home/hooks/home-hooks.hook.chroot
+++ /dev/null
@@ -1 +0,0 @@
-normal/home-hooks.hook.chroot
\ No newline at end of file
diff --git a/modules/parrot-build/templates/parrot-home/hooks/normal/home-hooks.hook.chroot b/modules/parrot-build/templates/parrot-home/hooks/normal/home-hooks.hook.chroot
deleted file mode 100755
index b5ebe005..00000000
--- a/modules/parrot-build/templates/parrot-home/hooks/normal/home-hooks.hook.chroot
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-set -e
-export DEBIAN_FRONTEND=noninteractive
-
-echo "Removing useless stuff"
-apt-get purge -y openjdk-8-* || true
diff --git a/modules/parrot-build/templates/parrot-home/package-lists/parrot-home.list.chroot b/modules/parrot-build/templates/parrot-home/package-lists/parrot-home.list.chroot
deleted file mode 100644
index 689d1266..00000000
--- a/modules/parrot-build/templates/parrot-home/package-lists/parrot-home.list.chroot
+++ /dev/null
@@ -1,26 +0,0 @@
-## parrot metapackages
-parrot-interface
-parrot-mate
-parrot-drivers
-
-# parrot tools
-parrot-updater
-anonsurf
-
-## home packages
-vlc
-geany
-atom
-electrum
-zulucrypt
-ricochet-im
-libreoffice
-keepassxc
-homebank
-qownnotes
-planner
-rhythmbox
-shotwell
-cheese
-qbittorrent
-gimp
diff --git a/modules/parrot-build/templates/parrot-security/package-lists/parrot-security.list.chroot b/modules/parrot-build/templates/parrot-security/package-lists/parrot-security.list.chroot
deleted file mode 100644
index f73b83bb..00000000
--- a/modules/parrot-build/templates/parrot-security/package-lists/parrot-security.list.chroot
+++ /dev/null
@@ -1,20 +0,0 @@
-## parrot metapackages
-parrot-interface
-parrot-mate
-parrot-tools-full
-parrot-drivers
-
-## other packages
-ricochet-im
-vlc
-mpv
-telnet
-zeal
-keepassxc
-qownnotes
-libreoffice
-qbittorrent
-
-emacs-nox
-atom
-geany
diff --git a/modules/parrot-build/templates/parrot-studio/package-lists/parrot-studio.list.chroot b/modules/parrot-build/templates/parrot-studio/package-lists/parrot-studio.list.chroot
deleted file mode 100644
index e373447a..00000000
--- a/modules/parrot-build/templates/parrot-studio/package-lists/parrot-studio.list.chroot
+++ /dev/null
@@ -1,58 +0,0 @@
-## parrot metapackages
-parrot-interface
-parrot-mate
-parrot-interface-full
-parrot-drivers
-
-
-##video editing
-blender
-kdenlive
-flowblade
-lightworks
-
-handbrake
-winff
-
-##audio editing
-lmms
-audacity
-mixxx
-rhythmbox
-
-##graphics
-gimp
-krita
-#freecad
-inkscape
-scribus
-darktable
-shotwell
-cheese
-
-##gaming
-#steam-launcher
-
-##development
-atom
-geany
-zeal
-
-
-## other packages
-qbittorrent
-vinagre
-vlc
-mpv
-electrum
-keepassxc
-homebank
-vym
-planner
-playonlinux
-winetricks
-stellarium
-kalzium
-geogebra
-fritzing
-tkgate
diff --git a/modules/parrot-build/templates/parrot-studio/packages.chroot/Lightworks-145RC11-108471-14.5.0.0.deb.REMOVED.git-id b/modules/parrot-build/templates/parrot-studio/packages.chroot/Lightworks-145RC11-108471-14.5.0.0.deb.REMOVED.git-id
deleted file mode 100644
index 098cacb2..00000000
--- a/modules/parrot-build/templates/parrot-studio/packages.chroot/Lightworks-145RC11-108471-14.5.0.0.deb.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-5dac39c81c5b7313ed933ee9e1b8629ed619dc35
\ No newline at end of file
diff --git a/modules/parrot-build/templates/parrot-studio/packages.chroot/libssl1.0.0_1.0.1t-1+deb8u6_amd64.deb b/modules/parrot-build/templates/parrot-studio/packages.chroot/libssl1.0.0_1.0.1t-1+deb8u6_amd64.deb
deleted file mode 100644
index 3ccbb89d..00000000
Binary files a/modules/parrot-build/templates/parrot-studio/packages.chroot/libssl1.0.0_1.0.1t-1+deb8u6_amd64.deb and /dev/null differ
diff --git a/modules/parrot-build/templates/parrot-variant-cinnamon/package-lists/parrot-cinnamon.list.chroot b/modules/parrot-build/templates/parrot-variant-cinnamon/package-lists/parrot-cinnamon.list.chroot
deleted file mode 100644
index 705bb027..00000000
--- a/modules/parrot-build/templates/parrot-variant-cinnamon/package-lists/parrot-cinnamon.list.chroot
+++ /dev/null
@@ -1,20 +0,0 @@
-## parrot metapackages
-apt-parrot
-parrot-core
-parrot-interface
-parrot-mini
-parrot-drivers
-parrot-tools-full
-
-## other packages
-vinagre
-etherape
-torchat
-vlc
-mpv
-electrum
-
-## desktop environment
-parrot-cinnamon
-
-anonsurf
diff --git a/modules/parrot-build/templates/parrot-variant-gnome/package-lists/parrot-gnome.list.chroot b/modules/parrot-build/templates/parrot-variant-gnome/package-lists/parrot-gnome.list.chroot
deleted file mode 100644
index a642fc1f..00000000
--- a/modules/parrot-build/templates/parrot-variant-gnome/package-lists/parrot-gnome.list.chroot
+++ /dev/null
@@ -1,21 +0,0 @@
-## parrot metapackages
-apt-parrot
-parrot-core
-parrot-interface
-parrot-mini
-parrot-drivers
-parrot-tools-full
-
-## other packages
-vinagre
-etherape
-torchat
-vlc
-mpv
-galculator
-electrum
-
-## desktop environment
-parrot-gnome
-
-anonsurf
diff --git a/modules/parrot-build/templates/parrot-variant-kde/package-lists/parrot-kde.list.chroot b/modules/parrot-build/templates/parrot-variant-kde/package-lists/parrot-kde.list.chroot
deleted file mode 100644
index dfefe177..00000000
--- a/modules/parrot-build/templates/parrot-variant-kde/package-lists/parrot-kde.list.chroot
+++ /dev/null
@@ -1,23 +0,0 @@
-## parrot metapackages
-parrot-interface
-parrot-kde
-sddm
-parrot-drivers
-parrot-tools-full
-
-## other packages
-vlc
-electrum
-zulucrypt
-ricochet-im
-libreoffice-writer
-libreoffice-calc
-libreoffice-impress
-keepassxc
-homebank
-vym
-planner
-
-parrot-updater
-
-anonsurf
diff --git a/modules/parrot-build/templates/parrot-variant-lxde/package-lists/parrot-lxde.list.chroot b/modules/parrot-build/templates/parrot-variant-lxde/package-lists/parrot-lxde.list.chroot
deleted file mode 100644
index f8aff5c4..00000000
--- a/modules/parrot-build/templates/parrot-variant-lxde/package-lists/parrot-lxde.list.chroot
+++ /dev/null
@@ -1,20 +0,0 @@
-## parrot metapackages
-apt-parrot
-parrot-core
-parrot-interface
-parrot-mini
-parrot-drivers
-parrot-tools-full
-
-## other packages
-vinagre
-etherape
-torchat
-vlc
-mpv
-electrum
-
-## desktop environment
-parrot-lxde
-
-anonsurf
diff --git a/modules/parrot-build/templates/parrot-variant-mate/package-lists/parrot-security.list.chroot b/modules/parrot-build/templates/parrot-variant-mate/package-lists/parrot-security.list.chroot
deleted file mode 100644
index f73b83bb..00000000
--- a/modules/parrot-build/templates/parrot-variant-mate/package-lists/parrot-security.list.chroot
+++ /dev/null
@@ -1,20 +0,0 @@
-## parrot metapackages
-parrot-interface
-parrot-mate
-parrot-tools-full
-parrot-drivers
-
-## other packages
-ricochet-im
-vlc
-mpv
-telnet
-zeal
-keepassxc
-qownnotes
-libreoffice
-qbittorrent
-
-emacs-nox
-atom
-geany
diff --git a/modules/parrot-build/templates/parrot-variant-xfce/package-lists/parrot-xfce.list.chroot b/modules/parrot-build/templates/parrot-variant-xfce/package-lists/parrot-xfce.list.chroot
deleted file mode 100644
index 7b4e24a1..00000000
--- a/modules/parrot-build/templates/parrot-variant-xfce/package-lists/parrot-xfce.list.chroot
+++ /dev/null
@@ -1,21 +0,0 @@
-## parrot metapackages
-apt-parrot
-parrot-core
-parrot-interface
-parrot-mini
-parrot-drivers
-parrot-tools-full
-
-## other packages
-vinagre
-etherape
-torchat
-vlc
-mpv
-galculator
-electrum
-
-## desktop environment
-parrot-xfce
-
-anonsurf