diff --git a/deb/deb-vendor.mk b/deb/deb-vendor.mk
index 910481965..62f5c8528 100644
--- a/deb/deb-vendor.mk
+++ b/deb/deb-vendor.mk
@@ -15,196 +15,5 @@
 # This file is generated by device/asus/deb/setup-makefiles.sh
 
 PRODUCT_COPY_FILES += \
-    vendor/asus/deb/proprietary/bin/ATFWD-daemon:system/bin/ATFWD-daemon \
-    vendor/asus/deb/proprietary/bin/bridgemgrd:system/bin/bridgemgrd \
-    vendor/asus/deb/proprietary/bin/btnvtool:system/bin/btnvtool \
-    vendor/asus/deb/proprietary/bin/diag_klog:system/bin/diag_klog \
-    vendor/asus/deb/proprietary/bin/diag_mdlog:system/bin/diag_mdlog \
-    vendor/asus/deb/proprietary/bin/ds_fmc_appd:system/bin/ds_fmc_appd \
-    vendor/asus/deb/proprietary/bin/efsks:system/bin/efsks \
-    vendor/asus/deb/proprietary/bin/hci_qcomm_init:system/bin/hci_qcomm_init \
-    vendor/asus/deb/proprietary/bin/irsc_util:system/bin/irsc_util \
-    vendor/asus/deb/proprietary/bin/ks:system/bin/ks \
-    vendor/asus/deb/proprietary/bin/mm-qcamera-app:system/bin/mm-qcamera-app \
-    vendor/asus/deb/proprietary/bin/mm-qcamera-daemon:system/bin/mm-qcamera-daemon \
-    vendor/asus/deb/proprietary/bin/mm-qjpeg-enc-test:system/bin/mm-qjpeg-enc-test \
-    vendor/asus/deb/proprietary/bin/mm-qomx-ienc-test:system/bin/mm-qomx-ienc-test \
-    vendor/asus/deb/proprietary/bin/mpdecision:system/bin/mpdecision \
-    vendor/asus/deb/proprietary/bin/netmgrd:system/bin/netmgrd \
-    vendor/asus/deb/proprietary/bin/nl_listener:system/bin/nl_listener \
-    vendor/asus/deb/proprietary/bin/port-bridge:system/bin/port-bridge \
-    vendor/asus/deb/proprietary/bin/qcks:system/bin/qcks \
-    vendor/asus/deb/proprietary/bin/qmuxd:system/bin/qmuxd \
-    vendor/asus/deb/proprietary/bin/qseecomd:system/bin/qseecomd \
-    vendor/asus/deb/proprietary/bin/radish:system/bin/radish \
-    vendor/asus/deb/proprietary/bin/rmt_storage:system/bin/rmt_storage \
-    vendor/asus/deb/proprietary/bin/sensors.qcom:system/bin/sensors.qcom \
-    vendor/asus/deb/proprietary/bin/thermald:system/bin/thermald \
-    vendor/asus/deb/proprietary/bin/usbhub:system/bin/usbhub \
-    vendor/asus/deb/proprietary/bin/usbhub_init:system/bin/usbhub_init \
-    vendor/asus/deb/proprietary/etc/DxHDCP.cfg:system/etc/DxHDCP.cfg \
-    vendor/asus/deb/proprietary/etc/firmware/vidc.b00:system/etc/firmware/vidc.b00 \
-    vendor/asus/deb/proprietary/etc/firmware/vidc.b01:system/etc/firmware/vidc.b01 \
-    vendor/asus/deb/proprietary/etc/firmware/vidc.b02:system/etc/firmware/vidc.b02 \
-    vendor/asus/deb/proprietary/etc/firmware/vidc.b03:system/etc/firmware/vidc.b03 \
-    vendor/asus/deb/proprietary/etc/firmware/vidc.mdt:system/etc/firmware/vidc.mdt \
-    vendor/asus/deb/proprietary/etc/firmware/vidc_1080p.fw:system/etc/firmware/vidc_1080p.fw \
-    vendor/asus/deb/proprietary/etc/firmware/vidcfw.elf:system/etc/firmware/vidcfw.elf \
-    vendor/asus/deb/proprietary/etc/gps.conf:system/etc/gps.conf \
-    vendor/asus/deb/proprietary/lib/hw/flp.msm8960.so:system/lib/hw/flp.msm8960.so \
-    vendor/asus/deb/proprietary/lib/hw/gps.msm8960.so:system/lib/hw/gps.msm8960.so \
-    vendor/asus/deb/proprietary/lib/hw/sensors.msm8960.so:system/lib/hw/sensors.msm8960.so \
-    vendor/asus/deb/proprietary/lib/libAKM.so:system/lib/libAKM.so \
-    vendor/asus/deb/proprietary/lib/libCommandSvc.so:system/lib/libCommandSvc.so \
-    vendor/asus/deb/proprietary/lib/libDxHdcp.so:system/lib/libDxHdcp.so \
-    vendor/asus/deb/proprietary/lib/libI420colorconvert.so:system/lib/libI420colorconvert.so \
-    vendor/asus/deb/proprietary/lib/libQSEEComAPI.so:system/lib/libQSEEComAPI.so \
-    vendor/asus/deb/proprietary/lib/libacdbdata.so:system/lib/libacdbdata.so \
-    vendor/asus/deb/proprietary/lib/libacdbloader.so:system/lib/libacdbloader.so \
-    vendor/asus/deb/proprietary/lib/libaudcal.so:system/lib/libaudcal.so \
-    vendor/asus/deb/proprietary/lib/libaudioalsa.so:system/lib/libaudioalsa.so \
-    vendor/asus/deb/proprietary/lib/libchromatix_ov5693_common.so:system/lib/libchromatix_ov5693_common.so \
-    vendor/asus/deb/proprietary/lib/libchromatix_ov5693_default_video.so:system/lib/libchromatix_ov5693_default_video.so \
-    vendor/asus/deb/proprietary/lib/libchromatix_ov5693_preview.so:system/lib/libchromatix_ov5693_preview.so \
-    vendor/asus/deb/proprietary/lib/libconfigdb.so:system/lib/libconfigdb.so \
-    vendor/asus/deb/proprietary/lib/libcsd-client.so:system/lib/libcsd-client.so \
-    vendor/asus/deb/proprietary/lib/libdiag.so:system/lib/libdiag.so \
-    vendor/asus/deb/proprietary/lib/libdrmdiag.so:system/lib/libdrmdiag.so \
-    vendor/asus/deb/proprietary/lib/libdrmfs.so:system/lib/libdrmfs.so \
-    vendor/asus/deb/proprietary/lib/libdrmtime.so:system/lib/libdrmtime.so \
-    vendor/asus/deb/proprietary/lib/libdsi_netctrl.so:system/lib/libdsi_netctrl.so \
-    vendor/asus/deb/proprietary/lib/libdsprofile.so:system/lib/libdsprofile.so \
-    vendor/asus/deb/proprietary/lib/libdss.so:system/lib/libdss.so \
-    vendor/asus/deb/proprietary/lib/libdsucsd.so:system/lib/libdsucsd.so \
-    vendor/asus/deb/proprietary/lib/libdsutils.so:system/lib/libdsutils.so \
-    vendor/asus/deb/proprietary/lib/libgps.utils.so:system/lib/libgps.utils.so \
-    vendor/asus/deb/proprietary/lib/libidl.so:system/lib/libidl.so \
-    vendor/asus/deb/proprietary/lib/libloc_core.so:system/lib/libloc_core.so \
-    vendor/asus/deb/proprietary/lib/libloc_eng.so:system/lib/libloc_eng.so \
-    vendor/asus/deb/proprietary/lib/libmm-abl.so:system/lib/libmm-abl.so \
-    vendor/asus/deb/proprietary/lib/libmm-color-convertor.so:system/lib/libmm-color-convertor.so \
-    vendor/asus/deb/proprietary/lib/libmmcamera2_stats_algorithm.so:system/lib/libmmcamera2_stats_algorithm.so \
-    vendor/asus/deb/proprietary/lib/libmmcamera_image_stab.so:system/lib/libmmcamera_image_stab.so \
-    vendor/asus/deb/proprietary/lib/libmmcamera_mi1040.so:system/lib/libmmcamera_mi1040.so \
-    vendor/asus/deb/proprietary/lib/libmmcamera_ov5693.so:system/lib/libmmcamera_ov5693.so \
-    vendor/asus/deb/proprietary/lib/libnetmgr.so:system/lib/libnetmgr.so \
-    vendor/asus/deb/proprietary/lib/libqcci_legacy.so:system/lib/libqcci_legacy.so \
-    vendor/asus/deb/proprietary/lib/libqdi.so:system/lib/libqdi.so \
-    vendor/asus/deb/proprietary/lib/libqdp.so:system/lib/libqdp.so \
-    vendor/asus/deb/proprietary/lib/libqmi.so:system/lib/libqmi.so \
-    vendor/asus/deb/proprietary/lib/libqmi_cci.so:system/lib/libqmi_cci.so \
-    vendor/asus/deb/proprietary/lib/libqmi_client_qmux.so:system/lib/libqmi_client_qmux.so \
-    vendor/asus/deb/proprietary/lib/libqmi_common_so.so:system/lib/libqmi_common_so.so \
-    vendor/asus/deb/proprietary/lib/libqmi_csi.so:system/lib/libqmi_csi.so \
-    vendor/asus/deb/proprietary/lib/libqmi_csvt_srvc.so:system/lib/libqmi_csvt_srvc.so \
-    vendor/asus/deb/proprietary/lib/libqmi_encdec.so:system/lib/libqmi_encdec.so \
-    vendor/asus/deb/proprietary/lib/libqmiservices.so:system/lib/libqmiservices.so \
     vendor/asus/deb/proprietary/lib/libril-qc-qmi-1.so:system/lib/libril-qc-qmi-1.so \
