Get rid of TODOs