diff --git a/audio/audio_effects.xml b/audio/audio_effects.xml
index 38cf387..c87a464 100644
--- a/audio/audio_effects.xml
+++ b/audio/audio_effects.xml
@@ -42,15 +42,6 @@
         <library name="audiosphere" path="libasphere.so"/>
         <library name="shoebox" path="libshoebox.so"/>
         <library name="misoundfx" path="libmisoundfx.so"/>
-        <!--DOLBY DAP-->
-        <library name="dap" path="libhwdap.so"/>
-        <!--DOLBY END-->
-        <!--DOLBY GAME-->
-        <library name="gamedap" path="libswgamedap.so"/>
-        <!--DOLBY END-->
-        <!--DOLBY VQE-->
-        <library name="vqe" path="libswvqe.so"/>
-        <!--DOLBY END-->
     </libraries>
     <effects>
         <effectProxy name="bassboost" library="proxy" uuid="14804144-a5ee-4d24-aa88-0002a5d5c51b">
@@ -100,15 +91,6 @@
         <effect name="audiosphere" library="audiosphere" uuid="184e62ab-2d19-4364-9d1b-c0a40733866c"/>
         <effect name="shoebox" library="shoebox" uuid="1eab784c-1a36-4b2a-b7fc-e34c44cab89e"/>
         <effect name="misoundfx" library="misoundfx" uuid="5b8e36a5-144a-4c38-b1d7-0002a5d5c51b"/>
-        <!--DOLBY DAP-->
-        <effect name="dap" library="dap" uuid="9d4921da-8225-4f29-aefa-39537a04bcaa"/>
-        <!--DOLBY END-->
-        <!--DOLBY GAME-->
-        <effect name="gamedap" library="gamedap" uuid="3783c334-d3a0-4d13-874f-0032e5fb80e2"/>
-        <!--DOLBY END-->
-        <!--DOLBY VQE-->
-        <effect name="vqe" library="vqe" uuid="64a0f614-7fa4-48b8-b081-d59dc954616f"/>
-        <!--DOLBY END-->
     </effects>
     <postprocess>
         <stream type="music">
diff --git a/properties/vendor.prop b/properties/vendor.prop
index 2761cce..58d21d7 100644
--- a/properties/vendor.prop
+++ b/properties/vendor.prop
@@ -38,7 +38,7 @@ ro.qc.sdk.audio.fluencetype=none
 ro.qc.sdk.audio.ssr=false
 ro.vendor.audio.aiasst.support=true
 ro.vendor.audio.camera.loopback.support=true
-ro.vendor.audio.dolby.dax.support=true
+ro.vendor.audio.dolby.dax.support=false
 ro.vendor.audio.dolby.vision.support=true
 ro.vendor.audio.feature.fade=true
 ro.vendor.audio.feature.spatial=7
@@ -272,9 +272,6 @@ ro.vendor.xiaomi.bl.poll=true
 sys.displayfeature.entry.enable=true
 sys.displayfeature_hidl=true
 
-# Dolby
-ro.vendor.dolby.dax.version=DAX3_3.6.1.6_r1
-
 # DPM
 persist.vendor.dpm.vndr.feature=1
 persist.vendor.dpm.vndr.halservice.enable=1
diff --git a/proprietary-files.txt b/proprietary-files.txt
index f81dfa3..5bbd69e 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -103,25 +103,17 @@ vendor/lib64/vendor.qti.hardware.pal@1.0.so
 
 # Audio soundfx
 vendor/lib/soundfx/libasphere.so
-vendor/lib/soundfx/libhwdap.so
 vendor/lib/soundfx/libmisoundfx.so
 vendor/lib/soundfx/libqcompostprocbundle.so
 vendor/lib/soundfx/libqcomvisualizer.so
 vendor/lib/soundfx/libqcomvoiceprocessing.so
 vendor/lib/soundfx/libshoebox.so
-vendor/lib/soundfx/libswdap.so
-vendor/lib/soundfx/libswgamedap.so
-vendor/lib/soundfx/libswvqe.so
 vendor/lib64/soundfx/libasphere.so
-vendor/lib64/soundfx/libhwdap.so
 vendor/lib64/soundfx/libmisoundfx.so
 vendor/lib64/soundfx/libqcompostprocbundle.so
 vendor/lib64/soundfx/libqcomvisualizer.so
 vendor/lib64/soundfx/libqcomvoiceprocessing.so
 vendor/lib64/soundfx/libshoebox.so
-vendor/lib64/soundfx/libswdap.so
-vendor/lib64/soundfx/libswgamedap.so
-vendor/lib64/soundfx/libswvqe.so
 
 # Bluetooth
 vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti
@@ -432,16 +424,6 @@ vendor/lib64/libsdmextension.so
 vendor/lib64/libtestutils.so
 vendor/lib64/libtinyxml2_1.so
 
-# Dolby music
-vendor/bin/hw/vendor.dolby.hardware.dms@2.0-service
-vendor/etc/dolby/dax-default.xml
-vendor/etc/init/vendor.dolby.hardware.dms@2.0-service.rc
-vendor/etc/vintf/manifest/manifest_vendor.dolby.hardware.dms.xml
-vendor/lib/vendor.dolby.hardware.dms@2.0.so
-vendor/lib64/libdlbdsservice.so
-vendor/lib64/vendor.dolby.hardware.dms@2.0-impl.so
-vendor/lib64/vendor.dolby.hardware.dms@2.0.so
-
 # DPM
 system_ext/bin/dpmd
 system_ext/bin/tcmd