Yep. But if you merge will this change, it will make sure you got rid of all locations, and it will handle some of the "must remember to un-comment later" issues.