diff --git a/CommonBoardConfig.mk b/CommonBoardConfig.mk
index 9dbfd69..fbf362c 100644
--- a/CommonBoardConfig.mk
+++ b/CommonBoardConfig.mk
@@ -70,8 +70,6 @@ TARGET_USES_ION := true
 
 # GPS
 TARGET_NO_RPC := true
-BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := default
-BOARD_VENDOR_QCOM_LOC_PDK_FEATURE_SET := true
 
 # Sensors
 USE_SENSOR_MULTI_HAL := true
diff --git a/device-common.mk b/device-common.mk
index f83dc08..fff2f55 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -72,7 +72,6 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.sensor.stepcounter.xml:system/etc/permissions/android.hardware.sensor.stepcounter.xml \
     frameworks/native/data/etc/android.hardware.sensor.stepdetector.xml:system/etc/permissions/android.hardware.sensor.stepdetector.xml \
     frameworks/native/data/etc/android.hardware.sensor.hifi_sensors.xml:system/etc/permissions/android.hardware.sensor.hifi_sensors.xml \
-    frameworks/native/data/etc/android.hardware.location.gps.xml:system/etc/permissions/android.hardware.location.gps.xml \
     frameworks/native/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.xml \
     frameworks/native/data/etc/android.hardware.telephony.cdma.xml:system/etc/permissions/android.hardware.telephony.cdma.xml \
     frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \
@@ -168,15 +167,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/sec_config:system/etc/sec_config
 
-PRODUCT_PACKAGES += \
-    gps.conf \
-    gps.default \
-    libgps.utils \
-    libloc_eng \
-    libloc_api_v02 \
-    libloc_ds_api \
-    libgnsspps
-
 HOSTAPD := hostapd
 HOSTAPD += hostapd_cli
 PRODUCT_PACKAGES += $(HOSTAPD)