I wonder if Barkeepers friend might work well. The UK formulation (different from the US) is 5% oxalic acid - and the rest is citric acid.