Remove extra logic around genders