A little late but....
Me an my cousin used two five gallon buckets of Zep professional rust converter. It wasn't cheap but worked miricales on a storage unit of plumbing tools/supplies we bought. After a coat of that, rinced, dried, oiled, we made a good profit of reselling the tools. Not a tool it didn't work on.