Remove unused imports ; format code