I polished the areas on my M5 where there were soap stains and heavy water spots. The polishing did the trick and took it all right out. I applied another layer of Opti-Coat and then put a layer of wax on top of that. It should hold up fine from now on. I think I'll try that net shield stuff next.