GEOT-3131 remove unnecessary cycle and sysout, backport of #190