Remove unused imports
Correct javadoc