diff --git a/Android.mk b/Android.mk
index 6153aaf..ff2b358 100644
--- a/Android.mk
+++ b/Android.mk
@@ -18,28 +18,4 @@ LOCAL_PATH := $(call my-dir)
ifeq ($(TARGET_DEVICE),sanders)
-include $(CLEAR_VARS)
-LOCAL_MODULE := daxService
-LOCAL_MODULE_OWNER := motorola
-LOCAL_SRC_FILES := proprietary/product/priv-app/daxService/daxService.apk
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := APPS
-LOCAL_DEX_PREOPT := false
-LOCAL_MODULE_SUFFIX := .apk
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_PRODUCT_SPECIFIC := true
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := MotoDolbyV3
-LOCAL_MODULE_OWNER := motorola
-LOCAL_SRC_FILES := proprietary/app/MotoDolbyV3/MotoDolbyV3.apk
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := APPS
-LOCAL_DEX_PREOPT := false
-LOCAL_MODULE_SUFFIX := .apk
-include $(BUILD_PREBUILT)
-
endif
diff --git a/proprietary/app/MotoDolbyV3/MotoDolbyV3.apk b/proprietary/app/MotoDolbyV3/MotoDolbyV3.apk
deleted file mode 100644
index 07a88bc..0000000
Binary files a/proprietary/app/MotoDolbyV3/MotoDolbyV3.apk and /dev/null differ
diff --git a/proprietary/etc/permissions/com.dolby.daxservice.xml b/proprietary/etc/permissions/com.dolby.daxservice.xml
deleted file mode 100644
index 6b8bd09..0000000
--- a/proprietary/etc/permissions/com.dolby.daxservice.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/proprietary/etc/permissions/com.motorola.dolby.dolbyui.features.xml b/proprietary/etc/permissions/com.motorola.dolby.dolbyui.features.xml
deleted file mode 100644
index 59f14d9..0000000
--- a/proprietary/etc/permissions/com.motorola.dolby.dolbyui.features.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/proprietary/etc/sysconfig/hiddenapi-whitelist-com.motorola.dolby.dolbyui.xml b/proprietary/etc/sysconfig/hiddenapi-whitelist-com.motorola.dolby.dolbyui.xml
deleted file mode 100644
index 3c55a12..0000000
--- a/proprietary/etc/sysconfig/hiddenapi-whitelist-com.motorola.dolby.dolbyui.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/proprietary/product/priv-app/daxService/daxService.apk b/proprietary/product/priv-app/daxService/daxService.apk
deleted file mode 100644
index 97cbd17..0000000
Binary files a/proprietary/product/priv-app/daxService/daxService.apk and /dev/null differ
diff --git a/proprietary/vendor/bin/hw/vendor.dolby.hardware.dms@1.0-service b/proprietary/vendor/bin/hw/vendor.dolby.hardware.dms@1.0-service
deleted file mode 100644
index 351b12f..0000000
Binary files a/proprietary/vendor/bin/hw/vendor.dolby.hardware.dms@1.0-service and /dev/null differ
diff --git a/proprietary/vendor/etc/dolby/dax-default.xml b/proprietary/vendor/etc/dolby/dax-default.xml
deleted file mode 100644
index 2de3baf..0000000
--- a/proprietary/vendor/etc/dolby/dax-default.xml
+++ /dev/null
@@ -1,1171 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - 16
- - 48
- - 48
- - 16
- - -16
- - -80
- - -112
- - -112
- - -112
- - -112
- - -112
- - -112
- - -80
- - -80
- - -80
- - -16
- - 16
- - 48
- - 48
- - 48
-
-
-
-
- - 3
- - 48
- - 48
- - -6
- - -16
- - -48
- - -48
- - -144
- - -144
- - -144
- - -144
- - -144
- - -144
- - -144
- - -144
- - -144
- - -144
- - -144
- - -144
- - -144
-
-
-
-
- - -144
- - -144
- - 10
- - -80
- - -112
- - -112
- - -80
- - -16
- - 48
- - 48
- - 16
- - -3
- - -16
- - -16
- - -48
- - -96
- - -144
- - -144
- - -144
- - -144
-
-
-
-
- - -48
- - -48
- - -48
- - -48
- - -48
- - -48
- - -48
- - -48
- - -48
- - -48
- - -48
- - -48
- - -48
- - -48
- - -48
- - -48
- - -48
- - -48
- - -48
- - -48
-
-
-
-
- - 0
- - 0
- - 0
- - 0
- - 0
- - 0
- - 0
- - 0
- - 0
- - 0
- - 0
- - 0
- - 0
- - 0
- - 0
- - 0
- - 0
- - 0
- - 0
- - 0
-
-
-
-
diff --git a/proprietary/vendor/etc/init/vendor.dolby.hardware.dms@1.0-service.rc b/proprietary/vendor/etc/init/vendor.dolby.hardware.dms@1.0-service.rc
deleted file mode 100644
index 558b937..0000000
--- a/proprietary/vendor/etc/init/vendor.dolby.hardware.dms@1.0-service.rc
+++ /dev/null
@@ -1,6 +0,0 @@
-service dms-hal-1-0 /vendor/bin/hw/vendor.dolby.hardware.dms@1.0-service
- class hal
- user media
- group audio media
-on boot
- mkdir /data/vendor/dolby 0770 media media
diff --git a/proprietary/vendor/lib/libdapparamstorage.so b/proprietary/vendor/lib/libdapparamstorage.so
deleted file mode 100644
index 9d11c7f..0000000
Binary files a/proprietary/vendor/lib/libdapparamstorage.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libstagefrightdolby.so b/proprietary/vendor/lib/libstagefrightdolby.so
deleted file mode 100644
index 357759e..0000000
Binary files a/proprietary/vendor/lib/libstagefrightdolby.so and /dev/null differ
diff --git a/proprietary/vendor/lib/soundfx/libswdap.so b/proprietary/vendor/lib/soundfx/libswdap.so
deleted file mode 100644
index f575340..0000000
Binary files a/proprietary/vendor/lib/soundfx/libswdap.so and /dev/null differ
diff --git a/proprietary/vendor/lib/vendor.dolby.hardware.dms@1.0.so b/proprietary/vendor/lib/vendor.dolby.hardware.dms@1.0.so
deleted file mode 100644
index b90c96f..0000000
Binary files a/proprietary/vendor/lib/vendor.dolby.hardware.dms@1.0.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libdapparamstorage.so b/proprietary/vendor/lib64/libdapparamstorage.so
deleted file mode 100644
index 5174dfa..0000000
Binary files a/proprietary/vendor/lib64/libdapparamstorage.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libdlbdsservice.so b/proprietary/vendor/lib64/libdlbdsservice.so
deleted file mode 100644
index 5ed890f..0000000
Binary files a/proprietary/vendor/lib64/libdlbdsservice.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/soundfx/libswdap.so b/proprietary/vendor/lib64/soundfx/libswdap.so
deleted file mode 100644
index c9c7ce6..0000000
Binary files a/proprietary/vendor/lib64/soundfx/libswdap.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/vendor.dolby.hardware.dms@1.0-impl.so b/proprietary/vendor/lib64/vendor.dolby.hardware.dms@1.0-impl.so
deleted file mode 100644
index e99e877..0000000
Binary files a/proprietary/vendor/lib64/vendor.dolby.hardware.dms@1.0-impl.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/vendor.dolby.hardware.dms@1.0.so b/proprietary/vendor/lib64/vendor.dolby.hardware.dms@1.0.so
deleted file mode 100644
index c960215..0000000
Binary files a/proprietary/vendor/lib64/vendor.dolby.hardware.dms@1.0.so and /dev/null differ
diff --git a/sanders-vendor.mk b/sanders-vendor.mk
index f9b1146..b0d032f 100644
--- a/sanders-vendor.mk
+++ b/sanders-vendor.mk
@@ -1447,24 +1447,6 @@ PRODUCT_COPY_FILES += \
vendor/motorola/sanders/proprietary/vendor/radio/qcril_database/upgrade/3_version_qcrildb.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/3_version_qcrildb.sql \
vendor/motorola/sanders/proprietary/vendor/radio/qcril_database/upgrade/4_version_qcrildb.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/4_version_qcrildb.sql
-# MotoDolby
-PRODUCT_COPY_FILES += \
- vendor/motorola/sanders/proprietary/etc/permissions/com.motorola.dolby.dolbyui.features.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/com.motorola.dolby.dolbyui.features.xml \
- vendor/motorola/sanders/proprietary/etc/sysconfig/hiddenapi-whitelist-com.motorola.dolby.dolbyui.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/hiddenapi-whitelist-com.motorola.dolby.dolbyui.xml \
- vendor/motorola/sanders/proprietary/etc/permissions/com.dolby.daxservice.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/com.dolby.daxservice.xml \
- vendor/motorola/sanders/proprietary/vendor/bin/hw/vendor.dolby.hardware.dms@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.dolby.hardware.dms@1.0-service \
- vendor/motorola/sanders/proprietary/vendor/etc/init/vendor.dolby.hardware.dms@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.dolby.hardware.dms@1.0-service.rc \
- vendor/motorola/sanders/proprietary/vendor/etc/dolby/dax-default.xml:$(TARGET_COPY_OUT_VENDOR)/etc/dolby/dax-default.xml \
- vendor/motorola/sanders/proprietary/vendor/lib/libdapparamstorage.so:$(TARGET_COPY_OUT_VENDOR)/lib/libdapparamstorage.so \
- vendor/motorola/sanders/proprietary/vendor/lib/libstagefrightdolby.so:$(TARGET_COPY_OUT_VENDOR)/lib/libstagefrightdolby.so \
- vendor/motorola/sanders/proprietary/vendor/lib/vendor.dolby.hardware.dms@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.dolby.hardware.dms@1.0.so \
- vendor/motorola/sanders/proprietary/vendor/lib/soundfx/libswdap.so:$(TARGET_COPY_OUT_VENDOR)/lib/soundfx/libswdap.so \
- vendor/motorola/sanders/proprietary/vendor/lib64/libdapparamstorage.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdapparamstorage.so \
- vendor/motorola/sanders/proprietary/vendor/lib64/libdlbdsservice.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdlbdsservice.so \
- vendor/motorola/sanders/proprietary/vendor/lib64/soundfx/libswdap.so:$(TARGET_COPY_OUT_VENDOR)/lib64/soundfx/libswdap.so \
- vendor/motorola/sanders/proprietary/vendor/lib64/vendor.dolby.hardware.dms@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.dolby.hardware.dms@1.0-impl.so \
- vendor/motorola/sanders/proprietary/vendor/lib64/vendor.dolby.hardware.dms@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.dolby.hardware.dms@1.0.so
-
PRODUCT_PACKAGES += \
vendor.qti.hardware.fm@1.0 \
libqct_resampler \
@@ -1480,6 +1462,4 @@ PRODUCT_PACKAGES += \
qcrilmsgtunnel \
TimeService \
WfdCommon \
- daxService \
- MotoDolbyV3 \
com.fingerprints.extension