fix typos and remove useless imports