Remove outdated TODOS