Index: uspace/drv/uhci-hcd/batch.c
===================================================================
--- uspace/drv/uhci-hcd/batch.c	(revision f567bcfa21aeafa070516a508a114ce99a13d224)
+++ uspace/drv/uhci-hcd/batch.c	(revision 4ca18aea925fcd2731c31488a3682fd2f11e4d50)
@@ -49,5 +49,4 @@
 	td_t *tds;
 	size_t transfers;
-//	usb_device_keeper_t *manager;
 } uhci_batch_t;
 
@@ -73,5 +72,5 @@
  * @param[in] func_out function to call on outbound transaction completion
  * @param[in] arg additional parameter to func_in or func_out
- * @param[in] manager Pointer to toggle management structure.
+ * @param[in] ep Pointer to endpoint toggle management structure.
  * @return Valid pointer if all substructures were successfully created,
  * NULL otherwise.
@@ -86,6 +85,5 @@
     char* setup_buffer, size_t setup_size,
     usbhc_iface_transfer_in_callback_t func_in,
-    usbhc_iface_transfer_out_callback_t func_out, void *arg,
-    usb_device_keeper_t *manager, endpoint_t *ep
+    usbhc_iface_transfer_out_callback_t func_out, void *arg, endpoint_t *ep
     )
 {
@@ -115,5 +113,4 @@
 	    "Failed to allocate batch instance.\n");
 	bzero(data, sizeof(uhci_batch_t));
-//	data->manager = manager;
 	instance->private_data = data;
 
@@ -181,11 +178,7 @@
 			    instance, i, data->tds[i].status);
 			td_print_status(&data->tds[i]);
-			endpoint_toggle_set(instance->ep,
-			    td_toggle(&data->tds[i]));
-/*
-			usb_device_keeper_set_toggle(data->manager,
-			    instance->target, instance->direction,
-			    td_toggle(&data->tds[i]));
-*/
+			if (instance->ep != NULL)
+				endpoint_toggle_set(instance->ep,
+				    td_toggle(&data->tds[i]));
 			if (i > 0)
 				goto substract_ret;
@@ -315,6 +308,4 @@
 	const bool low_speed = instance->speed == USB_SPEED_LOW;
 	int toggle = endpoint_toggle_get(instance->ep);
-//	usb_device_keeper_get_toggle(
-//	    data->manager, instance->target, instance->direction);
 	assert(toggle == 0 || toggle == 1);
 
@@ -348,6 +339,4 @@
 	td_set_ioc(&data->tds[transfer - 1]);
 	endpoint_toggle_set(instance->ep, toggle);
-//	usb_device_keeper_set_toggle(data->manager, instance->target,
-//	    instance->direction, toggle);
 }
 /*----------------------------------------------------------------------------*/
Index: uspace/drv/uhci-hcd/batch.h
===================================================================
--- uspace/drv/uhci-hcd/batch.h	(revision f567bcfa21aeafa070516a508a114ce99a13d224)
+++ uspace/drv/uhci-hcd/batch.h	(revision 4ca18aea925fcd2731c31488a3682fd2f11e4d50)
@@ -56,5 +56,4 @@
     usbhc_iface_transfer_out_callback_t func_out,
 		void *arg,
-		usb_device_keeper_t *manager,
 		endpoint_t *ep
 		);
Index: uspace/drv/uhci-hcd/iface.c
===================================================================
--- uspace/drv/uhci-hcd/iface.c	(revision f567bcfa21aeafa070516a508a114ce99a13d224)
+++ uspace/drv/uhci-hcd/iface.c	(revision 4ca18aea925fcd2731c31488a3682fd2f11e4d50)
@@ -246,6 +246,5 @@
 	usb_transfer_batch_t *batch =
 	    batch_get(fun, target, ep->transfer_type, ep->max_packet_size,
-	        ep->speed, data, size, NULL, 0, NULL, callback, arg,
-		&hc->manager, ep);
+	        ep->speed, data, size, NULL, 0, NULL, callback, arg, ep);
 	if (!batch)
 		return ENOMEM;
@@ -305,6 +304,5 @@
 	usb_transfer_batch_t *batch =
 	    batch_get(fun, target, ep->transfer_type, ep->max_packet_size,
-	        ep->speed, data, size, NULL, 0, callback, NULL, arg,
-		&hc->manager, ep);
+	        ep->speed, data, size, NULL, 0, callback, NULL, arg, ep);
 	if (!batch)
 		return ENOMEM;
@@ -353,6 +351,5 @@
 	usb_transfer_batch_t *batch =
 	    batch_get(fun, target, ep->transfer_type, ep->max_packet_size,
-	        ep->speed, data, size, NULL, 0, NULL, callback, arg,
-		&hc->manager, ep);
+	        ep->speed, data, size, NULL, 0, NULL, callback, arg, ep);
 	if (!batch)
 		return ENOMEM;
@@ -400,6 +397,5 @@
 	usb_transfer_batch_t *batch =
 	    batch_get(fun, target, ep->transfer_type, ep->max_packet_size,
-	        ep->speed, data, size, NULL, 0, callback, NULL, arg,
-		&hc->manager, ep);
+	        ep->speed, data, size, NULL, 0, callback, NULL, arg, ep);
 	if (!batch)
 		return ENOMEM;
@@ -449,6 +445,5 @@
 	usb_transfer_batch_t *batch =
 	    batch_get(fun, target, USB_TRANSFER_CONTROL, max_packet_size, speed,
-	        data, size, setup_data, setup_size, NULL, callback, arg,
-	        &hc->manager, ep);
+	        data, size, setup_data, setup_size, NULL, callback, arg, ep);
 	if (!batch)
 		return ENOMEM;
@@ -496,6 +491,5 @@
 	usb_transfer_batch_t *batch =
 	    batch_get(fun, target, USB_TRANSFER_CONTROL, max_packet_size, speed,
-	        data, size, setup_data, setup_size, callback, NULL, arg,
-		&hc->manager, ep);
+	        data, size, setup_data, setup_size, callback, NULL, arg, ep);
 	if (!batch)
 		return ENOMEM;