diff --git a/configs/compatibility_matrix.xml b/configs/compatibility_matrix.xml
index f2cb5d5..3c73cda 100644
--- a/configs/compatibility_matrix.xml
+++ b/configs/compatibility_matrix.xml
@@ -55,14 +55,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="true">
-        <name>vendor.dolby.hardware.dms</name>
-        <version>1.0</version>
-        <interface>
-            <name>IDms</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="native" optional="false">
         <name>netutils-wrapper</name>
         <!--
diff --git a/configs/manifest.xml b/configs/manifest.xml
index 5aa9dc8..edf4b7b 100644
--- a/configs/manifest.xml
+++ b/configs/manifest.xml
@@ -538,14 +538,4 @@
             <instance>wifidisplayhdcphal</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>vendor.dolby.hardware.dms</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IDms</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@1.0::IDms/default</fqname>
-    </hal>
 </manifest>
diff --git a/configs/media/media_codecs_dolby_audio.xml b/configs/media/media_codecs_dolby_audio.xml
deleted file mode 100644
index 1235428..0000000
--- a/configs/media/media_codecs_dolby_audio.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2016 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
-
-     This file was modified by Dolby Laboratories, Inc. The portions of the
-     code that are surrounded by "DOLBY..." are copyrighted and
-     licensed separately, as follows:
-
-     (C) 2018 Dolby Laboratories, Inc.
-     All rights reserved.
-
-     This program is protected under international and U.S. Copyright laws as
-     an unpublished work. This program is confidential and proprietary to the
-     copyright owners. Reproduction or disclosure, in whole or in part, or the
-     production of derivative works therefrom without the express permission of
-     the copyright owners is prohibited.
--->
-
-<Included>
-    <Decoders>
-        <!-- DOLBY_UDC -->
-        <MediaCodec name="OMX.dolby.ac3.decoder" type="audio/ac3">
-            <Limit name="channel-count" max="6" />
-            <Limit name="sample-rate" ranges="32000,44100,48000" />
-            <Limit name="bitrate" range="32000-640000" />
-        </MediaCodec>
-        <MediaCodec name="OMX.dolby.eac3.decoder" type="audio/eac3">
-            <Limit name="channel-count" max="8" />
-            <Limit name="sample-rate" ranges="32000,44100,48000" />
-            <Limit name="bitrate" range="32000-6144000" />
-        </MediaCodec>
-        <!-- DOLBY_UDC END -->
-    </Decoders>
-</Included>
diff --git a/configs/media_codecs_vendor.xml b/configs/media_codecs_vendor.xml
index 5f32b9b..25a74ab 100644
--- a/configs/media_codecs_vendor.xml
+++ b/configs/media_codecs_vendor.xml
@@ -374,5 +374,4 @@ Only the three quirks included above are recognized at this point:
         </MediaCodec>
     </Decoders>
     <Include href="media_codecs_google_video.xml" />
-    <Include href="media_codecs_dolby_audio.xml" />
 </MediaCodecs>
diff --git a/device.mk b/device.mk
index aadebeb..e882b5f 100644
--- a/device.mk
+++ b/device.mk
@@ -274,8 +274,7 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml \
     $(LOCAL_PATH)/configs/media_profiles_8953_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_8953_v1.xml \
     $(LOCAL_PATH)/configs/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml \
-    $(LOCAL_PATH)/configs/media_profiles_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml \
-    $(LOCAL_PATH)/configs/media/media_codecs_dolby_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_dolby_audio.xml
+    $(LOCAL_PATH)/configs/media_profiles_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml
 
 PRODUCT_COPY_FILES += \
     frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \
diff --git a/vendor_prop.mk b/vendor_prop.mk
index 61e35dc..f6d987c 100644
--- a/vendor_prop.mk
+++ b/vendor_prop.mk
@@ -46,9 +46,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
     vendor.audio.tunnel.encode=false \
     ro.config.media_vol_steps=25 \
     vendor.use.voice.path.for.pcm.voip=false \
-    hpx_send_params=1 \
-    vendor.audio.dolby.ds2.enabled=true \
-    vendor.audio.dolby.ds2.hardbypass=false
+    hpx_send_params=1
 
 # Bluetooth
 PRODUCT_PROPERTY_OVERRIDES += \