eliminated some TODOs