I have the same problem. Let us know when it's done.
In my astra MK5 light are on even if the key isnt in the ingnition. So i pull it off every time.