Clean sandbox archives and refactor archive cleaning