The best product we know of for this situation is A-Maz Water Stain remover.