diff --git a/audio/configs/audio_effects.conf b/audio/configs/audio_effects.conf
index 367d810..b109af8 100644
--- a/audio/configs/audio_effects.conf
+++ b/audio/configs/audio_effects.conf
@@ -54,9 +54,6 @@ libraries {
   shoebox {
     path /vendor/lib/soundfx/libshoebox.so
   }
-  dap {
-    path /vendor/lib/soundfx/libswdap.so
-  }
 }
 
 # Default pre-processing library. Add to audio_effect.conf "libraries" section if
@@ -269,10 +266,6 @@ effects {
     library shoebox
     uuid 1eab784c-1a36-4b2a-b7fc-e34c44cab89e
   }
-  dap {
-    library dap
-    uuid 6ab06da4-c516-4611-8166-452799218539
-  }
 }
 
 # additional effect from vendor
diff --git a/audio/configs/audio_effects.xml b/audio/configs/audio_effects.xml
index e079733..428fb53 100644
--- a/audio/configs/audio_effects.xml
+++ b/audio/configs/audio_effects.xml
@@ -41,7 +41,6 @@
         <library name="volume_listener" path="libvolumelistener.so"/>
         <library name="audiosphere" path="libasphere.so"/>
         <library name="shoebox" path="libshoebox.so"/>
-        <library name="dap" path="libswdap.so"/>
         <library name="spatializer" path="libswspatializer.so"/>
     </libraries>
     <effects>
@@ -90,9 +89,25 @@
         <effect name="notification_helper" library="volume_listener" uuid="0b776dde-0590-11e5-81ba-0025b32654a0"/>
         <effect name="audiosphere" library="audiosphere" uuid="184e62ab-2d19-4364-9d1b-c0a40733866c"/>
         <effect name="shoebox" library="shoebox" uuid="1eab784c-1a36-4b2a-b7fc-e34c44cab89e"/>
-        <effect name="dap" library="dap" uuid="6ab06da4-c516-4611-8166-452799218539"/>
         <effect name="spatializer" library="spatializer" uuid="ccd4cf09-a79d-46c2-9aae-06a1698d6c8f"/>
     </effects>
+    <postprocess>
+        <stream type="music">
+            <apply effect="music_helper"/>
+        </stream>
+        <stream type="ring">
+            <apply effect="ring_helper"/>
+        </stream>
+        <stream type="alarm">
+            <apply effect="alarm_helper"/>
+        </stream>
+        <stream type="voice_call">
+            <apply effect="voice_helper"/>
+        </stream>
+        <stream type="notification">
+            <apply effect="notification_helper"/>
+        </stream>
+    </postprocess>
     <preprocess>
         <stream type="voice_communication">
             <apply effect="aec"/>
diff --git a/common.mk b/common.mk
index 6313d09..202a69b 100644
--- a/common.mk
+++ b/common.mk
@@ -77,11 +77,8 @@ PRODUCT_PACKAGES += \
     libqcomvoiceprocessing \
     libqcompostprocbundle \
     libvolumelistener \
-    SamsungDAP \
     SamsungAudio
 
-TARGET_EXCLUDES_AUDIOFX := true
-
 PRODUCT_COPY_FILES += \
     $(COMMON_PATH)/audio/configs/audio_configs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_configs.xml \
     $(COMMON_PATH)/audio/configs/audio_configs_stock.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_configs_stock.xml \
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 4a007d2..6c013ab 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -109,7 +109,6 @@ vendor/lib/soundfx/libasphere.so
 vendor/lib/soundfx/libqcreverb.so
 vendor/lib/soundfx/libshoebox.so
 vendor/lib/soundfx/libqcbassboost.so
-vendor/lib/soundfx/libswdap.so
 vendor/lib/soundfx/libswspatializer.so
 vendor/lib64/soundfx/libqcvirt.so
 vendor/lib64/soundfx/libasphere.so
@@ -117,7 +116,6 @@ vendor/lib64/soundfx/libqcreverb.so
 vendor/lib64/soundfx/libshoebox.so
 vendor/lib64/soundfx/libqcbassboost.so
 vendor/lib64/soundfx/libswspatializer.so
-vendor/etc/dolby/dax-default.xml
 
 # Audio Firmware
 vendor/firmware/dax_param.bin