diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index edd2af7..80cf285 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -90,6 +90,7 @@ QCOM_BT_USE_SMD_TTY := true
 # Camera
 BOARD_QTI_CAMERA_32BIT_ONLY := true
 USE_DEVICE_SPECIFIC_CAMERA := true
+TARGET_HAS_LEGACY_CAMERA_HAL1 := true
 TARGET_TS_MAKEUP := true
 
 # Charger
@@ -151,9 +152,6 @@ TARGET_PROVIDES_KEYMASTER := true
 # Lights
 TARGET_PROVIDES_LIBLIGHT := true
 
-# Media
-TARGET_USES_MEDIA_EXTENSIONS := true
-
 # Peripheral manager
 TARGET_PER_MGR_ENABLED := true
 
diff --git a/system.prop b/system.prop
index 1d85826..d9a7b0f 100644
--- a/system.prop
+++ b/system.prop
@@ -28,10 +28,6 @@ bluetooth.hfp.client=1
 qcom.bluetooth.soc=rome
 ro.bt.bdaddr_path=/efs/bluetooth/bt_addr
 
-# Camera
-media.camera.ts.monotonic=0
-persist.camera.HAL3.enabled=1
-
 # CNE/DPM
 persist.cne.feature=1
 persist.dpm.feature=1