Remove un-needed TODOs.  Rendered obsolete a while ago.