Need Help Bike cuts out
 

I have a 2001 Honda CBR 600F1. Was out on bike and engine cut out i pulled up sellected neutral and engine started fine i sellected first again and engine cut out again! It did this a few times and managed to get it home. I removed the clutch switch over a year ago and its ran fine i have removed the side stand switch and cleaned out all the dirt from it and put back together it worked fine for about 5miles and did it again does anyone think it might be the side stand switch being faulty. I also fit HID xenon bulbs to the bike a week ago but tha bike still cuts out with no lights on!