diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c
index 057f7d8e77cf..cd760f37910a 100644
--- a/sys/dev/usb/usb_subr.c
+++ b/sys/dev/usb/usb_subr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: usb_subr.c,v 1.89 2001/11/10 17:10:42 augustss Exp $	*/
+/*	$NetBSD: usb_subr.c,v 1.90 2001/11/10 17:11:38 augustss Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $	*/
 
 /*
@@ -724,7 +724,6 @@ usbd_setup_pipe(usbd_device_handle dev, usbd_interface_handle iface,
 	p->repeat = 0;
 	p->interval = ival;
 	SIMPLEQ_INIT(&p->queue);
-	usb_callout_init(p->abort_handle);
 	err = dev->bus->methods->open_pipe(p);
 	if (err) {
 		DPRINTFN(-1,("usbd_setup_pipe: endpoint=0x%x failed, error="
diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c
index 868c924052ca..7994b212ec4a 100644
--- a/sys/dev/usb/usbdi.c
+++ b/sys/dev/usb/usbdi.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: usbdi.c,v 1.82 2001/11/10 16:54:56 augustss Exp $	*/
+/*	$NetBSD: usbdi.c,v 1.83 2001/11/10 17:11:38 augustss Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usbdi.c,v 1.28 1999/11/17 22:33:49 n_hibma Exp $	*/
 
 /*
@@ -269,12 +269,6 @@ usbd_close_pipe(usbd_pipe_handle pipe)
 	LIST_REMOVE(pipe, next);
 	pipe->endpoint->refcnt--;
 	pipe->methods->close(pipe);
-#if defined(__NetBSD__) && defined(DIAGNOSTIC)
-	if (callout_pending(&pipe->abort_handle)) {
-		callout_stop(&pipe->abort_handle);
-		printf("usbd_close_pipe: abort_handle pending");
-	}
-#endif
 	if (pipe->intrxfer != NULL)
 		usbd_free_xfer(pipe->intrxfer);
 	free(pipe, M_USB);
diff --git a/sys/dev/usb/usbdivar.h b/sys/dev/usb/usbdivar.h
index 61a44f327fcb..97cbab407786 100644
--- a/sys/dev/usb/usbdivar.h
+++ b/sys/dev/usb/usbdivar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: usbdivar.h,v 1.64 2001/11/10 16:54:56 augustss Exp $	*/
+/*	$NetBSD: usbdivar.h,v 1.65 2001/11/10 17:11:38 augustss Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usbdivar.h,v 1.11 1999/11/17 22:33:51 n_hibma Exp $	*/
 
 /*
@@ -176,8 +176,6 @@ struct usbd_pipe {
 	char			repeat;
 	int			interval;
 
-	usb_callout_t		abort_handle;
-
 	/* Filled by HC driver. */
 	struct usbd_pipe_methods *methods;
 };