Remove wrapper canon classes