diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index d0e76ba..d14fe28 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -88,14 +88,6 @@ BOARD_SUPPORTS_OPENSOURCE_STHAL := true
 BOARD_SUPPORTS_SOUND_TRIGGER := true
 BOARD_USES_ALSA_AUDIO := true
 
-# Display
-TARGET_USES_COLOR_METADATA := true
-TARGET_USES_DISPLAY_RENDER_INTENTS := true
-TARGET_USES_GRALLOC1 := true
-TARGET_USES_GRALLOC4 := true
-TARGET_USES_HWC2 := true
-TARGET_USES_ION := true
-
 # DRM
 TARGET_ENABLE_MEDIADRM_64 := true
 
@@ -112,6 +104,9 @@ DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += \
 DEVICE_MATRIX_FILE := hardware/qcom-caf/common/compatibility_matrix.xml
 DEVICE_MANIFEST_FILE += $(COMMON_PATH)/manifest.xml
 
+# Media
+TARGET_USES_ION := true
+
 # Metadata
 BOARD_USES_METADATA_PARTITION := true