Removed old todo's

Removed old todo's