Remove TODOs and FIXMEs

  * these have been captured in tracker(s)