diff --git a/oneplus2/Android.mk b/oneplus2/Android.mk
index 6ecfa4030..adf544cba 100644
--- a/oneplus2/Android.mk
+++ b/oneplus2/Android.mk
@@ -29,17 +29,6 @@ LOCAL_PRIVILEGED_MODULE := true
 LOCAL_CERTIFICATE := platform
 include $(BUILD_PREBUILT)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := com.qualcomm.location
-LOCAL_MODULE_OWNER := oneplus
-LOCAL_SRC_FILES := proprietary/priv-app/com.qualcomm.location/com.qualcomm.location.apk
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_MODULE_CLASS := APPS
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_CERTIFICATE := platform
-include $(BUILD_PREBUILT)
-
 include $(CLEAR_VARS)
 LOCAL_MODULE := qcrilmsgtunnel
 LOCAL_MODULE_OWNER := oneplus
diff --git a/oneplus2/oneplus2-vendor-blobs.mk b/oneplus2/oneplus2-vendor-blobs.mk
index 102a200a0..7de9261a3 100644
--- a/oneplus2/oneplus2-vendor-blobs.mk
+++ b/oneplus2/oneplus2-vendor-blobs.mk
@@ -244,36 +244,25 @@ PRODUCT_COPY_FILES += \
         vendor/oneplus/oneplus2/proprietary/etc/firmware/fingerprints.b02:/system/etc/firmware/fingerprints.b02 \
         vendor/oneplus/oneplus2/proprietary/etc/firmware/fingerprints.b03:/system/etc/firmware/fingerprints.b03 \
         vendor/oneplus/oneplus2/proprietary/etc/firmware/fingerprints.mdt:/system/etc/firmware/fingerprints.mdt \
-        vendor/oneplus/oneplus2/proprietary/bin/loc_launcher:/system/bin/loc_launcher \
-        vendor/oneplus/oneplus2/proprietary/bin/lowi-server:/system/bin/lowi-server \
-        vendor/oneplus/oneplus2/proprietary/bin/xtwifi-client:/system/bin/xtwifi-client \
-        vendor/oneplus/oneplus2/proprietary/bin/xtwifi-inet-agent:/system/bin/xtwifi-inet-agent \
-        vendor/oneplus/oneplus2/proprietary/etc/permissions/com.qualcomm.location.xml:/system/etc/permissions/com.qualcomm.location.xml \
         vendor/oneplus/oneplus2/proprietary/vendor/lib64/hw/flp.default.so:/system/vendor/lib64/hw/flp.default.so \
-        vendor/oneplus/oneplus2/proprietary/vendor/lib64/libalarmservice_jni.so:/system/vendor/lib64/libalarmservice_jni.so \
+        vendor/oneplus/oneplus2/proprietary/vendor/lib64/libdataitems.so:/system/vendor/lib64/libdataitems.so \
         vendor/oneplus/oneplus2/proprietary/vendor/lib64/libflp.so:/system/vendor/lib64/libflp.so \
         vendor/oneplus/oneplus2/proprietary/vendor/lib64/libgeofence.so:/system/vendor/lib64/libgeofence.so \
         vendor/oneplus/oneplus2/proprietary/vendor/lib64/libizat_core.so:/system/vendor/lib64/libizat_core.so \
         vendor/oneplus/oneplus2/proprietary/vendor/lib64/liblbs_core.so:/system/vendor/lib64/liblbs_core.so \
-        vendor/oneplus/oneplus2/proprietary/vendor/lib64/libloc_ext.so:/system/vendor/lib64/libloc_ext.so \
-        vendor/oneplus/oneplus2/proprietary/vendor/lib64/libloc_xtra.so:/system/vendor/lib64/libloc_xtra.so \
         vendor/oneplus/oneplus2/proprietary/vendor/lib64/liblocationservice.so:/system/vendor/lib64/liblocationservice.so \
-        vendor/oneplus/oneplus2/proprietary/vendor/lib64/liblocationservice_glue.so:/system/vendor/lib64/liblocationservice_glue.so \
         vendor/oneplus/oneplus2/proprietary/vendor/lib64/liblowi_client.so:/system/vendor/lib64/liblowi_client.so \
-        vendor/oneplus/oneplus2/proprietary/vendor/lib64/liblowi_wifihal.so:/system/vendor/lib64/liblowi_wifihal.so \
         vendor/oneplus/oneplus2/proprietary/vendor/lib64/libquipc_os_api.so:/system/vendor/lib64/libquipc_os_api.so \
         vendor/oneplus/oneplus2/proprietary/vendor/lib64/libulp2.so:/system/vendor/lib64/libulp2.so \
         vendor/oneplus/oneplus2/proprietary/vendor/lib64/libxtadapter.so:/system/vendor/lib64/libxtadapter.so \
         vendor/oneplus/oneplus2/proprietary/vendor/lib64/libxtwifi_ulp_adaptor.so:/system/vendor/lib64/libxtwifi_ulp_adaptor.so \
         vendor/oneplus/oneplus2/proprietary/vendor/lib/hw/flp.default.so:/system/vendor/lib/hw/flp.default.so \
