diff --git a/right/src/usb_interfaces/usb_interface_basic_keyboard.c b/right/src/usb_interfaces/usb_interface_basic_keyboard.c
index 290959d..2203f1f 100644
--- a/right/src/usb_interfaces/usb_interface_basic_keyboard.c
+++ b/right/src/usb_interfaces/usb_interface_basic_keyboard.c
@@ -35,16 +35,13 @@ usb_status_t UsbBasicKeyboardAction(void)
 
 usb_status_t UsbBasicKeyboardCallback(class_handle_t handle, uint32_t event, void *param)
 {
-    usb_status_t error = kStatus_USB_Error;
+    usb_status_t error = kStatus_USB_Success;
 
     switch (event) {
         // This report is received when the report has been sent
         case kUSB_DeviceHidEventSendResponse:
-            error = kStatus_USB_Success;
-            break;
         case kUSB_DeviceHidEventRecvResponse:
         case kUSB_DeviceHidEventGetReport:
-            error = kStatus_USB_InvalidRequest;
             break;
         case kUSB_DeviceHidEventSetReport: {
             usb_device_hid_report_struct_t *report = (usb_device_hid_report_struct_t*)param;
@@ -70,20 +67,18 @@ usb_status_t UsbBasicKeyboardCallback(class_handle_t handle, uint32_t event, voi
         case kUSB_DeviceHidEventGetProtocol:
         case kUSB_DeviceHidEventSetIdle:
         case kUSB_DeviceHidEventSetProtocol:
-            break;
         default:
             break;
     }
-
     return error;
 }
 
 usb_status_t UsbBasicKeyboardSetConfiguration(class_handle_t handle, uint8_t configuration)
 {
-    return kStatus_USB_Error;
+    return kStatus_USB_Success;
 }
 
 usb_status_t UsbBasicKeyboardSetInterface(class_handle_t handle, uint8_t interface, uint8_t alternateSetting)
 {
-    return kStatus_USB_Error;
+    return kStatus_USB_Success;
 }
diff --git a/right/src/usb_interfaces/usb_interface_generic_hid.c b/right/src/usb_interfaces/usb_interface_generic_hid.c
index 446821e..5bd4569 100644
--- a/right/src/usb_interfaces/usb_interface_generic_hid.c
+++ b/right/src/usb_interfaces/usb_interface_generic_hid.c
@@ -15,7 +15,7 @@ static usb_status_t UsbReceiveData(void)
 
 usb_status_t UsbGenericHidCallback(class_handle_t handle, uint32_t event, void *param)
 {
-    usb_status_t error = kStatus_USB_Error;
+    usb_status_t error = kStatus_USB_Success;
 
     switch (event) {
         case kUSB_DeviceHidEventSendResponse:
@@ -28,22 +28,18 @@ usb_status_t UsbGenericHidCallback(class_handle_t handle, uint32_t event, void *
                               GenericHidOutBuffer,
                               USB_GENERIC_HID_OUT_BUFFER_LENGTH);
             UsbGenericHidActionCounter++;
-            return UsbReceiveData();
+            error = UsbReceiveData();
             break;
         case kUSB_DeviceHidEventGetReport:
         case kUSB_DeviceHidEventSetReport:
         case kUSB_DeviceHidEventRequestReportBuffer:
-            error = kStatus_USB_InvalidRequest;
-            break;
         case kUSB_DeviceHidEventGetIdle:
         case kUSB_DeviceHidEventGetProtocol:
         case kUSB_DeviceHidEventSetIdle:
         case kUSB_DeviceHidEventSetProtocol:
-            break;
         default:
             break;
     }
-
     return error;
 }
 
@@ -52,7 +48,7 @@ usb_status_t UsbGenericHidSetConfiguration(class_handle_t handle, uint8_t config
     if (USB_COMPOSITE_CONFIGURATION_INDEX == configuration) {
         return UsbReceiveData();
     }
-    return kStatus_USB_Error;
+    return kStatus_USB_Success;
 }
 
 usb_status_t UsbGenericHidSetInterface(class_handle_t handle, uint8_t interface, uint8_t alternateSetting)
@@ -60,5 +56,5 @@ usb_status_t UsbGenericHidSetInterface(class_handle_t handle, uint8_t interface,
     if (USB_GENERIC_HID_INTERFACE_INDEX == interface) {
         return UsbReceiveData();
     }
-    return kStatus_USB_Error;
+    return kStatus_USB_Success;
 }
diff --git a/right/src/usb_interfaces/usb_interface_media_keyboard.c b/right/src/usb_interfaces/usb_interface_media_keyboard.c
index 2fce4e9..9ea8eea 100644
--- a/right/src/usb_interfaces/usb_interface_media_keyboard.c
+++ b/right/src/usb_interfaces/usb_interface_media_keyboard.c
@@ -33,37 +33,31 @@ usb_status_t UsbMediaKeyboardAction(void)
 
 usb_status_t UsbMediaKeyboardCallback(class_handle_t handle, uint32_t event, void *param)
 {
-    usb_status_t error = kStatus_USB_Error;
+    usb_status_t error = kStatus_USB_Success;
 
     switch (event) {
         // This report is received when the report has been sent
         case kUSB_DeviceHidEventSendResponse:
-            error = kStatus_USB_Success;
-            break;
         case kUSB_DeviceHidEventRecvResponse:
         case kUSB_DeviceHidEventGetReport:
         case kUSB_DeviceHidEventSetReport:
         case kUSB_DeviceHidEventRequestReportBuffer:
-            error = kStatus_USB_InvalidRequest;
-            break;
         case kUSB_DeviceHidEventGetIdle:
         case kUSB_DeviceHidEventGetProtocol:
         case kUSB_DeviceHidEventSetIdle:
         case kUSB_DeviceHidEventSetProtocol:
-            break;
         default:
             break;
     }
-
     return error;
 }
 
 usb_status_t UsbMediaKeyboardSetConfiguration(class_handle_t handle, uint8_t configuration)
 {
-    return kStatus_USB_Error;
+    return kStatus_USB_Success;
 }
 
 usb_status_t UsbMediaKeyboardSetInterface(class_handle_t handle, uint8_t interface, uint8_t alternateSetting)
 {
-    return kStatus_USB_Error;
+    return kStatus_USB_Success;
 }
diff --git a/right/src/usb_interfaces/usb_interface_mouse.c b/right/src/usb_interfaces/usb_interface_mouse.c
index 34a8165..60861cd 100644
--- a/right/src/usb_interfaces/usb_interface_mouse.c
+++ b/right/src/usb_interfaces/usb_interface_mouse.c
@@ -33,37 +33,31 @@ usb_status_t usbMouseAction(void)
 
 usb_status_t UsbMouseCallback(class_handle_t handle, uint32_t event, void *param)
 {
-    usb_status_t error = kStatus_USB_Error;
+    usb_status_t error = kStatus_USB_Success;
 
     switch (event) {
         // This report is received when the report has been sent
         case kUSB_DeviceHidEventSendResponse:
-            error = kStatus_USB_Success;
-            break;
         case kUSB_DeviceHidEventRecvResponse:
         case kUSB_DeviceHidEventGetReport:
         case kUSB_DeviceHidEventSetReport:
         case kUSB_DeviceHidEventRequestReportBuffer:
-            error = kStatus_USB_InvalidRequest;
-            break;
         case kUSB_DeviceHidEventGetIdle:
         case kUSB_DeviceHidEventGetProtocol:
         case kUSB_DeviceHidEventSetIdle:
         case kUSB_DeviceHidEventSetProtocol:
-            break;
         default:
             break;
     }
-
     return error;
 }
 
 usb_status_t UsbMouseSetConfiguration(class_handle_t handle, uint8_t configuration)
 {
-    return kStatus_USB_Error;
+    return kStatus_USB_Success;
 }
 
 usb_status_t UsbMouseSetInterface(class_handle_t handle, uint8_t interface, uint8_t alternateSetting)
 {
-    return kStatus_USB_Error;
+    return kStatus_USB_Success;
 }
diff --git a/right/src/usb_interfaces/usb_interface_system_keyboard.c b/right/src/usb_interfaces/usb_interface_system_keyboard.c
index 7d741bd..747290b 100644
--- a/right/src/usb_interfaces/usb_interface_system_keyboard.c
+++ b/right/src/usb_interfaces/usb_interface_system_keyboard.c
@@ -33,37 +33,31 @@ usb_status_t UsbSystemKeyboardAction(void)
 
 usb_status_t UsbSystemKeyboardCallback(class_handle_t handle, uint32_t event, void *param)
 {
-    usb_status_t error = kStatus_USB_Error;
+    usb_status_t error = kStatus_USB_Success;
 
     switch (event) {
         // This report is received when the report has been sent
         case kUSB_DeviceHidEventSendResponse:
-            error = kStatus_USB_Success;
-            break;
         case kUSB_DeviceHidEventRecvResponse:
         case kUSB_DeviceHidEventGetReport:
         case kUSB_DeviceHidEventSetReport:
         case kUSB_DeviceHidEventRequestReportBuffer:
-            error = kStatus_USB_InvalidRequest;
-            break;
         case kUSB_DeviceHidEventGetIdle:
         case kUSB_DeviceHidEventGetProtocol:
         case kUSB_DeviceHidEventSetIdle:
         case kUSB_DeviceHidEventSetProtocol:
-            break;
         default:
             break;
     }
-
     return error;
 }
 
 usb_status_t UsbSystemKeyboardSetConfiguration(class_handle_t handle, uint8_t configuration)
 {
-    return kStatus_USB_Error;
+    return kStatus_USB_Success;
 }
 
 usb_status_t UsbSystemKeyboardSetInterface(class_handle_t handle, uint8_t interface, uint8_t alternateSetting)
 {
-    return kStatus_USB_Error;
+    return kStatus_USB_Success;
 }