unused imports removed
compiles on JDK 7 again