This could be done in `remove0()` to reduce duplication?