Final cleanup of the MPP/Archiving branch.  Merging soon.