Removed old TODO comment