Remove explicit count variable