diff --git a/Aerodactyl-vendor.mk b/Aerodactyl-vendor.mk
index 800ac06..a3bd15e 100644
--- a/Aerodactyl-vendor.mk
+++ b/Aerodactyl-vendor.mk
@@ -332,8 +332,6 @@ PRODUCT_COPY_FILES += \
     vendor/nothing/Aerodactyl/proprietary/vendor/etc/lvacfs_params/2mic/LVIMFS_Parameter_xxxx_ID9_He_Unprocess.txt:$(TARGET_COPY_OUT_VENDOR)/etc/lvacfs_params/2mic/LVIMFS_Parameter_xxxx_ID9_He_Unprocess.txt \
     vendor/nothing/Aerodactyl/proprietary/vendor/etc/lvacfs_params/2mic/audiozoom_2.txt:$(TARGET_COPY_OUT_VENDOR)/etc/lvacfs_params/2mic/audiozoom_2.txt \
     vendor/nothing/Aerodactyl/proprietary/vendor/etc/mali_platform.config:$(TARGET_COPY_OUT_VENDOR)/etc/mali_platform.config \
-    vendor/nothing/Aerodactyl/proprietary/vendor/etc/media_codecs_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \
-    vendor/nothing/Aerodactyl/proprietary/vendor/etc/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \
     vendor/nothing/Aerodactyl/proprietary/vendor/etc/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml \
     vendor/nothing/Aerodactyl/proprietary/vendor/etc/meow.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/meow.cfg \
     vendor/nothing/Aerodactyl/proprietary/vendor/etc/mpe.conf:$(TARGET_COPY_OUT_VENDOR)/etc/mpe.conf \
