Migrate most of archiving stuff to archive engine