Removed already fixed todos.