CLC-2549 CCNs appearing as four-digit numbers - cleaned up commented lines