trivial changes to clean up some TODO's and unused code