try mo mothers water spot remover for glass. needs a bit of elbow grease pero highly recommended