Minor Javadoc changes
Removed unused import and fixed Javadoc comments