-        vendor/oneplus/oneplus2/proprietary/vendor/lib/libalarmservice_jni.so:/system/vendor/lib/libalarmservice_jni.so \
+        vendor/oneplus/oneplus2/proprietary/vendor/lib/libdataitems.so:/system/vendor/lib/libdataitems.so \
         vendor/oneplus/oneplus2/proprietary/vendor/lib/libflp.so:/system/vendor/lib/libflp.so \
         vendor/oneplus/oneplus2/proprietary/vendor/lib/libgeofence.so:/system/vendor/lib/libgeofence.so \
         vendor/oneplus/oneplus2/proprietary/vendor/lib/libizat_core.so:/system/vendor/lib/libizat_core.so \
         vendor/oneplus/oneplus2/proprietary/vendor/lib/liblbs_core.so:/system/vendor/lib/liblbs_core.so \
-        vendor/oneplus/oneplus2/proprietary/vendor/lib/libloc_ext.so:/system/vendor/lib/libloc_ext.so \
         vendor/oneplus/oneplus2/proprietary/vendor/lib/liblocationservice.so:/system/vendor/lib/liblocationservice.so \
-        vendor/oneplus/oneplus2/proprietary/vendor/lib/liblocationservice_glue.so:/system/vendor/lib/liblocationservice_glue.so \
         vendor/oneplus/oneplus2/proprietary/vendor/lib/liblowi_client.so:/system/vendor/lib/liblowi_client.so \
         vendor/oneplus/oneplus2/proprietary/vendor/lib/libquipc_os_api.so:/system/vendor/lib/libquipc_os_api.so \
         vendor/oneplus/oneplus2/proprietary/vendor/lib/libulp2.so:/system/vendor/lib/libulp2.so \
@@ -408,14 +397,12 @@ PRODUCT_COPY_FILES += \
         vendor/oneplus/oneplus2/proprietary/lib64/hw/sensors.msm8994.so:/system/lib64/hw/sensors.msm8994.so \
         vendor/oneplus/oneplus2/proprietary/lib/hw/sensors.msm8994.so:/system/lib/hw/sensors.msm8994.so \
         vendor/oneplus/oneplus2/proprietary/vendor/lib64/hw/activity_recognition.msm8994.so:/system/vendor/lib64/hw/activity_recognition.msm8994.so \
-        vendor/oneplus/oneplus2/proprietary/vendor/lib64/libdataitems.so:/system/vendor/lib64/libdataitems.so \
         vendor/oneplus/oneplus2/proprietary/vendor/lib64/libsensor1.so:/system/vendor/lib64/libsensor1.so \
         vendor/oneplus/oneplus2/proprietary/vendor/lib64/libsensor_reg.so:/system/vendor/lib64/libsensor_reg.so \
         vendor/oneplus/oneplus2/proprietary/vendor/lib64/libsensor_thresh.so:/system/vendor/lib64/libsensor_thresh.so \
         vendor/oneplus/oneplus2/proprietary/vendor/lib64/libsensor_user_cal.so:/system/vendor/lib64/libsensor_user_cal.so \
         vendor/oneplus/oneplus2/proprietary/vendor/lib64/sensors.ssc.so:/system/vendor/lib64/sensors.ssc.so \
         vendor/oneplus/oneplus2/proprietary/vendor/lib/hw/activity_recognition.msm8994.so:/system/vendor/lib/hw/activity_recognition.msm8994.so \
-        vendor/oneplus/oneplus2/proprietary/vendor/lib/libdataitems.so:/system/vendor/lib/libdataitems.so \
         vendor/oneplus/oneplus2/proprietary/vendor/lib/libsensor1.so:/system/vendor/lib/libsensor1.so \
         vendor/oneplus/oneplus2/proprietary/vendor/lib/libsensor_reg.so:/system/vendor/lib/libsensor_reg.so \
         vendor/oneplus/oneplus2/proprietary/vendor/lib/libsensor_thresh.so:/system/vendor/lib/libsensor_thresh.so \
diff --git a/oneplus2/oneplus2-vendor.mk b/oneplus2/oneplus2-vendor.mk
index c8a9f568e..c3b4f2a1a 100644
--- a/oneplus2/oneplus2-vendor.mk
+++ b/oneplus2/oneplus2-vendor.mk
@@ -20,9 +20,6 @@ PRODUCT_PACKAGES += \
     com.qti.dpmframework \
     dpmapi
 
-PRODUCT_PACKAGES += \
-    com.qualcomm.location
-
 PRODUCT_PACKAGES += \
     qcrilmsgtunnel \
     shutdownlistener \
