Got rid of some unneeed todos.