Index: uspace/lib/usb/hcd.c
===================================================================
--- uspace/lib/usb/hcd.c	(revision 34586183a2d535f280f5801720405357ee9da806)
+++ uspace/lib/usb/hcd.c	(revision b8a3cda7a0bb2e2ea3eeb8a5d2368d8d10f4963b)
@@ -314,18 +314,6 @@
     usb_transaction_handle_t *handle)
 {
-	usb_transaction_handle_t h;
-	int rc = ipc_call_sync_2_1(hcd_phone,
-	    IPC_M_USB_HCD_CONTROL_WRITE_STATUS,
-	    target.address, target.endpoint,
-	    &h);
-	if (rc != EOK) {
-		return rc;
-	}
-	
-	if (handle != NULL) {
-		*handle = h;
-	}
-	
-	return rc;
+	return prep_receive_data(hcd_phone, IPC_M_USB_HCD_CONTROL_WRITE_STATUS,
+	    target, 0, handle);
 }
 
@@ -345,18 +333,6 @@
     usb_transaction_handle_t *handle)
 {
-	usb_transaction_handle_t h;
-	int rc = ipc_call_sync_2_1(hcd_phone,
-	    IPC_M_USB_HCD_CONTROL_READ_STATUS,
-	    target.address, target.endpoint,
-	    &h);
-	if (rc != EOK) {
-		return rc;
-	}
-	
-	if (handle != NULL) {
-		*handle = h;
-	}
-	
-	return rc;
+	return send_buffer(hcd_phone, IPC_M_USB_HCD_CONTROL_READ_STATUS,
+	    target, NULL, 0, handle);
 }
 
Index: uspace/lib/usb/hcd.h
===================================================================
--- uspace/lib/usb/hcd.h	(revision 34586183a2d535f280f5801720405357ee9da806)
+++ uspace/lib/usb/hcd.h	(revision b8a3cda7a0bb2e2ea3eeb8a5d2368d8d10f4963b)
@@ -185,16 +185,4 @@
 	IPC_M_USB_HCD_CONTROLLER_FAILURE,
 	
-	
-	IPC_M_USB_HCD_INTERRUPT_OUT_DONE,
-	IPC_M_USB_HCD_INTERRUPT_IN_DONE,
-	
-	IPC_M_USB_HCD_CONTROL_WRITE_SETUP_DONE,
-	IPC_M_USB_HCD_CONTROL_WRITE_DATA_DONE,
-	IPC_M_USB_HCD_CONTROL_WRITE_STATUS_DONE,
-	
-	IPC_M_USB_HCD_CONTROL_READ_SETUP_DONE,
-	IPC_M_USB_HCD_CONTROL_READ_DATA_DONE,
-	IPC_M_USB_HCD_CONTROL_READ_STATUS_DONE,
-	
 	/* IPC_M_USB_HCD_ */
 } usb_hcd_callback_method_t;