May sound real strange but 000 super fine steel wool with paste wax. Put wax on steel wool
rub away let dry and polish with clean rag. Takes away water spots film and leaves very clean
surface that stays cleaner and repels water. WILL NOT SCRATCH GLASS!