If I'm going to spend the time on a proper wax up job, I always clay bar as a prep - you'd be amazed at the embedded dirt it shifts from a just washed car that you think you've got really clean.
Wrap a bit of cellophane around a finger and feel the paint surface pre-prep, clay it and test again ! You won't believe the difference