diff --git a/TODO.txt b/TODO.txt
index 6cb05d7c..1a236bfd 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -285,45 +285,6 @@ way:
     missing and not report it.
 
 
-Versioning the Back-end TOOLS
-------------------------------
-
-It would be nice if build.py (or one of the buildtools modules it
-imports) was able to download from wxpython.org/tools (or similar) and
-use specific verisons of sip or other back-end tools, so we can be
-sure that the correct versions are being used for the build.  This
-will make it easier for others who want to build and for keeping the
-buildbots up to date, especially if we ever have to custom patch the
-tools.
-
-One idea that comes to mind is to rename the binaries such that they
-include the platform and version number in the file names.  The
-build.py script will have a hard-coded value for the desired verison
-number, and before running the tool will check to see if there is a
-{toolName}-{platform}-{verison} file in the ./bin folder.  If so then
-that is what it will run.  If not then it will attempt to download it
-and then run it.  An added benefit of this appraoch is that if we ever
-need to rebuild old versions of Phoenix from an svn tag that depended
-on features of an old version of a tool, then we're covered because
-that verison of build.py will want to use the older verison of the
-tool and will do so automatically.
-
-  * Since this is downloading and executing code from the Internet
-    then we should have some precautions in place to protect the
-    user.  Is comparing the MD5 sum of the download with a value hard
-    coded in build.py  good enough?
-
-  * How should building on platforms that we have not made tool
-    binaries available for be handled?  -- Perhaps just inform the
-    user and instruct them to set an environment variable to a local
-    binary to use instead.
-
-  * How should failed downloads be handled?
-
-  * 
-
-
-
 
 other stuff
 ------------
@@ -334,10 +295,10 @@ other stuff
 
   * textctrl: add a renamed HitTest row/col overload
 
-  * data buffer support for image RGB and alpha data
+  * data buffer support for wxImage RGB and alpha data
 
-  * port all of the wxBitmap copy-to and copy-from buffer methods, and
-    raw bitmap access routines from Classic
+  * port all of the wx.Bitmap copy-to and copy-from buffer methods, and
+    raw bitmap access routines from Classic. 
 
   * Come up with some way to implement the MustHaveApp check that
     Classic does.  It should raise an exception when something is
@@ -347,20 +308,10 @@ other stuff
   * Should the functions created for things like addCppMethod be
     marked static?  How about using inline?
 
-  * Change the code generated for CppMethods, etc. to not pass _isErr
-    to the function, and instead just check if PyErr_Occurred after
-    the function returns.
-
   * Word-wrap the briefDoc strings used for %Docstring directives
 
   * It looks like the code that is flattening the element nodes to
     extract the briefDocs is not getting some spaces that should be in
     there, probably where some tags are being removed.
 
-  * Do something for the places where a wx API assumes that does not
-    take ownership of a C array or other object pointer, but assumes
-    that it will continue to exist for the life of the wx object and
-    will have problems (crashes) if it doesn't.  For example
-    wx.Pen.SetDashes and wx.DropFilesEvent, perhaps wx.Image buffers
-    too.   See the idea documented in event.py.