A pair of tweezers works really well to remove the clip completely. To replace tie a piece of string around the clip first, then if you do drop it you can easily fish it out.

I removed both clips when installing the HID kit as it was easier to route the wires this way. I did take the water tank off.

The main beams and the dip bulbs appear to sit the opposite way up (tag at the bottom on main beam). I had my dip beams done before I bought the car and did the mains after as they were totally useless in comparison.

Crosers