diff --git a/modules.load b/modules.load
index 5bb350f..b8a76ff 100644
--- a/modules.load
+++ b/modules.load
@@ -1,4 +1,3 @@
-spmi-pmic-arb-debug.ko
 msm_sysstats.ko
 twofish_generic.ko
 twofish_common.ko
@@ -61,7 +60,6 @@ usb_bam.ko
 memlat.ko
 memlat_scmi.ko
 cpufreq_stats_scmi.ko
-rimps_log.ko
 qcom_ramdump.ko
 panel_event_notifier.ko
 dmesg_dumper.ko
@@ -150,7 +148,6 @@ qti_userspace_cdev.ko
 sdpm_clk.ko
 qcom_edac.ko
 cpufreq_limit.ko
-qcom-cpufreq-hw-debug.ko
 qcom_lpm.ko
 sdhci-msm-sec.ko
 leds-qti-flash.ko
@@ -182,7 +179,6 @@ qcom-vadc-common.ko
 qti-glink-adc.ko
 industrialio-buffer-cb.ko
 nvmem_qfprom.ko
-icc-test.ko
 sec_arm64_fsimd_debug.ko
 sec_arm64_debug.ko
 sec_qc_rbcmd.ko
@@ -247,19 +243,6 @@ slimbus.ko
 slim-qcom-ngd-ctrl.ko
 hwmon.ko
 qti_amoled_ecm.ko
-coresight.ko
-coresight-tmc.ko
-coresight-funnel.ko
-coresight-replicator.ko
-coresight-stm.ko
-coresight-cti.ko
-coresight-tpda.ko
-coresight-tpdm.ko
-coresight-csr.ko
-coresight-dummy.ko
-coresight-remote-etm.ko
-coresight-tgu.ko
-coresight-hwevent.ko
 stm_core.ko
 stm_p_basic.ko
 stm_p_ost.ko
diff --git a/modules.load.recovery b/modules.load.recovery
index ff1b8b7..f927711 100644
--- a/modules.load.recovery
+++ b/modules.load.recovery
@@ -46,7 +46,6 @@ gunyah.ko
 mdt_loader.ko
 hwkm.ko
 icc-bcm-voter.ko
-icc-debug.ko
 iommu-logger.ko
 llcc-qcom.ko
 mem-hooks.ko
@@ -125,7 +124,6 @@ sec_qc_debug.ko
 sec_qc_summary.ko
 sec_qc_dbg_partition.ko
 sec_qc_param.ko
-spmi-pmic-arb-debug.ko
 msm_sysstats.ko
 twofish_generic.ko
 twofish_common.ko
@@ -157,7 +155,6 @@ debugcc-kalama.ko
 gpucc-kalama.ko
 bam_dma.ko
 msm_gpi.ko
-qcom_cpuss_sleep_stats.ko
 pdr_interface.ko
 qmi_helpers.ko
 heap_mem_ext_v01.ko
@@ -168,8 +165,6 @@ qsee_ipc_irq_bridge.ko
 glink_probe.ko
 glink_pkt.ko
 pmic_glink.ko
-qti_battery_debug.ko
-charger-ulog-glink.ko
 altmode-glink.ko
 pmic-glink-debug.ko
 soc_sleep_stats.ko
@@ -188,7 +183,6 @@ usb_bam.ko
 memlat.ko
 memlat_scmi.ko
 cpufreq_stats_scmi.ko
-rimps_log.ko
 qcom_ramdump.ko
 panel_event_notifier.ko
 dmesg_dumper.ko
@@ -203,7 +197,6 @@ spss_utils.ko
 spcom.ko
 msm_performance.ko
 qcom_va_minidump.ko
-hung_task_enh.ko
 qfprom-sys.ko
 wcd_usbss_i2c.ko
 qti-fixed-regulator.ko
@@ -213,7 +206,6 @@ hvc_gunyah.ko
 msm_geni_serial.ko
 frpc-adsprpc.ko
 rdbg.ko
-qcom_iommu_debug.ko
 lt9611uxc.ko
 qseecom_proxy.ko
 qcom-i2c-pmic.ko
@@ -234,7 +226,6 @@ phy-msm-m31-eusb2.ko
 dwc3-msm.ko
 ehset.ko
 lvstest.ko
-f_fs_ipc_log.ko
 usb_f_cdev.ko
 usb_f_ccid.ko
 usb_f_qdss.ko
@@ -277,7 +268,6 @@ qti_userspace_cdev.ko
 sdpm_clk.ko
 qcom_edac.ko
 cpufreq_limit.ko
-qcom-cpufreq-hw-debug.ko
 qcom_lpm.ko
 sdhci-msm-sec.ko
 leds-qti-flash.ko
@@ -309,7 +299,6 @@ qcom-vadc-common.ko
 qti-glink-adc.ko
 industrialio-buffer-cb.ko
 nvmem_qfprom.ko
-icc-test.ko
 sec_arm64_fsimd_debug.ko
 sec_arm64_debug.ko
 sec_qc_rbcmd.ko
@@ -374,19 +363,6 @@ slimbus.ko
 slim-qcom-ngd-ctrl.ko
 hwmon.ko
 qti_amoled_ecm.ko
-coresight.ko
-coresight-tmc.ko
-coresight-funnel.ko
-coresight-replicator.ko
-coresight-stm.ko
-coresight-cti.ko
-coresight-tpda.ko
-coresight-tpdm.ko
-coresight-csr.ko
-coresight-dummy.ko
-coresight-remote-etm.ko
-coresight-tgu.ko
-coresight-hwevent.ko
 stm_core.ko
 stm_p_basic.ko
 stm_p_ost.ko
diff --git a/modules.load.vendor_boot b/modules.load.vendor_boot
index 14c46e7..91d2ff9 100644
--- a/modules.load.vendor_boot
+++ b/modules.load.vendor_boot
@@ -46,7 +46,6 @@ gunyah.ko
 mdt_loader.ko
 hwkm.ko
 icc-bcm-voter.ko
-icc-debug.ko
 iommu-logger.ko
 llcc-qcom.ko
 mem-hooks.ko