diff --git a/meta-digi-arm/conf/machine/include/ccimx6.inc b/meta-digi-arm/conf/machine/include/ccimx6.inc
index b4fb42374..a8ecf4414 100644
--- a/meta-digi-arm/conf/machine/include/ccimx6.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx6.inc
@@ -84,15 +84,3 @@ CPU_FAMILY_q512 = "mx6q"
 CPU_FAMILY_dl256 = "mx6dl"
 CPU_FAMILY_wdl512 = "mx6dl"
 CPU_FAMILY_wbdl1024 = "mx6dl"
-
-# Per-variant device tree
-DTB_VARIANT_STR = ""
-DTB_VARIANT_STR_wbkq1024 = "-wbk"
-DTB_VARIANT_STR_wbq512 = "-wb"
-DTB_VARIANT_STR_wbq1024 = "-wb"
-DTB_VARIANT_STR_wq1024 = "-wb"
-DTB_VARIANT_STR_wdl256 = "-w"
-DTB_VARIANT_STR_q512 = "-wb"
-DTB_VARIANT_STR_dl256 = "-z"
-DTB_VARIANT_STR_wdl512 = "-mw"
-DTB_VARIANT_STR_wbdl1024 = "-mwb"
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb
index b33753679..b1fc97ba0 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb
@@ -8,7 +8,6 @@ DEPENDS += "lzop-native bc-native"
 # Internal repo branch
 SRCBRANCH = "v3.10/master"
 SRCBRANCH_mxs = "v3.10/dey-1.4/maint"
-SRCBRANCH_mx6 = "v3.10/dey-1.7/maint"
 
 SRCREV_external = ""
 SRCREV_external_mxs = ""
@@ -36,18 +35,6 @@ do_update_dts() {
 	:
 }
 
-do_update_dts_ccimx6() {
-	# Rename variant device tree to the standard name (used in u-boot)
-	for DTB in ${KERNEL_DEVICETREE}; do
-		DTS="${DTB%b}s"
-		DTS_VARIANT="$(echo ${DTS} | sed "s/${MACHINE}/${MACHINE}${DTB_VARIANT_STR}/g")"
-		[ "${DTS_VARIANT}" = "${DTS}" ] && continue
-		if [ -e "${S}/arch/arm/boot/dts/${DTS_VARIANT}" ]; then
-			cp -f "${S}/arch/arm/boot/dts/${DTS_VARIANT}" "${S}/arch/arm/boot/dts/${DTS}"
-		fi
-	done
-}
-
 do_update_dts_mxs() {
 	if [ -n "${HAVE_WIFI}" ]; then
 		config_dts enable  '_ssp2_mmc_wifi.dtsi'