Index: uspace/lib/drv/include/usb_iface.h
===================================================================
--- uspace/lib/drv/include/usb_iface.h	(revision 3f42eab8811ead7363c6107180e775451953c4fb)
+++ uspace/lib/drv/include/usb_iface.h	(revision c90163262531a9d6fd0787466623f8e3732fd826)
@@ -100,5 +100,5 @@
 } usb_target_t;
 
-/** Description of usb endpoint.
+/** Description of an usb endpoint.
  */
 typedef struct {
@@ -108,8 +108,4 @@
 	unsigned bytes_per_interval;
 } usb3_endpoint_desc_t;
-
-typedef struct {
-	unsigned polling_interval;
-} usb2_endpoint_desc_t;
 
 typedef struct usb_endpoint_desc {
@@ -133,6 +129,5 @@
 	unsigned packets;
 
-	/** Bus version specific information */
-	usb2_endpoint_desc_t usb2;
+	/** Superspeed-specific information */
 	usb3_endpoint_desc_t usb3;
 } usb_endpoint_desc_t;
Index: uspace/lib/usbdev/include/usb/dev/pipes.h
===================================================================
--- uspace/lib/usbdev/include/usb/dev/pipes.h	(revision 3f42eab8811ead7363c6107180e775451953c4fb)
+++ uspace/lib/usbdev/include/usb/dev/pipes.h	(revision c90163262531a9d6fd0787466623f8e3732fd826)
@@ -106,5 +106,5 @@
     size_t, const uint8_t *, size_t, usb_dev_session_t *);
 
-int usb_pipe_register(usb_pipe_t *, unsigned);
+int usb_pipe_register(usb_pipe_t *);
 int usb_pipe_unregister(usb_pipe_t *);
 
Index: uspace/lib/usbdev/src/devdrv.c
===================================================================
--- uspace/lib/usbdev/src/devdrv.c	(revision 3f42eab8811ead7363c6107180e775451953c4fb)
+++ uspace/lib/usbdev/src/devdrv.c	(revision c90163262531a9d6fd0787466623f8e3732fd826)
@@ -257,6 +257,5 @@
 	for (size_t i = 0; i < pipe_count; i++) {
 		if (pipes[i].present) {
-			rc = usb_pipe_register(&pipes[i].pipe,
-			    pipes[i].descriptor->poll_interval);
+			rc = usb_pipe_register(&pipes[i].pipe);
 			if (rc != EOK) {
 				goto rollback_unregister_endpoints;
Index: uspace/lib/usbdev/src/pipes.c
===================================================================
--- uspace/lib/usbdev/src/pipes.c	(revision 3f42eab8811ead7363c6107180e775451953c4fb)
+++ uspace/lib/usbdev/src/pipes.c	(revision c90163262531a9d6fd0787466623f8e3732fd826)
@@ -316,10 +316,9 @@
  * @return Error code.
  */
-int usb_pipe_register(usb_pipe_t *pipe, unsigned interval)
+int usb_pipe_register(usb_pipe_t *pipe)
 {
 	assert(pipe);
 	assert(pipe->bus_session);
 
-	pipe->desc.usb2.polling_interval = interval;
 	async_exch_t *exch = async_exchange_begin(pipe->bus_session);
 	if (!exch)
Index: uspace/lib/usbdev/src/pipesinit.c
===================================================================
--- uspace/lib/usbdev/src/pipesinit.c	(revision 3f42eab8811ead7363c6107180e775451953c4fb)
+++ uspace/lib/usbdev/src/pipesinit.c	(revision c90163262531a9d6fd0787466623f8e3732fd826)
@@ -178,7 +178,4 @@
 	};
 
-	/* TODO Extract USB2-related information */
-	ep_desc->usb2 = (usb2_endpoint_desc_t) { 0 };
-
 	if (companion_desc) {
 		ep_desc->usb3 = (usb3_endpoint_desc_t) {
Index: uspace/lib/usbhost/src/ddf_helpers.c
===================================================================
--- uspace/lib/usbhost/src/ddf_helpers.c	(revision 3f42eab8811ead7363c6107180e775451953c4fb)
+++ uspace/lib/usbhost/src/ddf_helpers.c	(revision c90163262531a9d6fd0787466623f8e3732fd826)
@@ -79,5 +79,5 @@
 		usb_str_transfer_type(endpoint_desc->transfer_type),
 		usb_str_direction(endpoint_desc->direction),
-		endpoint_desc->max_packet_size, endpoint_desc->usb2.polling_interval);
+		endpoint_desc->max_packet_size, endpoint_desc->interval);
 
 	return bus_endpoint_add(dev, endpoint_desc, NULL);