diff --git a/board/bootloader.mk b/board/bootloader.mk
index 9e01cab..54bd5e1 100644
--- a/board/bootloader.mk
+++ b/board/bootloader.mk
@@ -1,4 +1,3 @@
 # Bootloader
 TARGET_BOOTLOADER_BOARD_NAME := MSM8937
-
 TARGET_NO_BOOTLOADER := true
diff --git a/board/gps.mk b/board/gps.mk
index 9fb4c7d..ef67844 100644
--- a/board/gps.mk
+++ b/board/gps.mk
@@ -1,4 +1,3 @@
 # GPS
 USE_DEVICE_SPECIFIC_GPS := true
-USE_DEVICE_SPECIFIC_LOC_API := true
 TARGET_NO_RPC := true
diff --git a/board/qcom-keymaster.mk b/board/qcom-keymaster.mk
index daa8f0b..c5c23d0 100644
--- a/board/qcom-keymaster.mk
+++ b/board/qcom-keymaster.mk
@@ -1,2 +1,2 @@
 # Keystore
-TARGET_KEYMASTER_WAIT_FOR_QSEE := true
+TARGET_PROVIDES_KEYMASTER := true
diff --git a/product/frp.mk b/product/frp.mk
deleted file mode 100644
index 9a5a1ea..0000000
--- a/product/frp.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# Properties
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.frp.pst=/dev/block/bootdevice/by-name/config
diff --git a/product/nfc.mk b/product/nfc.mk
deleted file mode 100644
index 5f59f7a..0000000
--- a/product/nfc.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Permissions
-PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.hardware.nfc.hce.xml:system/etc/permissions/android.hardware.nfc.hce.xml \
-    frameworks/native/data/etc/android.hardware.nfc.xml:system/etc/permissions/android.hardware.nfc.xml
diff --git a/product/qcom-camera.mk b/product/qcom-camera.mk
index c3dfe92..b7edef6 100644
--- a/product/qcom-camera.mk
+++ b/product/qcom-camera.mk
@@ -3,7 +3,7 @@ PRODUCT_PACKAGES += \
     libshims_camera \
     libshim_ims_camera
 
-# ZRAM
+# Properties
 PRODUCT_PROPERTY_OVERRIDES += \
     camera.hal1.packagelist=com.skype.raider,com.google.android.talk \
     media.camera.ts.monotonic=0 \