diff --git a/build/arm.sh b/build/arm.sh
index dd0f868..171a7a7 100644
--- a/build/arm.sh
+++ b/build/arm.sh
@@ -32,7 +32,7 @@ SELF=arm
 
 . ./common.sh
 
-if [ ${PRODUCT_ARCH} != armv7 -a ${PRODUCT_ARCH} != aarch64 ]; then
+if [ ${PRODUCT_ARCH} != aarch64 ]; then
 	echo ">>> Cannot build arm image with arch ${PRODUCT_ARCH}"
 	exit 1
 fi
diff --git a/build/common.sh b/build/common.sh
index 56610a0..13fc2fc 100644
--- a/build/common.sh
+++ b/build/common.sh
@@ -523,14 +523,7 @@ setup_xtools()
 	# additional emulation layer so that chroot
 	# looks like a native environment later on
 	mkdir -p ${1}/usr/local/bin
-	case ${PRODUCT_TARGET} in
-	arm64)
-		cp /usr/local/bin/qemu-${PRODUCT_ARCH}-static ${1}/usr/local/bin
-		;;
-	*)
-		cp /usr/local/bin/qemu-${PRODUCT_TARGET}-static ${1}/usr/local/bin
-		;;
-	esac
+	cp /usr/local/bin/qemu-${PRODUCT_ARCH}-static ${1}/usr/local/bin
 	/usr/local/etc/rc.d/qemu_user_static onerestart
 
 	# copy the native toolchain for extra speed
diff --git a/device/BANANAPI.conf b/device/BANANAPI.conf
deleted file mode 100644
index 42f3bfb..0000000
--- a/device/BANANAPI.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# http://www.banana-pi.org/m1.html
-# http://www.banana-pi.org/m1plus.html
-# http://www.banana-pi.org/r1.html
-
-export MAKE_ARGS_DEV="
-UBLDR_LOADADDR=0x42000000
-"
-
-export PRODUCT_KERNEL=SMP-ARM
-export PRODUCT_TARGET=arm
-export PRODUCT_ARCH=armv7
-export PRODUCT_WANTS="u-boot-bananapi"
-export PRODUCT_WANTS_CROSS="arm-none-eabi-binutils qemu-user-static"
-
-export ARM_UBOOT_DIR="/usr/local/share/u-boot/u-boot-bananapi"
-
-arm_install_uboot()
-{
-	arm_unmount
-	dd if=${ARM_UBOOT_DIR}/u-boot-sunxi-with-spl.bin of=/dev/${DEV} bs=1k seek=8 conv=sync
-	arm_mount
-	cp ${ARM_UBOOT_DIR}/boot.scr ${STAGEDIR}/boot/msdos
-	cp -p ${STAGEDIR}/boot/ubldr.bin ${STAGEDIR}/boot/msdos
-	cp -pr ${STAGEDIR}/boot/dtb ${STAGEDIR}/boot/msdos
-}
diff --git a/device/CLEARFOG.conf b/device/CLEARFOG.conf
deleted file mode 100644
index 1bbe245..0000000
--- a/device/CLEARFOG.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-# https://www.solid-run.com/marvell-armada-family/clearfog/
-
-export MAKE_ARGS_DEV="
-UBLDR_LOADADDR=0x900000
-"
-
-export PRODUCT_KERNEL=SMP-ARM
-export PRODUCT_TARGET=arm
-export PRODUCT_ARCH=armv7
-export PRODUCT_WANTS="u-boot-clearfog"
-export PRODUCT_WANTS_CROSS="arm-none-eabi-binutils qemu-user-static"
-
-export ARM_UBOOT_DIR="/usr/local/share/u-boot/u-boot-clearfog"
-
-arm_install_uboot()
-{
-	arm_unmount
-	dd if=${ARM_UBOOT_DIR}/u-boot-spl.kwb of=/dev/${DEV} bs=512 seek=1 conv=sync
-	arm_mount
-	cp ${ARM_UBOOT_DIR}/boot.scr ${STAGEDIR}/boot/msdos
-	cp -p ${STAGEDIR}/boot/ubldr.bin ${STAGEDIR}/boot/msdos
-	cp -pr ${STAGEDIR}/boot/dtb ${STAGEDIR}/boot/msdos
-}
diff --git a/device/RPI2.conf b/device/RPI2.conf
deleted file mode 100644
index 13b75af..0000000
--- a/device/RPI2.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-# https://www.raspberrypi.org/products/raspberry-pi-2-model-b/
-
-export MAKE_ARGS_DEV="
-UBLDR_LOADADDR=0x2000000
-"
-
-export PRODUCT_KERNEL=SMP-ARM
-export PRODUCT_TARGET=arm
-export PRODUCT_ARCH=armv7
-export PRODUCT_WANTS="rpi-firmware u-boot-rpi2"
-export PRODUCT_WANTS_CROSS="arm-none-eabi-binutils qemu-user-static"
-
-export ARM_FIRMWARE_DIR="/usr/local/share/rpi-firmware"
-export ARM_UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi2"
-
-arm_install_uboot()
-{
-	cp -p ${ARM_UBOOT_DIR}/u-boot.bin ${STAGEDIR}/boot/msdos
-	cp -p ${ARM_UBOOT_DIR}/boot.scr ${STAGEDIR}/boot/msdos
-	cp -p ${ARM_FIRMWARE_DIR}/bootcode.bin ${STAGEDIR}/boot/msdos
-	cp -p ${ARM_FIRMWARE_DIR}/config.txt ${STAGEDIR}/boot/msdos
-	cp -p ${ARM_FIRMWARE_DIR}/fixup* ${STAGEDIR}/boot/msdos
-	cp -p ${ARM_FIRMWARE_DIR}/start* ${STAGEDIR}/boot/msdos
-	cp -p ${ARM_FIRMWARE_DIR}/bcm2709-rpi-2-b.dtb ${STAGEDIR}/boot/msdos
-	mkdir -p ${STAGEDIR}/boot/msdos/overlays
-	cp -p ${ARM_FIRMWARE_DIR}/overlays/mmc.dtbo ${STAGEDIR}/boot/msdos/overlays
-	cp -p ${STAGEDIR}/boot/ubldr.bin ${STAGEDIR}/boot/msdos/ubldr.bin
-	cp -pr ${STAGEDIR}/boot/dtb ${STAGEDIR}/boot/msdos
-}