Index: uspace/drv/bus/usb/xhci/commands.c
===================================================================
--- uspace/drv/bus/usb/xhci/commands.c	(revision 2e7692fe7de232b07538e1f035442086d174c02e)
+++ uspace/drv/bus/usb/xhci/commands.c	(revision eff60ca25b50ac6ae6a5a2689db949732c7c26c8)
@@ -408,6 +408,5 @@
 	command->slot_id = slot_id;
 
-	usb_log_debug2("Completed command trb:");
-	xhci_dump_trb(command_trb);
+	usb_log_debug2("Completed command trb: %s", xhci_trb_str_type(TRB_TYPE(*command_trb)));
 	if (TRB_TYPE(*command_trb) != XHCI_TRB_TYPE_NO_OP_CMD) {
 		if (code != XHCI_TRBC_SUCCESS) {
@@ -441,6 +440,5 @@
 		break;
 	default:
-		usb_log_debug2("Unsupported command trb.");
-		xhci_dump_trb(command_trb);
+		usb_log_debug2("Unsupported command trb: %s", xhci_trb_str_type(TRB_TYPE(*command_trb)));
 
 		command->completed = true;
@@ -451,6 +449,8 @@
 
 	if (!command->has_owner) {
+		usb_log_debug2("Command has no owner, deallocating.");
 		xhci_free_command(command);
 	} else {
+		usb_log_debug2("Command has owner, don't forget to deallocate!");
 		/* Copy the trb for later use so that we can free space on the cmd ring. */
 		command->trb = malloc32(sizeof(xhci_trb_t));
Index: uspace/drv/bus/usb/xhci/hc.c
===================================================================
--- uspace/drv/bus/usb/xhci/hc.c	(revision 2e7692fe7de232b07538e1f035442086d174c02e)
+++ uspace/drv/bus/usb/xhci/hc.c	(revision eff60ca25b50ac6ae6a5a2689db949732c7c26c8)
@@ -357,10 +357,7 @@
 	//       stuff, remove it.
 	xhci_cmd_t *cmd = xhci_alloc_command();
-	xhci_dump_state(hc);
 	xhci_send_no_op_command(hc, cmd);
 	xhci_wait_for_command(cmd, 1000000);
 	xhci_free_command(cmd);
-
-	xhci_dump_state(hc);
 
 	for (int i = 0; i < 10; ++i) {
@@ -372,6 +369,4 @@
 	}
 
-
-	xhci_dump_trb(hc->event_ring.dequeue_trb);
 	return EOK;
 }
@@ -402,6 +397,6 @@
 	while (err != ENOENT) {
 		if (err == EOK) {
-			usb_log_debug2("Dequeued from event ring.");
-			xhci_dump_trb(&trb);
+			usb_log_debug2("Dequeued trb from event ring: %s",
+					xhci_trb_str_type(TRB_TYPE(trb)));
 
 			hc_handle_event(hc, &trb);