SES-1812 : Remove unused imports
SES-1812 : Improve javadoc