Getting rid of some old TODOs.