diff --git a/configs/media/media_codecs_performance_sdmmagpie_v1.xml b/configs/media/media_codecs_performance_sdmmagpie_v1.xml
index cb12b7d..5a7f33a 100644
--- a/configs/media/media_codecs_performance_sdmmagpie_v1.xml
+++ b/configs/media/media_codecs_performance_sdmmagpie_v1.xml
@@ -34,16 +34,6 @@ limitations under the License.
-
-
-
-
-
-
-
-
-
-
@@ -92,15 +82,6 @@ limitations under the License.
-
-
-
-
-
-
-
-
-
diff --git a/configs/media/media_codecs_vendor_sdmmagpie_v1.xml b/configs/media/media_codecs_vendor_sdmmagpie_v1.xml
index 8c0b38c..7b6090b 100644
--- a/configs/media/media_codecs_vendor_sdmmagpie_v1.xml
+++ b/configs/media/media_codecs_vendor_sdmmagpie_v1.xml
@@ -89,12 +89,9 @@ Only the three quirks included above are recognized at this point:
|_____________|_________________________________________|
| h264 | 4096 2160 30 100 1036800 |
| hevc | 4096 2160 30 100 1036800 |
- | mpeg4-sw | 1920 1088 30 40 244800 |
| vp8 | 1920 1088 60 100 489600 |
| vp9 | 4096 2160 30 100 1036800 |
| | (4096) (2304) (30) (120) |
- | vc1 | 1920 1088 30 20 244800 |
- | h263-sw | 864 480 30 16 48600 |
| mpeg2 | 1920 1088 30 40 244800 |
|_____________|_________________________________________|
@@ -114,9 +111,7 @@ Only the three quirks included above are recognized at this point:
|__________|_________________________________________|
| h264 | 4096 2160 30 100 1036800 |
| hevc | 4096 2160 30 100 1036800 |
- | mpeg4-sw | 1280 720 30 4 108000 |
| vp8 | 1920 1088 60 40 489600 |
- | h263-sw | 864 480 30 2 48600 |
|__________|_________________________________________|
-->
@@ -126,7 +121,6 @@ Only the three quirks included above are recognized at this point:
-
@@ -206,39 +200,8 @@ Only the three quirks included above are recognized at this point:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -385,61 +348,6 @@ Only the three quirks included above are recognized at this point:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 2d6752c..c886fed 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -351,25 +351,19 @@ vendor/etc/init/vendor.qti.media.c2@1.0-service.rc
vendor/etc/init/vppservice.rc
vendor/etc/seccomp_policy/codec2.vendor.base.policy
vendor/etc/seccomp_policy/codec2.vendor.ext.policy
--vendor/lib/libMpeg4SwEncoder.so
-vendor/lib/libOmxAacDec.so
-vendor/lib/libOmxAlacDec.so
--vendor/lib/libOmxAlacDecSw.so
-vendor/lib/libOmxAmrDec.so
-vendor/lib/libOmxAmrwbplusDec.so
-vendor/lib/libOmxApeDec.so
--vendor/lib/libOmxApeDecSw.so
-vendor/lib/libOmxDsdDec.so
-vendor/lib/libOmxEvrcDec.so
-vendor/lib/libOmxQcelp13Dec.so
--vendor/lib/libOmxSwVdec.so
--vendor/lib/libOmxSwVencMpeg4.so
-vendor/lib/libOmxVpp.so
-vendor/lib/libOmxWmaDec.so
-vendor/lib/libdsd2pcm.so
-vendor/lib/libmmosal.so;MODULE=libmmosal_vendor
-vendor/lib/libqcodec2.so
--vendor/lib/libswvdec.so
-vendor/lib/libvppclient.so
-vendor/lib/libvpphvx.so
-vendor/lib/libvpplibrary.so
diff --git a/vendor.prop b/vendor.prop
index 553655a..4dc8e42 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -57,7 +57,6 @@ vendor.audio.feature.usb_offload.enable=true
vendor.audio.feature.usb_offload_sidetone_volume.enable=false
vendor.audio.feature.vbat.enable=true
vendor.audio.feature.wsa.enable=false
-vendor.audio.flac.sw.decoder.24bit=true
vendor.audio.hal.boot.timeout.ms=20000
vendor.audio_hal.in_period_size=144
vendor.audio_hal.period_multiplier=3