In addition to the vinegar and baking soda, try to use half of a lemon to fight the water stains. Apply the lemon directly to the stains, and then rinse and dry the area with a clean cloth.