WD40 is okay. But there are some more gentle solutions. First step is to buff with a 100% cotton terry rag that has a deep nap. Mother's Back-to-Black is also helpful. Meguiar's #7 polish is great for getting wax off and removing oxidation/contaminants/etc.

Hope this helps...Lee