Nothing wrong with a lil clay bar action to remove the stuff that caused those swirl marks in the first place... before polish and wax.