update TODO
remove some cruft