On severe water spots I take some muratic acid diluted with 2 to 3 parts of water. take a towel and get it wet and dampen a small area. Let it sit for about 1 minutes not letting it dry. Then gently rub the area with the towel and then follow with a good flush of water. I get low fume muratic...