Reformat and clean