Remove unused imports; fix javadoc