Clear STATUS_TO_SCALE at a better place