diff --git a/conf/machine/dragonboard-410c-32.conf b/conf/machine/dragonboard-410c-32.conf
deleted file mode 100644
index 495c2fae9..000000000
--- a/conf/machine/dragonboard-410c-32.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-#@TYPE: Machine
-#@NAME: dragonboard-410c-32
-#@DESCRIPTION: 32-bit machine configuration for the DragonBoard 410c (96boards), with Qualcomm Snapdragon 410 APQ8016.
-
-DEFAULTTUNE = "armv7athf-neon-vfpv4"
-require conf/machine/include/qcom-apq8016.inc
-
-MACHINE_FEATURES = "usbhost usbgadget alsa screen wifi bluetooth ext2"
-
-SERIAL_CONSOLE ?= "115200 ttyMSM0"
-
-# Building 32-bit kernel is not supported.
-PREFERRED_PROVIDER_virtual/kernel = "linux-dummy"
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
-
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-msm', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5-noinst-tools', '', d)} \
-    packagegroup-firmware-dragonboard410c \
-"
diff --git a/conf/machine/ifc6410.conf b/conf/machine/ifc6410.conf
deleted file mode 100644
index e0cffcfeb..000000000
--- a/conf/machine/ifc6410.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-#@TYPE: Machine
-#@NAME: ifc6410
-#@DESCRIPTION: Machine configuration for the Inforce IFC6410, with Qualcomm Snapdragon 600 APQ8064.
-
-require conf/machine/include/qcom-apq8064.inc
-
-# features
-MACHINE_FEATURES = "alsa kernel26 screen usb keyboard wifi ext2 ext3"
-
-MACHINE_EXTRA_RRECOMMENDS = " \
-    kernel-modules \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-msm', '', d)} \
-"
-
-KERNEL_IMAGETYPE ?= "zImage"
-KERNEL_DEVICETREE ?= "qcom-apq8064-ifc6410.dtb"
-
-SERIAL_CONSOLE ?= "115200 ttyMSM0"
-
-QCOM_BOOTIMG_ROOTFS ?= "/dev/mmcblk0p12"
-
-INHERIT += "qcom-firmware-mount"
diff --git a/conf/machine/nexus7-2013.conf b/conf/machine/nexus7-2013.conf
deleted file mode 100644
index 14be8b2f7..000000000
--- a/conf/machine/nexus7-2013.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-#@TYPE: Machine
-#@NAME: Nexus 7 2013
-#@DESCRIPTION: 32-bit machine configuration for the Asus Google Nexus 7 2013, with Qualcomm Snapdragon S4 Pro (APQ8064).
-
-require conf/machine/include/qcom-apq8064.inc
-
-MACHINE_FEATURES = "alsa screen wifi bluetooth ext2 ext3 usb usbhost usbgadget"
-
-KERNEL_IMAGETYPE ?= "zImage"
-KERNEL_DEVICETREE ?= "qcom-apq8064-asus-nexus7-flo.dtb"
-
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-msm', '', d)} \
-"
-
-SERIAL_CONSOLE ?= "115200 ttyMSM0"
-
-QCOM_BOOTIMG_ROOTFS ?= "PARTLABEL=userdata"
diff --git a/conf/machine/sdx55-mtp.conf b/conf/machine/sdx55-mtp.conf
deleted file mode 100644
index dda313cee..000000000
--- a/conf/machine/sdx55-mtp.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-#@TYPE: Machine
-#@NAME: SDX55-MTP
-#@DESCRIPTION: Machine configuration for the SDX55-MTP development board, with Qualcomm SDX55.
-
-require conf/machine/include/qcom-sdx55.inc
-
-MACHINE_FEATURES = "usbhost usbgadget"
-
-KERNEL_IMAGETYPE ?= "zImage"
-KERNEL_DEVICETREE ?= "qcom-sdx55-mtp.dtb"
-
-# UBI filesystem parameters
-MKUBIFS_ARGS ?= "-m 4096 -e 253952 -c 1188"
-UBINIZE_ARGS ?= "-m 4096 -p 256KiB -s 4096"
-
-# Use system partition for rootfs
-UBI_VOLNAME ?= "system"
-QCOM_BOOTIMG_ROOTFS ?= "ubi0:system"
diff --git a/conf/machine/sdx55-telit-fn980.conf b/conf/machine/sdx55-telit-fn980.conf
deleted file mode 100644
index 7514c7e11..000000000
--- a/conf/machine/sdx55-telit-fn980.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-#@TYPE: Machine
-#@NAME: SDX55-TELIT-FN980
-#@DESCRIPTION: Machine configuration for the Telit FN980 development board, with Qualcomm SDX55.
-
-require conf/machine/include/qcom-sdx55.inc
-
-MACHINE_FEATURES = "usbhost usbgadget"
-
-KERNEL_IMAGETYPE ?= "zImage"
-KERNEL_DEVICETREE ?= "qcom-sdx55-telit-fn980.dtb"
-
-# UBI filesystem parameters
-MKUBIFS_ARGS ?= "-m 4096 -e 253952 -c 528"
-UBINIZE_ARGS ?= "-m 4096 -p 256KiB -s 4096"
-
-# Use system partition for rootfs
-UBI_VOLNAME ?= "system"
-QCOM_BOOTIMG_ROOTFS ?= "ubi0:system"
-
-SERIAL_CONSOLES = "921600;ttyMSM0"