clean up some TODOs