remove some old TODOs