clean up TODOs as much as possible