Removed a few remaining references to gender