Remove outdated todo comments