diff --git a/audio/audio_effects.xml b/audio/audio_effects.xml
index 6c66329..e8efa99 100644
--- a/audio/audio_effects.xml
+++ b/audio/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="jdsp" path="libjamesdsp.so"/>
         <library name="spatializer" path="libspatialaudio.so"/>
         <library name="misoundfx" path="libmisoundfx.so"/>
     </libraries>
@@ -92,7 +91,6 @@
         <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="jamesdsp" library="jdsp" uuid="f27317f4-c984-4de6-9a90-545759495bf2"/>
         <effect name="spatializer" library="spatializer" uuid="cc4677de-ff72-11eb-9a03-0242ac130003"/>
         <effect name="misoundfx" library="misoundfx" uuid="5b8e36a5-144a-4c38-b1d7-0002a5d5c51b"/>
         </effects>
diff --git a/device.mk b/device.mk
index ffd48df..75c7703 100644
--- a/device.mk
+++ b/device.mk
@@ -12,9 +12,6 @@ ifeq ($(Vendor_Dolby),true)
 $(call inherit-product, vendor/dolby/dolby.mk)
 endif
 
-# JamesDSP
-$(call inherit-product, packages/apps/JamesDSPManager/config.mk)
-
 # Enable project quotas and casefolding for emulated storage without sdcardfs
 $(call inherit-product, $(SRC_TARGET_DIR)/product/emulated_storage.mk)
 
diff --git a/sepolicy/vendor/audioserver.te b/sepolicy/vendor/audioserver.te
index 4d98ed6..8b13789 100644
--- a/sepolicy/vendor/audioserver.te
+++ b/sepolicy/vendor/audioserver.te
@@ -1,4 +1 @@
-get_prop(audioserver, vendor_audio_prop)
 
-allow audioserver unlabeled:file { read write open getattr };
-allow hal_audio_default hal_audio_default:process { execmem };
diff --git a/vendorsetup.sh b/vendorsetup.sh
index fe0b8db..2df8bdf 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -9,6 +9,3 @@ git clone https://github.com/crdroidandroid/android_kernel_qcom_sm8350.git -b 14
 
 # Clone prebuilt kernel
 git clone https://github.com/Arijit78/device_xiaomi_stone-kernel.git -b 14 device/xiaomi/stone-kernel
-
-# Clone JamesDSP
-git clone https://github.com/Arijit78/packages_apps_JamesDSPManager.git -b udc packages/apps/JamesDSPManager