NEXUS-5511: Applied Igor's comments.

Changes:
* javadoc and since fixes, clearing up things
* removed redundant code and methods