removed old TODO comments