Cleared some todos.