#JC-958 remove comments