diff --git a/oneplus2/proprietary/bin/loc_launcher b/oneplus2/proprietary/bin/loc_launcher
deleted file mode 100755
index c47e0a61c..000000000
Binary files a/oneplus2/proprietary/bin/loc_launcher and /dev/null differ
diff --git a/oneplus2/proprietary/bin/lowi-server b/oneplus2/proprietary/bin/lowi-server
deleted file mode 100755
index 2fe9e0dc4..000000000
Binary files a/oneplus2/proprietary/bin/lowi-server and /dev/null differ
diff --git a/oneplus2/proprietary/bin/xtwifi-client b/oneplus2/proprietary/bin/xtwifi-client
deleted file mode 100755
index 8ec01d1e0..000000000
Binary files a/oneplus2/proprietary/bin/xtwifi-client and /dev/null differ
diff --git a/oneplus2/proprietary/bin/xtwifi-inet-agent b/oneplus2/proprietary/bin/xtwifi-inet-agent
deleted file mode 100755
index bbd7a65f2..000000000
Binary files a/oneplus2/proprietary/bin/xtwifi-inet-agent and /dev/null differ
diff --git a/oneplus2/proprietary/etc/permissions/com.qualcomm.location.xml b/oneplus2/proprietary/etc/permissions/com.qualcomm.location.xml
deleted file mode 100644
index 332442980..000000000
--- a/oneplus2/proprietary/etc/permissions/com.qualcomm.location.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!---******************************************************************************
-* @file    com.qualcomm.location.xml
-* @brief   configuration file for permission mapping
-*  Copyright (c) 2012 Qualcomm Atheros, Inc.
-*  All Rights Reserved.
-*  Qualcomm Atheros Confidential and Proprietary.
-*  *****************************************************************************-->
-
-<permissions>
-
-<permission name="com.qualcomm.permission.IZAT" >
-    <group gid="gps" />
-    <group gid="net_raw" />
-    <group gid="net_admin" />
-    <group gid="system" />
-    <group gid="diag" />
-    <group gid="qcom_diag" />
-    <group gid="sdcard_rw" />
-    <group gid="media_rw" />
-    <group gid="wifi" />
-</permission>
-
-</permissions>
diff --git a/oneplus2/proprietary/priv-app/com.qualcomm.location/com.qualcomm.location.apk b/oneplus2/proprietary/priv-app/com.qualcomm.location/com.qualcomm.location.apk
deleted file mode 100644
index 2e9a58e48..000000000
Binary files a/oneplus2/proprietary/priv-app/com.qualcomm.location/com.qualcomm.location.apk and /dev/null differ
diff --git a/oneplus2/proprietary/vendor/lib/libalarmservice_jni.so b/oneplus2/proprietary/vendor/lib/libalarmservice_jni.so
deleted file mode 100644
index 286b64a1f..000000000
Binary files a/oneplus2/proprietary/vendor/lib/libalarmservice_jni.so and /dev/null differ
diff --git a/oneplus2/proprietary/vendor/lib/libloc_ext.so b/oneplus2/proprietary/vendor/lib/libloc_ext.so
deleted file mode 100644
index 9f21c6479..000000000
Binary files a/oneplus2/proprietary/vendor/lib/libloc_ext.so and /dev/null differ
diff --git a/oneplus2/proprietary/vendor/lib/liblocationservice_glue.so b/oneplus2/proprietary/vendor/lib/liblocationservice_glue.so
deleted file mode 100644
index fbb11ba3d..000000000
Binary files a/oneplus2/proprietary/vendor/lib/liblocationservice_glue.so and /dev/null differ
diff --git a/oneplus2/proprietary/vendor/lib64/libalarmservice_jni.so b/oneplus2/proprietary/vendor/lib64/libalarmservice_jni.so
deleted file mode 100644
index 744ca526c..000000000
Binary files a/oneplus2/proprietary/vendor/lib64/libalarmservice_jni.so and /dev/null differ
diff --git a/oneplus2/proprietary/vendor/lib64/libloc_ext.so b/oneplus2/proprietary/vendor/lib64/libloc_ext.so
deleted file mode 100644
index 56220d80c..000000000
Binary files a/oneplus2/proprietary/vendor/lib64/libloc_ext.so and /dev/null differ
diff --git a/oneplus2/proprietary/vendor/lib64/libloc_xtra.so b/oneplus2/proprietary/vendor/lib64/libloc_xtra.so
deleted file mode 100644
index 53ffac0a4..000000000
Binary files a/oneplus2/proprietary/vendor/lib64/libloc_xtra.so and /dev/null differ
diff --git a/oneplus2/proprietary/vendor/lib64/liblocationservice_glue.so b/oneplus2/proprietary/vendor/lib64/liblocationservice_glue.so
deleted file mode 100644
index 6cc9f3ae3..000000000
Binary files a/oneplus2/proprietary/vendor/lib64/liblocationservice_glue.so and /dev/null differ
diff --git a/oneplus2/proprietary/vendor/lib64/liblowi_wifihal.so b/oneplus2/proprietary/vendor/lib64/liblowi_wifihal.so
deleted file mode 100644
index 494811496..000000000
Binary files a/oneplus2/proprietary/vendor/lib64/liblowi_wifihal.so and /dev/null differ