try a wire wheel on that angle grinder to clean up the parts. it will clean them up pretty good without removing metal.