Yes Disconnect the battery.
Most of my lights are seven years old.
The batteries are good for about 500 charges.
I am Now using these.
Solid Strong Connectors.
8.4V 3900mAh 6 x 18650 Portable Rechargeable Water - resistant Battery Pack-13.92 and Free Shipping| GearBest.com
__________________
Fred "The Real Fred"