Tough water spots

Some good glass cleaner and XXXX steel work did the trick for me.