Reformatted ZimImportController.clean.   Davy Cottet: please test and revise as necessary.