Removed old todo's