todos not comments!
Remove old commented-out stuff