-    vendor/asus/deb/proprietary/lib/libril-qcril-hook-oem.so:system/lib/libril-qcril-hook-oem.so \
-    vendor/asus/deb/proprietary/lib/libsensor1.so:system/lib/libsensor1.so \
-    vendor/asus/deb/proprietary/lib/libsensor_reg.so:system/lib/libsensor_reg.so \
-    vendor/asus/deb/proprietary/lib/libsensor_user_cal.so:system/lib/libsensor_user_cal.so \
-    vendor/asus/deb/proprietary/lib/libstagefright_hdcp.so:system/lib/libstagefright_hdcp.so \
-    vendor/asus/deb/proprietary/lib/libxml.so:system/lib/libxml.so \
-    vendor/asus/deb/proprietary/vendor/firmware/a300_pfp.fw:system/vendor/firmware/a300_pfp.fw \
-    vendor/asus/deb/proprietary/vendor/firmware/a300_pm4.fw:system/vendor/firmware/a300_pm4.fw \
-    vendor/asus/deb/proprietary/vendor/firmware/bcm2079x-b5_firmware.ncd:system/vendor/firmware/bcm2079x-b5_firmware.ncd \
-    vendor/asus/deb/proprietary/vendor/firmware/bcm2079x-b5_pre_firmware.ncd:system/vendor/firmware/bcm2079x-b5_pre_firmware.ncd \
-    vendor/asus/deb/proprietary/vendor/firmware/discretix/dxhdcp2.b00:system/vendor/firmware/discretix/dxhdcp2.b00 \
-    vendor/asus/deb/proprietary/vendor/firmware/discretix/dxhdcp2.b01:system/vendor/firmware/discretix/dxhdcp2.b01 \
-    vendor/asus/deb/proprietary/vendor/firmware/discretix/dxhdcp2.b02:system/vendor/firmware/discretix/dxhdcp2.b02 \
-    vendor/asus/deb/proprietary/vendor/firmware/discretix/dxhdcp2.b03:system/vendor/firmware/discretix/dxhdcp2.b03 \
-    vendor/asus/deb/proprietary/vendor/firmware/discretix/dxhdcp2.mdt:system/vendor/firmware/discretix/dxhdcp2.mdt \
-    vendor/asus/deb/proprietary/vendor/firmware/dsps.b00:system/vendor/firmware/dsps.b00 \
-    vendor/asus/deb/proprietary/vendor/firmware/dsps.b01:system/vendor/firmware/dsps.b01 \
-    vendor/asus/deb/proprietary/vendor/firmware/dsps.b02:system/vendor/firmware/dsps.b02 \
-    vendor/asus/deb/proprietary/vendor/firmware/dsps.b03:system/vendor/firmware/dsps.b03 \
-    vendor/asus/deb/proprietary/vendor/firmware/dsps.b04:system/vendor/firmware/dsps.b04 \
-    vendor/asus/deb/proprietary/vendor/firmware/dsps.b05:system/vendor/firmware/dsps.b05 \
-    vendor/asus/deb/proprietary/vendor/firmware/dsps.mdt:system/vendor/firmware/dsps.mdt \
-    vendor/asus/deb/proprietary/vendor/firmware/gss.b00:system/vendor/firmware/gss.b00 \
-    vendor/asus/deb/proprietary/vendor/firmware/gss.b01:system/vendor/firmware/gss.b01 \
-    vendor/asus/deb/proprietary/vendor/firmware/gss.b02:system/vendor/firmware/gss.b02 \
-    vendor/asus/deb/proprietary/vendor/firmware/gss.b03:system/vendor/firmware/gss.b03 \
-    vendor/asus/deb/proprietary/vendor/firmware/gss.b04:system/vendor/firmware/gss.b04 \
-    vendor/asus/deb/proprietary/vendor/firmware/gss.b05:system/vendor/firmware/gss.b05 \
-    vendor/asus/deb/proprietary/vendor/firmware/gss.b06:system/vendor/firmware/gss.b06 \
-    vendor/asus/deb/proprietary/vendor/firmware/gss.b07:system/vendor/firmware/gss.b07 \
-    vendor/asus/deb/proprietary/vendor/firmware/gss.b08:system/vendor/firmware/gss.b08 \
-    vendor/asus/deb/proprietary/vendor/firmware/gss.b09:system/vendor/firmware/gss.b09 \
-    vendor/asus/deb/proprietary/vendor/firmware/gss.b10:system/vendor/firmware/gss.b10 \
-    vendor/asus/deb/proprietary/vendor/firmware/gss.b11:system/vendor/firmware/gss.b11 \
-    vendor/asus/deb/proprietary/vendor/firmware/gss.mdt:system/vendor/firmware/gss.mdt \
-    vendor/asus/deb/proprietary/vendor/firmware/keymaster/keymaster.b00:system/vendor/firmware/keymaster/keymaster.b00 \
-    vendor/asus/deb/proprietary/vendor/firmware/keymaster/keymaster.b01:system/vendor/firmware/keymaster/keymaster.b01 \
-    vendor/asus/deb/proprietary/vendor/firmware/keymaster/keymaster.b02:system/vendor/firmware/keymaster/keymaster.b02 \
-    vendor/asus/deb/proprietary/vendor/firmware/keymaster/keymaster.b03:system/vendor/firmware/keymaster/keymaster.b03 \
-    vendor/asus/deb/proprietary/vendor/firmware/keymaster/keymaster.mdt:system/vendor/firmware/keymaster/keymaster.mdt \
-    vendor/asus/deb/proprietary/vendor/firmware/q6.b00:system/vendor/firmware/q6.b00 \
-    vendor/asus/deb/proprietary/vendor/firmware/q6.b01:system/vendor/firmware/q6.b01 \
-    vendor/asus/deb/proprietary/vendor/firmware/q6.b03:system/vendor/firmware/q6.b03 \
-    vendor/asus/deb/proprietary/vendor/firmware/q6.b04:system/vendor/firmware/q6.b04 \
-    vendor/asus/deb/proprietary/vendor/firmware/q6.b05:system/vendor/firmware/q6.b05 \
-    vendor/asus/deb/proprietary/vendor/firmware/q6.b06:system/vendor/firmware/q6.b06 \
-    vendor/asus/deb/proprietary/vendor/firmware/q6.mdt:system/vendor/firmware/q6.mdt \
-    vendor/asus/deb/proprietary/vendor/firmware/tzapps.b00:system/vendor/firmware/tzapps.b00 \
-    vendor/asus/deb/proprietary/vendor/firmware/tzapps.b01:system/vendor/firmware/tzapps.b01 \
-    vendor/asus/deb/proprietary/vendor/firmware/tzapps.b02:system/vendor/firmware/tzapps.b02 \
-    vendor/asus/deb/proprietary/vendor/firmware/tzapps.b03:system/vendor/firmware/tzapps.b03 \
-    vendor/asus/deb/proprietary/vendor/firmware/tzapps.mdt:system/vendor/firmware/tzapps.mdt \
-    vendor/asus/deb/proprietary/vendor/firmware/wcnss.b00:system/vendor/firmware/wcnss.b00 \
-    vendor/asus/deb/proprietary/vendor/firmware/wcnss.b01:system/vendor/firmware/wcnss.b01 \
-    vendor/asus/deb/proprietary/vendor/firmware/wcnss.b02:system/vendor/firmware/wcnss.b02 \
-    vendor/asus/deb/proprietary/vendor/firmware/wcnss.b04:system/vendor/firmware/wcnss.b04 \
-    vendor/asus/deb/proprietary/vendor/firmware/wcnss.b05:system/vendor/firmware/wcnss.b05 \
-    vendor/asus/deb/proprietary/vendor/firmware/wcnss.mdt:system/vendor/firmware/wcnss.mdt \
-    vendor/asus/deb/proprietary/vendor/lib/drm/libdrmwvmplugin.so:system/vendor/lib/drm/libdrmwvmplugin.so \
-    vendor/asus/deb/proprietary/vendor/lib/egl/eglsubAndroid.so:system/vendor/lib/egl/eglsubAndroid.so \
-    vendor/asus/deb/proprietary/vendor/lib/egl/libEGL_adreno.so:system/vendor/lib/egl/libEGL_adreno.so \
-    vendor/asus/deb/proprietary/vendor/lib/egl/libGLESv1_CM_adreno.so:system/vendor/lib/egl/libGLESv1_CM_adreno.so \
-    vendor/asus/deb/proprietary/vendor/lib/egl/libGLESv2_adreno.so:system/vendor/lib/egl/libGLESv2_adreno.so \
-    vendor/asus/deb/proprietary/vendor/lib/egl/libplayback_adreno.so:system/vendor/lib/egl/libplayback_adreno.so \
-    vendor/asus/deb/proprietary/vendor/lib/egl/libq3dtools_adreno.so:system/vendor/lib/egl/libq3dtools_adreno.so \
-    vendor/asus/deb/proprietary/vendor/lib/libC2D2.so:system/vendor/lib/libC2D2.so \
-    vendor/asus/deb/proprietary/vendor/lib/libCB.so:system/vendor/lib/libCB.so \
-    vendor/asus/deb/proprietary/vendor/lib/libRSDriver_adreno.so:system/vendor/lib/libRSDriver_adreno.so \
-    vendor/asus/deb/proprietary/vendor/lib/libWVStreamControlAPI_L1.so:system/vendor/lib/libWVStreamControlAPI_L1.so \
-    vendor/asus/deb/proprietary/vendor/lib/libWVphoneAPI.so:system/vendor/lib/libWVphoneAPI.so \
-    vendor/asus/deb/proprietary/vendor/lib/libadreno_utils.so:system/vendor/lib/libadreno_utils.so \
-    vendor/asus/deb/proprietary/vendor/lib/libbccQTI.so:system/vendor/lib/libbccQTI.so \
-    vendor/asus/deb/proprietary/vendor/lib/libc2d30-a3xx.so:system/vendor/lib/libc2d30-a3xx.so \
-    vendor/asus/deb/proprietary/vendor/lib/libc2d30.so:system/vendor/lib/libc2d30.so \
-    vendor/asus/deb/proprietary/vendor/lib/libdrmdecrypt.so:system/vendor/lib/libdrmdecrypt.so \
-    vendor/asus/deb/proprietary/vendor/lib/libgemini.so:system/vendor/lib/libgemini.so \
-    vendor/asus/deb/proprietary/vendor/lib/libgeofence.so:system/vendor/lib/libgeofence.so \
-    vendor/asus/deb/proprietary/vendor/lib/libgsl.so:system/vendor/lib/libgsl.so \
-    vendor/asus/deb/proprietary/vendor/lib/libimage-jpeg-enc-omx-comp.so:system/vendor/lib/libimage-jpeg-enc-omx-comp.so \
-    vendor/asus/deb/proprietary/vendor/lib/libimage-omx-common.so:system/vendor/lib/libimage-omx-common.so \
-    vendor/asus/deb/proprietary/vendor/lib/libizat_core.so:system/vendor/lib/libizat_core.so \
-    vendor/asus/deb/proprietary/vendor/lib/libllvm-qcom.so:system/vendor/lib/libllvm-qcom.so \
-    vendor/asus/deb/proprietary/vendor/lib/libloc_api_v02.so:system/vendor/lib/libloc_api_v02.so \
-    vendor/asus/deb/proprietary/vendor/lib/libloc_ds_api.so:system/vendor/lib/libloc_ds_api.so \
-    vendor/asus/deb/proprietary/vendor/lib/libmmcamera2_c2d_module.so:system/vendor/lib/libmmcamera2_c2d_module.so \
-    vendor/asus/deb/proprietary/vendor/lib/libmmcamera2_cpp_module.so:system/vendor/lib/libmmcamera2_cpp_module.so \
-    vendor/asus/deb/proprietary/vendor/lib/libmmcamera2_iface_modules.so:system/vendor/lib/libmmcamera2_iface_modules.so \
-    vendor/asus/deb/proprietary/vendor/lib/libmmcamera2_imglib_modules.so:system/vendor/lib/libmmcamera2_imglib_modules.so \
-    vendor/asus/deb/proprietary/vendor/lib/libmmcamera2_isp_modules.so:system/vendor/lib/libmmcamera2_isp_modules.so \
-    vendor/asus/deb/proprietary/vendor/lib/libmmcamera2_pproc_modules.so:system/vendor/lib/libmmcamera2_pproc_modules.so \
-    vendor/asus/deb/proprietary/vendor/lib/libmmcamera2_sensor_modules.so:system/vendor/lib/libmmcamera2_sensor_modules.so \
-    vendor/asus/deb/proprietary/vendor/lib/libmmcamera2_stats_modules.so:system/vendor/lib/libmmcamera2_stats_modules.so \
-    vendor/asus/deb/proprietary/vendor/lib/libmmcamera2_vpe_module.so:system/vendor/lib/libmmcamera2_vpe_module.so \
-    vendor/asus/deb/proprietary/vendor/lib/libmmcamera2_wnr_module.so:system/vendor/lib/libmmcamera2_wnr_module.so \
-    vendor/asus/deb/proprietary/vendor/lib/libmmcamera_faceproc.so:system/vendor/lib/libmmcamera_faceproc.so \
-    vendor/asus/deb/proprietary/vendor/lib/libmmcamera_imglib.so:system/vendor/lib/libmmcamera_imglib.so \
-    vendor/asus/deb/proprietary/vendor/lib/libmmipl.so:system/vendor/lib/libmmipl.so \
-    vendor/asus/deb/proprietary/vendor/lib/libmmjpeg.so:system/vendor/lib/libmmjpeg.so \
-    vendor/asus/deb/proprietary/vendor/lib/libmmqjpeg_codec.so:system/vendor/lib/libmmqjpeg_codec.so \
-    vendor/asus/deb/proprietary/vendor/lib/libmmstillomx.so:system/vendor/lib/libmmstillomx.so \
-    vendor/asus/deb/proprietary/vendor/lib/liboemcamera.so:system/vendor/lib/liboemcamera.so \
-    vendor/asus/deb/proprietary/vendor/lib/libqomx_jpegenc.so:system/vendor/lib/libqomx_jpegenc.so \
-    vendor/asus/deb/proprietary/vendor/lib/librs_adreno.so:system/vendor/lib/librs_adreno.so \
-    vendor/asus/deb/proprietary/vendor/lib/librs_adreno_sha1.so:system/vendor/lib/librs_adreno_sha1.so \
-    vendor/asus/deb/proprietary/vendor/lib/libsc-a3xx.so:system/vendor/lib/libsc-a3xx.so \
-    vendor/asus/deb/proprietary/vendor/lib/libwvdrm_L1.so:system/vendor/lib/libwvdrm_L1.so \
-    vendor/asus/deb/proprietary/vendor/lib/libwvm.so:system/vendor/lib/libwvm.so \
-    vendor/asus/deb/proprietary/vendor/lib/mediadrm/libwvdrmengine.so:system/vendor/lib/mediadrm/libwvdrmengine.so
+    vendor/asus/deb/proprietary/lib/libril-qcril-hook-oem.so:system/lib/libril-qcril-hook-oem.so
diff --git a/deb/proprietary/bin/ATFWD-daemon b/deb/proprietary/bin/ATFWD-daemon
deleted file mode 100644
index c331db911..000000000
Binary files a/deb/proprietary/bin/ATFWD-daemon and /dev/null differ
diff --git a/deb/proprietary/bin/bridgemgrd b/deb/proprietary/bin/bridgemgrd
deleted file mode 100644
index a4c7a7c6c..000000000
Binary files a/deb/proprietary/bin/bridgemgrd and /dev/null differ
diff --git a/deb/proprietary/bin/btnvtool b/deb/proprietary/bin/btnvtool
deleted file mode 100644
index 0de2ee242..000000000
Binary files a/deb/proprietary/bin/btnvtool and /dev/null differ
diff --git a/deb/proprietary/bin/diag_klog b/deb/proprietary/bin/diag_klog
deleted file mode 100644
index 4647989a1..000000000
Binary files a/deb/proprietary/bin/diag_klog and /dev/null differ
diff --git a/deb/proprietary/bin/diag_mdlog b/deb/proprietary/bin/diag_mdlog
deleted file mode 100644
index 052cd58e6..000000000
Binary files a/deb/proprietary/bin/diag_mdlog and /dev/null differ
diff --git a/deb/proprietary/bin/ds_fmc_appd b/deb/proprietary/bin/ds_fmc_appd
deleted file mode 100644
index 4abb0bc49..000000000
Binary files a/deb/proprietary/bin/ds_fmc_appd and /dev/null differ
diff --git a/deb/proprietary/bin/efsks b/deb/proprietary/bin/efsks
deleted file mode 100644
index c8dc55eae..000000000
Binary files a/deb/proprietary/bin/efsks and /dev/null differ
diff --git a/deb/proprietary/bin/hci_qcomm_init b/deb/proprietary/bin/hci_qcomm_init
deleted file mode 100644
index 1e0691678..000000000
Binary files a/deb/proprietary/bin/hci_qcomm_init and /dev/null differ
diff --git a/deb/proprietary/bin/irsc_util b/deb/proprietary/bin/irsc_util
deleted file mode 100644
index 16706dad6..000000000
Binary files a/deb/proprietary/bin/irsc_util and /dev/null differ
diff --git a/deb/proprietary/bin/ks b/deb/proprietary/bin/ks
deleted file mode 100644
index 9d076010a..000000000
Binary files a/deb/proprietary/bin/ks and /dev/null differ
diff --git a/deb/proprietary/bin/mm-qcamera-app b/deb/proprietary/bin/mm-qcamera-app
deleted file mode 100644
index c5be6c598..000000000
Binary files a/deb/proprietary/bin/mm-qcamera-app and /dev/null differ
diff --git a/deb/proprietary/bin/mm-qcamera-daemon b/deb/proprietary/bin/mm-qcamera-daemon
deleted file mode 100644
index abf5a16df..000000000
Binary files a/deb/proprietary/bin/mm-qcamera-daemon and /dev/null differ
diff --git a/deb/proprietary/bin/mm-qjpeg-enc-test b/deb/proprietary/bin/mm-qjpeg-enc-test
deleted file mode 100644
index 6f6f09d43..000000000
Binary files a/deb/proprietary/bin/mm-qjpeg-enc-test and /dev/null differ
diff --git a/deb/proprietary/bin/mm-qomx-ienc-test b/deb/proprietary/bin/mm-qomx-ienc-test
deleted file mode 100644
index 79053dc4c..000000000
Binary files a/deb/proprietary/bin/mm-qomx-ienc-test and /dev/null differ
diff --git a/deb/proprietary/bin/mpdecision b/deb/proprietary/bin/mpdecision
deleted file mode 100644
index 48aa9e9b2..000000000
Binary files a/deb/proprietary/bin/mpdecision and /dev/null differ
diff --git a/deb/proprietary/bin/netmgrd b/deb/proprietary/bin/netmgrd
deleted file mode 100644
index 0e00d6336..000000000
Binary files a/deb/proprietary/bin/netmgrd and /dev/null differ
diff --git a/deb/proprietary/bin/nl_listener b/deb/proprietary/bin/nl_listener
deleted file mode 100644
index dac0db0f2..000000000
Binary files a/deb/proprietary/bin/nl_listener and /dev/null differ
diff --git a/deb/proprietary/bin/port-bridge b/deb/proprietary/bin/port-bridge
deleted file mode 100644
index 20edc085c..000000000
Binary files a/deb/proprietary/bin/port-bridge and /dev/null differ
diff --git a/deb/proprietary/bin/qcks b/deb/proprietary/bin/qcks
deleted file mode 100644
index 237d3738b..000000000
Binary files a/deb/proprietary/bin/qcks and /dev/null differ
diff --git a/deb/proprietary/bin/qmuxd b/deb/proprietary/bin/qmuxd
deleted file mode 100644
index 360646955..000000000
Binary files a/deb/proprietary/bin/qmuxd and /dev/null differ
diff --git a/deb/proprietary/bin/qseecomd b/deb/proprietary/bin/qseecomd
deleted file mode 100644
index c5f70712f..000000000
Binary files a/deb/proprietary/bin/qseecomd and /dev/null differ
diff --git a/deb/proprietary/bin/radish b/deb/proprietary/bin/radish
deleted file mode 100644
index 5aaaa6870..000000000
Binary files a/deb/proprietary/bin/radish and /dev/null differ
diff --git a/deb/proprietary/bin/rmt_storage b/deb/proprietary/bin/rmt_storage
deleted file mode 100644
index 58a1c19f3..000000000
Binary files a/deb/proprietary/bin/rmt_storage and /dev/null differ
diff --git a/deb/proprietary/bin/sensors.qcom b/deb/proprietary/bin/sensors.qcom
deleted file mode 100644
index 7d69954b0..000000000
Binary files a/deb/proprietary/bin/sensors.qcom and /dev/null differ
diff --git a/deb/proprietary/bin/thermald b/deb/proprietary/bin/thermald
deleted file mode 100644
index a7e5ea4e3..000000000
Binary files a/deb/proprietary/bin/thermald and /dev/null differ
diff --git a/deb/proprietary/bin/usbhub b/deb/proprietary/bin/usbhub
deleted file mode 100644
index 5553d3592..000000000
Binary files a/deb/proprietary/bin/usbhub and /dev/null differ
diff --git a/deb/proprietary/bin/usbhub_init b/deb/proprietary/bin/usbhub_init
deleted file mode 100644
index 68e56a356..000000000
Binary files a/deb/proprietary/bin/usbhub_init and /dev/null differ
diff --git a/deb/proprietary/etc/DxHDCP.cfg b/deb/proprietary/etc/DxHDCP.cfg
deleted file mode 100644
index ea95edba5..000000000
--- a/deb/proprietary/etc/DxHDCP.cfg
+++ /dev/null
@@ -1,55 +0,0 @@
-#Debug detailing level
-#Default: full debug
-# 0 - nothing
-# 3 - critical errors
-# 5 - critical info
-# 10 - errors
-# 30 - warnings
-# 40 - info
-# 50 - additional info
-# 60 - full info
-DebugLevel=10
-
-#Every run will create log files on device with this prefix. /data/misc/HdcpLogs folder should be pre-created in the device
-#if commented\removed, no logs will show
-LogPath=/data/misc/HdcpLogs
-LogFile=HDCP_TSMT
-
-#Merge the client logs into logcat
-#comment out \ remove to disable
-LogcatLogs=True
-
-#sfs dir, comment out \ remove to enable default root dir (/persist/data)
-UserRootDir = /persist/data
-
-#HLOS data dir, comment out \ remove to enable default root dir (/data/system)
-HlosDataDir = /data/system
-
-#number of Max LC reconnection retries
-#if commented \ removed it will use default (1024)
-HdcpLcRetries=1024
-
-#inter LC reconnection retries delay
-#if commented \ removed it will use default (25)
-HdcpLcRetryDelay=25
-
-#overall connection timeout
-#remove \ comment to use default (10000)
-DownstreamOverallTimeout=10000
-
-#whether supports multi receivers (default is false)
-MultiReceivers=False
-
-#Which Hdcp Version to use
-#if removed\commented it is 2.1
-#0 := unknown
-#1 := 2.0
-#2 := 2.1
-#3 := 1.x
-DxHdcpVer=2
-
-#Avoid HDCP timeouts
-AvoidTimeouts=True
-
-#This parameter is to be set to true for working against Cavium's dongle which closes control port once the authentication is completed
-AllowCloseControlSocket=False
diff --git a/deb/proprietary/etc/firmware/vidc.b00 b/deb/proprietary/etc/firmware/vidc.b00
deleted file mode 100644
index dc619f939..000000000
Binary files a/deb/proprietary/etc/firmware/vidc.b00 and /dev/null differ
diff --git a/deb/proprietary/etc/firmware/vidc.b01 b/deb/proprietary/etc/firmware/vidc.b01
deleted file mode 100644
index d775f1081..000000000
Binary files a/deb/proprietary/etc/firmware/vidc.b01 and /dev/null differ
diff --git a/deb/proprietary/etc/firmware/vidc.b02 b/deb/proprietary/etc/firmware/vidc.b02
deleted file mode 100644
index 75653b65e..000000000
Binary files a/deb/proprietary/etc/firmware/vidc.b02 and /dev/null differ
diff --git a/deb/proprietary/etc/firmware/vidc.b03 b/deb/proprietary/etc/firmware/vidc.b03
deleted file mode 100644
index d9c3af9e3..000000000
Binary files a/deb/proprietary/etc/firmware/vidc.b03 and /dev/null differ
diff --git a/deb/proprietary/etc/firmware/vidc.mdt b/deb/proprietary/etc/firmware/vidc.mdt
deleted file mode 100644
index f0c9b73f1..000000000
Binary files a/deb/proprietary/etc/firmware/vidc.mdt and /dev/null differ
diff --git a/deb/proprietary/etc/firmware/vidc_1080p.fw b/deb/proprietary/etc/firmware/vidc_1080p.fw
deleted file mode 100644
index b56b5731d..000000000
Binary files a/deb/proprietary/etc/firmware/vidc_1080p.fw and /dev/null differ
diff --git a/deb/proprietary/etc/firmware/vidcfw.elf b/deb/proprietary/etc/firmware/vidcfw.elf
deleted file mode 100644
index 9f7db2260..000000000
Binary files a/deb/proprietary/etc/firmware/vidcfw.elf and /dev/null differ
diff --git a/deb/proprietary/etc/gps.conf b/deb/proprietary/etc/gps.conf
deleted file mode 100644
index 6aa19013b..000000000
--- a/deb/proprietary/etc/gps.conf
+++ /dev/null
@@ -1,92 +0,0 @@
-# XTRA_SERVER_QUERY (1=on, 0=off)
-# If XTRA_SERVER_QUERY is on, the XTRA_SERVERs listed
-# below will be ignored, and instead the servers will
-# be queried from the modem.
-XTRA_SERVER_QUERY=0
-# XTRA_SERVERs below are used only if XTRA_SERVER_QUERY
-# is off.
-XTRA_SERVER_1=http://xtra1.gpsonextra.net/xtra2.bin
-XTRA_SERVER_2=http://xtra2.gpsonextra.net/xtra2.bin
-XTRA_SERVER_3=http://xtra3.gpsonextra.net/xtra2.bin
-
-# Error Estimate
-# _SET = 1
-# _CLEAR = 0
-ERR_ESTIMATE=0
-
-#Test
-NTP_SERVER=time.gpsonextra.net
-#Asia
-# NTP_SERVER=asia.pool.ntp.org
-#Europe
-# NTP_SERVER=europe.pool.ntp.org
-#North America
-# NTP_SERVER=north-america.pool.ntp.org
-
-# DEBUG LEVELS: 0 - none, 1 - Error, 2 - Warning, 3 - Info
-#               4 - Debug, 5 - Verbose
-# If DEBUG_LEVEL is commented, Android's logging levels will be used
-DEBUG_LEVEL = 2
-
-# Intermediate position report, 1=enable, 0=disable
-INTERMEDIATE_POS=0
-
-# Below bit mask configures how GPS functionalities
-# should be locked when user turns off GPS on Settings
-# Set bit 0x1 if MO GPS functionalities are to be locked
-# Set bit 0x2 if NI GPS functionalities are to be locked
-# default - non is locked for backward compatibility
-#GPS_LOCK = 0
-
-# supl version 1.0
-SUPL_VER=0x10000
-
-# GPS Capabilities bit mask
-# SCHEDULING = 0x01
-# MSB = 0x02
-# MSA = 0x04
-# ON_DEMAND_TIME = 0x10
-# GEOFENCE = 0x20
-# default = ON_DEMAND_TIME | MSA | MSB | SCHEDULING | GEOFENCE
-CAPABILITIES=0x37
-
-# Accuracy threshold for intermediate positions
-# less accurate positions are ignored, 0 for passing all positions
-# ACCURACY_THRES=5000
-
-################################
-##### AGPS server settings #####
-################################
-
-# FOR SUPL SUPPORT, set the following
-# SUPL_HOST=supl.host.com or IP
-# SUPL_PORT=1234
-SUPL_HOST=supl.google.com
-SUPL_PORT=7276
-
-# FOR C2K PDE SUPPORT, set the following
-# C2K_HOST=c2k.pde.com or IP
-# C2K_PORT=1234
-
-####################################
-#  LTE Positioning Profile Settings
-####################################
-# 0: Enable RRLP on LTE(Default)
-# 1: Enable LPP_User_Plane on LTE
-# 2: Enable LPP_Control_Plane
-# 3: Enable both LPP_User_Plane and LPP_Control_Plane
-LPP_PROFILE = 0
-
-################################
-# EXTRA SETTINGS
-################################
-# NMEA provider (1=Modem Processor, 0=Application Processor)
-NMEA_PROVIDER=0
-
-##################################################
-# Select Positioning Protocol on A-GLONASS system
-##################################################
-# 0x1: RRC CPlane
-# 0x2: RRLP UPlane
-# 0x4: LLP Uplane
-A_GLONASS_POS_PROTOCOL_SELECT = 0
diff --git a/deb/proprietary/lib/hw/flp.msm8960.so b/deb/proprietary/lib/hw/flp.msm8960.so
deleted file mode 100644
index a068adb58..000000000
Binary files a/deb/proprietary/lib/hw/flp.msm8960.so and /dev/null differ
diff --git a/deb/proprietary/lib/hw/gps.msm8960.so b/deb/proprietary/lib/hw/gps.msm8960.so
deleted file mode 100644
index bb5905d91..000000000
Binary files a/deb/proprietary/lib/hw/gps.msm8960.so and /dev/null differ
diff --git a/deb/proprietary/lib/hw/sensors.msm8960.so b/deb/proprietary/lib/hw/sensors.msm8960.so
deleted file mode 100644
index 943463463..000000000
Binary files a/deb/proprietary/lib/hw/sensors.msm8960.so and /dev/null differ
diff --git a/deb/proprietary/lib/libAKM.so b/deb/proprietary/lib/libAKM.so
deleted file mode 100644
index d2d3f1e4c..000000000
Binary files a/deb/proprietary/lib/libAKM.so and /dev/null differ
diff --git a/deb/proprietary/lib/libCommandSvc.so b/deb/proprietary/lib/libCommandSvc.so
deleted file mode 100644
index e90b5112d..000000000
Binary files a/deb/proprietary/lib/libCommandSvc.so and /dev/null differ
diff --git a/deb/proprietary/lib/libDxHdcp.so b/deb/proprietary/lib/libDxHdcp.so
deleted file mode 100644
index 07f6aa501..000000000
Binary files a/deb/proprietary/lib/libDxHdcp.so and /dev/null differ
diff --git a/deb/proprietary/lib/libI420colorconvert.so b/deb/proprietary/lib/libI420colorconvert.so
deleted file mode 100644
index dbcde6284..000000000
Binary files a/deb/proprietary/lib/libI420colorconvert.so and /dev/null differ
diff --git a/deb/proprietary/lib/libQSEEComAPI.so b/deb/proprietary/lib/libQSEEComAPI.so
deleted file mode 100644
index ae88c1273..000000000
Binary files a/deb/proprietary/lib/libQSEEComAPI.so and /dev/null differ
diff --git a/deb/proprietary/lib/libacdbdata.so b/deb/proprietary/lib/libacdbdata.so
deleted file mode 100644
index a5a9dd83f..000000000
Binary files a/deb/proprietary/lib/libacdbdata.so and /dev/null differ
diff --git a/deb/proprietary/lib/libacdbloader.so b/deb/proprietary/lib/libacdbloader.so
deleted file mode 100644
index dc481e78a..000000000
Binary files a/deb/proprietary/lib/libacdbloader.so and /dev/null differ
diff --git a/deb/proprietary/lib/libaudcal.so b/deb/proprietary/lib/libaudcal.so
deleted file mode 100644
index 8f5a36682..000000000
Binary files a/deb/proprietary/lib/libaudcal.so and /dev/null differ
diff --git a/deb/proprietary/lib/libaudioalsa.so b/deb/proprietary/lib/libaudioalsa.so
deleted file mode 100644
index bb38d0918..000000000
Binary files a/deb/proprietary/lib/libaudioalsa.so and /dev/null differ
diff --git a/deb/proprietary/lib/libchromatix_ov5693_common.so b/deb/proprietary/lib/libchromatix_ov5693_common.so
deleted file mode 100644
index 934579e5e..000000000
Binary files a/deb/proprietary/lib/libchromatix_ov5693_common.so and /dev/null differ
diff --git a/deb/proprietary/lib/libchromatix_ov5693_default_video.so b/deb/proprietary/lib/libchromatix_ov5693_default_video.so
deleted file mode 100644
index 25ca95714..000000000
Binary files a/deb/proprietary/lib/libchromatix_ov5693_default_video.so and /dev/null differ
diff --git a/deb/proprietary/lib/libchromatix_ov5693_preview.so b/deb/proprietary/lib/libchromatix_ov5693_preview.so
deleted file mode 100644
index 89c54f96e..000000000
Binary files a/deb/proprietary/lib/libchromatix_ov5693_preview.so and /dev/null differ
diff --git a/deb/proprietary/lib/libconfigdb.so b/deb/proprietary/lib/libconfigdb.so
deleted file mode 100644
index e5d0f1b66..000000000
Binary files a/deb/proprietary/lib/libconfigdb.so and /dev/null differ
diff --git a/deb/proprietary/lib/libcsd-client.so b/deb/proprietary/lib/libcsd-client.so
deleted file mode 100644
index 424c76d50..000000000
Binary files a/deb/proprietary/lib/libcsd-client.so and /dev/null differ
diff --git a/deb/proprietary/lib/libdiag.so b/deb/proprietary/lib/libdiag.so
deleted file mode 100644
index dfcbe4f44..000000000
Binary files a/deb/proprietary/lib/libdiag.so and /dev/null differ
diff --git a/deb/proprietary/lib/libdrmdiag.so b/deb/proprietary/lib/libdrmdiag.so
deleted file mode 100644
index 30c6ae36c..000000000
Binary files a/deb/proprietary/lib/libdrmdiag.so and /dev/null differ
diff --git a/deb/proprietary/lib/libdrmfs.so b/deb/proprietary/lib/libdrmfs.so
deleted file mode 100644
index f04289e67..000000000
Binary files a/deb/proprietary/lib/libdrmfs.so and /dev/null differ
diff --git a/deb/proprietary/lib/libdrmtime.so b/deb/proprietary/lib/libdrmtime.so
deleted file mode 100644
index 29b5b8f48..000000000
Binary files a/deb/proprietary/lib/libdrmtime.so and /dev/null differ
diff --git a/deb/proprietary/lib/libdsi_netctrl.so b/deb/proprietary/lib/libdsi_netctrl.so
deleted file mode 100644
index 4b734eee5..000000000
Binary files a/deb/proprietary/lib/libdsi_netctrl.so and /dev/null differ
diff --git a/deb/proprietary/lib/libdsprofile.so b/deb/proprietary/lib/libdsprofile.so
deleted file mode 100644
index acde30d9a..000000000
Binary files a/deb/proprietary/lib/libdsprofile.so and /dev/null differ
diff --git a/deb/proprietary/lib/libdss.so b/deb/proprietary/lib/libdss.so
deleted file mode 100644
index a02667651..000000000
Binary files a/deb/proprietary/lib/libdss.so and /dev/null differ
diff --git a/deb/proprietary/lib/libdsucsd.so b/deb/proprietary/lib/libdsucsd.so
deleted file mode 100644
index 3eefb9955..000000000
Binary files a/deb/proprietary/lib/libdsucsd.so and /dev/null differ
diff --git a/deb/proprietary/lib/libdsutils.so b/deb/proprietary/lib/libdsutils.so
deleted file mode 100644
index 8339f2f79..000000000
Binary files a/deb/proprietary/lib/libdsutils.so and /dev/null differ
diff --git a/deb/proprietary/lib/libgps.utils.so b/deb/proprietary/lib/libgps.utils.so
deleted file mode 100644
index 604ee6736..000000000
Binary files a/deb/proprietary/lib/libgps.utils.so and /dev/null differ
diff --git a/deb/proprietary/lib/libidl.so b/deb/proprietary/lib/libidl.so
deleted file mode 100644
index 36e58a4c1..000000000
Binary files a/deb/proprietary/lib/libidl.so and /dev/null differ
diff --git a/deb/proprietary/lib/libloc_core.so b/deb/proprietary/lib/libloc_core.so
deleted file mode 100644
index 45f6fbefc..000000000
Binary files a/deb/proprietary/lib/libloc_core.so and /dev/null differ
diff --git a/deb/proprietary/lib/libloc_eng.so b/deb/proprietary/lib/libloc_eng.so
deleted file mode 100644
index 88d4ec9fa..000000000
Binary files a/deb/proprietary/lib/libloc_eng.so and /dev/null differ
diff --git a/deb/proprietary/lib/libmm-abl.so b/deb/proprietary/lib/libmm-abl.so
deleted file mode 100644
index 79b4920bc..000000000
Binary files a/deb/proprietary/lib/libmm-abl.so and /dev/null differ
diff --git a/deb/proprietary/lib/libmm-color-convertor.so b/deb/proprietary/lib/libmm-color-convertor.so
deleted file mode 100644
index 42ae803ab..000000000
Binary files a/deb/proprietary/lib/libmm-color-convertor.so and /dev/null differ
diff --git a/deb/proprietary/lib/libmmcamera2_stats_algorithm.so b/deb/proprietary/lib/libmmcamera2_stats_algorithm.so
deleted file mode 100644
index 33d0cbb2e..000000000
Binary files a/deb/proprietary/lib/libmmcamera2_stats_algorithm.so and /dev/null differ
diff --git a/deb/proprietary/lib/libmmcamera_image_stab.so b/deb/proprietary/lib/libmmcamera_image_stab.so
deleted file mode 100644
index dc795261c..000000000
Binary files a/deb/proprietary/lib/libmmcamera_image_stab.so and /dev/null differ
diff --git a/deb/proprietary/lib/libmmcamera_mi1040.so b/deb/proprietary/lib/libmmcamera_mi1040.so
deleted file mode 100644
index 34d3fa7e6..000000000
Binary files a/deb/proprietary/lib/libmmcamera_mi1040.so and /dev/null differ
diff --git a/deb/proprietary/lib/libmmcamera_ov5693.so b/deb/proprietary/lib/libmmcamera_ov5693.so
deleted file mode 100644
index 66a71054b..000000000
Binary files a/deb/proprietary/lib/libmmcamera_ov5693.so and /dev/null differ
diff --git a/deb/proprietary/lib/libnetmgr.so b/deb/proprietary/lib/libnetmgr.so
deleted file mode 100644
index 51f4566f0..000000000
Binary files a/deb/proprietary/lib/libnetmgr.so and /dev/null differ
diff --git a/deb/proprietary/lib/libqcci_legacy.so b/deb/proprietary/lib/libqcci_legacy.so
deleted file mode 100644
index 4cb629c04..000000000
Binary files a/deb/proprietary/lib/libqcci_legacy.so and /dev/null differ
diff --git a/deb/proprietary/lib/libqdi.so b/deb/proprietary/lib/libqdi.so
deleted file mode 100644
index 197703421..000000000
Binary files a/deb/proprietary/lib/libqdi.so and /dev/null differ
diff --git a/deb/proprietary/lib/libqdp.so b/deb/proprietary/lib/libqdp.so
deleted file mode 100644
index 071f80fbd..000000000
Binary files a/deb/proprietary/lib/libqdp.so and /dev/null differ
diff --git a/deb/proprietary/lib/libqmi.so b/deb/proprietary/lib/libqmi.so
deleted file mode 100644
index f0cdfecdc..000000000
Binary files a/deb/proprietary/lib/libqmi.so and /dev/null differ
diff --git a/deb/proprietary/lib/libqmi_cci.so b/deb/proprietary/lib/libqmi_cci.so
deleted file mode 100644
index ad1082a97..000000000
Binary files a/deb/proprietary/lib/libqmi_cci.so and /dev/null differ
diff --git a/deb/proprietary/lib/libqmi_client_qmux.so b/deb/proprietary/lib/libqmi_client_qmux.so
deleted file mode 100644
index bf4d952ce..000000000
Binary files a/deb/proprietary/lib/libqmi_client_qmux.so and /dev/null differ
diff --git a/deb/proprietary/lib/libqmi_common_so.so b/deb/proprietary/lib/libqmi_common_so.so
deleted file mode 100644
index ce63816cb..000000000
Binary files a/deb/proprietary/lib/libqmi_common_so.so and /dev/null differ
diff --git a/deb/proprietary/lib/libqmi_csi.so b/deb/proprietary/lib/libqmi_csi.so
deleted file mode 100644
index d23323b5b..000000000
Binary files a/deb/proprietary/lib/libqmi_csi.so and /dev/null differ
diff --git a/deb/proprietary/lib/libqmi_csvt_srvc.so b/deb/proprietary/lib/libqmi_csvt_srvc.so
deleted file mode 100644
index d69a6d4ee..000000000
Binary files a/deb/proprietary/lib/libqmi_csvt_srvc.so and /dev/null differ
diff --git a/deb/proprietary/lib/libqmi_encdec.so b/deb/proprietary/lib/libqmi_encdec.so
deleted file mode 100644
index 5519f15d7..000000000
Binary files a/deb/proprietary/lib/libqmi_encdec.so and /dev/null differ
diff --git a/deb/proprietary/lib/libqmiservices.so b/deb/proprietary/lib/libqmiservices.so
deleted file mode 100644
index cd263651d..000000000
Binary files a/deb/proprietary/lib/libqmiservices.so and /dev/null differ
diff --git a/deb/proprietary/lib/libsensor1.so b/deb/proprietary/lib/libsensor1.so
deleted file mode 100644
index aa9c48933..000000000
Binary files a/deb/proprietary/lib/libsensor1.so and /dev/null differ
diff --git a/deb/proprietary/lib/libsensor_reg.so b/deb/proprietary/lib/libsensor_reg.so
deleted file mode 100644
index 7f4ebe997..000000000
Binary files a/deb/proprietary/lib/libsensor_reg.so and /dev/null differ
diff --git a/deb/proprietary/lib/libsensor_user_cal.so b/deb/proprietary/lib/libsensor_user_cal.so
deleted file mode 100644
index 7644e9b5c..000000000
Binary files a/deb/proprietary/lib/libsensor_user_cal.so and /dev/null differ
diff --git a/deb/proprietary/lib/libstagefright_hdcp.so b/deb/proprietary/lib/libstagefright_hdcp.so
deleted file mode 100644
index b388fd3a0..000000000
Binary files a/deb/proprietary/lib/libstagefright_hdcp.so and /dev/null differ
diff --git a/deb/proprietary/lib/libxml.so b/deb/proprietary/lib/libxml.so
deleted file mode 100644
index dfd9783b9..000000000
Binary files a/deb/proprietary/lib/libxml.so and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/a300_pfp.fw b/deb/proprietary/vendor/firmware/a300_pfp.fw
deleted file mode 100644
index 552267797..000000000
Binary files a/deb/proprietary/vendor/firmware/a300_pfp.fw and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/a300_pm4.fw b/deb/proprietary/vendor/firmware/a300_pm4.fw
deleted file mode 100644
index 840e5a968..000000000
Binary files a/deb/proprietary/vendor/firmware/a300_pm4.fw and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/bcm2079x-b5_firmware.ncd b/deb/proprietary/vendor/firmware/bcm2079x-b5_firmware.ncd
deleted file mode 100644
index e517b1161..000000000
Binary files a/deb/proprietary/vendor/firmware/bcm2079x-b5_firmware.ncd and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/bcm2079x-b5_pre_firmware.ncd b/deb/proprietary/vendor/firmware/bcm2079x-b5_pre_firmware.ncd
deleted file mode 100644
index 47d224b9d..000000000
Binary files a/deb/proprietary/vendor/firmware/bcm2079x-b5_pre_firmware.ncd and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/discretix/dxhdcp2.b00 b/deb/proprietary/vendor/firmware/discretix/dxhdcp2.b00
deleted file mode 100644
index 331f7be61..000000000
Binary files a/deb/proprietary/vendor/firmware/discretix/dxhdcp2.b00 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/discretix/dxhdcp2.b01 b/deb/proprietary/vendor/firmware/discretix/dxhdcp2.b01
deleted file mode 100644
index 900658e88..000000000
Binary files a/deb/proprietary/vendor/firmware/discretix/dxhdcp2.b01 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/discretix/dxhdcp2.b02 b/deb/proprietary/vendor/firmware/discretix/dxhdcp2.b02
deleted file mode 100644
index a55d8b01d..000000000
Binary files a/deb/proprietary/vendor/firmware/discretix/dxhdcp2.b02 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/discretix/dxhdcp2.b03 b/deb/proprietary/vendor/firmware/discretix/dxhdcp2.b03
deleted file mode 100644
index 0afb09423..000000000
Binary files a/deb/proprietary/vendor/firmware/discretix/dxhdcp2.b03 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/discretix/dxhdcp2.mdt b/deb/proprietary/vendor/firmware/discretix/dxhdcp2.mdt
deleted file mode 100644
index 737e21838..000000000
Binary files a/deb/proprietary/vendor/firmware/discretix/dxhdcp2.mdt and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/dsps.b00 b/deb/proprietary/vendor/firmware/dsps.b00
deleted file mode 100644
index b68e0b545..000000000
Binary files a/deb/proprietary/vendor/firmware/dsps.b00 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/dsps.b01 b/deb/proprietary/vendor/firmware/dsps.b01
deleted file mode 100644
index 71cddcc7d..000000000
Binary files a/deb/proprietary/vendor/firmware/dsps.b01 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/dsps.b02 b/deb/proprietary/vendor/firmware/dsps.b02
deleted file mode 100644
index 149ba9324..000000000
Binary files a/deb/proprietary/vendor/firmware/dsps.b02 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/dsps.b03 b/deb/proprietary/vendor/firmware/dsps.b03
deleted file mode 100644
index ee15eeacb..000000000
Binary files a/deb/proprietary/vendor/firmware/dsps.b03 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/dsps.b04 b/deb/proprietary/vendor/firmware/dsps.b04
deleted file mode 100644
index be0ca3688..000000000
Binary files a/deb/proprietary/vendor/firmware/dsps.b04 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/dsps.b05 b/deb/proprietary/vendor/firmware/dsps.b05
deleted file mode 100644
index a4de70cc2..000000000
Binary files a/deb/proprietary/vendor/firmware/dsps.b05 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/dsps.mdt b/deb/proprietary/vendor/firmware/dsps.mdt
deleted file mode 100644
index 14f0ca566..000000000
Binary files a/deb/proprietary/vendor/firmware/dsps.mdt and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/gss.b00 b/deb/proprietary/vendor/firmware/gss.b00
deleted file mode 100644
index e27ff1fae..000000000
Binary files a/deb/proprietary/vendor/firmware/gss.b00 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/gss.b01 b/deb/proprietary/vendor/firmware/gss.b01
deleted file mode 100644
index 704d525b6..000000000
Binary files a/deb/proprietary/vendor/firmware/gss.b01 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/gss.b02 b/deb/proprietary/vendor/firmware/gss.b02
deleted file mode 100644
index 22ec4880a..000000000
Binary files a/deb/proprietary/vendor/firmware/gss.b02 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/gss.b03 b/deb/proprietary/vendor/firmware/gss.b03
deleted file mode 100644
index f7db95c70..000000000
Binary files a/deb/proprietary/vendor/firmware/gss.b03 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/gss.b04 b/deb/proprietary/vendor/firmware/gss.b04
deleted file mode 100644
index 593f4708d..000000000
Binary files a/deb/proprietary/vendor/firmware/gss.b04 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/gss.b05 b/deb/proprietary/vendor/firmware/gss.b05
deleted file mode 100644
index 88823c88e..000000000
Binary files a/deb/proprietary/vendor/firmware/gss.b05 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/gss.b06 b/deb/proprietary/vendor/firmware/gss.b06
deleted file mode 100644
index 80a7ae73e..000000000
Binary files a/deb/proprietary/vendor/firmware/gss.b06 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/gss.b07 b/deb/proprietary/vendor/firmware/gss.b07
deleted file mode 100644
index ac39dbed1..000000000
Binary files a/deb/proprietary/vendor/firmware/gss.b07 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/gss.b08 b/deb/proprietary/vendor/firmware/gss.b08
deleted file mode 100644
index 8f4e45a6e..000000000
Binary files a/deb/proprietary/vendor/firmware/gss.b08 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/gss.b09 b/deb/proprietary/vendor/firmware/gss.b09
deleted file mode 100644
index b1b948b42..000000000
Binary files a/deb/proprietary/vendor/firmware/gss.b09 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/gss.b10 b/deb/proprietary/vendor/firmware/gss.b10
deleted file mode 100644
index adefdd62b..000000000
Binary files a/deb/proprietary/vendor/firmware/gss.b10 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/gss.b11 b/deb/proprietary/vendor/firmware/gss.b11
deleted file mode 100644
index de9cb5e85..000000000
Binary files a/deb/proprietary/vendor/firmware/gss.b11 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/gss.mdt b/deb/proprietary/vendor/firmware/gss.mdt
deleted file mode 100644
index 1aae51be9..000000000
Binary files a/deb/proprietary/vendor/firmware/gss.mdt and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/keymaster/keymaster.b00 b/deb/proprietary/vendor/firmware/keymaster/keymaster.b00
deleted file mode 100644
index 6dd217ffc..000000000
Binary files a/deb/proprietary/vendor/firmware/keymaster/keymaster.b00 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/keymaster/keymaster.b01 b/deb/proprietary/vendor/firmware/keymaster/keymaster.b01
deleted file mode 100644
index 8f502faa1..000000000
Binary files a/deb/proprietary/vendor/firmware/keymaster/keymaster.b01 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/keymaster/keymaster.b02 b/deb/proprietary/vendor/firmware/keymaster/keymaster.b02
deleted file mode 100644
index cdb5b8de6..000000000
Binary files a/deb/proprietary/vendor/firmware/keymaster/keymaster.b02 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/keymaster/keymaster.b03 b/deb/proprietary/vendor/firmware/keymaster/keymaster.b03
deleted file mode 100644
index 26a7d7fde..000000000
Binary files a/deb/proprietary/vendor/firmware/keymaster/keymaster.b03 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/keymaster/keymaster.mdt b/deb/proprietary/vendor/firmware/keymaster/keymaster.mdt
deleted file mode 100644
index 2ebdf37fc..000000000
Binary files a/deb/proprietary/vendor/firmware/keymaster/keymaster.mdt and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/q6.b00 b/deb/proprietary/vendor/firmware/q6.b00
deleted file mode 100644
index 6bf351ca7..000000000
Binary files a/deb/proprietary/vendor/firmware/q6.b00 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/q6.b01 b/deb/proprietary/vendor/firmware/q6.b01
deleted file mode 100644
index 2bbd2e3ab..000000000
Binary files a/deb/proprietary/vendor/firmware/q6.b01 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/q6.b03 b/deb/proprietary/vendor/firmware/q6.b03
deleted file mode 100644
index eeaf62e0a..000000000
Binary files a/deb/proprietary/vendor/firmware/q6.b03 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/q6.b04 b/deb/proprietary/vendor/firmware/q6.b04
deleted file mode 100644
index 93f712715..000000000
Binary files a/deb/proprietary/vendor/firmware/q6.b04 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/q6.b05 b/deb/proprietary/vendor/firmware/q6.b05
deleted file mode 100644
index b98f3d5ed..000000000
Binary files a/deb/proprietary/vendor/firmware/q6.b05 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/q6.b06 b/deb/proprietary/vendor/firmware/q6.b06
deleted file mode 100644
index 4310bd5d0..000000000
Binary files a/deb/proprietary/vendor/firmware/q6.b06 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/q6.mdt b/deb/proprietary/vendor/firmware/q6.mdt
deleted file mode 100644
index 917a640bb..000000000
Binary files a/deb/proprietary/vendor/firmware/q6.mdt and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/tzapps.b00 b/deb/proprietary/vendor/firmware/tzapps.b00
deleted file mode 100644
index ac4e8c9d3..000000000
Binary files a/deb/proprietary/vendor/firmware/tzapps.b00 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/tzapps.b01 b/deb/proprietary/vendor/firmware/tzapps.b01
deleted file mode 100644
index 30d64de86..000000000
Binary files a/deb/proprietary/vendor/firmware/tzapps.b01 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/tzapps.b02 b/deb/proprietary/vendor/firmware/tzapps.b02
deleted file mode 100644
index 3c5121533..000000000
Binary files a/deb/proprietary/vendor/firmware/tzapps.b02 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/tzapps.b03 b/deb/proprietary/vendor/firmware/tzapps.b03
deleted file mode 100644
index 1ff82c6f4..000000000
Binary files a/deb/proprietary/vendor/firmware/tzapps.b03 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/tzapps.mdt b/deb/proprietary/vendor/firmware/tzapps.mdt
deleted file mode 100644
index 94b5cc9ee..000000000
Binary files a/deb/proprietary/vendor/firmware/tzapps.mdt and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/wcnss.b00 b/deb/proprietary/vendor/firmware/wcnss.b00
deleted file mode 100644
index 0d5bb805c..000000000
Binary files a/deb/proprietary/vendor/firmware/wcnss.b00 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/wcnss.b01 b/deb/proprietary/vendor/firmware/wcnss.b01
deleted file mode 100644
index 0c97065bc..000000000
Binary files a/deb/proprietary/vendor/firmware/wcnss.b01 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/wcnss.b02 b/deb/proprietary/vendor/firmware/wcnss.b02
deleted file mode 100644
index b1ddb2c05..000000000
Binary files a/deb/proprietary/vendor/firmware/wcnss.b02 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/wcnss.b04 b/deb/proprietary/vendor/firmware/wcnss.b04
deleted file mode 100644
index 547047f9a..000000000
Binary files a/deb/proprietary/vendor/firmware/wcnss.b04 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/wcnss.b05 b/deb/proprietary/vendor/firmware/wcnss.b05
deleted file mode 100644
index 4faa8809e..000000000
Binary files a/deb/proprietary/vendor/firmware/wcnss.b05 and /dev/null differ
diff --git a/deb/proprietary/vendor/firmware/wcnss.mdt b/deb/proprietary/vendor/firmware/wcnss.mdt
deleted file mode 100644
index 99a4a02ab..000000000
Binary files a/deb/proprietary/vendor/firmware/wcnss.mdt and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/drm/libdrmwvmplugin.so b/deb/proprietary/vendor/lib/drm/libdrmwvmplugin.so
deleted file mode 100644
index f914cc149..000000000
Binary files a/deb/proprietary/vendor/lib/drm/libdrmwvmplugin.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/egl/eglsubAndroid.so b/deb/proprietary/vendor/lib/egl/eglsubAndroid.so
deleted file mode 100644
index 854c1daee..000000000
Binary files a/deb/proprietary/vendor/lib/egl/eglsubAndroid.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/egl/libEGL_adreno.so b/deb/proprietary/vendor/lib/egl/libEGL_adreno.so
deleted file mode 100644
index a244587f8..000000000
Binary files a/deb/proprietary/vendor/lib/egl/libEGL_adreno.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/egl/libGLESv1_CM_adreno.so b/deb/proprietary/vendor/lib/egl/libGLESv1_CM_adreno.so
deleted file mode 100644
index e4be8e3fd..000000000
Binary files a/deb/proprietary/vendor/lib/egl/libGLESv1_CM_adreno.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/egl/libGLESv2_adreno.so b/deb/proprietary/vendor/lib/egl/libGLESv2_adreno.so
deleted file mode 100644
index 537eb073d..000000000
Binary files a/deb/proprietary/vendor/lib/egl/libGLESv2_adreno.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/egl/libplayback_adreno.so b/deb/proprietary/vendor/lib/egl/libplayback_adreno.so
deleted file mode 100644
index a06733f35..000000000
Binary files a/deb/proprietary/vendor/lib/egl/libplayback_adreno.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/egl/libq3dtools_adreno.so b/deb/proprietary/vendor/lib/egl/libq3dtools_adreno.so
deleted file mode 100644
index 01ed1d0e5..000000000
Binary files a/deb/proprietary/vendor/lib/egl/libq3dtools_adreno.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/libC2D2.so b/deb/proprietary/vendor/lib/libC2D2.so
deleted file mode 100644
index 8af301a16..000000000
Binary files a/deb/proprietary/vendor/lib/libC2D2.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/libCB.so b/deb/proprietary/vendor/lib/libCB.so
deleted file mode 100644
index 817cdae3f..000000000
Binary files a/deb/proprietary/vendor/lib/libCB.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/libRSDriver_adreno.so b/deb/proprietary/vendor/lib/libRSDriver_adreno.so
deleted file mode 100644
index 35e85e1de..000000000
Binary files a/deb/proprietary/vendor/lib/libRSDriver_adreno.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/libWVStreamControlAPI_L1.so b/deb/proprietary/vendor/lib/libWVStreamControlAPI_L1.so
deleted file mode 100644
index 4e46dbe2d..000000000
Binary files a/deb/proprietary/vendor/lib/libWVStreamControlAPI_L1.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/libWVphoneAPI.so b/deb/proprietary/vendor/lib/libWVphoneAPI.so
deleted file mode 100644
index 510403fad..000000000
Binary files a/deb/proprietary/vendor/lib/libWVphoneAPI.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/libadreno_utils.so b/deb/proprietary/vendor/lib/libadreno_utils.so
deleted file mode 100644
index 38bc29ed1..000000000
Binary files a/deb/proprietary/vendor/lib/libadreno_utils.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/libbccQTI.so b/deb/proprietary/vendor/lib/libbccQTI.so
deleted file mode 100644
index a0221b2eb..000000000
Binary files a/deb/proprietary/vendor/lib/libbccQTI.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/libc2d30-a3xx.so b/deb/proprietary/vendor/lib/libc2d30-a3xx.so
deleted file mode 100644
index 9b6461d89..000000000
Binary files a/deb/proprietary/vendor/lib/libc2d30-a3xx.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/libc2d30.so b/deb/proprietary/vendor/lib/libc2d30.so
deleted file mode 100644
index 4c0b1af3b..000000000
Binary files a/deb/proprietary/vendor/lib/libc2d30.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/libdrmdecrypt.so b/deb/proprietary/vendor/lib/libdrmdecrypt.so
deleted file mode 100644
index 9a5cfdc27..000000000
Binary files a/deb/proprietary/vendor/lib/libdrmdecrypt.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/libgemini.so b/deb/proprietary/vendor/lib/libgemini.so
deleted file mode 100644
index 9fbd4b394..000000000
Binary files a/deb/proprietary/vendor/lib/libgemini.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/libgeofence.so b/deb/proprietary/vendor/lib/libgeofence.so
deleted file mode 100644
index f054c8702..000000000
Binary files a/deb/proprietary/vendor/lib/libgeofence.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/libgsl.so b/deb/proprietary/vendor/lib/libgsl.so
deleted file mode 100644
index ee757d816..000000000
Binary files a/deb/proprietary/vendor/lib/libgsl.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/libimage-jpeg-enc-omx-comp.so b/deb/proprietary/vendor/lib/libimage-jpeg-enc-omx-comp.so
deleted file mode 100644
index b4b154147..000000000
Binary files a/deb/proprietary/vendor/lib/libimage-jpeg-enc-omx-comp.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/libimage-omx-common.so b/deb/proprietary/vendor/lib/libimage-omx-common.so
deleted file mode 100644
index d91045101..000000000
Binary files a/deb/proprietary/vendor/lib/libimage-omx-common.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/libizat_core.so b/deb/proprietary/vendor/lib/libizat_core.so
deleted file mode 100644
index 97561d4dc..000000000
Binary files a/deb/proprietary/vendor/lib/libizat_core.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/libllvm-qcom.so b/deb/proprietary/vendor/lib/libllvm-qcom.so
deleted file mode 100644
index 774573bc6..000000000
Binary files a/deb/proprietary/vendor/lib/libllvm-qcom.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/libloc_api_v02.so b/deb/proprietary/vendor/lib/libloc_api_v02.so
deleted file mode 100644
index d6db21235..000000000
Binary files a/deb/proprietary/vendor/lib/libloc_api_v02.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/libloc_ds_api.so b/deb/proprietary/vendor/lib/libloc_ds_api.so
deleted file mode 100644
index 30c5b730a..000000000
Binary files a/deb/proprietary/vendor/lib/libloc_ds_api.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/libmmcamera2_c2d_module.so b/deb/proprietary/vendor/lib/libmmcamera2_c2d_module.so
deleted file mode 100644
index 44e79fc7f..000000000
Binary files a/deb/proprietary/vendor/lib/libmmcamera2_c2d_module.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/libmmcamera2_cpp_module.so b/deb/proprietary/vendor/lib/libmmcamera2_cpp_module.so
deleted file mode 100644
index d5aba90d7..000000000
Binary files a/deb/proprietary/vendor/lib/libmmcamera2_cpp_module.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/libmmcamera2_iface_modules.so b/deb/proprietary/vendor/lib/libmmcamera2_iface_modules.so
deleted file mode 100644
index 09eb5f80b..000000000
Binary files a/deb/proprietary/vendor/lib/libmmcamera2_iface_modules.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/libmmcamera2_imglib_modules.so b/deb/proprietary/vendor/lib/libmmcamera2_imglib_modules.so
deleted file mode 100644
index 26a680207..000000000
Binary files a/deb/proprietary/vendor/lib/libmmcamera2_imglib_modules.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/libmmcamera2_isp_modules.so b/deb/proprietary/vendor/lib/libmmcamera2_isp_modules.so
deleted file mode 100644
index 78a1177f9..000000000
Binary files a/deb/proprietary/vendor/lib/libmmcamera2_isp_modules.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/libmmcamera2_pproc_modules.so b/deb/proprietary/vendor/lib/libmmcamera2_pproc_modules.so
deleted file mode 100644
index 9c79d80f7..000000000
Binary files a/deb/proprietary/vendor/lib/libmmcamera2_pproc_modules.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/libmmcamera2_sensor_modules.so b/deb/proprietary/vendor/lib/libmmcamera2_sensor_modules.so
deleted file mode 100644
index 63079a5e5..000000000
Binary files a/deb/proprietary/vendor/lib/libmmcamera2_sensor_modules.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/libmmcamera2_stats_modules.so b/deb/proprietary/vendor/lib/libmmcamera2_stats_modules.so
deleted file mode 100644
index d1d7c7cf6..000000000
Binary files a/deb/proprietary/vendor/lib/libmmcamera2_stats_modules.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/libmmcamera2_vpe_module.so b/deb/proprietary/vendor/lib/libmmcamera2_vpe_module.so
deleted file mode 100644
index 3fe0eafe2..000000000
Binary files a/deb/proprietary/vendor/lib/libmmcamera2_vpe_module.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/libmmcamera2_wnr_module.so b/deb/proprietary/vendor/lib/libmmcamera2_wnr_module.so
deleted file mode 100644
index a5cdf934c..000000000
Binary files a/deb/proprietary/vendor/lib/libmmcamera2_wnr_module.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/libmmcamera_faceproc.so b/deb/proprietary/vendor/lib/libmmcamera_faceproc.so
deleted file mode 100644
index 25d47e88b..000000000
Binary files a/deb/proprietary/vendor/lib/libmmcamera_faceproc.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/libmmcamera_imglib.so b/deb/proprietary/vendor/lib/libmmcamera_imglib.so
deleted file mode 100644
index ce93967df..000000000
Binary files a/deb/proprietary/vendor/lib/libmmcamera_imglib.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/libmmipl.so b/deb/proprietary/vendor/lib/libmmipl.so
deleted file mode 100644
index f24c1dd0c..000000000
Binary files a/deb/proprietary/vendor/lib/libmmipl.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/libmmjpeg.so b/deb/proprietary/vendor/lib/libmmjpeg.so
deleted file mode 100644
index 2230b81f8..000000000
Binary files a/deb/proprietary/vendor/lib/libmmjpeg.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/libmmqjpeg_codec.so b/deb/proprietary/vendor/lib/libmmqjpeg_codec.so
deleted file mode 100644
index 90be6d4ea..000000000
Binary files a/deb/proprietary/vendor/lib/libmmqjpeg_codec.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/libmmstillomx.so b/deb/proprietary/vendor/lib/libmmstillomx.so
deleted file mode 100644
index eb10a165b..000000000
Binary files a/deb/proprietary/vendor/lib/libmmstillomx.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/liboemcamera.so b/deb/proprietary/vendor/lib/liboemcamera.so
deleted file mode 100644
index 252beefb0..000000000
Binary files a/deb/proprietary/vendor/lib/liboemcamera.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/libqomx_jpegenc.so b/deb/proprietary/vendor/lib/libqomx_jpegenc.so
deleted file mode 100644
index 00efd7b0e..000000000
Binary files a/deb/proprietary/vendor/lib/libqomx_jpegenc.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/librs_adreno.so b/deb/proprietary/vendor/lib/librs_adreno.so
deleted file mode 100644
index a99594012..000000000
Binary files a/deb/proprietary/vendor/lib/librs_adreno.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/librs_adreno_sha1.so b/deb/proprietary/vendor/lib/librs_adreno_sha1.so
deleted file mode 100644
index 604269704..000000000
Binary files a/deb/proprietary/vendor/lib/librs_adreno_sha1.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/libsc-a3xx.so b/deb/proprietary/vendor/lib/libsc-a3xx.so
deleted file mode 100644
index 628d28c07..000000000
Binary files a/deb/proprietary/vendor/lib/libsc-a3xx.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/libwvdrm_L1.so b/deb/proprietary/vendor/lib/libwvdrm_L1.so
deleted file mode 100644
index f60ba3b86..000000000
Binary files a/deb/proprietary/vendor/lib/libwvdrm_L1.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/libwvm.so b/deb/proprietary/vendor/lib/libwvm.so
deleted file mode 100644
index 70f7930ac..000000000
Binary files a/deb/proprietary/vendor/lib/libwvm.so and /dev/null differ
diff --git a/deb/proprietary/vendor/lib/mediadrm/libwvdrmengine.so b/deb/proprietary/vendor/lib/mediadrm/libwvdrmengine.so
deleted file mode 100644
index 1e3792534..000000000
Binary files a/deb/proprietary/vendor/lib/mediadrm/libwvdrmengine.so and /dev/null differ
diff --git a/flo/Android.mk b/flo/Android.mk
index f76e5d5b2..ddb6a807d 100644
--- a/flo/Android.mk
+++ b/flo/Android.mk
@@ -16,6 +16,6 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(TARGET_DEVICE),flo)
+ifneq ($(filter flo deb,$(TARGET_DEVICE)),)
 
 endif