diff --git a/proprietary/vendor/etc/media_codecs_c2.xml b/proprietary/vendor/etc/media_codecs_c2.xml
deleted file mode 100644
index 655ad21..0000000
--- a/proprietary/vendor/etc/media_codecs_c2.xml
+++ /dev/null
@@ -1,489 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<MediaCodecs>
-    <Settings>
-        <!-- disable TV and telephony domains by default. These must be opted in by OEMs -->
-        <Domain name="telephony" enabled="false" />
-        <Domain name="tv" enabled="false" />
-        <Variant name="slow-cpu" enabled="false" />
-    </Settings>
-    <Decoders>
-        <MediaCodec name="c2.android.mp3.decoder" type="audio/mpeg">
-            <Alias name="OMX.google.mp3.decoder" />
-            <Limit name="channel-count" max="2" />
-            <Limit name="sample-rate" ranges="8000,11025,12000,16000,22050,24000,32000,44100,48000" />
-            <Limit name="bitrate" range="8000-320000" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.amrnb.decoder" type="audio/3gpp">
-            <Alias name="OMX.google.amrnb.decoder" />
-            <Limit name="channel-count" max="1" />
-            <Limit name="sample-rate" ranges="8000" />
-            <Limit name="bitrate" range="4750-12200" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.amrwb.decoder" type="audio/amr-wb">
-            <Alias name="OMX.google.amrwb.decoder" />
-            <Limit name="channel-count" max="1" />
-            <Limit name="sample-rate" ranges="16000" />
-            <Limit name="bitrate" range="6600-23850" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.aac.decoder" type="audio/mp4a-latm">
-            <Alias name="OMX.google.aac.decoder" />
-            <Limit name="channel-count" max="8" />
-            <Limit name="sample-rate" ranges="7350,8000,11025,12000,16000,22050,24000,32000,44100,48000" />
-            <Limit name="bitrate" range="8000-960000" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.g711.alaw.decoder" type="audio/g711-alaw">
-            <Alias name="OMX.google.g711.alaw.decoder" />
-            <Limit name="channel-count" max="6" />
-            <Limit name="sample-rate" ranges="8000-48000" />
-            <Limit name="bitrate" range="64000" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.g711.mlaw.decoder" type="audio/g711-mlaw">
-            <Alias name="OMX.google.g711.mlaw.decoder" />
-            <Limit name="channel-count" max="6" />
-            <Limit name="sample-rate" ranges="8000-48000" />
-            <Limit name="bitrate" range="64000" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.vorbis.decoder" type="audio/vorbis">
-            <Alias name="OMX.google.vorbis.decoder" />
-            <Limit name="channel-count" max="8" />
-            <Limit name="sample-rate" ranges="8000-96000" />
-            <Limit name="bitrate" range="32000-500000" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.opus.decoder" type="audio/opus">
-            <Alias name="OMX.google.opus.decoder" />
-            <Limit name="channel-count" max="8" />
-            <Limit name="sample-rate" ranges="8000,12000,16000,24000,48000" />
-            <Limit name="bitrate" range="6000-510000" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.raw.decoder" type="audio/raw">
-            <Alias name="OMX.google.raw.decoder" />
-            <Limit name="channel-count" max="8" />
-            <Limit name="sample-rate" ranges="8000-96000" />
-            <Limit name="bitrate" range="1-10000000" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.flac.decoder" type="audio/flac">
-            <Alias name="OMX.google.flac.decoder" />
-            <Limit name="channel-count" max="8" />
-            <Limit name="sample-rate" ranges="1-655350" />
-            <Limit name="bitrate" range="1-21000000" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.gsm.decoder" type="audio/gsm" domain="telephony">
-            <Alias name="OMX.google.gsm.decoder" />
-            <Limit name="channel-count" max="1" />
-            <Limit name="sample-rate" ranges="8000" />
-            <Limit name="bitrate" range="13000" />
-        </MediaCodec>
-        <MediaCodec name="c2.mtk.adpcm-ms.decoder" type="audio/x-adpcm-ms">
-            <Alias name="OMX.MTK.AUDIO.DECODER.ADPCM.MS" />
-            <Limit name="channel-count" max="8" />
-        </MediaCodec>
-        <MediaCodec name="c2.mtk.adpcm-dvi-ima.decoder" type="audio/x-adpcm-dvi-ima">
-            <Alias name="OMX.MTK.AUDIO.DECODER.ADPCM.DVI" />
-            <Limit name="channel-count" max="8" />
-        </MediaCodec>
-        <MediaCodec name="c2.mtk.alac.decoder" type="audio/alac">
-            <Alias name="OMX.MTK.AUDIO.DECODER.ALAC" />
-            <Limit name="channel-count" max="8" />
-        </MediaCodec>
-        <MediaCodec name="c2.mtk.wma.decoder" type="audio/x-ms-wma">
-            <Alias name="OMX.MTK.AUDIO.DECODER.WMA" />
-            <Limit name="channel-count" max="2" />
-        </MediaCodec>
-        <MediaCodec name="c2.mtk.mp3.decoder" type="audio/mpeg" rank="5">
-            <Alias name="OMX.MTK.AUDIO.DECODER.MP3" />
-            <Limit name="channel-count" max="2" />
-            <Limit name="sample-rate" ranges="8000,11025,12000,16000,22050,24000,32000,44100,48000" />
-            <Limit name="bitrate" range="8000-320000" />
-        </MediaCodec>
-        <MediaCodec name="c2.mtk.mpeg4.decoder" type="video/mp4v-es" >
-            <Alias name="OMX.MTK.VIDEO.DECODER.MPEG4" />
-             <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="size" min="16x16" max="2048x1088" />
-             <!-- max 2048x1088@60 -->
-            <Limit name="block-count" range="1-8704" />
-            <Limit name="blocks-per-second" range="1-522240" />
-            <Limit name="bitrate" range="1-60000000" />
-            <Feature name="adaptive-playback"/>
-            <Limit name="concurrent-instances" max="15" />
-            <Limit name="performance-point-1920x1088" value="30" />
-        </MediaCodec>
-        <MediaCodec name="c2.mtk.h263.decoder" type="video/3gpp" >
-            <Alias name="OMX.MTK.VIDEO.DECODER.H263" />
-            <Limit name="size" min="128x96" max="1408x1152" />
-            <Feature name="adaptive-playback"/>
-            <Limit name="concurrent-instances" max="15" />
-            <Limit name="performance-point-1280x720" value="30" />
-        </MediaCodec>
-        <MediaCodec name="c2.mtk.avc.decoder" type="video/avc" >
-            <Alias name="OMX.MTK.VIDEO.DECODER.AVC" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="size" min="64x64" max="4096x2176" />
-            <!-- max 4096x2176@30 -->
-            <Limit name="block-count" range="16-34816" />
-            <Limit name="blocks-per-second" range="16-1044480" />
-            <Limit name="bitrate" range="1-100000000" />
-            <Quirk name="wants-NAL-fragments" />
-            <Feature name="adaptive-playback"/>
-            <Limit name="concurrent-instances" max="15" />
-            <Limit name="performance-point-3840x2160" value="30" />
-        </MediaCodec>
-        <MediaCodec name="c2.mtk.avc.decoder.secure" type="video/avc" >
-            <Alias name="OMX.MTK.VIDEO.DECODER.AVC.secure" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="size" min="64x64" max="1920x1088" />
-            <!-- max 1920x1088@30 -->
-            <Limit name="block-count" range="16-8160" />
-            <Limit name="blocks-per-second" range="16-244800" />
-            <Limit name="bitrate" range="1-100000000" />
-            <Quirk name="wants-NAL-fragments" />
-            <Feature name="secure-playback" required="true" />
-            <Feature name="adaptive-playback"/>
-            <Limit name="concurrent-instances" max="1" />
-            <Limit name="performance-point-1920x1088" value="30" />
-        </MediaCodec>
-        <MediaCodec name="c2.mtk.hevc.decoder" type="video/hevc" >
-            <Alias name="OMX.MTK.VIDEO.DECODER.HEVC" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="size" min="16x16" max="4096x2176" />
-            <!-- max 4096x2176@30 -->
-            <Limit name="block-count" range="1-34816" />
-            <Limit name="blocks-per-second" range="1-1044480" />
-            <Limit name="bitrate" range="1-100000000" />
-            <Feature name="adaptive-playback"/>
-            <Limit name="concurrent-instances" max="15" />
-            <Limit name="performance-point-3840x2160" value="30" />
-        </MediaCodec>
-        <MediaCodec name="c2.mtk.hevc.decoder.secure" type="video/hevc" >
-            <Alias name="OMX.MTK.VIDEO.DECODER.HEVC.secure" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="size" min="16x16" max="1920x1088" />
-            <!-- max 1920x1088@30 -->
-            <Limit name="block-count" range="1-8160" />
-            <Limit name="blocks-per-second" range="1-244800" />
-            <Limit name="bitrate" range="1-100000000" />
-            <Feature name="secure-playback" required="true" />
-            <Feature name="adaptive-playback"/>
-            <Limit name="concurrent-instances" max="1" />
-            <Limit name="performance-point-1920x1088" value="30" />
-        </MediaCodec>
-        <MediaCodec name="c2.mtk.heif.decoder" type="image/vnd.android.heic" >
-            <Alias name="OMX.MTK.VIDEO.DECODER.HEIF" />
-            <Limit name="size" min="16x16" max="16383x16383" />
-            <Feature name="adaptive-playback"/>
-            <Limit name="concurrent-instances" max="15" />
-            <Limit name="performance-point-3840x2160" value="30" />
-        </MediaCodec>
-        <MediaCodec name="c2.mtk.vp9.decoder" type="video/x-vnd.on2.vp9" >
-            <Alias name="OMX.MTK.VIDEO.DECODER.VP9" />
-            <Limit name="alignment" value="1x1" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="size" min="16x16" max="4096x2176" />
-            <!-- max 4096x2176@30 -->
-            <Limit name="block-count" range="1-34816" />
-            <Limit name="blocks-per-second" range="1-1044480" />
-            <Limit name="bitrate" range="1-100000000" />
-            <Feature name="adaptive-playback"/>
-            <Limit name="concurrent-instances" max="15" />
-            <Limit name="performance-point-3840x2160" value="30" />
-        </MediaCodec>
-        <MediaCodec name="c2.mtk.vp9.decoder.secure" type="video/x-vnd.on2.vp9" >
-            <Alias name="OMX.MTK.VIDEO.DECODER.VP9.secure" />
-            <Limit name="alignment" value="1x1" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="size" min="16x16" max="1920x1088" />
-            <!-- max 1920x1088@30 -->
-            <Limit name="block-count" range="1-8160" />
-            <Limit name="blocks-per-second" range="1-244800" />
-            <Limit name="bitrate" range="1-100000000" />
-            <Quirk name="wants-NAL-fragments" />
-            <Feature name="secure-playback" required="true" />
-            <Feature name="adaptive-playback"/>
-            <Limit name="concurrent-instances" max="1" />
-            <Limit name="performance-point-1920x1088" value="30" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.mpeg4.decoder" type="video/mp4v-es" update="true">
-            <Alias name="OMX.google.mpeg4.decoder" />
-            <!-- profiles and levels:  ProfileSimple : Level3 -->
-            <Limit name="size" min="2x2" max="352x288" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" range="12-11880" />
-            <Limit name="bitrate" range="1-384000" />
-            <Feature name="adaptive-playback" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.h263.decoder" type="video/3gpp" update="true">
-            <Alias name="OMX.google.h263.decoder" />
-            <!-- profiles and levels:  ProfileBaseline : Level30, ProfileBaseline : Level45
-                    ProfileISWV2 : Level30, ProfileISWV2 : Level45 -->
-            <Limit name="size" min="2x2" max="352x288" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="bitrate" range="1-384000" />
-            <Feature name="adaptive-playback" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.avc.decoder" type="video/avc" update="true">
-            <Alias name="OMX.google.h264.decoder" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="size" min="2x2" max="1920x1088" />
-            <!-- profiles and levels:  ProfileHigh : Level51 -->
-            <Limit name="block-count" range="1-16384" />
-            <Limit name="blocks-per-second" range="1-986400" />
-            <Limit name="bitrate" range="1-40000000" />
-            <Feature name="adaptive-playback" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.hevc.decoder" type="video/hevc" update="true">
-            <Alias name="OMX.google.hevc.decoder" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="8x8" />
-            <Limit name="size" min="2x2" max="1920x1088" />
-            <!-- profiles and levels:  ProfileMain : MainTierLevel51 -->
-            <Limit name="block-count" range="1-65536" />
-            <Limit name="blocks-per-second" range="1-491520" />
-            <Limit name="bitrate" range="1-5000000" />
-            <Feature name="adaptive-playback" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
-            <Alias name="OMX.google.vp8.decoder" />
-            <Limit name="size" min="2x2" max="2048x2048" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="block-count" range="1-8192" /> <!-- max 2048x1024 -->
-                <Limit name="blocks-per-second" range="1-1000000" />
-                <Limit name="bitrate" range="1-40000000" />
-            <Feature name="adaptive-playback" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
-            <Alias name="OMX.google.vp9.decoder" />
-            <Limit name="alignment" value="1x1" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="size" min="2x2" max="1280x1280" />
-                <Limit name="block-count" range="1-3600" /> <!-- max 1280x720 -->
-                <Limit name="blocks-per-second" range="1-108000" />
-                <Limit name="bitrate" range="1-5000000" />
-            <Feature name="adaptive-playback" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.av1.decoder" type="video/av01" update="true">
-            <Limit name="size" min="2x2" max="1920x1088" />
-            <Limit name="alignment" value="1x1" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="block-count" range="1-8160" />
-            <Limit name="blocks-per-second" range="1-244800" />
-            <Limit name="bitrate" range="1-120000000" />
-            <Feature name="adaptive-playback" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.av1-dav1d.decoder" type="video/av01" update="true">
-            <Limit name="size" min="2x2" max="1920x1088" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="block-count" range="1-8160" /><!-- max 1920x1088 -->
-            <Limit name="blocks-per-second" range="1-244800" />
-            <Limit name="bitrate" range="1-40000000" />
-            <Feature name="adaptive-playback" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.mpeg2.decoder" type="video/mpeg2" domain="tv" update="true">
-            <Alias name="OMX.google.mpeg2.decoder" />
-            <!-- profiles and levels:  ProfileMain : LevelHL -->
-            <Limit name="size" min="16x16" max="1920x1088" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" range="1-244800" />
-            <Limit name="bitrate" range="1-20000000" />
-            <Feature name="adaptive-playback" />
-        </MediaCodec>
-    </Decoders>
-    <Encoders>
-        <MediaCodec name="c2.android.aac.encoder" type="audio/mp4a-latm">
-            <Alias name="OMX.google.aac.encoder" />
-            <Limit name="channel-count" max="6" />
-            <Limit name="sample-rate" ranges="8000,11025,12000,16000,22050,24000,32000,44100,48000" />
-            <!-- also may support 64000, 88200  and 96000 Hz -->
-            <Limit name="bitrate" range="8000-960000" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.amrnb.encoder" type="audio/3gpp">
-            <Alias name="OMX.google.amrnb.encoder" />
-            <Limit name="channel-count" max="1" />
-            <Limit name="sample-rate" ranges="8000" />
-            <Limit name="bitrate" range="4750-12200" />
-            <Feature name="bitrate-modes" value="CBR" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.amrwb.encoder" type="audio/amr-wb">
-            <Alias name="OMX.google.amrwb.encoder" />
-            <Limit name="channel-count" max="1" />
-            <Limit name="sample-rate" ranges="16000" />
-            <Limit name="bitrate" range="6600-23850" />
-            <Feature name="bitrate-modes" value="CBR" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.flac.encoder" type="audio/flac">
-            <Alias name="OMX.google.flac.encoder" />
-            <Limit name="channel-count" max="2" />
-            <Limit name="sample-rate" ranges="1-655350" />
-            <Limit name="bitrate" range="1-21000000" />
-            <Limit name="complexity" range="0-8"  default="5" />
-            <Feature name="bitrate-modes" value="CQ" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.opus.encoder" type="audio/opus">
-            <Limit name="channel-count" max="2" />
-            <Limit name="sample-rate" ranges="8000,12000,16000,24000,48000" />
-            <Limit name="bitrate" range="500-512000" />
-            <Limit name="complexity" range="0-10"  default="5" />
-            <Feature name="bitrate-modes" value="CBR" />
-        </MediaCodec>
-        <MediaCodec name="c2.mtk.avc.encoder" type="video/avc" >
-            <Alias name="OMX.MTK.VIDEO.ENCODER.AVC" />
-            <Limit name="size" min="160x128" max="3840x2176" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <!-- max 4096x2176@30 -->
-            <Limit name="block-count" range="80-32640" />
-            <Limit name="blocks-per-second" range="80-979200" />
-            <Limit name="bitrate" range="1-100000000" />
-            <Limit name="concurrent-instances" max="10" />
-            <Limit name="performance-point-3840x2160" value="30" />
-        </MediaCodec>
-        <MediaCodec name="c2.mtk.avc.encoder.secure" type="video/avc" >
-            <Limit name="size" min="160x128" max="3840x2176" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <!-- max 4096x2176@30 -->
-            <Limit name="block-count" range="80-34816" />
-            <Limit name="blocks-per-second" range="80-1044480" />
-            <Limit name="bitrate" range="1-100000000" />
-            <Limit name="concurrent-instances" max="10" />
-            <Limit name="performance-point-3840x2160" value="30" />
-            <Feature name="special-codec" required="true" />
-        </MediaCodec>
-        <MediaCodec name="c2.mtk.hevc.encoder" type="video/hevc" >
-            <Alias name="OMX.MTK.VIDEO.ENCODER.HEVC" />
-            <Limit name="size" min="160x128" max="3840x2176" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <!-- max 3840x217@30 -->
-            <Limit name="block-count" range="80-32640" />
-            <Limit name="blocks-per-second" range="80-979200" />
-            <Limit name="bitrate" range="1-100000000" />
-            <Limit name="quality" range="0-100" default="50" />
-            <Limit name="concurrent-instances" max="10" />
-            <Feature name="bitrate-modes" value="VBR,CBR,CQ" />
-            <Limit name="performance-point-3840x2160" value="30" />
-        </MediaCodec>
-        <MediaCodec name="c2.mtk.hevc.encoder.secure" type="video/hevc" >
-            <Limit name="size" min="160x128" max="3840x2160" />
-           <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <!-- max 3840x2160@30 -->
-            <Limit name="block-count" range="80-34816" />
-            <Limit name="blocks-per-second" range="80-1044480" />
-            <Limit name="bitrate" range="1-100000000" />
-            <Limit name="quality" range="0-100" default="50" />
-            <Limit name="concurrent-instances" max="10" />
-            <Feature name="bitrate-modes" value="VBR,CBR,CQ" />
-            <Limit name="performance-point-3840x2160" value="30" />
-            <Feature name="special-codec" required="true" />
-        </MediaCodec>
-        <MediaCodec name="c2.mtk.heif.encoder" type="image/vnd.android.heic" >
-            <Alias name="OMX.MTK.VIDEO.ENCODER.HEIF" />
-            <Limit name="size" min="160x128" max="16383x16383" />
-            <Limit name="alignment" value="16x16" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="quality" range="0-100" default="50" />
-            <Limit name="concurrent-instances" max="16" />
-            <Feature name="bitrate-modes" value="VBR,CBR,CQ" />
-            <Limit name="performance-point-3840x2160" value="30" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.av1.encoder" type="video/av01" update="true" enabled="false" minsdk="34">
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="size" min="2x2" max="720x720" />
-            <Limit name="block-count" range="1-1350" /> <!-- max 720x480 -->
-            <Limit name="bitrate" range="1-5000000" />
-            <Limit name="quality" range="0-100"  default="80" />
-            <Limit name="complexity" range="0-5"  default="0" />
-            <Feature name="bitrate-modes" value="VBR,CBR,CQ" />
-            <Attribute name="software-codec" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.h263.encoder" type="video/3gpp" update="true">
-            <Alias name="OMX.google.h263.encoder" />
-            <!-- profiles and levels:  ProfileBaseline : Level45 -->
-            <Limit name="size" min="176x144" max="176x144" />
-            <Limit name="alignment" value="16x16" />
-            <Limit name="bitrate" range="1-128000" />
-            <Attribute name="software-codec" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.mpeg4.encoder" type="video/mp4v-es" update="true">
-            <Alias name="OMX.google.mpeg4.encoder" />
-            <!-- profiles and levels:  ProfileCore : Level2 -->
-            <Limit name="size" min="16x16" max="176x144" />
-            <Limit name="alignment" value="16x16" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" range="12-1485" />
-            <Limit name="bitrate" range="1-64000" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.avc.encoder" type="video/avc" update="true">
-            <Alias name="OMX.google.h264.encoder" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="size" min="16x16" max="1808x1808" />
-                <!-- profiles and levels:  ProfileBaseline : Level3 -->
-                <Limit name="block-count" range="1-1620" />
-                <Limit name="blocks-per-second" range="1-40500" />
-                <Limit name="bitrate" range="1-12000000" />
-            <Feature name="intra-refresh" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
-            <Alias name="OMX.google.vp8.encoder" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="size" min="2x2" max="720x720" />
-                <!-- profiles and levels:  ProfileMain : Level_Version0-3 -->
-                <Limit name="block-count" range="1-3600" /> <!-- max 1280x720 -->
-                <Limit name="bitrate" range="1-20000000" />
-            <Feature name="bitrate-modes" value="VBR,CBR" />
-            <Attribute name="software-codec" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.hevc.encoder" type="video/hevc" update="true">
-            <!-- profiles and levels:  ProfileMain : MainTierLevel51 -->
-            <Limit name="size" min="2x2" max="512x512" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="8x8" />
-            <Limit name="block-count" range="1-4096" /> <!-- max 512x512 -->
-            <Limit name="blocks-per-second" range="1-122880" />
-            <Limit name="frame-rate" range="1-300" />
-            <Limit name="bitrate" range="1-10000000" />
-            <Limit name="complexity" range="0-10"  default="0" />
-            <Limit name="quality" range="0-100"  default="80" />
-            <Feature name="bitrate-modes" value="VBR,CBR,CQ" />
-            <Attribute name="software-codec" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.vp9.encoder" type="video/x-vnd.on2.vp9" update="true" enabled="false">
-            <Alias name="OMX.google.vp9.encoder" />
-            <!-- profiles and levels:  ProfileMain : Level_Version0-3 -->
-            <Limit name="size" min="2x2" max="2048x2048" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <!-- 2016 devices can encode at about 8fps at this block count -->
-            <Limit name="block-count" range="1-3600" /> <!-- max 1280x720 -->
-            <Limit name="bitrate" range="1-40000000" />
-            <Feature name="bitrate-modes" value="VBR,CBR" />
-        </MediaCodec>
-    </Encoders>
-</MediaCodecs>
diff --git a/proprietary/vendor/etc/media_codecs_performance.xml b/proprietary/vendor/etc/media_codecs_performance.xml
deleted file mode 100644
index 69b506a..0000000
--- a/proprietary/vendor/etc/media_codecs_performance.xml
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright (C) 2012 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!--
-<!DOCTYPE MediaCodecs [
-<!ELEMENT MediaCodecs (Decoders,Encoders)>
-<!ELEMENT Decoders (MediaCodec*)>
-<!ELEMENT Encoders (MediaCodec*)>
-<!ELEMENT MediaCodec (Type*,Quirk*)>
-<!ATTLIST MediaCodec name CDATA #REQUIRED>
-<!ATTLIST MediaCodec type CDATA>
-<!ELEMENT Type EMPTY>
-<!ATTLIST Type name CDATA #REQUIRED>
-<!ELEMENT Quirk EMPTY>
-<!ATTLIST Quirk name CDATA #REQUIRED>
-]>
-
-There's a simple and a complex syntax to declare the availability of a
-media codec:
-
-A codec that properly follows the OpenMax spec and therefore doesn't have any
-quirks and that only supports a single content type can be declared like so:
-
-    <MediaCodec name="OMX.foo.bar" type="something/interesting" />
-
-If a codec has quirks OR supports multiple content types, the following syntax
-can be used:
-
-    <MediaCodec name="OMX.foo.bar" >
-        <Type name="something/interesting" />
-        <Type name="something/else" />
-        ...
-        <Quirk name="requires-allocate-on-input-ports" />
-        <Quirk name="requires-allocate-on-output-ports" />
-        <Quirk name="output-buffers-are-unreadable" />
-    </MediaCodec>
-
-Only the three quirks included above are recognized at this point:
-
-"requires-allocate-on-input-ports"
-    must be advertised if the component does not properly support specification
-    of input buffers using the OMX_UseBuffer(...) API but instead requires
-    OMX_AllocateBuffer to be used.
-
-"requires-allocate-on-output-ports"
-    must be advertised if the component does not properly support specification
-    of output buffers using the OMX_UseBuffer(...) API but instead requires
-    OMX_AllocateBuffer to be used.
-
-"output-buffers-are-unreadable"
-    must be advertised if the emitted output buffers of a decoder component
-    are not readable, i.e. use a custom format even though abusing one of
-    the official OMX colorspace constants.
-    Clients of such decoders will not be able to access the decoded data,
-    naturally making the component much less useful. The only use for
-    a component with this quirk is to render the output to the screen.
-    Audio decoders MUST NOT advertise this quirk.
-    Video decoders that advertise this quirk must be accompanied by a
-    corresponding color space converter for thumbnail extraction,
-    matching surfaceflinger support that can render the custom format to
-    a texture and possibly other code, so just DON'T USE THIS QUIRK.
-
-    2012/07/13 config for MTK OMX Media Codecs, created by Morris Yang (mtk03147)
--->
-
-<MediaCodecs>
-    <Encoders>
-        <!-- MTK codec -->
-        <MediaCodec name="c2.mtk.mpeg4.encoder" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="1033-2272" />
-        </MediaCodec>
-        <MediaCodec name="c2.mtk.h263.encoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="970-2134" />
-        </MediaCodec>
-        <MediaCodec name="c2.mtk.avc.encoder" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="55-122" />
-            <Limit name="measured-frame-rate-720x480" range="142-312" />
-            <Limit name="measured-frame-rate-1280x720" range="64-141" />
-      <Limit name="measured-frame-rate-1920x1080" range="30-66" />
-        </MediaCodec>
-        <MediaCodec name="c2.mtk.hevc.encoder" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="45-99" />
-            <Limit name="measured-frame-rate-720x480" range="57-126" />
-            <Limit name="measured-frame-rate-1280x0720" range="53-117" />
-            <Limit name="measured-frame-rate-3840x2160" range="13-29" />
-        </MediaCodec>
-        <!-- Google codec -->
-        <MediaCodec name="c2.android.avc.encoder" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="101-223" />
-            <Limit name="measured-frame-rate-720x480" range="118-259" />
-            <Limit name="measured-frame-rate-1280x720" range="21-46" />
-            <Limit name="measured-frame-rate-1920x1080" range="13-29" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.hevc.encoder" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="54-119" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.h263.encoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="275-605" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.mpeg4.encoder" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="263-579" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="140-308" />
-            <Limit name="measured-frame-rate-640x360" range="69-151" />
-            <Limit name="measured-frame-rate-1280x720" range="29-64" />
-            <Limit name="measured-frame-rate-1920x1080" range="9-20" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.av1.encoder" type="video/av01" update="true">
-            <Limit name="measured-frame-rate-320x240" range="100-219" />
-            <Limit name="measured-frame-rate-720x480" range="59-129" />
-        </MediaCodec>
-    </Encoders>
-    <Decoders>
-        <!-- MTK codec -->
-        <MediaCodec name="c2.mtk.mpeg4.decoder" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="304-670" />
-            <Limit name="measured-frame-rate-480x360" range="142-312" />
-            <Limit name="measured-frame-rate-1280x720" range="45-98" />
-        </MediaCodec>
-        <MediaCodec name="c2.mtk.h263.decoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="266-585" />
-            <Limit name="measured-frame-rate-352x288" range="167-367" />
-        </MediaCodec>
-        <MediaCodec name="c2.mtk.avc.decoder" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="346-761" />
-            <Limit name="measured-frame-rate-720x480" range="124-272" />
-            <Limit name="measured-frame-rate-1280x720" range="186-409" />
-            <Limit name="measured-frame-rate-1920x1080" range="113-248" />
-        </MediaCodec>
-         <MediaCodec name="c2.mtk.hevc.decoder" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-352x288" range="266-585" />
-            <Limit name="measured-frame-rate-640x360" range="187-412" />
-            <Limit name="measured-frame-rate-720x480" range="169-371" />
-            <Limit name="measured-frame-rate-1280x720" range="315-693" />
-            <Limit name="measured-frame-rate-1920x1080" range="95-209" />
-            <Limit name="measured-frame-rate-3840x2160" range="35-76" />
-        </MediaCodec>
-        <MediaCodec name="c2.mtk.vpx.decoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="34-75" />
-            <Limit name="measured-frame-rate-640x360" range="32-71" />
-            <Limit name="measured-frame-rate-1280x720" range="56-123" />
-            <Limit name="measured-frame-rate-1920x1080" range="23-51" />
-        </MediaCodec>
-        <MediaCodec name="c2.mtk.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
-            <Limit name="measured-frame-rate-320x180" range="163-359" />
-            <Limit name="measured-frame-rate-640x360" range="119-261" />
-            <Limit name="measured-frame-rate-1280x720" range="139-305" />
-            <Limit name="measured-frame-rate-1920x1080" range="45-98" />
-            <Limit name="measured-frame-rate-3840x2160" range="29-63" />
-        </MediaCodec>
-        <!-- Google codec -->
-        <MediaCodec name="c2.android.mpeg4.decoder" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="739-1625" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.h263.decoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="603-1327" />
-            <Limit name="measured-frame-rate-352x288" range="345-759" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.avc.decoder" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="110-243" />
-            <Limit name="measured-frame-rate-720x480" range="151-332" />
-            <Limit name="measured-frame-rate-1280x720" range="91-201" />
-            <Limit name="measured-frame-rate-1920x1080" range="47-104" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.hevc.decoder" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-352x288" range="114-250" />
-            <Limit name="measured-frame-rate-640x360" range="120-265" />
-            <Limit name="measured-frame-rate-720x480" range="197-434" />
-            <Limit name="measured-frame-rate-1280x720" range="39-85" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="360-792" />
-            <Limit name="measured-frame-rate-640x360" range="177-390" />
-            <Limit name="measured-frame-rate-1280x720" range="64-140" />
-            <Limit name="measured-frame-rate-1920x1080" range="30-49" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
-            <Limit name="measured-frame-rate-320x180" range="220-484" />
-            <Limit name="measured-frame-rate-640x360" range="383-842" />
-            <Limit name="measured-frame-rate-1280x720" range="52-115" />
-            <Limit name="measured-frame-rate-1920x1080" range="29-64" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.av1.decoder" type="video/av01" update="true">
-            <Limit name="measured-frame-rate-352x288" range="284-626" />
-            <Limit name="measured-frame-rate-640x360" range="188-415" />
-            <Limit name="measured-frame-rate-720x480" range="135-298" />
-            <Limit name="measured-frame-rate-1280x720" range="64-142" />
-        </MediaCodec>
-        <MediaCodec name="c2.android.av1-dav1d.decoder" type="video/av01" update="true">
-            <Limit name="measured-frame-rate-352x288" range="284-625" />
-            <Limit name="measured-frame-rate-640x360" range="275-605" />
-            <Limit name="measured-frame-rate-720x480" range="261-575" />
-            <Limit name="measured-frame-rate-1280x720" range="198-436" />
-       </MediaCodec>
-    </Decoders>
-</MediaCodecs>