removed old TODO