diff --git a/TODO b/TODO
index 3a9cc9c..6b748f0 100644
--- a/TODO
+++ b/TODO
@@ -1,24 +1,15 @@
-# Initial release
-
- * figure out htpasswd & auth for scheduling builds [Michael]
- * ensure need auth to trigger builds  [Michael]
-
-# Future
 
  * Add nightly-checkuri
  * finish port of wikilog [Joshua]
+ * Add wikilog link on console page
  * implement buildhistory writeback step in -helper (can then drop from builders.py) [Richard]
- * implement send QA email step (builders.py)
- * implement current link (builders.py)
  * per worker auth (workers.py & config.py)
- * implement default population for different releases in webform (schedulers.py?) [Paul]
  * DEFAULT for buildapp SRCREV still true? (schedulers.py)
  * Add IRC notifier (services.py) [Michael]
- * Add link on console page to error report for build?
  * formatting/labels of the yocto-autobuilder-helper inputs (schedulers.py) [Paul]
  * add mail notification functionality to yocto-autobuilder-helper, it already
    knows how to iterate error reports. (services.py)
  * Simple script to start buildbot controller, janitor and PRServer [Michael]
- * Review ForceScheduler inputs and whether they are used by the helper scripts, particularly the poky_number parameter of nightly is possibly no longer required (possibly unused parameters are annotated in schedulers.py)
+ * Clean up ForceScheduler form layout (multiple column?)
  * Look into allowed_origins property of built in web server
  * switch wikilog to buildbot.util.service.HTTPClient?