issue #2328 refractor etc support:remove comments