cleaned up the TODO list