diff --git a/app/models/form/sales/subsections/household_characteristics.rb b/app/models/form/sales/subsections/household_characteristics.rb
index 47466a492..23aa34270 100644
--- a/app/models/form/sales/subsections/household_characteristics.rb
+++ b/app/models/form/sales/subsections/household_characteristics.rb
@@ -25,7 +25,7 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection
       Form::Sales::Pages::OldPersonsSharedOwnershipValueCheck.new("age_1_old_persons_shared_ownership_joint_purchase_value_check", nil, self, joint_purchase: true),
       Form::Sales::Pages::OldPersonsSharedOwnershipValueCheck.new("age_1_old_persons_shared_ownership_value_check", nil, self, joint_purchase: false),
       (Form::Sales::Pages::SexRegisteredAtBirth1.new(nil, nil, self) if form.start_year_2026_or_later?),
-      Form::Sales::Pages::GenderIdentity1.new(nil, nil, self),
+      (Form::Sales::Pages::GenderIdentity1.new(nil, nil, self) unless form.start_year_2026_or_later?),
       Form::Sales::Pages::Buyer1EthnicGroup.new(nil, nil, self),
       Form::Sales::Pages::Buyer1EthnicBackgroundBlack.new(nil, nil, self),
       Form::Sales::Pages::Buyer1EthnicBackgroundAsian.new(nil, nil, self),
@@ -48,7 +48,7 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection
       (Form::Sales::Pages::NotRetiredValueCheck.new("age_2_buyer_not_retired_value_check", nil, self, person_index: 2) if form.start_year_2024_or_later?),
       (Form::Sales::Pages::PersonStudentNotChildValueCheck.new("buyer_2_age_student_not_child_value_check", nil, self, person_index: 2) unless form.start_year_2025_or_later?),
       (Form::Sales::Pages::SexRegisteredAtBirth2.new(nil, nil, self) if form.start_year_2026_or_later?),
-      Form::Sales::Pages::GenderIdentity2.new(nil, nil, self),
+      (Form::Sales::Pages::GenderIdentity2.new(nil, nil, self) unless form.start_year_2026_or_later?),
       buyer_2_ethnicity_nationality_pages,
       Form::Sales::Pages::Buyer2WorkingSituation.new(nil, nil, self),
       Form::Sales::Pages::RetirementValueCheck.new("working_situation_2_retirement_value_check_joint_purchase", nil, self, person_index: 2),
@@ -59,89 +59,31 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection
       Form::Sales::Pages::BuyerLiveInValueCheck.new("buyer_2_live_in_property_value_check", nil, self, person_index: 2),
       Form::Sales::Pages::NumberOfOthersInProperty.new("number_of_others_in_property", nil, self, joint_purchase: false),
       Form::Sales::Pages::NumberOfOthersInProperty.new("number_of_others_in_property_joint_purchase", nil, self, joint_purchase: true),
