diff --git a/TODO b/TODO
index 7f001a61e3..4c5094c35d 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-NuttX TODO List (Last updated October 11, 2017)
+NuttX TODO List (Last updated October 15, 2017)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 This file summarizes known NuttX bugs, limitations, inconsistencies with
@@ -24,7 +24,7 @@ nuttx/:
   (0)  Other drivers (drivers/)
  (12)  Libraries (libc/, libm/)
  (10)  File system/Generic drivers (fs/, drivers/)
- (10)  Graphics Subsystem (graphics/)
+  (9)  Graphics Subsystem (graphics/)
   (3)  Build system / Toolchains
   (3)  Linux/Cywgin simulation (arch/sim)
   (4)  ARM (arch/arm/)
@@ -2007,38 +2007,7 @@ o Graphics Subsystem (graphics/)
   Priority:    Low, not a serious issue but worth noting.  There is no plan
                to change this behavior.
 
-  Title:       REMOVE SINGLE USER MODE
-  Description: NX graphics supports two modes:  A simple single user mode and
-               more complex multi-user mode selected with CONFIG_NX_MULTIUSER=y.
-               In this configuration, an application can start the NX server
-               with boardctrl(BOARDIOC_NX_START);  After that, all graphic
-               interactions are via a thin layer in libnx/.   The OS
-               interface is only via messages sent and received using POSIX
-               message queues.  So this is good code and respects all of the
-               POSIX interfacing rules.  Hence, it works well in all build
-               modes (FLAT, PROTECTED, and KERNEL builds).
-
-               But without CONFIG_NX_MULTIUSER, the single user applications
-               violate all of the rules and calls internal NX functions
-               directly.  This includes all calls to internal OSfunctions
-               with names like, nx_open, up_fbinitialize, board_lcd_*, and
-               others.  This is a violation of interfacing standard in all
-               cases and can only be made to work in the FLAT build mode.
-
-               The single user mode does have some desirable properties:  It
-               is lighter weight and so more suitable for very resource limited
-               platforms.  But I think that in the long run the only reasonable
-               solution is to eliminate the single user mode and provide only
-               the multi-user mode with the message queue interface.
-  Status:      Open
-  Priority:    Low-Medium, not a serious issue but worth noting.  Single user
-               mode is a blemish on the OS and not compatible with the RTOS
-               roadmap.  But neither is there any critical necessity to
-               remove the offending code immediately.  Be aware:  If you use
-               the single user mode, it will be yanked out from under your
-               feet in the not-so-distant future.
-
-  Title:       WIDE-FOUNT SUPPORT
+  Title:       WIDE-FONT SUPPORT
   Description: Wide fonts are not currently supported by the NuttX graphics sub-
                system.  There is some discussion here: