Removed old todo comment