diff --git a/common.mk b/common.mk
index 35e1755..55b9ea8 100644
--- a/common.mk
+++ b/common.mk
@@ -84,6 +84,8 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     SamsungDAP
 
+TARGET_EXCLUDES_AUDIOFX := true
+
 PRODUCT_COPY_FILES += \
     $(COMMON_PATH)/configs/audio/audio_configs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_configs.xml \
     $(COMMON_PATH)/configs/audio/audio_configs_stock.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_configs_stock.xml \
diff --git a/configs/audio/audio_effects.conf b/configs/audio/audio_effects.conf
index 6cfb41c..367d810 100644
--- a/configs/audio/audio_effects.conf
+++ b/configs/audio/audio_effects.conf
@@ -224,10 +224,6 @@ effects {
     library downmix
     uuid 93f04452-e4fe-41cc-91f9-e475b6d1d69f
   }
-  hw_acc {
-    library offload_bundle
-    uuid 7d1580bd-297f-4683-9239-e475b6d1d69f
-  }
   loudness_enhancer {
     library loudness_enhancer
     uuid fa415329-2034-4bea-b5dc-5b381c8d1e2c
diff --git a/configs/audio/audio_effects.xml b/configs/audio/audio_effects.xml
index ea32917..1e83989 100644
--- a/configs/audio/audio_effects.xml
+++ b/configs/audio/audio_effects.xml
@@ -78,7 +78,6 @@
             <libhw library="visualizer_hw" uuid="7a8044a0-1a71-11e3-a184-0002a5d5c51b"/>
         </effectProxy>
         <effect name="downmix" library="downmix" uuid="93f04452-e4fe-41cc-91f9-e475b6d1d69f"/>
-        <effect name="hw_acc" library="offload_bundle" uuid="7d1580bd-297f-4683-9239-e475b6d1d69f"/>
         <effect name="loudness_enhancer" library="loudness_enhancer" uuid="fa415329-2034-4bea-b5dc-5b381c8d1e2c"/>
         <effect name="dynamics_processing" library="dynamics_processing" uuid="e0e6539b-1781-7261-676f-6d7573696340"/>
         <effect name="aec" library="audio_pre_processing" uuid="0f8d0d2a-59e5-45fe-b6e4-248c8a799109"/>
diff --git a/vendor.prop b/vendor.prop
index 8aa5b47..1668656 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -42,7 +42,7 @@ vendor.audio.enable.mirrorlink=false
 persist.vendor.audio.voicecall.speaker.stereo=true
 vendor.audio.feature.spkr_prot.enable=true
 vendor.audio.feature.a2dp_offload.enable=true
-vendor.audio.feature.compr_voip.enable=true
+vendor.audio.feature.compr_voip.enable=false
 vendor.audio.feature.compress_meta_data.enable=true
 vendor.audio.feature.deepbuffer_as_primary.enable=true
 vendor.audio.feature.display_port.enable=true