Removed old TODO comments.