Rework factory reset support