diff --git a/components/bt/controller/lib_esp32c3_family b/components/bt/controller/lib_esp32c3_family
deleted file mode 160000
index 32f15e826a..0000000000
--- a/components/bt/controller/lib_esp32c3_family
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 32f15e826a102d2d64e612620468122ea2234a2e
diff --git a/components/esp_common/CMakeLists.txt b/components/esp_common/CMakeLists.txt
index c2b6586437..3f4ae7442f 100644
--- a/components/esp_common/CMakeLists.txt
+++ b/components/esp_common/CMakeLists.txt
@@ -17,7 +17,7 @@ else()
              "src/system_api.c")
 
     # IPC framework is not applicable if freertos unicore config is selected
-    if(NOT CONFIG_FREERTOS_UNICORE)
+    if(NOT CONFIG_FREERTOS_UNICORE OR CONFIG_APPTRACE_GCOV_ENABLE)
         list(APPEND srcs "src/ipc.c")
     endif()
 
diff --git a/components/esp_common/component.mk b/components/esp_common/component.mk
index 4d80bc4bf6..f8415111d8 100644
--- a/components/esp_common/component.mk
+++ b/components/esp_common/component.mk
@@ -7,7 +7,9 @@ COMPONENT_SRCDIRS := src
 
 # IPC framework is not applicable if freertos unicore config is selected
 ifdef CONFIG_FREERTOS_UNICORE
-COMPONENT_OBJEXCLUDE := src/ipc.o
+    ifndef CONFIG_APPTRACE_GCOV_ENABLE
+        COMPONENT_OBJEXCLUDE := src/ipc.o
+    endif
 endif
 
 # disable stack protection in files which are involved in initialization of that feature
diff --git a/components/tinyusb/tinyusb b/components/tinyusb/tinyusb
deleted file mode 160000
index 68f6ef6790..0000000000
--- a/components/tinyusb/tinyusb
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 68f6ef679000f9cd22b20af7473d7f0480d2862e
diff --git a/examples/peripherals/secure_element/atecc608_ecdsa/components/esp-cryptoauthlib b/examples/peripherals/secure_element/atecc608_ecdsa/components/esp-cryptoauthlib
deleted file mode 160000
index 36d0642e66..0000000000
--- a/examples/peripherals/secure_element/atecc608_ecdsa/components/esp-cryptoauthlib
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 36d0642e66ff5b1c7a291873f24c498ca6ffedef