Fix destroy: remove from proper z-set