removed unused imports and some PMD varnings