diff --git a/system.prop b/system.prop
index 9aa653e0276e7dbc70de5b2ce0bd21ce541b0b83..69e3abe157cc8a203d344ea5f28475c391dc7edf 100644
--- a/system.prop
+++ b/system.prop
@@ -26,7 +26,6 @@ media.stagefright.enable-player=true
 media.stagefright.enable-qcp=true
 media.stagefright.enable-scan=true
 media.stagefright.thumbnail.prefer_hw_codecs=true
-mm.enable.smoothstreaming=true
 persist.mm.enable.prefetch=true
 ro.media.recorder-max-base-layer-fps=60
 ro.media.xml_variant.codecs=_lahaina
diff --git a/vendor.prop b/vendor.prop
index beba6c458bf5ecf65346bde191c25464012d8a0c..2870a5730f47d7eaa1ad7d865a99598e35b36e63 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -194,11 +194,6 @@ vendor.display.use_smooth_motion=0
 vendor.gralloc.disable_ubwc=0
 
 # Media
-debug.config.media.video.aie.support=true
-debug.config.media.video.ais.support=true
-debug.config.media.video.frc.support=true
-debug.media.video.frc=false
-debug.media.video.vpp=false
 debug.stagefright.ccodec=4
 debug.stagefright.omx_default_rank=0
 media.aac_51_output_enabled=true
@@ -215,16 +210,6 @@ persist.mm.enable.prefetch=true
 ro.config.vc_call_vol_steps=11
 ro.media.xml_variant.codecs=_lahaina
 ro.media.xml_variant.codecs_performance=_lahaina
-ro.vendor.media.video.frc.support=true
-ro.vendor.media.video.vpp.support=true
-vendor.media.vpp.aie.cade=100
-vendor.media.vpp.aie.ltm=1
-vendor.media.vpp.aie.ltmacebrih=0
-vendor.media.vpp.aie.ltmacebril=20
-vendor.media.vpp.aie.ltmacestr=37
-vendor.media.vpp.aie.ltmsatgain=55
-vendor.media.vpp.aie.ltmsatoff=55
-vendor.media.vpp.debug.value.use=false
 vendor.mm.enable.qcom_parser=16777215
 vendor.mm.enable.qcom_parser=63963135
 vendor.media.target_variant=_lahaina