remove unused imports, clean code