diff --git a/src/xinput.xml b/src/xinput.xml
index 0fb15e4..38bde51 100644
--- a/src/xinput.xml
+++ b/src/xinput.xml
@@ -46,7 +46,6 @@ This will, e.g., be necessary for automatically generated byte-order conversion
 which will, e.g., be necessary for server-side xcb.
 
 This affects the following:
-* QueryDeviceState reply field "classes" ( structs InputState, ... )
 * SendExtensionEvent member "events"
 
 *****
@@ -64,17 +63,6 @@ This is needed for the following XI2-events ( and eventcopies thereof )
 
 *****
 
-xml and generator should support
-switch-case similar to switch-bitcase.
-
-(and maybe: variable sized unions with a mechanism to define
-which union-field is selected.)
-
-One of these features is needed for the InputInfo type
-which is used by request "ListInputDevices" for the list "input_infos".
-
-*****
-
 Parametrized structs
 
 This is needed for being able to use the value of the field