Quantized wrapper cleanup