CarPro Spotless is usually my first attempt. If 1 possibly 2 applications doesn't do the trick, then I move to 3D Eraser Gel. That will most always knock-out water spots. If for any reason that doesn't get spots off glass, I keep an old polishing pad and will dampen it with Spotless and polish it with that.