diff --git a/system.prop b/system.prop
index 7fa4899..f972ffd 100644
--- a/system.prop
+++ b/system.prop
@@ -6,6 +6,9 @@ audio.offload.min.duration.secs=60
 audio.offload.video=false
 media.aac_51_output_enabled=true
 
+# Bluetooth
+persist.vendor.btstack.aac_frm_ctl.enabled=true
+
 # Charger
 ro.charger.enable_suspend=1
 
@@ -43,6 +46,9 @@ ro.media.recorder-max-base-layer-fps=60
 persist.vendor.data.mode=concurrent
 ro.vendor.use_data_netmgrd=true
 
+# NFC
+ro.nfc.port=I2C
+
 # Radio
 ro.telephony.default_network=33,33
 
diff --git a/vendor.prop b/vendor.prop
index fdc6055..af18b7a 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -138,7 +138,6 @@ bluetooth.profile.sap.server.enabled?=true
 persist.bluetooth.a2dp_offload.disabled=false
 persist.vendor.bt.aac_frm_ctl.enabled=true
 persist.vendor.bt.aac_vbr_frm_ctl.enabled=true
-persist.vendor.btstack.aac_frm_ctl.enabled=true
 persist.vendor.qcom.bluetooth.a2dp_mcast_test.enabled=false
 persist.vendor.qcom.bluetooth.a2dp_offload_cap=sbc-aac-aptx-aptxhd-ldac
 persist.vendor.qcom.bluetooth.aac_frm_ctl.enabled=true
@@ -243,9 +242,6 @@ ro.incremental.enable=true
 debug.stagefright.ccodec=4
 debug.stagefright.omx_default_rank=0
 
-# NFC
-ro.nfc.port=I2C
-
 # Perf
 ro.vendor.extension_library=libqti-perfd-client.so
 ro.vendor.perf-hal.ver=2.2
@@ -309,9 +305,6 @@ sys.vendor.shutdown.waittime=500
 ro.soc.manufacturer=QTI
 ro.soc.model=SM7325
 
-# SSR
-persist.vendor.ssr.restart_level=ALL_ENABLE
-
 # Stagefright
 debug.stagefright.c2inputsurface=-1