more ArchiveDao cleanup