Reformat and remove useless import