diff --git a/components/bootloader/subproject/main/ld/esp32p4/bootloader.ld b/components/bootloader/subproject/main/ld/esp32p4/bootloader.ld
index 24a0d5239b..5544c2ca40 100644
--- a/components/bootloader/subproject/main/ld/esp32p4/bootloader.ld
+++ b/components/bootloader/subproject/main/ld/esp32p4/bootloader.ld
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 /**
- * TODO: IDF-8002
  * Simplified memory map for the bootloader.
  *  Make sure the bootloader can load into main memory without overwriting itself.
  *
diff --git a/components/freertos/FreeRTOS-Kernel-SMP/portable/riscv/port.c b/components/freertos/FreeRTOS-Kernel-SMP/portable/riscv/port.c
index 3bd684e44e..6ac5a10e4c 100644
--- a/components/freertos/FreeRTOS-Kernel-SMP/portable/riscv/port.c
+++ b/components/freertos/FreeRTOS-Kernel-SMP/portable/riscv/port.c
@@ -481,7 +481,6 @@ StackType_t *pxPortInitialiseStack(StackType_t *pxTopOfStack, TaskFunction_t pxC
 
     // Return the task's current stack pointer address which should point to the starting interrupt stack frame
     return (StackType_t *)uxStackPointer;
-    //TODO: IDF-2393
 }
 
 // ------------------- Hook Functions ----------------------
diff --git a/components/hal/esp32p4/include/hal/efuse_hal.h b/components/hal/esp32p4/include/hal/efuse_hal.h
index d50b1772cb..704635edbb 100644
--- a/components/hal/esp32p4/include/hal/efuse_hal.h
+++ b/components/hal/esp32p4/include/hal/efuse_hal.h
@@ -16,7 +16,6 @@
 extern "C" {
 #endif
 
-//TODO: IDF-7512
 /**
  * @brief get chip version
  */
diff --git a/components/hal/esp32p4/include/hal/rwdt_ll.h b/components/hal/esp32p4/include/hal/rwdt_ll.h
index 97f4fc21f1..f4f0599342 100644
--- a/components/hal/esp32p4/include/hal/rwdt_ll.h
+++ b/components/hal/esp32p4/include/hal/rwdt_ll.h
@@ -14,7 +14,6 @@ extern "C" {
 
 #include "hal/lpwdt_ll.h"
 
-//TODO: IDF-7539
 typedef lp_wdt_dev_t rwdt_dev_t;
 
 #define RWDT_DEV_GET() &LP_WDT
diff --git a/components/idf_test/include/esp32/idf_performance_target.h b/components/idf_test/include/esp32/idf_performance_target.h
index c222734ef4..ca772c685f 100644
--- a/components/idf_test/include/esp32/idf_performance_target.h
+++ b/components/idf_test/include/esp32/idf_performance_target.h
@@ -42,7 +42,7 @@
 
 #if !CONFIG_FREERTOS_SMP // IDF-5224
 #ifndef IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_FRHOST_4BIT
-#define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_FRHOST_4BIT                   11000   // TODO: IDF-5490
+#define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_FRHOST_4BIT                   11000
 #endif
 #else
 #ifndef IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_FRHOST_4BIT
diff --git a/components/soc/esp32c5/include/soc/system_reg.h b/components/soc/esp32c5/include/soc/system_reg.h
index 939bf695f0..9723cd0679 100644
--- a/components/soc/esp32c5/include/soc/system_reg.h
+++ b/components/soc/esp32c5/include/soc/system_reg.h
@@ -6,7 +6,6 @@
 
 #include "soc/hp_system_reg.h"
 
-// TODO: IDF-5720
 #include "soc/intpri_reg.h"
 #define SYSTEM_CPU_INTR_FROM_CPU_0_REG INTPRI_CPU_INTR_FROM_CPU_0_REG
 #define SYSTEM_CPU_INTR_FROM_CPU_0 INTPRI_CPU_INTR_FROM_CPU_0
diff --git a/components/soc/esp32c6/include/soc/system_reg.h b/components/soc/esp32c6/include/soc/system_reg.h
index 17cf94805e..dc7320e2a7 100644
--- a/components/soc/esp32c6/include/soc/system_reg.h
+++ b/components/soc/esp32c6/include/soc/system_reg.h
@@ -6,7 +6,6 @@
 
 #include "soc/hp_system_reg.h"
 
-// TODO: IDF-5720
 #include "soc/intpri_reg.h"
 #define SYSTEM_CPU_INTR_FROM_CPU_0_REG INTPRI_CPU_INTR_FROM_CPU_0_REG
 #define SYSTEM_CPU_INTR_FROM_CPU_0 INTPRI_CPU_INTR_FROM_CPU_0
diff --git a/components/soc/esp32h2/include/soc/system_reg.h b/components/soc/esp32h2/include/soc/system_reg.h
index b2cb6089ee..5ebbfa63b1 100644
--- a/components/soc/esp32h2/include/soc/system_reg.h
+++ b/components/soc/esp32h2/include/soc/system_reg.h
@@ -7,6 +7,5 @@
 #include "soc/hp_system_reg.h"
 #include "soc/intpri_reg.h"
 
-// ESP32H2-TODO : TODO: IDF-5720
 #define SYSTEM_CPU_INTR_FROM_CPU_0_REG INTPRI_CPU_INTR_FROM_CPU_0_REG
 #define SYSTEM_CPU_INTR_FROM_CPU_0 INTPRI_CPU_INTR_FROM_CPU_0