JAL-1230 comment unused code to avoid NPE