All: remove-unit(x) -> x