diff --git a/manifest.xml b/manifest.xml
index 4ccae76..eb4160e 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -44,16 +44,6 @@
         <transport>hwbinder</transport>
         <fqname>@4.0::IKeymasterDevice/default</fqname>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.media.c2</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IComponentStore</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@1.0::IComponentStore/default</fqname>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.media.omx</name>
         <transport>hwbinder</transport>
diff --git a/proprietary-files.txt b/proprietary-files.txt
index e8bbf60..0d881ae 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -922,15 +922,6 @@ vendor/lib64/vendor.qti.hardware.vpp@1.1.so
 vendor/lib64/vendor.qti.hardware.vpp@1.2.so
 vendor/lib64/vendor.qti.hardware.vpp@1.3.so
 
-# Media (Codec2) - from mojito - RKQ1.201022.002/V12.5.2.0.RKGMIXM
-vendor/bin/hw/vendor.qti.media.c2@1.0-service|711fc86b6a7768ba844155b61debdda4e291767e
-vendor/etc/init/vendor.qti.media.c2@1.0-service.rc|11209316ba8aae64b689217bc13b0804f6620678
-vendor/etc/media_codecs_c2.xml|9d36d65cd87fa2ccfab2e4035feb2c106efc1a48
-vendor/etc/seccomp_policy/codec2.vendor.base.policy|05b0779b5da2ea640984d46a46a796edeaab5fab
-vendor/etc/seccomp_policy/codec2.vendor.ext.policy|6a9a9eb3261048f02805261568097410e1a23b2d
-vendor/lib/libqcodec2.so|d799248294af4cf923f851111dc3b77f70622edc
-vendor/lib64/libqcodec2.so|4253b248baf778fd6e87fdc1b6c0403a92edc401
-
 # Neural Networks
 vendor/bin/hw/android.hardware.neuralnetworks@1.3-service-qti
 vendor/bin/npu_launcher
diff --git a/vendor.prop b/vendor.prop
index 82e9acb..6ae67c3 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -167,10 +167,8 @@ vendor.gralloc.disable_ubwc=0
 ro.hardware.keystore_desede=true
 
 # Media
-debug.media.codec2=2
-debug.stagefright.c2inputsurface=-1
-debug.stagefright.ccodec=4
-debug.stagefright.omx_default_rank=512
+debug.stagefright.ccodec=1
+debug.stagefright.omx_default_rank=0
 
 # Perf
 ro.vendor.extension_library=libqti-perfd-client.so