Further quantizer cleanup