reformat and remove unused ones