Buff out water spots and rings with 0000 steel wool as necessary.