Good tip on the wax 😉
I usually have brake cleaner to hand and that can used to remove oil and grease marks (apply with cloth and gently rub).