Remove outdated TODOs