Make sure models are loaded during migrations.
Minor cleanup to archive model.