Removed outdated todos