Out of curiosity, why would a combined bathroom require removing urinals?

They could still exist, and have the added benefit of anyone regardless of their presenting gender being able to use them.