I used A-1 Hardwater Stain Remover manufactured by Titan Labs and had great results.
One of my customers told me he has and I could see hardwater stains on his glass.
He went on to tell me he tried to remove the water stains by using Sprayaway.
I told my customer I had A1 Hardwater Stain Remover and would try removing the stain.