diff --git a/TODO b/TODO
index 0205f4c0628742fa9334f5003e07fc755b9e4c22..ec995ec96b18e9bb8a8938ac123dc33791fd0e81 100644
--- a/TODO
+++ b/TODO
@@ -2,6 +2,8 @@
 
 * Separate workspace list for every physical output.
 
+* Key to move pointer to another physical screen.
+
 * Grab specific keys 
 
   Current code grabs modifier keys and any other keypress. We need to
@@ -20,70 +22,6 @@
   Can we cooperate with a stand-alone program? Write our status to a
   root hint or named pipe than can be picked up by another program?
 
-* Changing focus from keyboard
-
-  Save the subwindows of the root window and focus each when pressing
-  modkey + user_key_change. First option always last focused window.
-
-  I would like it to work like this: modkey-Tab-Tab-Tab... Release
-  modkey to focus on a window *and* to remember the window where we
-  started.
-
-  This will also need to work if the change focus with the mouse.
-
-  A single modkey-Tab would then get the focus to end up in the window
-  where we started tabbing or where we last had our focus if changing
-  with the mouse.
-
-  This is now implemented like this:
-
-    Always keep the current window as the first element in the current
-    workspace window list. Always keep the window we focused before it
-    as the second element.
-
-    When we focus on the next window from the current one, the first
-    Tab always goes to the window we had focus in before.
-
-  Currently, we stop tabbing when the MODKEY is released. We might
-  want to stop tabbing and focus on the new window if we get another
-  command as well...
-
-  I have bound Alt_L explicitly and looking for key release events.
-  This is a bit ugly. It is possible to ask for what keys give
-  XCB_MOD_MASK_4 or whatever MODKEY is.
-
-    GetModifierMapping
-
-    This request returns the keycodes of the keys being used as
-    modifiers. The number of keycodes in the list is
-    8*keycodes-per-modifier. The keycodes are divided into eight sets,
-    with each set containing keycodes-per-modifier elements. The sets
-    are assigned to the modifiers Shift, Lock, Control, Mod1, Mod2,
-    Mod3, Mod4, and Mod5, in order. The keycodes-per-modifier value is
-    chosen arbitrarily by the server; zeroes are used to fill in
-    unused elements within each set. If only zero values are given in
-    a set, the use of the corresponding modifier has been disabled.
-    The order of keycodes within each set is chosen arbitrarily by the
-    server.
-
-    xcb_get_modifier_mapping()
-
-    xcb_get_modifier_mapping_unchecked()
-
-    xcb_keycode_t * xcb_get_modifier_mapping_keycodes()
-
-    xcb_keycode_t *
-    xcb_get_modifier_mapping_keycodes (const xcb_get_modifier_mapping_reply_t *R  /**< */);
-
-    xcb_get_modifier_mapping_keycodes_length (const xcb_get_modifier_mapping_reply_t *R  /**< */);
-
-  How do we re-establish stack order after moving around windows to
-  focus on? Do we want to?
-
-  There is a bug when we change from one ws to another and focuswin
-  doesn't get reset. That is, focuswin isn't NULL but the
-  focuswin->wsitem[curws] is empty.
-
 * Virtual screens/workspaces
 
   Partially done. Still needed:
@@ -127,10 +65,8 @@
   
   Also respect EWMH hints _NET_WM_TYPE_DOCK and _NET_WM_TYPE_DESKTOP.
 
-* Flag to disable dontmoveoff?
-
-
-* Key to move pointer to another physical screen.
+* Flag to disable that mcwm won't allow windows to move off the
+  screen?
 
 * Use xcb-event's event handlers?