A good work over with a degreaser, and a scratch cover polish usually works for me. I've recently acquired an old cabinet which has some bad water rings on the surface. I'm not ready to refinish the entire cabinet, I rather like the original look. However, I would like to get rid of the water rings. Which aspect of this technique will best achieve that?