Cleaning up TODO list