Removed debug code, added javadoc
TRUNK-3289 cleanup code