Removed old todo's from the code