diff --git a/properties/system.prop b/properties/system.prop
index ec7d7126..4be79850 100644
--- a/properties/system.prop
+++ b/properties/system.prop
@@ -27,9 +27,6 @@ persist.vendor.cne.feature=1
 persist.data.df.dev_name=rmnet_usb0
 persist.vendor.data.profile_update=true
 
-# DPM
-persist.vendor.dpm.feature=1
-
 # Disable GC freed lines
 dalvik.vm.debug.alloc=0
 
@@ -110,7 +107,6 @@ persist.timed.enable=true
 
 # Radio
 DEVICE_PROVISIONED=1
-persist.backup.ntpServer=0.pool.ntp.org
 persist.radio.aosp_usr_pref_sel=true
 persist.radio.add_power_save=1
 persist.radio.VT_CAM_INTERFACE=2 
@@ -119,12 +115,7 @@ persist.vendor.ims.disableADBLogs=1
 persist.vendor.ims.disableIMSLogs=1
 persist.vendor.radio.enable_temp_dds=true
 persist.vendor.radio.force_on_dc=true
-persist.vendor.radio.mt_sms_ack=30
-persist.sys.fflag.override.settings_provider_model=false
-persist.sys.fflag.override.settings_network_and_internet_v2=true
 ril.subscription.types=RUIM
-ro.telephony.default_network=33,33
-telephony.lteOnCdmaDevice=1
 
 # SELinux
 ro.build.selinux=1
@@ -132,9 +123,6 @@ ro.build.selinux=1
 #Storaged
 ro.storaged.event.interval=99999
 
-# SSR
-persist.vendor.ssr.restart_level=ALL_ENABLE
-
 # Zygote preforking
 persist.device_config.runtime_native.usap_pool_enabled=true
 
diff --git a/properties/vendor.prop b/properties/vendor.prop
index 204eb810..5ffa434d 100644
--- a/properties/vendor.prop
+++ b/properties/vendor.prop
@@ -117,6 +117,16 @@ vendor.camera.aux.packagelist=com.google.android.GoogleCamera,com.android.camera
 # Codec2 switch
 debug.media.codec2=2
 
+# Data
+persist.vendor.data.iwlan.enable=true
+persist.vendor.data.mode=concurrent
+ro.telephony.iwlan_operation_mode=legacy
+ro.vendor.use_data_netmgrd=true
+
+# DPM
+persist.vendor.dpm.loglevel=0
+persist.vendor.dpmhalservice.enable=1
+
 # DRM
 drm.service.enabled=true
 
@@ -144,6 +154,9 @@ vendor.video.disable.ubwc=1
 # Fwk detect
 ro.vendor.qti.va_aosp.support=1
 
+# Fwk detect
+ro.vendor.qti.va_aosp.support=1
+
 # GPS
 persist.backup.ntpServer="0.pool.ntp.org"
 persist.vendor.overlay.izat.optin=rro
@@ -175,35 +188,33 @@ persist.vendor.qcomsysd.enabled=1
 ro.vendor.extension_library=libqti-perfd-client.so
 ro.vendor.perf.scroll_opt=true
 
+# RCS
+persist.rcs.supported=0
+
 # Radio
 persist.dbg.volte_avail_ovr=1
 persist.dbg.vt_avail_ovr=1
 persist.dbg.wfc_avail_ovr=1
-persist.dbg.ims_volte_enable=1
-persist.vendor.data.iwlan.enable=true
-persist.vendor.data.mode=concurrent
-persist.vendor.dpmhalservice.enable=1
+persist.sys.fflag.override.settings_provider_model=false
 persist.vendor.qti.telephony.vt_cam_interface=2
 persist.vendor.radio.aosp_usr_pref_sel=true
 persist.vendor.radio.add_power_save=1
 persist.vendor.radio.apm_sim_not_pwdn=1
 persist.vendor.radio.custom_ecc=1
 persist.vendor.radio.data_con_rprt=1
-persist.vendor.radio.procedure_bytes=SKIP
-persist.vendor.radio.rat_on=combine
-persist.vendor.radio.redir_party_num=1
-persist.vendor.radio.sib16_support=1
 persist.vendor.radio.data_ltd_sys_ind=1
 persist.vendor.radio.force_ltd_sys_ind=1
 persist.vendor.radio.manual_nw_rej_ct=1
 persist.vendor.radio.mt_sms_ack=30
 persist.vendor.radio.procedure_bytes=SKIP
-persist.radio.calls.on.ims=1
-ro.telephony.iwlan_operation_mode=legacy
-ro.vendor.use_data_netmgrd=true
-ro.telephony.default_network=22,20
+persist.vendor.radio.process_sups_ind=1
+persist.vendor.radio.rat_on=combine
+persist.vendor.radio.redir_party_num=1
+persist.vendor.radio.report_codec=1
+persist.vendor.radio.sib16_support=1
 ro.telephony.default_cdma_sub=0
-vendor.rild.libpath=/vendor/lib64/libril-qc-hal-qmi.so
+ro.telephony.default_network=22,22
+telephony.lteOnCdmaDevice=1
 
 # Rendering
 debug.egl.hw=1
@@ -223,6 +234,9 @@ ro.vendor.sensors.sta_detect=true
 ro.soc.manufacturer=QTI
 ro.soc.model=SDM660
 
+# SSR
+persist.vendor.ssr.restart_level=ALL_ENABLE
+
 # System restart
 ro.build.shutdown_timeout=2