(#579) - Remove outdated comments