diff --git a/app/models/form/sales/pages/person.rb b/app/models/form/sales/pages/person.rb
index 3cf347353..e198754b6 100644
--- a/app/models/form/sales/pages/person.rb
+++ b/app/models/form/sales/pages/person.rb
@@ -3,22 +3,4 @@ class Form::Sales::Pages::Person < ::Form::Page
     super(id, hsh, subsection)
     @person_index = person_index
   end
-
-  def person_display_number
-    joint_purchase? ? @person_index - 2 : @person_index - 1
-  end
-
-  def joint_purchase?
-    id.include?("_joint_purchase")
-  end
-
-  def details_known_question_id
-    "details_known_#{person_display_number}"
-  end
-
-  def field_for_person(field, suffix = "")
-    return [field, person_display_number, suffix].join if field == "details_known_"
-
-    [field, @person_index, suffix].join
-  end
 end
diff --git a/app/models/form/sales/questions/person.rb b/app/models/form/sales/questions/person.rb
deleted file mode 100644
index 3c7f78214..000000000
--- a/app/models/form/sales/questions/person.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-class Form::Sales::Questions::Person < ::Form::Question
-  def initialize(id, hsh, page, person_index:)
-    super(id, hsh, page)
-    @person_index = person_index
-  end
-
-  def person_display_number
-    joint_purchase? ? @person_index - 2 : @person_index - 1
-  end
-
-  def joint_purchase?
-    page.id.include?("_joint_purchase")
-  end
-
-  def field_for_person(field, suffix = "")
-    return [field, person_display_number, suffix].join if field == "details_known_"
-
-    [field, @person_index, suffix].join
-  end
-end
diff --git a/app/models/form/sales/questions/person_age.rb b/app/models/form/sales/questions/person_age.rb
index 91a55d82a..c0a3e55a8 100644
--- a/app/models/form/sales/questions/person_age.rb
+++ b/app/models/form/sales/questions/person_age.rb
@@ -1,6 +1,6 @@
-class Form::Sales::Questions::PersonAge < Form::Sales::Questions::Person
+class Form::Sales::Questions::PersonAge < ::Form::Question
   def initialize(id, hsh, page, person_index:)
-    super
+    super(id, hsh, page)
     @check_answer_label = "Person #{person_index}’s age"
     @header = "Age"
     @type = "numeric"
diff --git a/app/models/form/sales/questions/person_age_known.rb b/app/models/form/sales/questions/person_age_known.rb
index 2a272840f..198b4ed30 100644
--- a/app/models/form/sales/questions/person_age_known.rb
+++ b/app/models/form/sales/questions/person_age_known.rb
@@ -1,6 +1,6 @@
-class Form::Sales::Questions::PersonAgeKnown < ::Form::Sales::Questions::Person
+class Form::Sales::Questions::PersonAgeKnown < ::Form::Question
   def initialize(id, hsh, page, person_index:)
-    super
+    super(id, hsh, page)
     @check_answer_label = "Person #{person_index}’s age known?"
     @header = "Do you know person #{person_index}’s age?"
     @type = "radio"
diff --git a/app/models/form/sales/questions/person_gender_identity.rb b/app/models/form/sales/questions/person_gender_identity.rb
index e2db984aa..01967e737 100644
--- a/app/models/form/sales/questions/person_gender_identity.rb
+++ b/app/models/form/sales/questions/person_gender_identity.rb
@@ -1,6 +1,6 @@
-class Form::Sales::Questions::PersonGenderIdentity < ::Form::Sales::Questions::Person
+class Form::Sales::Questions::PersonGenderIdentity < ::Form::Question
   def initialize(id, hsh, page, person_index:)
-    super
+    super(id, hsh, page)
     @check_answer_label = "Person #{person_index}’s gender identity"
     @header = "Which of these best describes Person #{person_index}’s gender identity?"
     @type = "radio"
diff --git a/app/models/form/sales/questions/person_known.rb b/app/models/form/sales/questions/person_known.rb
index 1714be055..80dc6f36b 100644
--- a/app/models/form/sales/questions/person_known.rb
+++ b/app/models/form/sales/questions/person_known.rb
@@ -1,6 +1,6 @@
-class Form::Sales::Questions::PersonKnown < Form::Sales::Questions::Person
+class Form::Sales::Questions::PersonKnown < ::Form::Question
   def initialize(id, hsh, page, person_index:)
-    super
+    super(id, hsh, page)
     @check_answer_label = "Details known for person #{person_index}?"
     @header = "Do you know the details for person #{person_index}?"
     @type = "radio"
diff --git a/app/models/form/sales/questions/person_relationship_to_buyer_1.rb b/app/models/form/sales/questions/person_relationship_to_buyer_1.rb
index b4651ee2f..774de4208 100644
--- a/app/models/form/sales/questions/person_relationship_to_buyer_1.rb
+++ b/app/models/form/sales/questions/person_relationship_to_buyer_1.rb
@@ -1,6 +1,6 @@
-class Form::Sales::Questions::PersonRelationshipToBuyer1 < ::Form::Sales::Questions::Person
+class Form::Sales::Questions::PersonRelationshipToBuyer1 < ::Form::Question
   def initialize(id, hsh, page, person_index:)
-    super
+    super(id, hsh, page)
     @check_answer_label = "Person #{person_index}’s relationship to Buyer 1"
     @header = "What is Person #{person_index}’s relationship to Buyer 1?"
     @type = "radio"
diff --git a/app/models/form/sales/questions/person_working_situation.rb b/app/models/form/sales/questions/person_working_situation.rb
index b114334bf..0740541b3 100644
--- a/app/models/form/sales/questions/person_working_situation.rb
+++ b/app/models/form/sales/questions/person_working_situation.rb
@@ -1,6 +1,6 @@
-class Form::Sales::Questions::PersonWorkingSituation < ::Form::Sales::Questions::Person
+class Form::Sales::Questions::PersonWorkingSituation < ::Form::Question
   def initialize(id, hsh, page, person_index:)
-    super
+    super(id, hsh, page)
     @check_answer_label = "Person #{person_index}’s working situation"
     @header = "Which of these best describes Person #{person_index}’s working situation?"
     @type = "radio"