clean up, update TODO