Removed unused imports
Small javadoc improvements