Removed outdated TODOS.