The best product I have used to remove water spots from glass without harming the glass is "Auto Glym Car Glass Polish." The stuff is also great for getting rid of the contaminants that attach themselves to your glass. Get a Ziploc bag and put your hand inside it. Then, slide it over the glass. It will likely feel like you have sand attached to your glass. After using Auto Glym, it will feel completely smooth.