I would be happy to use `removeUnitOf`, that would be great ! I haven't figured out how to do that in a backwards-compatible way.