CJ-1162 fix, CJ-1161 fix
removed debug messages