unused imports & java docs fixed

Code analysis was complaining about these.