The kill switch point is the one I would keep first. One habit that helps is giving every flag a removal date when it is created, so temporary flags do not stay in the code.