Removed old @todo's