Removed some unused imports (PMD report).



Just a test of the patching process, some trivial PMD error changes...