#JC-1358: Commented code replased