Got rid of some old todos.