Minor clean up of TODOs