Removed old TODO comments