diff --git a/flo/proprietary/etc/gps.conf b/flo/proprietary/etc/gps.conf
deleted file mode 100644
index 6aa19013b..000000000
--- a/flo/proprietary/etc/gps.conf
+++ /dev/null
@@ -1,92 +0,0 @@
-# XTRA_SERVER_QUERY (1=on, 0=off)
-# If XTRA_SERVER_QUERY is on, the XTRA_SERVERs listed
-# below will be ignored, and instead the servers will
-# be queried from the modem.
-XTRA_SERVER_QUERY=0
-# XTRA_SERVERs below are used only if XTRA_SERVER_QUERY
-# is off.
-XTRA_SERVER_1=http://xtra1.gpsonextra.net/xtra2.bin
-XTRA_SERVER_2=http://xtra2.gpsonextra.net/xtra2.bin
-XTRA_SERVER_3=http://xtra3.gpsonextra.net/xtra2.bin
-
-# Error Estimate
-# _SET = 1
-# _CLEAR = 0
-ERR_ESTIMATE=0
-
-#Test
-NTP_SERVER=time.gpsonextra.net
-#Asia
-# NTP_SERVER=asia.pool.ntp.org
-#Europe
-# NTP_SERVER=europe.pool.ntp.org
-#North America
-# NTP_SERVER=north-america.pool.ntp.org
-
-# DEBUG LEVELS: 0 - none, 1 - Error, 2 - Warning, 3 - Info
-#               4 - Debug, 5 - Verbose
-# If DEBUG_LEVEL is commented, Android's logging levels will be used
-DEBUG_LEVEL = 2
-
-# Intermediate position report, 1=enable, 0=disable
-INTERMEDIATE_POS=0
-
-# Below bit mask configures how GPS functionalities
-# should be locked when user turns off GPS on Settings
-# Set bit 0x1 if MO GPS functionalities are to be locked
-# Set bit 0x2 if NI GPS functionalities are to be locked
-# default - non is locked for backward compatibility
-#GPS_LOCK = 0
-
-# supl version 1.0
-SUPL_VER=0x10000
-
-# GPS Capabilities bit mask
-# SCHEDULING = 0x01
-# MSB = 0x02
-# MSA = 0x04
-# ON_DEMAND_TIME = 0x10
-# GEOFENCE = 0x20
-# default = ON_DEMAND_TIME | MSA | MSB | SCHEDULING | GEOFENCE
-CAPABILITIES=0x37
-
-# Accuracy threshold for intermediate positions
-# less accurate positions are ignored, 0 for passing all positions
-# ACCURACY_THRES=5000
-
-################################
-##### AGPS server settings #####
-################################
-
-# FOR SUPL SUPPORT, set the following
-# SUPL_HOST=supl.host.com or IP
-# SUPL_PORT=1234
-SUPL_HOST=supl.google.com
-SUPL_PORT=7276
-
-# FOR C2K PDE SUPPORT, set the following
-# C2K_HOST=c2k.pde.com or IP
-# C2K_PORT=1234
-
-####################################
-#  LTE Positioning Profile Settings
-####################################
-# 0: Enable RRLP on LTE(Default)
-# 1: Enable LPP_User_Plane on LTE
-# 2: Enable LPP_Control_Plane
-# 3: Enable both LPP_User_Plane and LPP_Control_Plane
-LPP_PROFILE = 0
-
-################################
-# EXTRA SETTINGS
-################################
-# NMEA provider (1=Modem Processor, 0=Application Processor)
-NMEA_PROVIDER=0
-
-##################################################
-# Select Positioning Protocol on A-GLONASS system
-##################################################
-# 0x1: RRC CPlane
-# 0x2: RRLP UPlane
-# 0x4: LLP Uplane
-A_GLONASS_POS_PROTOCOL_SELECT = 0
diff --git a/flo/proprietary/lib/hw/gps.msm8960.so b/flo/proprietary/lib/hw/gps.msm8960.so
deleted file mode 100644
index f1fdfac8a..000000000
Binary files a/flo/proprietary/lib/hw/gps.msm8960.so and /dev/null differ
diff --git a/flo/proprietary/lib/libgps.utils.so b/flo/proprietary/lib/libgps.utils.so
deleted file mode 100644
index 604ee6736..000000000
Binary files a/flo/proprietary/lib/libgps.utils.so and /dev/null differ
diff --git a/flo/proprietary/lib/libloc_core.so b/flo/proprietary/lib/libloc_core.so
deleted file mode 100644
index 33f484417..000000000
Binary files a/flo/proprietary/lib/libloc_core.so and /dev/null differ
diff --git a/flo/proprietary/lib/libloc_eng.so b/flo/proprietary/lib/libloc_eng.so
deleted file mode 100644
index 2a611faf2..000000000
Binary files a/flo/proprietary/lib/libloc_eng.so and /dev/null differ