..or don't remove the Male and Female aspects, just add non-binary.