diff --git a/board/camera.mk b/board/camera.mk
index d0274d1..f7af579 100644
--- a/board/camera.mk
+++ b/board/camera.mk
@@ -1,4 +1,3 @@
 # Camera
-TARGET_CAMERASERVICE_CLOSES_NATIVE_HANDLES := true
+BOARD_QTI_CAMERA_32BIT_ONLY := true
 USE_DEVICE_SPECIFIC_CAMERA := true
-TARGET_HAS_LEGACY_CAMERA_HAL1 := true
diff --git a/product/qcom-camera.mk b/product/qcom-camera.mk
index 0e83bb7..bbf8df1 100644
--- a/product/qcom-camera.mk
+++ b/product/qcom-camera.mk
@@ -1,5 +1,6 @@
 # Camera
 PRODUCT_PACKAGES += \
+    camera.msm8937 \
     libshims_camera \
     libshim_ims_camera \
     Snap
@@ -12,6 +13,4 @@ PRODUCT_PROPERTY_OVERRIDES += \
     persist.camera.is_type=1 \
     vidc.debug.perf.mode=2 \
     vidc.enc.dcvs.extra-buff-count=2 \
-    vidc.enc.disable.pq=true \
-    media.stagefright.legacyencoder=true \
-    media.stagefright.less-secure=true
+    vidc.enc.disable.pq=true
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 0c9bf64..e8daff7 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -94,17 +94,7 @@ etc/camera/s5k3l8_mono_chromatix.xml
 etc/camera/s5k3m2xm_chromatix.xml
 etc/camera/s5k3m2xm_chromatix_bear.xml
 etc/camera/s5k3m2xx_chromatix.xml
-lib/hw/camera.msm8937.so
-lib/libRecoFace.so
-lib/libmm-qcamera.so
-lib/libmmcamera_interface.so
-lib/libmmjpeg_interface.so
 lib/libmorpho_memory_allocator.so
-lib/libmorpho_panorama.so
-lib/libqomx_core.so
-vendor/lib/libFaceGrade.so
-vendor/lib/libFaceProc.so
-vendor/lib/libarcsoft_beauty_shot.so
 vendor/lib/libchromaflash.so
 vendor/lib/libflash_pmic.so
 vendor/lib/libjpegdhw.so