cleaning up TODOs