Refactor 24 month archive feature