diff --git a/device.mk b/device.mk
index 7558023..708f233 100644
--- a/device.mk
+++ b/device.mk
@@ -156,6 +156,9 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     vendor.qti.hardware.capabilityconfigstore@1.0.vendor
 
+# DebugFS
+PRODUCT_SET_DEBUGFS_RESTRICTIONS := true
+
 # Display
 PRODUCT_PACKAGES += \
     android.hardware.graphics.composer@2.4.vendor \
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 26b59a6..0d23826 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -822,13 +822,3 @@ on property:vendor.opengles.version=*
 #Set gpu available frequencies property
 on property:vendor.gpu.available_frequencies=*
     setprop ro.vendor.gpu.available_frequencies ${vendor.gpu.available_frequencies}
-
-on property:sys.boot_completed=1 && property:ro.product.debugfs_restrictions.enabled=true && \
-   property:persist.dbg.keep_debugfs_mounted="" && property:ro.debuggable="1"
-   setprop persist.dbg.keep_debugfs_mounted 1
-
-on late-init && property:ro.build.type=user && property:ro.debuggable="1"
-    mount debugfs debugfs /sys/kernel/debug
-    chmod 0755 /sys/kernel/debug
-on property:sys.boot_completed=1 && property:ro.build.type=user && property:ro.debuggable="1"
-   chmod 0755 /sys/kernel/tracing