Removed unused imports and fixed Javadoc warning.