clean code, removed unused imports