Refactor archive code. Reduce audit violations.