In a nut shell yes, I just iron-x'd the discs, scrubbed them hard, sanded them with sand paper and when I installed new pads (after bedded in) I completed a number of 100mph+ braking sessions and over the evening the "warped" feeling went away. Currently now they are smooth and deposit free.
No skimming needed!