I have found copper ball bearings to be very effective. Just put them in the glass with a bit of soapy warm water and shake them vigorously for a few minutes. I was surprised by how effective they've been. I don't know if you're in the UK, but I bought mine from Lakeland. If it's water staining that's got deep into the glass, as others have said, then there's little to be done beyond professional restoration, but definitely give the ball bearings a try!