diff --git a/right/src/buspal/bm_usb/usb_descriptor.h b/right/src/buspal/bm_usb/usb_descriptor.h
index 8ab8392..d1fe334 100644
--- a/right/src/buspal/bm_usb/usb_descriptor.h
+++ b/right/src/buspal/bm_usb/usb_descriptor.h
@@ -1,5 +1,5 @@
 #ifndef __USB_DESCRIPTOR_H__
-#define __USB_DESCRIPTOR_H__ 1
+#define __USB_DESCRIPTOR_H__
 
 #include "bootloader_common.h"
 #include "usb_device_config.h"
@@ -20,15 +20,7 @@
 /* usb descritpor length */
 #define USB_DEVICE_DESCRIPTOR_LENGTH (18)
 
-#if (USB_DEVICE_CONFIG_HID == 0) && (USB_DEVICE_CONFIG_MSC == 1)
-#define USB_CONFIGURE_DESCRIPTOR_LENGTH (32) // 64, HID_only = 41, MSC_ONLY = 32
-#elif(USB_DEVICE_CONFIG_HID == 1) && (USB_DEVICE_CONFIG_MSC == 0)
 #define USB_CONFIGURE_DESCRIPTOR_LENGTH (41) // 64, HID_only = 41, MSC_ONLY = 32
-#elif(USB_DEVICE_CONFIG_HID == 1) && (USB_DEVICE_CONFIG_MSC == 1)
-#define USB_CONFIGURE_DESCRIPTOR_LENGTH (64) // 64, HID_only = 41, MSC_ONLY = 32
-#else
-#define USB_CONFIGURE_DESCRIPTOR_LENGTH (41) // 64, HID_only = 41, MSC_ONLY = 32
-#endif
 
 #define USB_HID_REPORT_DESC_SIZE (76)
 #define USB_HID_GENERIC_DESCRIPTOR_LENGTH (32)
@@ -43,27 +35,7 @@
 #define USB_STRING_COUNT (4)
 #define USB_LANGUAGE_COUNT (1)
 
-#if (USB_DEVICE_CONFIG_HID == 1) && (USB_DEVICE_CONFIG_MSC == 1)
-// HID + MSC composite device
 #define USB_HID_CONFIG_INDEX (USB_CONFIGURE_ONLY_DESCRIPTOR_LENGTH)
-#define USB_MSC_CONFIG_INDEX                                                                       \
-    (USB_HID_CONFIG_INDEX + 2 * USB_ENDPOINT_DESCRIPTOR_LENGTH + USB_INTERFACE_DESCRIPTOR_LENGTH + \
-     USB_HID_DESCRIPTOR_LENGTH)
-#elif(USB_DEVICE_CONFIG_HID == 1) && (USB_DEVICE_CONFIG_MSC == 0)
-// HID-Only device
-#define USB_HID_CONFIG_INDEX (USB_CONFIGURE_ONLY_DESCRIPTOR_LENGTH)
-#define USB_MSC_CONFIG_INDEX (0)
-#elif(USB_DEVICE_CONFIG_HID == 0) && (USB_DEVICE_CONFIG_MSC == 1)
-// MSC-only device
-#define USB_HID_CONFIG_INDEX (0)
-#define USB_MSC_CONFIG_INDEX (USB_CONFIGURE_ONLY_DESCRIPTOR_LENGTH)
-#else
-// No USB
-#define USB_HID_CONFIG_INDEX (USB_CONFIGURE_ONLY_DESCRIPTOR_LENGTH)
-#define USB_MSC_CONFIG_INDEX                                                                       \
-    (USB_HID_CONFIG_INDEX + 2 * USB_ENDPOINT_DESCRIPTOR_LENGTH + USB_INTERFACE_DESCRIPTOR_LENGTH + \
-     USB_HID_DESCRIPTOR_LENGTH)
-#endif
 
 #define HS_BULK_IN_PACKET_SIZE (512)
 #define HS_BULK_OUT_PACKET_SIZE (512)
@@ -83,13 +55,8 @@
 #define USB_MSC_BULK_OUT_ENDPOINT (4)
 #define USB_MSC_INTERFACE_COUNT (1)
 
-#if (USB_DEVICE_CONFIG_HID == 1) && (USB_DEVICE_CONFIG_MSC == 1)
-#define USB_HID_GENERIC_INTERFACE_INDEX (0)
-#define USB_MSC_INTERFACE_INDEX (1)
-#else
 #define USB_HID_GENERIC_INTERFACE_INDEX (0)
 #define USB_MSC_INTERFACE_INDEX (0)
-#endif
 
 // HID
 #define USB_HID_GENERIC_CONFIGURE_INDEX (1)
@@ -115,15 +82,7 @@
 #define HS_HID_GENERIC_INTERRUPT_IN_INTERVAL (0x04) /* 2^(4-1) = 1ms */
 #define FS_HID_GENERIC_INTERRUPT_IN_INTERVAL (0x01)
 
-#if (USB_DEVICE_CONFIG_HID == 1) && (USB_DEVICE_CONFIG_MSC == 1)
-#define USB_COMPOSITE_INTERFACE_COUNT (USB_HID_GENERIC_INTERFACE_COUNT + USB_MSC_INTERFACE_COUNT)
-#elif(USB_DEVICE_CONFIG_HID == 1) && (USB_DEVICE_CONFIG_MSC == 0)
 #define USB_COMPOSITE_INTERFACE_COUNT (USB_HID_GENERIC_INTERFACE_COUNT)
-#elif(USB_DEVICE_CONFIG_HID == 0) && (USB_DEVICE_CONFIG_MSC == 1)
-#define USB_COMPOSITE_INTERFACE_COUNT (USB_MSC_INTERFACE_COUNT)
-#else
-#define USB_COMPOSITE_INTERFACE_COUNT (USB_HID_GENERIC_INTERFACE_COUNT)
-#endif
 
 #define USB_COMPOSITE_CONFIGURE_INDEX (1)
 
@@ -131,15 +90,7 @@
 #define USB_STRING_DESCRIPTOR_0_LENGTH (0x02)
 #define USB_STRING_DESCRIPTOR_1_LENGTH (56)
 #define USB_STRING_DESCRIPTOR_2_LENGTH (40)
-#if ((USB_DEVICE_CONFIG_MSC > 0U) && (USB_DEVICE_CONFIG_HID > 0U)) // MSC + HID
-#define USB_STRING_DESCRIPTOR_3_LENGTH (60)
-#elif((USB_DEVICE_CONFIG_MSC == 0U) && (USB_DEVICE_CONFIG_HID > 0U)) // Only HID
 #define USB_STRING_DESCRIPTOR_3_LENGTH (44)
-#elif((USB_DEVICE_CONFIG_MSC > 0U) && (USB_DEVICE_CONFIG_HID == 0U)) // Only MSC
-#define USB_STRING_DESCRIPTOR_3_LENGTH (28)
-#else
-#define USB_STRING_DESCRIPTOR_3_LENGTH (2)
-#endif
 #define USB_STRING_DESCRIPTOR_ERROR_LENGTH (32)
 
 #define USB_CONFIGURE_DRAWN (0x32)
@@ -205,4 +156,4 @@ extern usb_language_list_t g_language_list;
 
 extern usb_language_list_t *g_language_ptr;
 
-#endif /* __USB_DESCRIPTOR_H__ */
+#endif