You can get a water spot remover (think carpro do it) to dissolve the minerals causing the marks. If it's etched in, machine polish.