Review and clean up TODOs