remove unused imports, some code style