diff --git a/common.mk b/common.mk
index 0396ed8..b764826 100644
--- a/common.mk
+++ b/common.mk
@@ -310,10 +310,6 @@ PRODUCT_PACKAGES += \
     init.qti.media.rc \
     init.qti.media.sh
 
-PRODUCT_COPY_FILES += \
-    frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \
-    frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_telephony.xml
-
 PRODUCT_COPY_FILES += \
     frameworks/av/media/libstagefright/data/media_codecs_google_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_c2.xml \
     frameworks/av/media/libstagefright/data/media_codecs_google_c2_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_c2_audio.xml \
diff --git a/extract-files.sh b/extract-files.sh
index 2b465f2..1124808 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -73,6 +73,9 @@ function blob_fixup() {
         vendor/etc/media_codecs_c2_audio.xml)
             sed -i '/media_codecs_dolby_audio/d' "${2}"
             ;;
+        vendor/etc/media_codecs_cape.xml|vendor/etc/media_codecs_diwali_v0.xml|vendor/etc/media_codecs_diwali_v1.xml|vendor/etc/media_codecs_diwali_v2.xml|vendor/etc/media_codecs_taro.xml|vendor/etc/media_codecs_ukee.xml)
+            sed -i -E '/media_codecs_(google_audio|google_telephony|vendor_audio)/d' "${2}"
+            ;;
         vendor/etc/qcril_database/upgrade/config/6.0_config.sql)
             sed -i '/persist.vendor.radio.redir_party_num/ s/true/false/g' "${2}"
             ;;
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 79c393c..2834294 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -448,7 +448,6 @@ vendor/etc/media_codecs_performance_taro.xml
 vendor/etc/media_codecs_performance_ukee.xml
 vendor/etc/media_codecs_taro.xml
 vendor/etc/media_codecs_ukee.xml
-vendor/etc/media_codecs_vendor_audio.xml
 vendor/etc/media_diwali_v0/video_system_specs.json
 vendor/etc/media_diwali_v1/video_system_specs.json
 vendor/etc/media_diwali_v2/video_system_specs.json