-      Form::Sales::Pages::PersonKnown.new("person_2_known", nil, self, person_index: 2),
-      (form.start_year_2025_or_later? ? Form::Sales::Pages::PersonRelationshipToBuyer1YesNo.new("person_2_relationship_to_buyer_1", nil, self, person_index: 2) : Form::Sales::Pages::PersonRelationshipToBuyer1.new("person_2_relationship_to_buyer_1", nil, self, person_index: 2)),
-      (Form::Sales::Pages::PartnerUnder16ValueCheck.new("relationship_2_partner_under_16_value_check", nil, self, person_index: 2) if form.start_year_2024_or_later?),
-      (Form::Sales::Pages::MultiplePartnersValueCheck.new("relationship_2_multiple_partners_value_check", nil, self, person_index: 2) if form.start_year_2024_or_later?),
-      (Form::Sales::Pages::PersonStudentNotChildValueCheck.new("relationship_2_student_not_child_value_check", nil, self, person_index: 2) unless form.start_year_2025_or_later?),
-      Form::Sales::Pages::PersonAge.new("person_2_age", nil, self, person_index: 2),
-      Form::Sales::Pages::RetirementValueCheck.new("age_2_retirement_value_check", nil, self, person_index: 2),
-      (Form::Sales::Pages::NotRetiredValueCheck.new("age_2_not_retired_value_check", nil, self, person_index: 2) if form.start_year_2024_or_later?),
-      (Form::Sales::Pages::PersonStudentNotChildValueCheck.new("age_2_student_not_child_value_check", nil, self, person_index: 2) unless form.start_year_2025_or_later?),
-      (Form::Sales::Pages::PartnerUnder16ValueCheck.new("age_2_partner_under_16_value_check", nil, self, person_index: 2) if form.start_year_2024_or_later?),
-      (Form::Sales::Pages::PersonSexRegisteredAtBirth.new("person_2_sex_registered_at_birth", nil, self, person_index: 2) if form.start_year_2026_or_later?),
-      Form::Sales::Pages::PersonGenderIdentity.new("person_2_gender_identity", nil, self, person_index: 2),
-      Form::Sales::Pages::PersonWorkingSituation.new("person_2_working_situation", nil, self, person_index: 2),
-      Form::Sales::Pages::RetirementValueCheck.new("working_situation_2_retirement_value_check", nil, self, person_index: 2),
-      (Form::Sales::Pages::NotRetiredValueCheck.new("working_situation_2_not_retired_value_check", nil, self, person_index: 2) if form.start_year_2024_or_later?),
-      (Form::Sales::Pages::PersonStudentNotChildValueCheck.new("working_situation_2_student_not_child_value_check", nil, self, person_index: 2) unless form.start_year_2025_or_later?),
-      Form::Sales::Pages::PersonKnown.new("person_3_known", nil, self, person_index: 3),
-      (form.start_year_2025_or_later? ? Form::Sales::Pages::PersonRelationshipToBuyer1YesNo.new("person_3_relationship_to_buyer_1", nil, self, person_index: 3) : Form::Sales::Pages::PersonRelationshipToBuyer1.new("person_3_relationship_to_buyer_1", nil, self, person_index: 3)),
-      (Form::Sales::Pages::PartnerUnder16ValueCheck.new("relationship_3_partner_under_16_value_check", nil, self, person_index: 3) if form.start_year_2024_or_later?),
-      (Form::Sales::Pages::MultiplePartnersValueCheck.new("relationship_3_multiple_partners_value_check", nil, self, person_index: 3) if form.start_year_2024_or_later?),
-      (Form::Sales::Pages::PersonStudentNotChildValueCheck.new("relationship_3_student_not_child_value_check", nil, self, person_index: 3) unless form.start_year_2025_or_later?),
-      Form::Sales::Pages::PersonAge.new("person_3_age", nil, self, person_index: 3),
-      Form::Sales::Pages::RetirementValueCheck.new("age_3_retirement_value_check", nil, self, person_index: 3),
-      (Form::Sales::Pages::NotRetiredValueCheck.new("age_3_not_retired_value_check", nil, self, person_index: 3) if form.start_year_2024_or_later?),
-      (Form::Sales::Pages::PersonStudentNotChildValueCheck.new("age_3_student_not_child_value_check", nil, self, person_index: 3) unless form.start_year_2025_or_later?),
-      (Form::Sales::Pages::PartnerUnder16ValueCheck.new("age_3_partner_under_16_value_check", nil, self, person_index: 3) if form.start_year_2024_or_later?),
-      (Form::Sales::Pages::PersonSexRegisteredAtBirth.new("person_3_sex_registered_at_birth", nil, self, person_index: 3) if form.start_year_2026_or_later?),
-      Form::Sales::Pages::PersonGenderIdentity.new("person_3_gender_identity", nil, self, person_index: 3),
-      Form::Sales::Pages::PersonWorkingSituation.new("person_3_working_situation", nil, self, person_index: 3),
-      Form::Sales::Pages::RetirementValueCheck.new("working_situation_3_retirement_value_check", nil, self, person_index: 3),
-      (Form::Sales::Pages::NotRetiredValueCheck.new("working_situation_3_not_retired_value_check", nil, self, person_index: 3) if form.start_year_2024_or_later?),
-      (Form::Sales::Pages::PersonStudentNotChildValueCheck.new("working_situation_3_student_not_child_value_check", nil, self, person_index: 3) unless form.start_year_2025_or_later?),
-      Form::Sales::Pages::PersonKnown.new("person_4_known", nil, self, person_index: 4),
-      (form.start_year_2025_or_later? ? Form::Sales::Pages::PersonRelationshipToBuyer1YesNo.new("person_4_relationship_to_buyer_1", nil, self, person_index: 4) : Form::Sales::Pages::PersonRelationshipToBuyer1.new("person_4_relationship_to_buyer_1", nil, self, person_index: 4)),
-      (Form::Sales::Pages::PartnerUnder16ValueCheck.new("relationship_4_partner_under_16_value_check", nil, self, person_index: 4) if form.start_year_2024_or_later?),
-      (Form::Sales::Pages::MultiplePartnersValueCheck.new("relationship_4_multiple_partners_value_check", nil, self, person_index: 4) if form.start_year_2024_or_later?),
-      (Form::Sales::Pages::PersonStudentNotChildValueCheck.new("relationship_4_student_not_child_value_check", nil, self, person_index: 4) unless form.start_year_2025_or_later?),
-      Form::Sales::Pages::PersonAge.new("person_4_age", nil, self, person_index: 4),
-      Form::Sales::Pages::RetirementValueCheck.new("age_4_retirement_value_check", nil, self, person_index: 4),
-      (Form::Sales::Pages::NotRetiredValueCheck.new("age_4_not_retired_value_check", nil, self, person_index: 4) if form.start_year_2024_or_later?),
-      (Form::Sales::Pages::PersonStudentNotChildValueCheck.new("age_4_student_not_child_value_check", nil, self, person_index: 4) unless form.start_year_2025_or_later?),
-      (Form::Sales::Pages::PartnerUnder16ValueCheck.new("age_4_partner_under_16_value_check", nil, self, person_index: 4) if form.start_year_2024_or_later?),
-      (Form::Sales::Pages::PersonSexRegisteredAtBirth.new("person_4_sex_registered_at_birth", nil, self, person_index: 4) if form.start_year_2026_or_later?),
-      Form::Sales::Pages::PersonGenderIdentity.new("person_4_gender_identity", nil, self, person_index: 4),
-      Form::Sales::Pages::PersonWorkingSituation.new("person_4_working_situation", nil, self, person_index: 4),
-      Form::Sales::Pages::RetirementValueCheck.new("working_situation_4_retirement_value_check", nil, self, person_index: 4),
-      (Form::Sales::Pages::NotRetiredValueCheck.new("working_situation_4_not_retired_value_check", nil, self, person_index: 4) if form.start_year_2024_or_later?),
-      (Form::Sales::Pages::PersonStudentNotChildValueCheck.new("working_situation_4_student_not_child_value_check", nil, self, person_index: 4) unless form.start_year_2025_or_later?),
-      Form::Sales::Pages::PersonKnown.new("person_5_known", nil, self, person_index: 5),
-      (form.start_year_2025_or_later? ? Form::Sales::Pages::PersonRelationshipToBuyer1YesNo.new("person_5_relationship_to_buyer_1", nil, self, person_index: 5) : Form::Sales::Pages::PersonRelationshipToBuyer1.new("person_5_relationship_to_buyer_1", nil, self, person_index: 5)),
-      (Form::Sales::Pages::PartnerUnder16ValueCheck.new("relationship_5_partner_under_16_value_check", nil, self, person_index: 5) if form.start_year_2024_or_later?),
-      (Form::Sales::Pages::MultiplePartnersValueCheck.new("relationship_5_multiple_partners_value_check", nil, self, person_index: 5) if form.start_year_2024_or_later?),
-      (Form::Sales::Pages::PersonStudentNotChildValueCheck.new("relationship_5_student_not_child_value_check", nil, self, person_index: 5) unless form.start_year_2025_or_later?),
-      Form::Sales::Pages::PersonAge.new("person_5_age", nil, self, person_index: 5),
-      Form::Sales::Pages::RetirementValueCheck.new("age_5_retirement_value_check", nil, self, person_index: 5),
-      (Form::Sales::Pages::NotRetiredValueCheck.new("age_5_not_retired_value_check", nil, self, person_index: 5) if form.start_year_2024_or_later?),
-      (Form::Sales::Pages::PersonStudentNotChildValueCheck.new("age_5_student_not_child_value_check", nil, self, person_index: 5) unless form.start_year_2025_or_later?),
-      (Form::Sales::Pages::PartnerUnder16ValueCheck.new("age_5_partner_under_16_value_check", nil, self, person_index: 5) if form.start_year_2024_or_later?),
-      (Form::Sales::Pages::PersonSexRegisteredAtBirth.new("person_5_sex_registered_at_birth", nil, self, person_index: 5) if form.start_year_2026_or_later?),
-      Form::Sales::Pages::PersonGenderIdentity.new("person_5_gender_identity", nil, self, person_index: 5),
-      Form::Sales::Pages::PersonWorkingSituation.new("person_5_working_situation", nil, self, person_index: 5),
-      Form::Sales::Pages::RetirementValueCheck.new("working_situation_5_retirement_value_check", nil, self, person_index: 5),
-      (Form::Sales::Pages::NotRetiredValueCheck.new("working_situation_5_not_retired_value_check", nil, self, person_index: 5) if form.start_year_2024_or_later?),
-      (Form::Sales::Pages::PersonStudentNotChildValueCheck.new("working_situation_5_student_not_child_value_check", nil, self, person_index: 5) unless form.start_year_2025_or_later?),
-      Form::Sales::Pages::PersonKnown.new("person_6_known", nil, self, person_index: 6),
-      (form.start_year_2025_or_later? ? Form::Sales::Pages::PersonRelationshipToBuyer1YesNo.new("person_6_relationship_to_buyer_1", nil, self, person_index: 6) : Form::Sales::Pages::PersonRelationshipToBuyer1.new("person_6_relationship_to_buyer_1", nil, self, person_index: 6)),
-      (Form::Sales::Pages::PartnerUnder16ValueCheck.new("relationship_6_partner_under_16_value_check", nil, self, person_index: 6) if form.start_year_2024_or_later?),
-      (Form::Sales::Pages::MultiplePartnersValueCheck.new("relationship_6_multiple_partners_value_check", nil, self, person_index: 6) if form.start_year_2024_or_later?),
-      (Form::Sales::Pages::PersonStudentNotChildValueCheck.new("relationship_6_student_not_child_value_check", nil, self, person_index: 6) unless form.start_year_2025_or_later?),
-      Form::Sales::Pages::PersonAge.new("person_6_age", nil, self, person_index: 6),
-      Form::Sales::Pages::RetirementValueCheck.new("age_6_retirement_value_check", nil, self, person_index: 6),
-      (Form::Sales::Pages::NotRetiredValueCheck.new("age_6_not_retired_value_check", nil, self, person_index: 6) if form.start_year_2024_or_later?),
-      (Form::Sales::Pages::PersonStudentNotChildValueCheck.new("age_6_student_not_child_value_check", nil, self, person_index: 6) unless form.start_year_2025_or_later?),
-      (Form::Sales::Pages::PartnerUnder16ValueCheck.new("age_6_partner_under_16_value_check", nil, self, person_index: 6) if form.start_year_2024_or_later?),
-      (Form::Sales::Pages::PersonSexRegisteredAtBirth.new("person_6_sex_registered_at_birth", nil, self, person_index: 6) if form.start_year_2026_or_later?),
-      Form::Sales::Pages::PersonGenderIdentity.new("person_6_gender_identity", nil, self, person_index: 6),
-      Form::Sales::Pages::PersonWorkingSituation.new("person_6_working_situation", nil, self, person_index: 6),
-      Form::Sales::Pages::RetirementValueCheck.new("working_situation_6_retirement_value_check", nil, self, person_index: 6),
-      (Form::Sales::Pages::NotRetiredValueCheck.new("working_situation_6_not_retired_value_check", nil, self, person_index: 6) if form.start_year_2024_or_later?),
-      (Form::Sales::Pages::PersonStudentNotChildValueCheck.new("working_situation_6_student_not_child_value_check", nil, self, person_index: 6) unless form.start_year_2025_or_later?),
+      (2..6).flat_map { |index| person_pages(index) },
     ].flatten.compact
   end
 
