Removed old todo