diff --git a/common/base.mk b/common/base.mk
index 548d305..b30cb74 100644
--- a/common/base.mk
+++ b/common/base.mk
@@ -237,7 +237,7 @@
 endif
 
 ifeq ($(TARGET_BUILD_VARIANT),user)
-PRODUCT_DEFAULT_PROPERTY_OVERRIDES+= \
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
 	ro.adb.secure=1
 endif
 
diff --git a/common/common64.mk b/common/common64.mk
index 295fcd8..326b264 100644
--- a/common/common64.mk
+++ b/common/common64.mk
@@ -32,5 +32,3 @@
 # Permission for Wi-Fi passpoint support
 PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.passpoint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.passpoint.xml
 
-PRODUCT_PRIVATE_KEY := device/qcom/common/qcom.key
-
diff --git a/device.mk b/device.mk
index 9e4b875..256df5a 100644
--- a/device.mk
+++ b/device.mk
@@ -35,11 +35,8 @@
 # targeting the same model with all of them.
 PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_MODEL=FP3 PRODUCT_NAME=FP3 TARGET_PRODUCT=FP3
 
-# vendor/qcom/proprietary/common/config/device-vendor.mk --> PRODUCT_LIST
-TARGET_BASE_PRODUCT := FP3
-TARGET_VENDOR := fairphone
 
-TARGET_SYSTEM_PROP := device/$(TARGET_VENDOR)/$(PRODUCT_NAME)/system.prop
+TARGET_SYSTEM_PROP := $(FP_PATH)/system.prop
 
 # Define the build number based on the product flavour and on the build manifest
 # revision
@@ -77,14 +74,7 @@
 	vendor
 
 
-AB_OTA_POSTINSTALL_CONFIG += \
-	RUN_POSTINSTALL_vendor=true \
-	POSTINSTALL_PATH_vendor=bin/checkpoint_gc \
-	FILESYSTEM_TYPE_vendor=ext4 \
-	POSTINSTALL_OPTIONAL_vendor=true
-
 PRODUCT_PACKAGES += \
-	checkpoint_gc \
 	update_engine_sideload
 
 
@@ -108,10 +98,6 @@
 
 
 # Audio
-# AV Enhancement
-TARGET_ENABLE_QC_AV_ENHANCEMENTS := true
-
-
 PRODUCT_PACKAGES += \
 	android.hardware.audio@6.0 \
 	android.hardware.audio.common@6.0 \