Remove outdated comments and code