Removed some unnecessary todo-comments