Merge pull request #237 from pingtimeout/JAVA-402

Remove comments prior to the fix (JAVA-402)