Cleaning out TODOs