Abstracted active archiving logic into its own method and updated 'reset variants' functionality to use active archiving logic. TRAD-32