diff --git a/components/esp_matter_controller/esp_matter_controller_console.cpp b/components/esp_matter_controller/esp_matter_controller_console.cpp
index 2b9971619..4e7f68f08 100644
--- a/components/esp_matter_controller/esp_matter_controller_console.cpp
+++ b/components/esp_matter_controller/esp_matter_controller_console.cpp
@@ -38,7 +38,6 @@ using chip::Inet::IPAddress;
 using chip::Transport::PeerAddress;
 using esp_matter::controller::command_data_t;
 
-const static char *TAG = "esp_matter_controller";
 namespace esp_matter {
 
 namespace console {
diff --git a/device_hal/device/esp32_devkit_c/device.c b/device_hal/device/esp32_devkit_c/device.c
index fe7448418..f76c2e562 100644
--- a/device_hal/device/esp32_devkit_c/device.c
+++ b/device_hal/device/esp32_devkit_c/device.c
@@ -19,8 +19,6 @@
 #define LED_CHANNEL 0 /* LEDC_CHANNEL_0 */
 #define BUTTON_GPIO_PIN GPIO_NUM_0
 
-static const char *TAG = "device";
-
 led_driver_config_t led_driver_get_config()
 {
     led_driver_config_t config = {
diff --git a/device_hal/device/esp32c3_devkit_m/device.c b/device_hal/device/esp32c3_devkit_m/device.c
index fa8e7d1b3..15d93f8f3 100644
--- a/device_hal/device/esp32c3_devkit_m/device.c
+++ b/device_hal/device/esp32c3_devkit_m/device.c
@@ -19,7 +19,6 @@
 #define LED_CHANNEL 0 /* RMT_CHANNEL_0 */
 #define BUTTON_GPIO_PIN GPIO_NUM_9
 
-static const char *TAG = "device";
 
 led_driver_config_t led_driver_get_config()
 {
diff --git a/device_hal/device/esp32h2_devkit_c/device.c b/device_hal/device/esp32h2_devkit_c/device.c
index fa8e7d1b3..6d5982df6 100644
--- a/device_hal/device/esp32h2_devkit_c/device.c
+++ b/device_hal/device/esp32h2_devkit_c/device.c
@@ -19,8 +19,6 @@
 #define LED_CHANNEL 0 /* RMT_CHANNEL_0 */
 #define BUTTON_GPIO_PIN GPIO_NUM_9
 
-static const char *TAG = "device";
-
 led_driver_config_t led_driver_get_config()
 {
     led_driver_config_t config = {
diff --git a/device_hal/device/esp32s3_devkit_c/device.c b/device_hal/device/esp32s3_devkit_c/device.c
index ea9fb775c..b70e4af42 100644
--- a/device_hal/device/esp32s3_devkit_c/device.c
+++ b/device_hal/device/esp32s3_devkit_c/device.c
@@ -19,8 +19,6 @@
 #define LED_CHANNEL 0 /* RMT_CHANNEL_0 */
 #define BUTTON_GPIO_PIN GPIO_NUM_0
 
-static const char *TAG = "device";
-
 led_driver_config_t led_driver_get_config()
 {
     led_driver_config_t config = {
diff --git a/device_hal/device/hollow/device.c b/device_hal/device/hollow/device.c
index fa8e7d1b3..6d5982df6 100644
--- a/device_hal/device/hollow/device.c
+++ b/device_hal/device/hollow/device.c
@@ -19,8 +19,6 @@
 #define LED_CHANNEL 0 /* RMT_CHANNEL_0 */
 #define BUTTON_GPIO_PIN GPIO_NUM_9
 
-static const char *TAG = "device";
-
 led_driver_config_t led_driver_get_config()
 {
     led_driver_config_t config = {
diff --git a/device_hal/device/m5stack/device.c b/device_hal/device/m5stack/device.c
index defea4ed1..aad413bc2 100644
--- a/device_hal/device/m5stack/device.c
+++ b/device_hal/device/m5stack/device.c
@@ -19,8 +19,6 @@
 #define LED_CHANNEL 7 /* LEDC_CHANNEL_7 */
 #define BUTTON_GPIO_PIN 39 /* Left button on M5Stack */
 
-static const char *TAG = "device";
-
 led_driver_config_t led_driver_get_config()
 {
     led_driver_config_t config = {
diff --git a/docs/en/developing.rst b/docs/en/developing.rst
index fa8bf8afb..8706d68d0 100644
--- a/docs/en/developing.rst
+++ b/docs/en/developing.rst
@@ -54,7 +54,6 @@ For using VSCode for developement, please check `Developing in WSL <https://code
       git clone --recursive https://github.com/espressif/esp-idf.git
       cd esp-idf; git checkout v4.4.3; git submodule update --init --recursive;
       ./install.sh
-      source ./export.sh
       cd ..
 
 .. only:: esp32h2
@@ -64,7 +63,6 @@ For using VSCode for developement, please check `Developing in WSL <https://code
       git clone --recursive https://github.com/espressif/esp-idf.git
       cd esp-idf; git checkout 20949d444f; git submodule update --init --recursive;
       ./install.sh
-      source ./export.sh
       cd ..
 
 Cloning the esp-matter repository takes a while due to a lot of submodules in the upstream connectedhomeip,
@@ -72,6 +70,10 @@ so if you want to do a shallow clone use the following command:
 
 ::
 
+   cd esp-idf
+   source ./export.sh
+   cd ..
+
    git clone --depth 1 https://github.com/espressif/esp-matter.git
    cd esp-matter
    git submodule update --init --depth 1
@@ -83,6 +85,10 @@ To clone the esp-matter repository with all the submodules, use the following co
 
 ::
 
+   cd esp-idf
+   source ./export.sh
+   cd ..
+
    git clone --recursive https://github.com/espressif/esp-matter.git
    cd esp-matter
    ./install.sh