clean up, update TODO list