You can also remove the zinc plating with phosphoric acid. Same stuff as in Coke. Much safer to handle then muriatic acid, but takes longer. Be careful of how you store acids in your shop as acid fumes will seriously rust anything in sight. I keep muriatic acid in another shed outside. I haven't see the Phosphoric acid cleaners rust things though. Look for Metal Prep or similar concoctions at Home Depot.
George