Removed todo-comments.