kill some TODOs