Michel,
Leave the neutral safety switch out. I say this because the day will come when you need to start it in gear. The clutch master or slave will die in the middle of the street or something, and you'll need to be able to turn the starter over in gear.
Ask me how I know!