As far as I know, you will have to replace the lights to remove the xenon.
Thats what I have to do for my 2SS. I have made the appointment with the authorities to get it cleared. Thats one of the things they said needs to be done.
The other thing: to add a REAR fog light (red).
I will post the mods I had to do when importing.
Patrick