Removed old TODO