change order of cleanup staging dir