diff --git a/conf/layer.conf b/conf/layer.conf
index c87c4cf..3184b66 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -16,8 +16,9 @@ BBMASK += "meta-compulab/recipes-graphics"
 BBMASK += ".*boundary.*"
 
 CORE_IMAGE_EXTRA_INSTALL += " kernel-modules kernel linux-compulab-headers firmware-imx-sdma-imx7d"
+CORE_IMAGE_EXTRA_INSTALL += " packagegroup-tools-bluetooth "
+CORE_IMAGE_EXTRA_INSTALL += " grub "
 
-CORE_IMAGE_EXTRA_INSTALL += " wpa-supplicant pulseaudio " 
 HOSTTOOLS += " git-lfs "
 HOSTTOOLS += " bison "
 
diff --git a/conf/machine/compulab-imx8mm.inc b/conf/machine/compulab-imx8mm.inc
index e626b72..31e2996 100644
--- a/conf/machine/compulab-imx8mm.inc
+++ b/conf/machine/compulab-imx8mm.inc
@@ -36,10 +36,6 @@ MACHINE_FIRMWARE:remove = "linux-firmware-ath10k"
 
 DEFAULTTUNE:mx8mm-nxp-bsp = "aarch64"
 
-# PLATFORM_FLAVOR = "mx8mmevk"
-# PLATFORM_FLAVOR:ucm-imx8m-mini = "mx8mmevk"
-# PLATFORM_FLAVOR:mcm-imx8m-mini = "mx8mmevk"
-# PLATFORM_FLAVOR:iot-gate-imx8 = "mx8mmevk"
 # Optee parameters
 OPTEE_BIN_EXT = "8mm"
 OPTEE_PLATFORM_FLAVOR = "mx8mm_cl_iot_gate"
diff --git a/conf/machine/iot-gate-imx8.conf b/conf/machine/iot-gate-imx8.conf
index fa5cab4..5234161 100644
--- a/conf/machine/iot-gate-imx8.conf
+++ b/conf/machine/iot-gate-imx8.conf
@@ -22,10 +22,6 @@ UBOOT_CONFIG[mfgtool] = "iot-gate-imx8_defconfig"
 # Set u-boot DTB
 UBOOT_DTB_NAME = "iot-gate-imx8.dtb"
 
-# Prefered components
-# PREFERRED_PROVIDER_virtual/kernel_mx8mm = "linux-compulab"
-# PREFERRED_PROVIDER_virtual/bootloader_mx8mm = "u-boot-compulab"
-
 # Block recipes
 BBMASK += "meta-compulab/recipes-bsp/u-boot"