+  def person_pages(person_index)
+    [
+      Form::Sales::Pages::PersonKnown.new("person_#{person_index}_known", nil, self, person_index:),
+      (form.start_year_2025_or_later? ? Form::Sales::Pages::PersonRelationshipToBuyer1YesNo.new("person_#{person_index}_relationship_to_buyer_1", nil, self, person_index:) : Form::Sales::Pages::PersonRelationshipToBuyer1.new("person_#{person_index}_relationship_to_buyer_1", nil, self, person_index:)),
+      (Form::Sales::Pages::PartnerUnder16ValueCheck.new("relationship_#{person_index}_partner_under_16_value_check", nil, self, person_index:) if form.start_year_2024_or_later?),
+      (Form::Sales::Pages::MultiplePartnersValueCheck.new("relationship_#{person_index}_multiple_partners_value_check", nil, self, person_index:) if form.start_year_2024_or_later?),
+      (Form::Sales::Pages::PersonStudentNotChildValueCheck.new("relationship_#{person_index}_student_not_child_value_check", nil, self, person_index:) unless form.start_year_2025_or_later?),
+      Form::Sales::Pages::PersonAge.new("person_#{person_index}_age", nil, self, person_index:),
+      Form::Sales::Pages::RetirementValueCheck.new("age_#{person_index}_retirement_value_check", nil, self, person_index:),
+      (Form::Sales::Pages::NotRetiredValueCheck.new("age_#{person_index}_not_retired_value_check", nil, self, person_index:) if form.start_year_2024_or_later?),
+      (Form::Sales::Pages::PersonStudentNotChildValueCheck.new("age_#{person_index}_student_not_child_value_check", nil, self, person_index:) unless form.start_year_2025_or_later?),
+      (Form::Sales::Pages::PartnerUnder16ValueCheck.new("age_#{person_index}_partner_under_16_value_check", nil, self, person_index:) if form.start_year_2024_or_later?),
+      (Form::Sales::Pages::PersonGenderIdentity.new("person_#{person_index}_gender_identity", nil, self, person_index:) unless form.start_year_2026_or_later?),
+      (Form::Sales::Pages::PersonSexRegisteredAtBirth.new("person_#{person_index}_sex_registered_at_birth", nil, self, person_index:) if form.start_year_2026_or_later?),
+      Form::Sales::Pages::PersonWorkingSituation.new("person_#{person_index}_working_situation", nil, self, person_index:),
+      Form::Sales::Pages::RetirementValueCheck.new("working_situation_#{person_index}_retirement_value_check", nil, self, person_index:),
+      (Form::Sales::Pages::NotRetiredValueCheck.new("working_situation_#{person_index}_not_retired_value_check", nil, self, person_index:) if form.start_year_2024_or_later?),
+      (Form::Sales::Pages::PersonStudentNotChildValueCheck.new("working_situation_#{person_index}_student_not_child_value_check", nil, self, person_index:) unless form.start_year_2025_or_later?),
+    ]
+  end
+
   def buyer_2_ethnicity_nationality_pages
     if form.start_date.year >= 2023
       [
diff --git a/config/locales/forms/2026/lettings/household_characteristics.en.yml b/config/locales/forms/2026/lettings/household_characteristics.en.yml
index 83665004f..73b1fbae9 100644
--- a/config/locales/forms/2026/lettings/household_characteristics.en.yml
+++ b/config/locales/forms/2026/lettings/household_characteristics.en.yml
@@ -44,13 +44,6 @@ en:
             hint_text: ""
             question_text: "Enter gender identity"
 
-          sex1:
-            page_header: ""
-            check_answer_label: "Lead tenant’s gender identity"
-            check_answer_prompt: ""
-            hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth."
-            question_text: "Which of these best describes the lead tenant’s gender identity?"
-
           ethnic_group:
             page_header: ""
             check_answer_label: "Lead tenant’s ethnic group"
@@ -158,13 +151,6 @@ en:
             hint_text: ""
             question_text: "Enter gender identity"
 
-          sex2:
-            page_header: ""
-            check_answer_label: "Person 2’s gender identity"
-            check_answer_prompt: ""
-            hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth."
-            question_text: "Which of these best describes person 2’s gender identity?"
-
           ecstat2:
             page_header: ""
             check_answer_label: "Person 2’s working situation"
@@ -220,13 +206,6 @@ en:
             hint_text: ""
             question_text: "Enter gender identity"
 
-          sex3:
-            page_header: ""
-            check_answer_label: "Person 3’s gender identity"
-            check_answer_prompt: ""
-            hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth."
-            question_text: "Which of these best describes person 3’s gender identity?"
-
           ecstat3:
             page_header: ""
             check_answer_label: "Person 3’s working situation"
@@ -282,13 +261,6 @@ en:
             hint_text: ""
             question_text: "Enter gender identity"
 
-          sex4:
-            page_header: ""
-            check_answer_label: "Person 4’s gender identity"
-            check_answer_prompt: ""
-            hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth."
-            question_text: "Which of these best describes person 4’s gender identity?"
-
           ecstat4:
             page_header: ""
             check_answer_label: "Person 4’s working situation"
@@ -344,13 +316,6 @@ en:
             hint_text: ""
             question_text: "Enter gender identity"
 
-          sex5:
-            page_header: ""
-            check_answer_label: "Person 5’s gender identity"
-            check_answer_prompt: ""
-            hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth."
-            question_text: "Which of these best describes person 5’s gender identity?"
-
           ecstat5:
             page_header: ""
             check_answer_label: "Person 5’s working situation"
@@ -406,13 +371,6 @@ en:
             hint_text: ""
             question_text: "Enter gender identity"
 
-          sex6:
-            page_header: ""
-            check_answer_label: "Person 6’s gender identity"
-            check_answer_prompt: ""
-            hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth."
-            question_text: "Which of these best describes person 6’s gender identity?"
-
           ecstat6:
             page_header: ""
             check_answer_label: "Person 6’s working situation"
@@ -468,13 +426,6 @@ en:
             hint_text: ""
             question_text: "Enter gender identity"
 
-          sex7:
-            page_header: ""
-            check_answer_label: "Person 7’s gender identity"
-            check_answer_prompt: ""
-            hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth."
-            question_text: "Which of these best describes person 7’s gender identity?"
-
           ecstat7:
             page_header: ""
             check_answer_label: "Person 7’s working situation"
@@ -530,13 +481,6 @@ en:
             hint_text: ""
             question_text: "Enter gender identity"
 
-          sex8:
-            page_header: ""
-            check_answer_label: "Person 8’s gender identity"
-            check_answer_prompt: ""
-            hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth."
-            question_text: "Which of these best describes person 8’s gender identity?"
-
           ecstat8:
             page_header: ""
             check_answer_label: "Person 8’s working situation"
diff --git a/config/locales/forms/2026/sales/household_characteristics.en.yml b/config/locales/forms/2026/sales/household_characteristics.en.yml
index 4bdb07670..3639cca01 100644
--- a/config/locales/forms/2026/sales/household_characteristics.en.yml
+++ b/config/locales/forms/2026/sales/household_characteristics.en.yml
@@ -23,13 +23,6 @@ en:
             hint_text: "This is the sex that was registered at birth. The next question will ask about the buyer's gender identity."
             question_text: "What was buyer 1's sex at birth?"
 
-          sex1:
-            page_header: ""
-            check_answer_label: "Buyer 1’s gender identity"
-            check_answer_prompt: ""
-            hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth."
-            question_text: "Which of these best describes buyer 1’s gender identity?"
-
           ethnic_group:
             page_header: ""
             check_answer_label: "Buyer 1’s ethnic group"
@@ -151,20 +144,6 @@ en:
               hint_text: "This is the sex that was registered at birth. The next question will ask about the person's gender identity."
               question_text: "What was person 2's sex at birth?"
 
-          sex2:
-            buyer:
-              page_header: ""
-              check_answer_label: "Buyer 2’s gender identity"
-              check_answer_prompt: ""
-              hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth."
-              question_text: "Which of these best describes buyer 2’s gender identity?"
-            person:
-              page_header: ""
-              check_answer_label: "Person 2’s gender identity"
-              check_answer_prompt: ""
-              hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth."
-              question_text: "Which of these best describes person 2’s gender identity?"
-
           ethnic_group2:
             page_header: ""
             check_answer_label: "Buyer 2’s ethnic group"
@@ -294,13 +273,6 @@ en:
             hint_text: "This is the sex that was registered at birth. The next question will ask about the person's gender identity."
             question_text: "What was person 3's sex at birth?"
 
-          sex3:
-            page_header: ""
-            check_answer_label: "Person 3’s gender identity"
-            check_answer_prompt: ""
-            hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth."
-            question_text: "Which of these best describes person 3’s gender identity?"
-
           ecstat3:
             page_header: ""
             check_answer_label: "Person 3’s working situation"
@@ -342,13 +314,6 @@ en:
             hint_text: "This is the sex that was registered at birth. The next question will ask about the person's gender identity."
             question_text: "What was person 4's sex at birth?"
 
-          sex4:
-            page_header: ""
-            check_answer_label: "Person 4’s gender identity"
-            check_answer_prompt: ""
-            hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth."
-            question_text: "Which of these best describes person 4’s gender identity?"
-
           ecstat4:
             page_header: ""
             check_answer_label: "Person 4’s working situation"
@@ -390,13 +355,6 @@ en:
             hint_text: "This is the sex that was registered at birth. The next question will ask about the person's gender identity."
             question_text: "What was person 5's sex at birth?"
 
-          sex5:
-            page_header: ""
-            check_answer_label: "Person 5’s gender identity"
-            check_answer_prompt: ""
-            hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth."
-            question_text: "Which of these best describes person 5’s gender identity?"
-
           ecstat5:
             page_header: ""
             check_answer_label: "Person 5’s working situation"
@@ -438,13 +396,6 @@ en:
             hint_text: "This is the sex that was registered at birth. The next question will ask about the person's gender identity."
             question_text: "What was person 6's sex at birth?"
 
-          sex6:
-            page_header: ""
-            check_answer_label: "Person 6’s gender identity"
-            check_answer_prompt: ""
-            hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth."
-            question_text: "Which of these best describes person 6’s gender identity?"
-
           ecstat6:
             page_header: ""
             check_answer_label: "Person 6’s working situation"
diff --git a/spec/models/form/sales/subsections/household_characteristics_spec.rb b/spec/models/form/sales/subsections/household_characteristics_spec.rb
index 58ce2ce5f..2fea8d88d 100644
--- a/spec/models/form/sales/subsections/household_characteristics_spec.rb
+++ b/spec/models/form/sales/subsections/household_characteristics_spec.rb
@@ -407,7 +407,6 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
           age_1_old_persons_shared_ownership_joint_purchase_value_check
           age_1_old_persons_shared_ownership_value_check
           buyer_1_sex_registered_at_birth
-          buyer_1_gender_identity
           buyer_1_ethnic_group
           buyer_1_ethnic_background_black
           buyer_1_ethnic_background_asian
@@ -428,7 +427,6 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
           age_2_buyer_retirement_value_check
           age_2_buyer_not_retired_value_check
           buyer_2_sex_registered_at_birth
-          buyer_2_gender_identity
           buyer_2_ethnic_group
           buyer_2_ethnic_background_black
           buyer_2_ethnic_background_asian
@@ -453,7 +451,6 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
           age_2_not_retired_value_check
           age_2_partner_under_16_value_check
           person_2_sex_registered_at_birth
-          person_2_gender_identity
           person_2_working_situation
           working_situation_2_retirement_value_check
           working_situation_2_not_retired_value_check
@@ -466,7 +463,6 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
           age_3_not_retired_value_check
           age_3_partner_under_16_value_check
           person_3_sex_registered_at_birth
-          person_3_gender_identity
           person_3_working_situation
           working_situation_3_retirement_value_check
           working_situation_3_not_retired_value_check
@@ -479,7 +475,6 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
           age_4_not_retired_value_check
           age_4_partner_under_16_value_check
           person_4_sex_registered_at_birth
-          person_4_gender_identity
           person_4_working_situation
           working_situation_4_retirement_value_check
           working_situation_4_not_retired_value_check
@@ -492,7 +487,6 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
           age_5_not_retired_value_check
           age_5_partner_under_16_value_check
           person_5_sex_registered_at_birth
-          person_5_gender_identity
           person_5_working_situation
           working_situation_5_retirement_value_check
           working_situation_5_not_retired_value_check
@@ -505,7 +499,6 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
           age_6_not_retired_value_check
           age_6_partner_under_16_value_check
           person_6_sex_registered_at_birth
-          person_6_gender_identity
           person_6_working_situation
           working_situation_6_retirement_value_check
           working_situation_6_not_retired_value_check