Yes, good Idea! If your flashlight dims then it would be good practice to remove the cell/cells and test on a battery checker. Anything in the 20% mark or below should be disposed of or recharged (if RCR123). Don't be in the belief of "should be able to get another Xminutes out of them". If you think this; and put them back into your flashlight, you will be asking for trouble!!
I gave my brother a flashlight as a gift and it exploded tonight; burned holes in the carpet; hole in the wall and black spray all over the other wall; blew out of both ends; melted the threads on the light; i gave 4 of these lights away as gifts with the lithium batteries and feel really bad about it. the batteries are cyclops but made in china with a phone number; let me see, ethelyne glycol in our toothpaste and cough syrup, exploding batteries, lead in kids toys, tires that blow out the sides, anybody get the message?