Lock button, washer fluid ?

[Adam132601]

I have to really really mash down on my lock button to get my doors to lock/unlock. I took the following from the console removal section.

Remove shift indicator bezel and boot, this will allow room to remove
the hazard warning switch. Once the switch has been removed, remove the
screw that was directly under the switch. NOTE, pay special attention to
connectors for hazard switch and shift indicator; they are keyed the same
and can be inadvertently switched during the reassembly process.

Is this all that I need to do to get the hazard switch and lock button out? Once the switch is out can I take it apart and clean contacts or should I just replace it. To remove the shift indicator bezel and boot do I just pry and pull? Any helpful hints? Anyone done this?



Is there anywhere on the X5 washer fluid system notorious for leaking? I go through fluid much faster than I should.