As a much retired chemist the following points may help.
1. The pickle used for "calcium deposits" may just have been neutralised so as to be ineffective. Try a fresh diluted solution.
2. The pickle is usually doing two things removing scale – essentially copper oxides – and removing/dissolving flux residues. The oxide should dissolve in any dilute acid, thus hydrochoric,sulphuric or citric will be ok. Sodium Bisulphate (aka Hydogen sulphate) is half neutralised sulphuric acid a should also work OK it is like citric acid a solid which may be more convenient.
3. Nitric acid will also dissolve the scale but even dilute nitric acid will slowly dissolve copper (sulphuric should not).
4. As an aside all acids will remove the zinc from brass leaving it copper coloured
5. Hydrochoric acid is a gas HCl dissolved in water it will tend to escape and attack bare steel and iron intiating serious and rapid rusting. Keep it out of enclosed workshops!
6. What do the elfins allow you to buy in 2012? Even citric acid, from health food shops, has moved under the counter but ask. Hydrochoric acid is sold as patio cleaner. Strongish Sulphuric acid is I guess still available as battery acid and will need carefully diluting acid to water. (pure concentrated 98% ,an oily dense liquid, is probably difficult to obtain and would need very careful diluting as adding the concentrated acid to water generates enough heat to boil the mixture if done too rapidly, AVOID)