Fair points all around, though I caution Flitz might be a little aggressive. Maas polish is a slightly milder one that may be a better start point. Also, if you intend to buff it out yourself, please remember a few things.
1. The buffer is the most dangerous tool in a smith's shop. Yes, worse even than the forge. I've seen 14" machete blades buried in the ceiling by a careless moment. Go extremely slowly and carefully.
2. You can't put back what you take off. This applies to everything, of course. Go slow, mask areas you want to preserve, and go slow.
3. Buffed steel can get very hot, very quickly. Work in short sessions, and cool the blade in water if it gets too hot to touch. When I buff a knife, I keep my fingers on the side facing me. If my fingers get too warm, it's time to cool.