cleaning up some TODOs