CFY-1230 removed debugging code