Cleaning up the TODO list