diff --git a/conf/init.check_ap_pd_auth.sh b/conf/init.check_ap_pd_auth.sh
deleted file mode 100644
index 8175e754..00000000
--- a/conf/init.check_ap_pd_auth.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/vendor/bin/sh
-
-# This script sets up `ro.vendor.sjtag_ap_is_unlocked` for the non-fused
-# device. For a fused device, this property should be set by
-# betterbug->ss-restart-detector when PD is acquired.
-
-SJTAG_STATUS=0x$(cat /sys/devices/platform/sjtag_ap/interface/status)
-SOFT_LOCK_BIT=4
-AUTH_PASS_BIT=8
-
-# Unlocked or locked but auth passed.
-if test "$((SJTAG_STATUS & (1 << SOFT_LOCK_BIT)))" = 0 -o \
-    "$((SJTAG_STATUS & (1 << AUTH_PASS_BIT)))" != 0 ; then
-  setprop ro.vendor.sjtag_ap_is_unlocked true
-fi
diff --git a/conf/init.debug.rc b/conf/init.debug.rc
index f86f224b..019a514b 100644
--- a/conf/init.debug.rc
+++ b/conf/init.debug.rc
@@ -50,14 +50,3 @@ on property:persist.sys.device_provisioned=1 && property:ro.revision=PROTO1.1
     start vendor.force_pkvm
 on property:persist.sys.device_provisioned=1 && property:ro.revision=EVT1.0
     start vendor.force_pkvm
-
-service vendor.check_ap_pd_auth_sh /vendor/bin/init.check_ap_pd_auth.sh
-    class main
-    user root
-    group root system
-    oneshot
-
-# Enable etm/etm2dram when ramdump is enabled, and ap-sjtag is unlocked.
-on property:ro.boot.ramdump=enabled && property:ro.vendor.sjtag_ap_is_unlocked=true
-    write /sys/devices/platform/exynos-etm/etm_on 1
-    write /sys/devices/platform/etm2dram/arm 1
diff --git a/device.mk b/device.mk
index fef49dc2..a3f5f1d1 100644
--- a/device.mk
+++ b/device.mk
@@ -342,8 +342,7 @@ PRODUCT_COPY_FILES += \
 
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_COPY_FILES += \
-	device/google/zuma/conf/init.debug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.debug.rc \
-	device/google/zuma/conf/init.check_ap_pd_auth.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.check_ap_pd_auth.sh
+	device/google/zuma/conf/init.debug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.debug.rc
 PRODUCT_COPY_FILES += \
 	device/google/zuma/conf/init.freq.userdebug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.freq.userdebug.rc
 endif