archival module cleanup

Stacked on another small MR.

Merge request reports

Loading