Removed outdated TODOs