diff --git a/legacy_tests/app_test_i2s_loopback/hid_report_descriptor.h b/legacy_tests/app_test_i2s_loopback/hid_report_descriptor.h
index 6ba8ea01..e0b185f8 100644
--- a/legacy_tests/app_test_i2s_loopback/hid_report_descriptor.h
+++ b/legacy_tests/app_test_i2s_loopback/hid_report_descriptor.h
@@ -5,8 +5,6 @@
 
 #include "xua_hid_report.h"
 
-#define USB_HID_REPORT_ID_CONSUMER  ( 0x02 )
-
 #if 0
 /* Existing static report descriptor kept for reference */
 unsigned char hidReportDescriptor[] =
@@ -79,7 +77,7 @@ static const USB_HID_Short_Item_t hidUsageConsumerControl   = {
 static const USB_HID_Report_Element_t hidReportPageConsumer     = {
     .item.header = HID_REPORT_SET_HEADER(1, HID_REPORT_ITEM_TYPE_GLOBAL, HID_REPORT_ITEM_TAG_USAGE_PAGE),
     .item.data = { USB_HID_USAGE_PAGE_ID_CONSUMER, 0x00 },
-    .location = HID_REPORT_SET_LOC( USB_HID_REPORT_ID_CONSUMER, 1, 0, 0 ) };
+    .location = HID_REPORT_SET_LOC( 0, 1, 0, 0 ) };
 
 /*
  * Define configurable items in the HID Report descriptor.
@@ -87,32 +85,32 @@ static const USB_HID_Report_Element_t hidReportPageConsumer     = {
 static USB_HID_Report_Element_t hidUsageByte0Bit5   = { 
     .item.header = HID_REPORT_SET_HEADER(1, HID_REPORT_ITEM_TYPE_LOCAL, HID_REPORT_ITEM_TAG_USAGE), 
     .item.data = { 0xE2, 0x00 }, 
-    .location = HID_REPORT_SET_LOC( USB_HID_REPORT_ID_CONSUMER, 0, 0, 5 ) 
+    .location = HID_REPORT_SET_LOC( 0, 0, 0, 5 ) 
 }; // Mute
 static USB_HID_Report_Element_t hidUsageByte0Bit4   = { 
     .item.header = HID_REPORT_SET_HEADER(1, HID_REPORT_ITEM_TYPE_LOCAL, HID_REPORT_ITEM_TAG_USAGE), 
     .item.data = { 0xEA, 0x00 }, 
-    .location = HID_REPORT_SET_LOC( USB_HID_REPORT_ID_CONSUMER, 0, 0, 4 ) 
+    .location = HID_REPORT_SET_LOC( 0, 0, 0, 4 ) 
 }; // Vol-
 static USB_HID_Report_Element_t hidUsageByte0Bit3   = { 
     .item.header = HID_REPORT_SET_HEADER(1, HID_REPORT_ITEM_TYPE_LOCAL, HID_REPORT_ITEM_TAG_USAGE), 
     .item.data = { 0xE9, 0x00 }, 
-    .location = HID_REPORT_SET_LOC( USB_HID_REPORT_ID_CONSUMER, 0, 0, 3 ) 
+    .location = HID_REPORT_SET_LOC( 0, 0, 0, 3 ) 
 }; // Vol+
 static USB_HID_Report_Element_t hidUsageByte0Bit2   = { 
     .item.header = HID_REPORT_SET_HEADER(1, HID_REPORT_ITEM_TYPE_LOCAL, HID_REPORT_ITEM_TAG_USAGE), 
     .item.data = { 0xB6, 0x00 }, 
-    .location = HID_REPORT_SET_LOC( USB_HID_REPORT_ID_CONSUMER, 0, 0, 2 ) 
+    .location = HID_REPORT_SET_LOC( 0, 0, 0, 2 ) 
 }; // Scan Prev
 static USB_HID_Report_Element_t hidUsageByte0Bit1   = { 
     .item.header = HID_REPORT_SET_HEADER(1, HID_REPORT_ITEM_TYPE_LOCAL, HID_REPORT_ITEM_TAG_USAGE), 
     .item.data = { 0xB5, 0x00 }, 
-    .location = HID_REPORT_SET_LOC( USB_HID_REPORT_ID_CONSUMER, 0, 0, 1 ) 
+    .location = HID_REPORT_SET_LOC( 0, 0, 0, 1 ) 
 }; // Scan Next
 static USB_HID_Report_Element_t hidUsageByte0Bit0   = { 
     .item.header = HID_REPORT_SET_HEADER(1, HID_REPORT_ITEM_TYPE_LOCAL, HID_REPORT_ITEM_TAG_USAGE), 
     .item.data = { 0xB0, 0x00 }, 
-    .location = HID_REPORT_SET_LOC( USB_HID_REPORT_ID_CONSUMER, 0, 0, 0 ) 
+    .location = HID_REPORT_SET_LOC( 0, 0, 0, 0 ) 
 }; // Play
 
 /*