Remove unused import and clean up unnecessary javadoc