diff --git a/right/src/buspal/bm_usb/composite.c b/right/src/buspal/bm_usb/composite.c
index 5307af0..aa60964 100644
--- a/right/src/buspal/bm_usb/composite.c
+++ b/right/src/buspal/bm_usb/composite.c
@@ -3,7 +3,6 @@
 #include "usb_device.h"
 
 #include "usb_device_class.h"
-//#include "usb_device_msc.h"
 #include "usb_device_hid.h"
 #include "usb_device_ch9.h"
 #include "usb_descriptor.h"
diff --git a/right/src/buspal/bm_usb/composite.h b/right/src/buspal/bm_usb/composite.h
index 72594b4..ca054be 100644
--- a/right/src/buspal/bm_usb/composite.h
+++ b/right/src/buspal/bm_usb/composite.h
@@ -1,7 +1,6 @@
 #ifndef __USB_DEVICE_COMPOSITE_H__
 #define __USB_DEVICE_COMPOSITE_H__ 1
 
-//#include "msc_disk.h"
 #include "hid_bootloader.h"
 #include "usb_device_config.h"
 
diff --git a/right/src/buspal/bm_usb/usb_descriptor.c b/right/src/buspal/bm_usb/usb_descriptor.c
index 12df75a..070c25f 100644
--- a/right/src/buspal/bm_usb/usb_descriptor.c
+++ b/right/src/buspal/bm_usb/usb_descriptor.c
@@ -4,7 +4,6 @@
 
 #include "usb_device_class.h"
 #include "usb_device_hid.h"
-//#include "usb_device_msc.h"
 #include "bootloader_hid_report_ids.h"
 
 #include "usb_descriptor.h"
diff --git a/right/src/buspal/bootloader/bl_context.h b/right/src/buspal/bootloader/bl_context.h
index e756785..db21716 100644
--- a/right/src/buspal/bootloader/bl_context.h
+++ b/right/src/buspal/bootloader/bl_context.h
@@ -5,7 +5,6 @@
 #include "bootloader/bl_peripheral.h"
 #include "memory.h"
 #include "packet/command_packet.h"
-//#include "bootloader/bl_command.h"
 #include "property.h"
 #include "command.h"
 
diff --git a/right/src/buspal/bootloader/bootloader.h b/right/src/buspal/bootloader/bootloader.h
index 6b1c63f..4095989 100644
--- a/right/src/buspal/bootloader/bootloader.h
+++ b/right/src/buspal/bootloader/bootloader.h
@@ -3,12 +3,7 @@
 
 #include "bootloader_common.h"
 #include "bootloader/bl_peripheral.h"
-//#include "bootloader/bl_command.h"
 #include "bootloader/bl_context.h"
-//#include "bootloader/bl_version.h"
-//#include "bootloader/bl_user_entry.h"
-//#include "bootloader/bl_peripheral_interface.h"
-//#include "bootloader/bl_shutdown_cleanup.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // Definitions
diff --git a/right/src/buspal/bootloader_common.h b/right/src/buspal/bootloader_common.h
index 58b5a6f..f8da0f5 100644
--- a/right/src/buspal/bootloader_common.h
+++ b/right/src/buspal/bootloader_common.h
@@ -11,7 +11,6 @@
 #include "fsl_common.h"
 
 #if defined(BOOTLOADER_HOST)
-//#include "blfwk/bootloader_config.h"
 #elif defined(BUSPAL)
 #include "../src/buspal_config.h"
 #else
diff --git a/right/src/buspal/command.c b/right/src/buspal/command.c
index 3d44a02..3b3a380 100644
--- a/right/src/buspal/command.c
+++ b/right/src/buspal/command.c
@@ -1,12 +1,8 @@
-//#include "memory/memory.h"
-//#include "property/property.h"
-//#include "utilities/fsl_assert.h"
 #include <string.h>
 #include <stdint.h>
 #include "command.h"
 #include "packet/serial_packet.h"
 #include "crc16.h"
-//#include "utilities/fsl_rtos_abstraction.h"
 
 #include "fsl_flash.h"
 #include "fsl_device_registers.h"
diff --git a/right/src/buspal/crc16.c b/right/src/buspal/crc16.c
index d845674..6771da0 100644
--- a/right/src/buspal/crc16.c
+++ b/right/src/buspal/crc16.c
@@ -1,7 +1,5 @@
 #include "bootloader_common.h"
 #include "crc16.h"
-//#include "utilities/fsl_assert.h"
-//#include "utilities/fsl_rtos_abstraction.h"
 
 #if !defined(BOOTLOADER_HOST)
 #include "fsl_device_registers.h"
diff --git a/right/src/buspal/microseconds/microseconds_pit.c b/right/src/buspal/microseconds/microseconds_pit.c
index 94bcb0c..fe31636 100644
--- a/right/src/buspal/microseconds/microseconds_pit.c
+++ b/right/src/buspal/microseconds/microseconds_pit.c
@@ -6,7 +6,6 @@
  */
 #include "microseconds/microseconds.h"
 #include <stdarg.h>
-//#include "bootloader_common.h"
 #include "bus_pal_hardware.h"
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/right/src/buspal/microseconds/microseconds_sysclk.c b/right/src/buspal/microseconds/microseconds_sysclk.c
index 44cdd24..387ce6b 100644
--- a/right/src/buspal/microseconds/microseconds_sysclk.c
+++ b/right/src/buspal/microseconds/microseconds_sysclk.c
@@ -4,7 +4,6 @@
  *
  * Notes: The driver configure sysclk as lifetime timer
  */
-//#include "bootloader_common.h"
 #include "microseconds/microseconds.h"
 #include "fsl_device_registers.h"
 #include <stdarg.h>
diff --git a/right/src/buspal/packet/command_packet.h b/right/src/buspal/packet/command_packet.h
index 916ac55..e06b160 100644
--- a/right/src/buspal/packet/command_packet.h
+++ b/right/src/buspal/packet/command_packet.h
@@ -1,7 +1,6 @@
 #if !defined(__COMMAND_PACKET_H__)
 #define __COMMAND_PACKET_H__
 
-//#include "bootloader_common.h"
 #include "stdint.h"
 
 //! @addtogroup packet
diff --git a/right/src/buspal/packet/serial_packet.c b/right/src/buspal/packet/serial_packet.c
index 76d608f..5ab9fa8 100644
--- a/right/src/buspal/packet/serial_packet.c
+++ b/right/src/buspal/packet/serial_packet.c
@@ -1,5 +1,4 @@
 #include <string.h>
-//#include "bootloader_common.h"
 #include "bootloader/bl_context.h"
 #include "bootloader/bootloader.h"
 #include "packet/command_packet.h"
@@ -7,11 +6,6 @@
 #include "fsl_common.h"
 #include "bl_peripheral.h"
 #include "crc16.h"
-//#include "utilities/fsl_assert.h"
-
-#ifndef BOOTLOADER_HOST
-#include "microseconds/microseconds.h"
-#endif
 
 //! @addtogroup packet
 //! @{
diff --git a/right/src/buspal/packet/serial_packet.h b/right/src/buspal/packet/serial_packet.h
index 4b155e5..d88d58e 100644
--- a/right/src/buspal/packet/serial_packet.h
+++ b/right/src/buspal/packet/serial_packet.h
@@ -4,7 +4,6 @@
 #include "bootloader_common.h"
 #include "bootloader/bl_peripheral.h"
 #include "command_packet.h"
-//#include "property/property.h"
 #include "stdbool.h"
 
 //! @addtogroup packet