Another cleanup pass, correctin various TODOs.
Removed old TODOs.