diff --git a/app/models/form/common/pages/created_by.rb b/app/models/form/common/pages/created_by.rb
index e02f97740..94c7dc587 100644
--- a/app/models/form/common/pages/created_by.rb
+++ b/app/models/form/common/pages/created_by.rb
@@ -2,9 +2,6 @@ class Form::Common::Pages::CreatedBy < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "created_by"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/common/pages/organisation.rb b/app/models/form/common/pages/organisation.rb
index 48b157a56..eb799d1e9 100644
--- a/app/models/form/common/pages/organisation.rb
+++ b/app/models/form/common/pages/organisation.rb
@@ -2,9 +2,6 @@ class Form::Common::Pages::Organisation < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "organisation"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/common/questions/created_by_id.rb b/app/models/form/common/questions/created_by_id.rb
index b8409d99c..5b6631868 100644
--- a/app/models/form/common/questions/created_by_id.rb
+++ b/app/models/form/common/questions/created_by_id.rb
@@ -4,9 +4,7 @@ class Form::Common::Questions::CreatedById < ::Form::Question
     @id = "created_by_id"
     @check_answer_label = "User"
     @header = "Which user are you creating this log for?"
-    @hint_text = ""
     @type = "select"
-    @page = page
   end
 
   def answer_options
diff --git a/app/models/form/common/questions/owning_organisation_id.rb b/app/models/form/common/questions/owning_organisation_id.rb
index 9adb0bf64..c09968ef9 100644
--- a/app/models/form/common/questions/owning_organisation_id.rb
+++ b/app/models/form/common/questions/owning_organisation_id.rb
@@ -4,9 +4,7 @@ class Form::Common::Questions::OwningOrganisationId < ::Form::Question
     @id = "owning_organisation_id"
     @check_answer_label = "Owning organisation"
     @header = "Which organisation owns this log?"
-    @hint_text = ""
     @type = "select"
-    @page = page
   end
 
   def answer_options
diff --git a/app/models/form/lettings/pages/created_by.rb b/app/models/form/lettings/pages/created_by.rb
index 42289befa..8a30428e0 100644
--- a/app/models/form/lettings/pages/created_by.rb
+++ b/app/models/form/lettings/pages/created_by.rb
@@ -2,9 +2,6 @@ class Form::Lettings::Pages::CreatedBy < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "created_by"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/lettings/pages/location.rb b/app/models/form/lettings/pages/location.rb
index d15091cb5..9641d0e1a 100644
--- a/app/models/form/lettings/pages/location.rb
+++ b/app/models/form/lettings/pages/location.rb
@@ -1,8 +1,6 @@
 class Form::Lettings::Pages::Location < ::Form::Page
   def initialize(_id, hsh, subsection)
     super("location", hsh, subsection)
-    @header = ""
-    @description = ""
     @depends_on = [{
       "needstype" => 2,
       "scheme_has_multiple_locations?" => true,
diff --git a/app/models/form/lettings/pages/managing_organisation.rb b/app/models/form/lettings/pages/managing_organisation.rb
index bc8534999..1be4e3daa 100644
--- a/app/models/form/lettings/pages/managing_organisation.rb
+++ b/app/models/form/lettings/pages/managing_organisation.rb
@@ -2,9 +2,6 @@ class Form::Lettings::Pages::ManagingOrganisation < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "managing_organisation"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/lettings/pages/needs_type.rb b/app/models/form/lettings/pages/needs_type.rb
index 0a67d831b..11f36fa4e 100644
--- a/app/models/form/lettings/pages/needs_type.rb
+++ b/app/models/form/lettings/pages/needs_type.rb
@@ -2,9 +2,6 @@ class Form::Lettings::Pages::NeedsType < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "needs_type"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/lettings/pages/property_reference.rb b/app/models/form/lettings/pages/property_reference.rb
index 150974ee8..d8cc09b79 100644
--- a/app/models/form/lettings/pages/property_reference.rb
+++ b/app/models/form/lettings/pages/property_reference.rb
@@ -2,9 +2,6 @@ class Form::Lettings::Pages::PropertyReference < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "property_reference"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/lettings/pages/renewal.rb b/app/models/form/lettings/pages/renewal.rb
index 873ff8822..01cc81426 100644
--- a/app/models/form/lettings/pages/renewal.rb
+++ b/app/models/form/lettings/pages/renewal.rb
@@ -2,9 +2,6 @@ class Form::Lettings::Pages::Renewal < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "renewal"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/lettings/pages/rent_type.rb b/app/models/form/lettings/pages/rent_type.rb
index d1ac4de99..faf3dfefc 100644
--- a/app/models/form/lettings/pages/rent_type.rb
+++ b/app/models/form/lettings/pages/rent_type.rb
@@ -1,8 +1,6 @@
 class Form::Lettings::Pages::RentType < ::Form::Page
   def initialize(_id, hsh, subsection)
     super("rent_type", hsh, subsection)
-    @header = ""
-    @description = ""
     @derived = true
   end
 
diff --git a/app/models/form/lettings/pages/scheme.rb b/app/models/form/lettings/pages/scheme.rb
index 77828e1cf..afa436864 100644
--- a/app/models/form/lettings/pages/scheme.rb
+++ b/app/models/form/lettings/pages/scheme.rb
@@ -1,8 +1,6 @@
 class Form::Lettings::Pages::Scheme < ::Form::Page
   def initialize(_id, hsh, subsection)
     super("scheme", hsh, subsection)
-    @header = ""
-    @description = ""
     @depends_on = [{
       "needstype" => 2,
     }]
diff --git a/app/models/form/lettings/pages/stock_owner.rb b/app/models/form/lettings/pages/stock_owner.rb
index d142214c5..d92824f0e 100644
--- a/app/models/form/lettings/pages/stock_owner.rb
+++ b/app/models/form/lettings/pages/stock_owner.rb
@@ -2,9 +2,6 @@ class Form::Lettings::Pages::StockOwner < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "stock_owner"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/lettings/pages/tenancy_start_date.rb b/app/models/form/lettings/pages/tenancy_start_date.rb
index fd0810893..bd9bbbb5d 100644
--- a/app/models/form/lettings/pages/tenancy_start_date.rb
+++ b/app/models/form/lettings/pages/tenancy_start_date.rb
@@ -2,8 +2,6 @@ class Form::Lettings::Pages::TenancyStartDate < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "tenancy_start_date"
-    @description = ""
-    @subsection = subsection
     @next_unresolved_page_id = "scheme"
   end
 
diff --git a/app/models/form/lettings/pages/tenant_code.rb b/app/models/form/lettings/pages/tenant_code.rb
index 67771514a..eaf7a9f8a 100644
--- a/app/models/form/lettings/pages/tenant_code.rb
+++ b/app/models/form/lettings/pages/tenant_code.rb
@@ -2,9 +2,6 @@ class Form::Lettings::Pages::TenantCode < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "tenant_code"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/lettings/questions/created_by_id.rb b/app/models/form/lettings/questions/created_by_id.rb
index a120e72a8..d61be8882 100644
--- a/app/models/form/lettings/questions/created_by_id.rb
+++ b/app/models/form/lettings/questions/created_by_id.rb
@@ -4,9 +4,7 @@ class Form::Lettings::Questions::CreatedById < ::Form::Question
     @id = "created_by_id"
     @check_answer_label = "Log owner"
     @header = "Which user are you creating this log for?"
-    @hint_text = ""
     @type = "select"
-    @page = page
   end
 
   def answer_options
diff --git a/app/models/form/lettings/questions/irproduct_other.rb b/app/models/form/lettings/questions/irproduct_other.rb
index 7607d6d9c..99945ceea 100644
--- a/app/models/form/lettings/questions/irproduct_other.rb
+++ b/app/models/form/lettings/questions/irproduct_other.rb
@@ -5,6 +5,5 @@ class Form::Lettings::Questions::IrproductOther < ::Form::Question
     @check_answer_label = "Product name"
     @header = "Name of rent product"
     @type = "text"
-    @page = page
   end
 end
diff --git a/app/models/form/lettings/questions/location_id.rb b/app/models/form/lettings/questions/location_id.rb
index 84b37ec50..07ed61318 100644
--- a/app/models/form/lettings/questions/location_id.rb
+++ b/app/models/form/lettings/questions/location_id.rb
@@ -3,7 +3,6 @@ class Form::Lettings::Questions::LocationId < ::Form::Question
     super("location_id", hsh, page)
     @check_answer_label = "Location"
     @header = "Which location is this log for?"
-    @hint_text = ""
     @type = "radio"
     @answer_options = answer_options
     @inferred_answers = {
diff --git a/app/models/form/lettings/questions/managing_organisation.rb b/app/models/form/lettings/questions/managing_organisation.rb
index 3f33c8617..bd4f57fe8 100644
--- a/app/models/form/lettings/questions/managing_organisation.rb
+++ b/app/models/form/lettings/questions/managing_organisation.rb
@@ -8,7 +8,6 @@ class Form::Lettings::Questions::ManagingOrganisation < ::Form::Question
     @header = "Which organisation manages this letting?"
     @type = "select"
     @answer_options = answer_options
-    @page = page
   end
 
   def answer_options
diff --git a/app/models/form/lettings/questions/needs_type.rb b/app/models/form/lettings/questions/needs_type.rb
index 46949a2bf..331899821 100644
--- a/app/models/form/lettings/questions/needs_type.rb
+++ b/app/models/form/lettings/questions/needs_type.rb
@@ -7,7 +7,6 @@ class Form::Lettings::Questions::NeedsType < ::Form::Question
     @hint_text = "General needs housing includes both self-contained and shared housing without support or specific adaptations. Supported housing can include direct access hostels, group homes, residential care and nursing homes."
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/property_reference.rb b/app/models/form/lettings/questions/property_reference.rb
index 40517b9d3..75168f1bd 100644
--- a/app/models/form/lettings/questions/property_reference.rb
+++ b/app/models/form/lettings/questions/property_reference.rb
@@ -7,6 +7,5 @@ class Form::Lettings::Questions::PropertyReference < ::Form::Question
     @hint_text = "This is how you usually refer to this property on your own systems."
     @type = "text"
     @width = 10
-    @page = page
   end
 end
diff --git a/app/models/form/lettings/questions/renewal.rb b/app/models/form/lettings/questions/renewal.rb
index 06b5f0ff4..1282984cc 100644
--- a/app/models/form/lettings/questions/renewal.rb
+++ b/app/models/form/lettings/questions/renewal.rb
@@ -4,10 +4,8 @@ class Form::Lettings::Questions::Renewal < ::Form::Question
     @id = "renewal"
     @check_answer_label = "Property renewal"
     @header = "Is this letting a renewal?"
-    @hint_text = ""
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/rent_type.rb b/app/models/form/lettings/questions/rent_type.rb
index c7c23c74b..64e2839e2 100644
--- a/app/models/form/lettings/questions/rent_type.rb
+++ b/app/models/form/lettings/questions/rent_type.rb
@@ -4,11 +4,9 @@ class Form::Lettings::Questions::RentType < ::Form::Question
     @id = "rent_type"
     @check_answer_label = "Rent type"
     @header = "What is the rent type?"
-    @hint_text = ""
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @conditional_for = { "irproduct_other" => [5] }
-    @page = page
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/stock_owner.rb b/app/models/form/lettings/questions/stock_owner.rb
index 1f4323531..de82258a6 100644
--- a/app/models/form/lettings/questions/stock_owner.rb
+++ b/app/models/form/lettings/questions/stock_owner.rb
@@ -7,7 +7,6 @@ class Form::Lettings::Questions::StockOwner < ::Form::Question
     @check_answer_label = "Stock owner"
     @header = "Which organisation owns this property?"
     @type = "select"
-    @page = page
   end
 
   def answer_options
diff --git a/app/models/form/lettings/questions/tenancy_start_date.rb b/app/models/form/lettings/questions/tenancy_start_date.rb
index 925eb00bc..b50021597 100644
--- a/app/models/form/lettings/questions/tenancy_start_date.rb
+++ b/app/models/form/lettings/questions/tenancy_start_date.rb
@@ -6,6 +6,5 @@ class Form::Lettings::Questions::TenancyStartDate < ::Form::Question
     @header = "What is the tenancy start date?"
     @type = "date"
     @unresolved_hint_text = "Some scheme details have changed, and now this log needs updating. Check that the tenancy start date is correct."
-    @page = page
   end
 end
diff --git a/app/models/form/lettings/questions/tenant_code.rb b/app/models/form/lettings/questions/tenant_code.rb
index dcbbb72a8..1872ebe8e 100644
--- a/app/models/form/lettings/questions/tenant_code.rb
+++ b/app/models/form/lettings/questions/tenant_code.rb
@@ -7,6 +7,5 @@ class Form::Lettings::Questions::TenantCode < ::Form::Question
     @hint_text = "This is how you usually refer to this tenancy on your own systems."
     @type = "text"
     @width = 10
-    @page = page
   end
 end
diff --git a/app/models/form/sales/pages/about_deposit_with_discount.rb b/app/models/form/sales/pages/about_deposit_with_discount.rb
index 1de5365aa..6a4a54071 100644
--- a/app/models/form/sales/pages/about_deposit_with_discount.rb
+++ b/app/models/form/sales/pages/about_deposit_with_discount.rb
@@ -3,8 +3,6 @@ class Form::Sales::Pages::AboutDepositWithDiscount < ::Form::Page
     super
     @id = "about_deposit_with_discount"
     @header = "About the deposit"
-    @description = ""
-    @subsection = subsection
     @depends_on = [{ "is_type_discount?" => true }]
   end
 
diff --git a/app/models/form/sales/pages/about_deposit_without_discount.rb b/app/models/form/sales/pages/about_deposit_without_discount.rb
index 00f306208..65a59e6c0 100644
--- a/app/models/form/sales/pages/about_deposit_without_discount.rb
+++ b/app/models/form/sales/pages/about_deposit_without_discount.rb
@@ -2,8 +2,6 @@ class Form::Sales::Pages::AboutDepositWithoutDiscount < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @header = "About the deposit"
-    @description = ""
-    @subsection = subsection
     @depends_on = [{ "is_type_discount?" => false }]
   end
 
diff --git a/app/models/form/sales/pages/about_price_not_rtb.rb b/app/models/form/sales/pages/about_price_not_rtb.rb
index 795ed9226..6e1011a28 100644
--- a/app/models/form/sales/pages/about_price_not_rtb.rb
+++ b/app/models/form/sales/pages/about_price_not_rtb.rb
@@ -3,8 +3,6 @@ class Form::Sales::Pages::AboutPriceNotRtb < ::Form::Page
     super
     @id = "about_price_not_rtb"
     @header = "About the price of the property"
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "right_to_buy?" => false,
     }]
diff --git a/app/models/form/sales/pages/about_price_rtb.rb b/app/models/form/sales/pages/about_price_rtb.rb
index ec90afa01..ff338f6f6 100644
--- a/app/models/form/sales/pages/about_price_rtb.rb
+++ b/app/models/form/sales/pages/about_price_rtb.rb
@@ -3,8 +3,6 @@ class Form::Sales::Pages::AboutPriceRtb < ::Form::Page
     super
     @id = "about_price_rtb"
     @header = "About the price of the property"
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "right_to_buy?" => true,
     }]
diff --git a/app/models/form/sales/pages/about_price_shared_ownership.rb b/app/models/form/sales/pages/about_price_shared_ownership.rb
index b3f34c121..1f65a7d19 100644
--- a/app/models/form/sales/pages/about_price_shared_ownership.rb
+++ b/app/models/form/sales/pages/about_price_shared_ownership.rb
@@ -3,8 +3,6 @@ class Form::Sales::Pages::AboutPriceSharedOwnership < ::Form::Page
     super
     @id = "about_price_shared_ownership"
     @header = "About the price of the property"
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/sales/pages/about_staircase.rb b/app/models/form/sales/pages/about_staircase.rb
index 03ea570f7..fd740c10e 100644
--- a/app/models/form/sales/pages/about_staircase.rb
+++ b/app/models/form/sales/pages/about_staircase.rb
@@ -3,8 +3,6 @@ class Form::Sales::Pages::AboutStaircase < ::Form::Page
     super
     @id = "about_staircasing"
     @header = "About the staircasing transaction"
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "staircase" => 1,
     }]
diff --git a/app/models/form/sales/pages/age1.rb b/app/models/form/sales/pages/age1.rb
index 833758056..de9b1ef8d 100644
--- a/app/models/form/sales/pages/age1.rb
+++ b/app/models/form/sales/pages/age1.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::Age1 < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_1_age"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/sales/pages/age2.rb b/app/models/form/sales/pages/age2.rb
index b744935c6..d849c1465 100644
--- a/app/models/form/sales/pages/age2.rb
+++ b/app/models/form/sales/pages/age2.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::Age2 < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_2_age"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "jointpur" => 1,
     }]
diff --git a/app/models/form/sales/pages/armed_forces.rb b/app/models/form/sales/pages/armed_forces.rb
index 006380f02..d96f6a832 100644
--- a/app/models/form/sales/pages/armed_forces.rb
+++ b/app/models/form/sales/pages/armed_forces.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::ArmedForces < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "armed_forces"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/sales/pages/armed_forces_spouse.rb b/app/models/form/sales/pages/armed_forces_spouse.rb
index 7c4128b87..9dcc393fd 100644
--- a/app/models/form/sales/pages/armed_forces_spouse.rb
+++ b/app/models/form/sales/pages/armed_forces_spouse.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::ArmedForcesSpouse < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "armed_forces_spouse"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/sales/pages/buyer1_ethnic_background_arab.rb b/app/models/form/sales/pages/buyer1_ethnic_background_arab.rb
index 93fb1afe0..e0e74e129 100644
--- a/app/models/form/sales/pages/buyer1_ethnic_background_arab.rb
+++ b/app/models/form/sales/pages/buyer1_ethnic_background_arab.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::Buyer1EthnicBackgroundArab < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_1_ethnic_background_arab"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "ethnic_group" => 4,
     }]
diff --git a/app/models/form/sales/pages/buyer1_ethnic_background_asian.rb b/app/models/form/sales/pages/buyer1_ethnic_background_asian.rb
index dd6802a99..599a48f91 100644
--- a/app/models/form/sales/pages/buyer1_ethnic_background_asian.rb
+++ b/app/models/form/sales/pages/buyer1_ethnic_background_asian.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::Buyer1EthnicBackgroundAsian < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_1_ethnic_background_asian"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "ethnic_group" => 2,
     }]
diff --git a/app/models/form/sales/pages/buyer1_ethnic_background_black.rb b/app/models/form/sales/pages/buyer1_ethnic_background_black.rb
index ce6cf3a0b..73e17d912 100644
--- a/app/models/form/sales/pages/buyer1_ethnic_background_black.rb
+++ b/app/models/form/sales/pages/buyer1_ethnic_background_black.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::Buyer1EthnicBackgroundBlack < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_1_ethnic_background_black"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "ethnic_group" => 3,
     }]
diff --git a/app/models/form/sales/pages/buyer1_ethnic_background_mixed.rb b/app/models/form/sales/pages/buyer1_ethnic_background_mixed.rb
index 5225feed1..13fea19a7 100644
--- a/app/models/form/sales/pages/buyer1_ethnic_background_mixed.rb
+++ b/app/models/form/sales/pages/buyer1_ethnic_background_mixed.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::Buyer1EthnicBackgroundMixed < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_1_ethnic_background_mixed"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "ethnic_group" => 1,
     }]
diff --git a/app/models/form/sales/pages/buyer1_ethnic_background_white.rb b/app/models/form/sales/pages/buyer1_ethnic_background_white.rb
index 6351e50d7..2e4bd3097 100644
--- a/app/models/form/sales/pages/buyer1_ethnic_background_white.rb
+++ b/app/models/form/sales/pages/buyer1_ethnic_background_white.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::Buyer1EthnicBackgroundWhite < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_1_ethnic_background_white"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "ethnic_group" => 0,
     }]
diff --git a/app/models/form/sales/pages/buyer1_ethnic_group.rb b/app/models/form/sales/pages/buyer1_ethnic_group.rb
index 4daad4f1d..af0269290 100644
--- a/app/models/form/sales/pages/buyer1_ethnic_group.rb
+++ b/app/models/form/sales/pages/buyer1_ethnic_group.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::Buyer1EthnicGroup < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_1_ethnic_group"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/sales/pages/buyer1_income.rb b/app/models/form/sales/pages/buyer1_income.rb
index e4f88be81..943296d2b 100644
--- a/app/models/form/sales/pages/buyer1_income.rb
+++ b/app/models/form/sales/pages/buyer1_income.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::Buyer1Income < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_1_income"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/sales/pages/buyer1_income_value_check.rb b/app/models/form/sales/pages/buyer1_income_value_check.rb
index 51170702e..04540c47f 100644
--- a/app/models/form/sales/pages/buyer1_income_value_check.rb
+++ b/app/models/form/sales/pages/buyer1_income_value_check.rb
@@ -1,9 +1,6 @@
 class Form::Sales::Pages::Buyer1IncomeValueCheck < ::Form::Page
   def initialize(id, hsh, subsection)
     super
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [
       {
         "income1_under_soft_min?" => true,
diff --git a/app/models/form/sales/pages/buyer1_live_in_property.rb b/app/models/form/sales/pages/buyer1_live_in_property.rb
index 6146f6782..0d780ffed 100644
--- a/app/models/form/sales/pages/buyer1_live_in_property.rb
+++ b/app/models/form/sales/pages/buyer1_live_in_property.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::Buyer1LiveInProperty < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_1_live_in_property"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/sales/pages/buyer1_mortgage.rb b/app/models/form/sales/pages/buyer1_mortgage.rb
index e17e9124b..583d1e0b6 100644
--- a/app/models/form/sales/pages/buyer1_mortgage.rb
+++ b/app/models/form/sales/pages/buyer1_mortgage.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::Buyer1Mortgage < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_1_mortgage"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/sales/pages/buyer1_previous_tenure.rb b/app/models/form/sales/pages/buyer1_previous_tenure.rb
index 1379fbd30..52d08d8fb 100644
--- a/app/models/form/sales/pages/buyer1_previous_tenure.rb
+++ b/app/models/form/sales/pages/buyer1_previous_tenure.rb
@@ -3,8 +3,6 @@ class Form::Sales::Pages::Buyer1PreviousTenure < ::Form::Page
     super
     @id = "buyer1_previous_tenure"
     @header = "What was buyer 1's previous tenure?"
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/sales/pages/buyer1_working_situation.rb b/app/models/form/sales/pages/buyer1_working_situation.rb
index bde1dba09..8d56caa47 100644
--- a/app/models/form/sales/pages/buyer1_working_situation.rb
+++ b/app/models/form/sales/pages/buyer1_working_situation.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::Buyer1WorkingSituation < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_1_working_situation"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/sales/pages/buyer2_income.rb b/app/models/form/sales/pages/buyer2_income.rb
index 207b6ec46..65b88077d 100644
--- a/app/models/form/sales/pages/buyer2_income.rb
+++ b/app/models/form/sales/pages/buyer2_income.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::Buyer2Income < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_2_income"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "jointpur" => 1,
     }]
diff --git a/app/models/form/sales/pages/buyer2_live_in_property.rb b/app/models/form/sales/pages/buyer2_live_in_property.rb
index 03b13536f..8904c21f2 100644
--- a/app/models/form/sales/pages/buyer2_live_in_property.rb
+++ b/app/models/form/sales/pages/buyer2_live_in_property.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::Buyer2LiveInProperty < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_2_live_in_property"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "jointpur" => 1,
     }]
diff --git a/app/models/form/sales/pages/buyer2_mortgage.rb b/app/models/form/sales/pages/buyer2_mortgage.rb
index bcac72218..e8b0c3718 100644
--- a/app/models/form/sales/pages/buyer2_mortgage.rb
+++ b/app/models/form/sales/pages/buyer2_mortgage.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::Buyer2Mortgage < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_2_mortgage"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{ "jointpur" => 1 }]
   end
 
diff --git a/app/models/form/sales/pages/buyer2_relationship_to_buyer1.rb b/app/models/form/sales/pages/buyer2_relationship_to_buyer1.rb
index 8927ddd5a..026486883 100644
--- a/app/models/form/sales/pages/buyer2_relationship_to_buyer1.rb
+++ b/app/models/form/sales/pages/buyer2_relationship_to_buyer1.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::Buyer2RelationshipToBuyer1 < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_2_relationship_to_buyer_1"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "jointpur" => 1,
     }]
diff --git a/app/models/form/sales/pages/buyer2_working_situation.rb b/app/models/form/sales/pages/buyer2_working_situation.rb
index 83e4468db..4523c34cc 100644
--- a/app/models/form/sales/pages/buyer2_working_situation.rb
+++ b/app/models/form/sales/pages/buyer2_working_situation.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::Buyer2WorkingSituation < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_2_working_situation"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "jointpur" => 1,
     }]
diff --git a/app/models/form/sales/pages/buyer_company.rb b/app/models/form/sales/pages/buyer_company.rb
index dae1fecb9..b9f628f31 100644
--- a/app/models/form/sales/pages/buyer_company.rb
+++ b/app/models/form/sales/pages/buyer_company.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::BuyerCompany < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_company"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "ownershipsch" => 3,
     }]
diff --git a/app/models/form/sales/pages/buyer_interview.rb b/app/models/form/sales/pages/buyer_interview.rb
index a781d8a07..ebd2e387a 100644
--- a/app/models/form/sales/pages/buyer_interview.rb
+++ b/app/models/form/sales/pages/buyer_interview.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::BuyerInterview < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_interview"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/sales/pages/buyer_live.rb b/app/models/form/sales/pages/buyer_live.rb
index bf1302058..d0b772355 100644
--- a/app/models/form/sales/pages/buyer_live.rb
+++ b/app/models/form/sales/pages/buyer_live.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::BuyerLive < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_live"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "companybuy" => 2,
     }]
diff --git a/app/models/form/sales/pages/buyer_previous.rb b/app/models/form/sales/pages/buyer_previous.rb
index 5a75787c8..361b3ba47 100644
--- a/app/models/form/sales/pages/buyer_previous.rb
+++ b/app/models/form/sales/pages/buyer_previous.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::BuyerPrevious < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_previous"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/sales/pages/buyer_still_serving.rb b/app/models/form/sales/pages/buyer_still_serving.rb
index 08d2d951b..8bbcf7ff1 100644
--- a/app/models/form/sales/pages/buyer_still_serving.rb
+++ b/app/models/form/sales/pages/buyer_still_serving.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::BuyerStillServing < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_still_serving"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "hhregres" => 1,
     }]
diff --git a/app/models/form/sales/pages/buyers_organisations.rb b/app/models/form/sales/pages/buyers_organisations.rb
index cc6f82984..95bd65c91 100644
--- a/app/models/form/sales/pages/buyers_organisations.rb
+++ b/app/models/form/sales/pages/buyers_organisations.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::BuyersOrganisations < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyers_organisations"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/sales/pages/deposit_value_check.rb b/app/models/form/sales/pages/deposit_value_check.rb
index 7c0fc9fef..8fa76ce1a 100644
--- a/app/models/form/sales/pages/deposit_value_check.rb
+++ b/app/models/form/sales/pages/deposit_value_check.rb
@@ -1,9 +1,6 @@
 class Form::Sales::Pages::DepositValueCheck < ::Form::Page
   def initialize(id, hsh, subsection)
     super
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [
       {
         "deposit_over_soft_max?" => true,
diff --git a/app/models/form/sales/pages/discounted_ownership_type.rb b/app/models/form/sales/pages/discounted_ownership_type.rb
index 031c5c620..4c7ae2464 100644
--- a/app/models/form/sales/pages/discounted_ownership_type.rb
+++ b/app/models/form/sales/pages/discounted_ownership_type.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::DiscountedOwnershipType < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "discounted_ownership_type"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "ownershipsch" => 2,
     }]
diff --git a/app/models/form/sales/pages/exchange_date.rb b/app/models/form/sales/pages/exchange_date.rb
index 59e23ab01..ec71b0647 100644
--- a/app/models/form/sales/pages/exchange_date.rb
+++ b/app/models/form/sales/pages/exchange_date.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::ExchangeDate < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "exchange_contracts"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "resale" => 2,
     }]
diff --git a/app/models/form/sales/pages/gender_identity1.rb b/app/models/form/sales/pages/gender_identity1.rb
index 9a92a16e9..2dadce8ba 100644
--- a/app/models/form/sales/pages/gender_identity1.rb
+++ b/app/models/form/sales/pages/gender_identity1.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::GenderIdentity1 < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_1_gender_identity"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/sales/pages/gender_identity2.rb b/app/models/form/sales/pages/gender_identity2.rb
index f5db5aecb..3d72842c9 100644
--- a/app/models/form/sales/pages/gender_identity2.rb
+++ b/app/models/form/sales/pages/gender_identity2.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::GenderIdentity2 < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_2_gender_identity"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "jointpur" => 1,
     }]
diff --git a/app/models/form/sales/pages/handover_date.rb b/app/models/form/sales/pages/handover_date.rb
index a4216da40..eeeb48333 100644
--- a/app/models/form/sales/pages/handover_date.rb
+++ b/app/models/form/sales/pages/handover_date.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::HandoverDate < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "handover_date"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "ownershipsch" => 1,
     }]
diff --git a/app/models/form/sales/pages/household_disability.rb b/app/models/form/sales/pages/household_disability.rb
index 23902773f..c9e4a8e2b 100644
--- a/app/models/form/sales/pages/household_disability.rb
+++ b/app/models/form/sales/pages/household_disability.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::HouseholdDisability < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "household_disability"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/sales/pages/household_wheelchair.rb b/app/models/form/sales/pages/household_wheelchair.rb
index 97d4abc52..81d98e1ee 100644
--- a/app/models/form/sales/pages/household_wheelchair.rb
+++ b/app/models/form/sales/pages/household_wheelchair.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::HouseholdWheelchair < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "household_wheelchair"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/sales/pages/household_wheelchair_check.rb b/app/models/form/sales/pages/household_wheelchair_check.rb
index b4f4c06ae..0cd457444 100644
--- a/app/models/form/sales/pages/household_wheelchair_check.rb
+++ b/app/models/form/sales/pages/household_wheelchair_check.rb
@@ -1,9 +1,6 @@
 class Form::Sales::Pages::HouseholdWheelchairCheck < ::Form::Page
   def initialize(id, hsh, subsection)
     super
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [
       {
         "wheelchair_when_not_disabled?" => true,
diff --git a/app/models/form/sales/pages/housing_benefits.rb b/app/models/form/sales/pages/housing_benefits.rb
index da67f7bf3..5de83cbfd 100644
--- a/app/models/form/sales/pages/housing_benefits.rb
+++ b/app/models/form/sales/pages/housing_benefits.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::HousingBenefits < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "housing_benefits"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/sales/pages/joint_purchase.rb b/app/models/form/sales/pages/joint_purchase.rb
index d863531ea..bec7c88c1 100644
--- a/app/models/form/sales/pages/joint_purchase.rb
+++ b/app/models/form/sales/pages/joint_purchase.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::JointPurchase < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "joint_purchase"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [
       { "ownershipsch" => 1 },
       { "ownershipsch" => 2 },
diff --git a/app/models/form/sales/pages/la_nominations.rb b/app/models/form/sales/pages/la_nominations.rb
index c5c775e9f..e756e3071 100644
--- a/app/models/form/sales/pages/la_nominations.rb
+++ b/app/models/form/sales/pages/la_nominations.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::LaNominations < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "la_nominations"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/sales/pages/last_accommodation.rb b/app/models/form/sales/pages/last_accommodation.rb
index 43ccd276e..373a20511 100644
--- a/app/models/form/sales/pages/last_accommodation.rb
+++ b/app/models/form/sales/pages/last_accommodation.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::LastAccommodation < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "last_accommodation"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/sales/pages/last_accommodation_la.rb b/app/models/form/sales/pages/last_accommodation_la.rb
index d8a5fb972..6e4211e12 100644
--- a/app/models/form/sales/pages/last_accommodation_la.rb
+++ b/app/models/form/sales/pages/last_accommodation_la.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::LastAccommodationLa < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "last_accommodation_la"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "is_previous_la_inferred" => false,
     }]
diff --git a/app/models/form/sales/pages/leasehold_charges.rb b/app/models/form/sales/pages/leasehold_charges.rb
index 7aed92db9..93382cf18 100644
--- a/app/models/form/sales/pages/leasehold_charges.rb
+++ b/app/models/form/sales/pages/leasehold_charges.rb
@@ -1,11 +1,4 @@
 class Form::Sales::Pages::LeaseholdCharges < ::Form::Page
-  def initialize(id, hsh, subsection)
-    super
-    @header = ""
-    @description = ""
-    @subsection = subsection
-  end
-
   def questions
     @questions ||= [
       Form::Sales::Questions::LeaseholdChargesKnown.new(nil, nil, self),
diff --git a/app/models/form/sales/pages/living_before_purchase.rb b/app/models/form/sales/pages/living_before_purchase.rb
index e76b8fd63..5fa695bbc 100644
--- a/app/models/form/sales/pages/living_before_purchase.rb
+++ b/app/models/form/sales/pages/living_before_purchase.rb
@@ -1,11 +1,4 @@
 class Form::Sales::Pages::LivingBeforePurchase < ::Form::Page
-  def initialize(id, hsh, subsection)
-    super
-    @header = ""
-    @description = ""
-    @subsection = subsection
-  end
-
   def questions
     @questions ||= [
       Form::Sales::Questions::LivingBeforePurchase.new(nil, nil, self),
diff --git a/app/models/form/sales/pages/monthly_rent.rb b/app/models/form/sales/pages/monthly_rent.rb
index 826314edf..29f0d895f 100644
--- a/app/models/form/sales/pages/monthly_rent.rb
+++ b/app/models/form/sales/pages/monthly_rent.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::MonthlyRent < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "monthly_rent"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/sales/pages/mortgage_amount.rb b/app/models/form/sales/pages/mortgage_amount.rb
index 88f642042..153c3bbe6 100644
--- a/app/models/form/sales/pages/mortgage_amount.rb
+++ b/app/models/form/sales/pages/mortgage_amount.rb
@@ -2,8 +2,6 @@ class Form::Sales::Pages::MortgageAmount < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @header = "Mortgage Amount"
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "mortgageused" => 1,
     }]
diff --git a/app/models/form/sales/pages/mortgage_length.rb b/app/models/form/sales/pages/mortgage_length.rb
index edc005c21..2877cffd8 100644
--- a/app/models/form/sales/pages/mortgage_length.rb
+++ b/app/models/form/sales/pages/mortgage_length.rb
@@ -1,11 +1,4 @@
 class Form::Sales::Pages::MortgageLength < ::Form::Page
-  def initialize(id, hsh, subsection)
-    super
-    @header = ""
-    @description = ""
-    @subsection = subsection
-  end
-
   def questions
     @questions ||= [
       Form::Sales::Questions::MortgageLength.new(nil, nil, self),
diff --git a/app/models/form/sales/pages/mortgage_value_check.rb b/app/models/form/sales/pages/mortgage_value_check.rb
index 7bbd62cf8..954b50872 100644
--- a/app/models/form/sales/pages/mortgage_value_check.rb
+++ b/app/models/form/sales/pages/mortgage_value_check.rb
@@ -1,9 +1,6 @@
 class Form::Sales::Pages::MortgageValueCheck < ::Form::Page
   def initialize(id, hsh, subsection)
     super
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [
       {
         "mortgage_over_soft_max?" => true,
diff --git a/app/models/form/sales/pages/mortgageused.rb b/app/models/form/sales/pages/mortgageused.rb
index cc320f145..4a22c480e 100644
--- a/app/models/form/sales/pages/mortgageused.rb
+++ b/app/models/form/sales/pages/mortgageused.rb
@@ -1,11 +1,4 @@
 class Form::Sales::Pages::Mortgageused < ::Form::Page
-  def initialize(id, hsh, subsection)
-    super
-    @header = ""
-    @description = ""
-    @subsection = subsection
-  end
-
   def questions
     @questions ||= [
       Form::Sales::Questions::Mortgageused.new(nil, nil, self),
diff --git a/app/models/form/sales/pages/nationality1.rb b/app/models/form/sales/pages/nationality1.rb
index 740aa694f..65bba7c6a 100644
--- a/app/models/form/sales/pages/nationality1.rb
+++ b/app/models/form/sales/pages/nationality1.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::Nationality1 < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_1_nationality"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/sales/pages/number_joint_buyers.rb b/app/models/form/sales/pages/number_joint_buyers.rb
index 2d57326e1..890280386 100644
--- a/app/models/form/sales/pages/number_joint_buyers.rb
+++ b/app/models/form/sales/pages/number_joint_buyers.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::NumberJointBuyers < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "number_joint_buyers"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "jointpur" => 1,
     }]
diff --git a/app/models/form/sales/pages/number_of_others_in_property.rb b/app/models/form/sales/pages/number_of_others_in_property.rb
index b97c70775..ed82303ec 100644
--- a/app/models/form/sales/pages/number_of_others_in_property.rb
+++ b/app/models/form/sales/pages/number_of_others_in_property.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::NumberOfOthersInProperty < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "number_of_others_in_property"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/sales/pages/outright_ownership_type.rb b/app/models/form/sales/pages/outright_ownership_type.rb
index 6c48e7107..3fc5ff115 100644
--- a/app/models/form/sales/pages/outright_ownership_type.rb
+++ b/app/models/form/sales/pages/outright_ownership_type.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::OutrightOwnershipType < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "outright_ownership_type"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "ownershipsch" => 3,
     }]
diff --git a/app/models/form/sales/pages/ownership_scheme.rb b/app/models/form/sales/pages/ownership_scheme.rb
index 224bc52a2..d92e56600 100644
--- a/app/models/form/sales/pages/ownership_scheme.rb
+++ b/app/models/form/sales/pages/ownership_scheme.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::OwnershipScheme < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "ownership_scheme"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/sales/pages/person_age.rb b/app/models/form/sales/pages/person_age.rb
index f0f86a251..983486847 100644
--- a/app/models/form/sales/pages/person_age.rb
+++ b/app/models/form/sales/pages/person_age.rb
@@ -1,9 +1,6 @@
 class Form::Sales::Pages::PersonAge < Form::Sales::Pages::Person
   def initialize(id, hsh, subsection, person_index:)
     super
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{ details_known_question_id => 1, "jointpur" => joint_purchase? ? 1 : 2 }]
   end
 
diff --git a/app/models/form/sales/pages/person_gender_identity.rb b/app/models/form/sales/pages/person_gender_identity.rb
index 11ff0ac98..db1016144 100644
--- a/app/models/form/sales/pages/person_gender_identity.rb
+++ b/app/models/form/sales/pages/person_gender_identity.rb
@@ -1,9 +1,6 @@
 class Form::Sales::Pages::PersonGenderIdentity < Form::Sales::Pages::Person
   def initialize(id, hsh, subsection, person_index:)
     super
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [
       { details_known_question_id => 1, "jointpur" => joint_purchase? ? 1 : 2 },
     ]
diff --git a/app/models/form/sales/pages/person_known.rb b/app/models/form/sales/pages/person_known.rb
index df82ff41d..9f09c6b56 100644
--- a/app/models/form/sales/pages/person_known.rb
+++ b/app/models/form/sales/pages/person_known.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::PersonKnown < Form::Sales::Pages::Person
   def initialize(id, hsh, subsection, person_index:)
     super
     @header_partial = "person_#{person_display_number}_known_page"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = (person_display_number..4).map { |index| { "hholdcount" => index, "jointpur" => joint_purchase? ? 1 : 2 } }
   end
 
diff --git a/app/models/form/sales/pages/person_relationship_to_buyer_1.rb b/app/models/form/sales/pages/person_relationship_to_buyer_1.rb
index f4a625528..d3d379c8a 100644
--- a/app/models/form/sales/pages/person_relationship_to_buyer_1.rb
+++ b/app/models/form/sales/pages/person_relationship_to_buyer_1.rb
@@ -1,9 +1,6 @@
 class Form::Sales::Pages::PersonRelationshipToBuyer1 < ::Form::Sales::Pages::Person
   def initialize(id, hsh, subsection, person_index:)
     super
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [
       { details_known_question_id => 1, "jointpur" => joint_purchase? ? 1 : 2 },
     ]
diff --git a/app/models/form/sales/pages/person_working_situation.rb b/app/models/form/sales/pages/person_working_situation.rb
index a78e90be3..7d1a1254d 100644
--- a/app/models/form/sales/pages/person_working_situation.rb
+++ b/app/models/form/sales/pages/person_working_situation.rb
@@ -1,9 +1,6 @@
 class Form::Sales::Pages::PersonWorkingSituation < Form::Sales::Pages::Person
   def initialize(id, hsh, subsection, person_index:)
     super
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{ details_known_question_id => 1, "jointpur" => joint_purchase? ? 1 : 2 }]
   end
 
diff --git a/app/models/form/sales/pages/previous_bedrooms.rb b/app/models/form/sales/pages/previous_bedrooms.rb
index 3c6eb26b1..87632e305 100644
--- a/app/models/form/sales/pages/previous_bedrooms.rb
+++ b/app/models/form/sales/pages/previous_bedrooms.rb
@@ -3,8 +3,6 @@ class Form::Sales::Pages::PreviousBedrooms < ::Form::Page
     super
     @id = "previous_bedrooms"
     @header = "About the buyers’ previous property"
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "soctenant" => 1,
     }]
diff --git a/app/models/form/sales/pages/previous_ownership.rb b/app/models/form/sales/pages/previous_ownership.rb
index 17fb00a6b..88b438e07 100644
--- a/app/models/form/sales/pages/previous_ownership.rb
+++ b/app/models/form/sales/pages/previous_ownership.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::PreviousOwnership < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "previous_ownership"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/sales/pages/privacy_notice.rb b/app/models/form/sales/pages/privacy_notice.rb
index 7c1056ccb..a41800194 100644
--- a/app/models/form/sales/pages/privacy_notice.rb
+++ b/app/models/form/sales/pages/privacy_notice.rb
@@ -3,8 +3,6 @@ class Form::Sales::Pages::PrivacyNotice < ::Form::Page
     super
     @id = "privacy_notice"
     @header = "Department for Levelling Up, Housing and Communities privacy notice"
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "noint" => 2,
     }]
diff --git a/app/models/form/sales/pages/property_building_type.rb b/app/models/form/sales/pages/property_building_type.rb
index 8f93b305c..40c8f3738 100644
--- a/app/models/form/sales/pages/property_building_type.rb
+++ b/app/models/form/sales/pages/property_building_type.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::PropertyBuildingType < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "property_building_type"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/sales/pages/property_local_authority.rb b/app/models/form/sales/pages/property_local_authority.rb
index 1698ace47..0fc05b6d7 100644
--- a/app/models/form/sales/pages/property_local_authority.rb
+++ b/app/models/form/sales/pages/property_local_authority.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::PropertyLocalAuthority < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "property_local_authority"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/sales/pages/property_number_of_bedrooms.rb b/app/models/form/sales/pages/property_number_of_bedrooms.rb
index 5efb6b0f4..796a617d5 100644
--- a/app/models/form/sales/pages/property_number_of_bedrooms.rb
+++ b/app/models/form/sales/pages/property_number_of_bedrooms.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::PropertyNumberOfBedrooms < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "property_number_of_bedrooms"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/sales/pages/property_unit_type.rb b/app/models/form/sales/pages/property_unit_type.rb
index 9ee5506ca..c9bcb661f 100644
--- a/app/models/form/sales/pages/property_unit_type.rb
+++ b/app/models/form/sales/pages/property_unit_type.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::PropertyUnitType < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "property_unit_type"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/sales/pages/property_wheelchair_accessible.rb b/app/models/form/sales/pages/property_wheelchair_accessible.rb
index d587d61a7..a63964059 100644
--- a/app/models/form/sales/pages/property_wheelchair_accessible.rb
+++ b/app/models/form/sales/pages/property_wheelchair_accessible.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::PropertyWheelchairAccessible < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "property_wheelchair_accessible"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/sales/pages/purchase_price.rb b/app/models/form/sales/pages/purchase_price.rb
index 5eeb84138..22277dc5a 100644
--- a/app/models/form/sales/pages/purchase_price.rb
+++ b/app/models/form/sales/pages/purchase_price.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::PurchasePrice < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "purchase_price"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/sales/pages/purchaser_code.rb b/app/models/form/sales/pages/purchaser_code.rb
index 79723e0b0..8282453ad 100644
--- a/app/models/form/sales/pages/purchaser_code.rb
+++ b/app/models/form/sales/pages/purchaser_code.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::PurchaserCode < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "purchaser_code"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/sales/pages/resale.rb b/app/models/form/sales/pages/resale.rb
index 031efd3d6..ffdbbc046 100644
--- a/app/models/form/sales/pages/resale.rb
+++ b/app/models/form/sales/pages/resale.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::Resale < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "resale"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [
       {
         "staircase" => 2,
diff --git a/app/models/form/sales/pages/sale_date.rb b/app/models/form/sales/pages/sale_date.rb
index 518e9b5ff..036e04907 100644
--- a/app/models/form/sales/pages/sale_date.rb
+++ b/app/models/form/sales/pages/sale_date.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::SaleDate < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "completion_date"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/sales/pages/savings.rb b/app/models/form/sales/pages/savings.rb
index 42f2c1bb4..969ff414c 100644
--- a/app/models/form/sales/pages/savings.rb
+++ b/app/models/form/sales/pages/savings.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::Savings < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "savings"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/sales/pages/savings_value_check.rb b/app/models/form/sales/pages/savings_value_check.rb
index 7f31097f9..779bdae30 100644
--- a/app/models/form/sales/pages/savings_value_check.rb
+++ b/app/models/form/sales/pages/savings_value_check.rb
@@ -1,9 +1,6 @@
 class Form::Sales::Pages::SavingsValueCheck < ::Form::Page
   def initialize(id, hsh, subsection)
     super
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [
       {
         "savings_over_soft_max?" => true,
diff --git a/app/models/form/sales/pages/shared_ownership_type.rb b/app/models/form/sales/pages/shared_ownership_type.rb
index c90074bae..3bc5dbdf7 100644
--- a/app/models/form/sales/pages/shared_ownership_type.rb
+++ b/app/models/form/sales/pages/shared_ownership_type.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::SharedOwnershipType < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "shared_ownership_type"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "ownershipsch" => 1,
     }]
diff --git a/app/models/form/sales/pages/staircase.rb b/app/models/form/sales/pages/staircase.rb
index 139bd7e40..6ab76e2bf 100644
--- a/app/models/form/sales/pages/staircase.rb
+++ b/app/models/form/sales/pages/staircase.rb
@@ -2,9 +2,6 @@ class Form::Sales::Pages::Staircase < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "staircasing"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions
diff --git a/app/models/form/sales/questions/age1.rb b/app/models/form/sales/questions/age1.rb
index 48dfa7446..e38224b17 100644
--- a/app/models/form/sales/questions/age1.rb
+++ b/app/models/form/sales/questions/age1.rb
@@ -5,7 +5,6 @@ class Form::Sales::Questions::Age1 < ::Form::Question
     @check_answer_label = "Lead buyer’s age"
     @header = "Age"
     @type = "numeric"
-    @page = page
     @width = 2
     @inferred_check_answers_value = {
       "condition" => {
diff --git a/app/models/form/sales/questions/age2.rb b/app/models/form/sales/questions/age2.rb
index ade402eb6..9696679a8 100644
--- a/app/models/form/sales/questions/age2.rb
+++ b/app/models/form/sales/questions/age2.rb
@@ -5,7 +5,6 @@ class Form::Sales::Questions::Age2 < ::Form::Question
     @check_answer_label = "Buyer 2’s age"
     @header = "Age"
     @type = "numeric"
-    @page = page
     @width = 2
     @inferred_check_answers_value = {
       "condition" => { "age2_known" => 1 },
diff --git a/app/models/form/sales/questions/armed_forces.rb b/app/models/form/sales/questions/armed_forces.rb
index 6822e712a..af003c5b2 100644
--- a/app/models/form/sales/questions/armed_forces.rb
+++ b/app/models/form/sales/questions/armed_forces.rb
@@ -7,7 +7,6 @@ class Form::Sales::Questions::ArmedForces < ::Form::Question
     @type = "radio"
     @hint_text = "A regular is somebody who has served in the Royal Navy, the Royal Marines, the Royal Airforce or Army full time and does not include reserve forces"
     @answer_options = ANSWER_OPTIONS
-    @page = page
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/armed_forces_spouse.rb b/app/models/form/sales/questions/armed_forces_spouse.rb
index cd9a3aca1..cf38bd434 100644
--- a/app/models/form/sales/questions/armed_forces_spouse.rb
+++ b/app/models/form/sales/questions/armed_forces_spouse.rb
@@ -5,9 +5,7 @@ class Form::Sales::Questions::ArmedForcesSpouse < ::Form::Question
     @check_answer_label = "Are any of the buyers a spouse or civil partner of a UK armed forces regular who died in service within the last 2 years?"
     @header = "Are any of the buyers a spouse or civil partner of a UK armed forces regular who died in service within the last 2 years?"
     @type = "radio"
-    @hint_text = ""
     @answer_options = ANSWER_OPTIONS
-    @page = page
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/buyer1_age_known.rb b/app/models/form/sales/questions/buyer1_age_known.rb
index f3b0c0938..74d9a122b 100644
--- a/app/models/form/sales/questions/buyer1_age_known.rb
+++ b/app/models/form/sales/questions/buyer1_age_known.rb
@@ -6,7 +6,6 @@ class Form::Sales::Questions::Buyer1AgeKnown < ::Form::Question
     @header = "Do you know buyer 1’s age?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
     @hint_text = "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest."
     @conditional_for = {
       "age1" => [0],
diff --git a/app/models/form/sales/questions/buyer1_ethnic_background_arab.rb b/app/models/form/sales/questions/buyer1_ethnic_background_arab.rb
index 2006eec92..19526f5b7 100644
--- a/app/models/form/sales/questions/buyer1_ethnic_background_arab.rb
+++ b/app/models/form/sales/questions/buyer1_ethnic_background_arab.rb
@@ -6,7 +6,6 @@ class Form::Sales::Questions::Buyer1EthnicBackgroundArab < ::Form::Question
     @header = "Which of the following best describes the buyer 1’s Arab background?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
     @hint_text = "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest."
     @check_answers_card_number = 1
   end
diff --git a/app/models/form/sales/questions/buyer1_ethnic_background_asian.rb b/app/models/form/sales/questions/buyer1_ethnic_background_asian.rb
index 9e61ed0a6..ee910c054 100644
--- a/app/models/form/sales/questions/buyer1_ethnic_background_asian.rb
+++ b/app/models/form/sales/questions/buyer1_ethnic_background_asian.rb
@@ -6,7 +6,6 @@ class Form::Sales::Questions::Buyer1EthnicBackgroundAsian < ::Form::Question
     @header = "Which of the following best describes the buyer 1’s Asian or Asian British background?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
     @hint_text = "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest."
     @check_answers_card_number = 1
   end
diff --git a/app/models/form/sales/questions/buyer1_ethnic_background_black.rb b/app/models/form/sales/questions/buyer1_ethnic_background_black.rb
index bc9f16dde..4c24f1433 100644
--- a/app/models/form/sales/questions/buyer1_ethnic_background_black.rb
+++ b/app/models/form/sales/questions/buyer1_ethnic_background_black.rb
@@ -6,7 +6,6 @@ class Form::Sales::Questions::Buyer1EthnicBackgroundBlack < ::Form::Question
     @header = "Which of the following best describes the buyer 1’s Black, African, Caribbean or Black British background?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
     @hint_text = "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest."
     @check_answers_card_number = 1
   end
diff --git a/app/models/form/sales/questions/buyer1_ethnic_background_mixed.rb b/app/models/form/sales/questions/buyer1_ethnic_background_mixed.rb
index c264459c7..8fa879949 100644
--- a/app/models/form/sales/questions/buyer1_ethnic_background_mixed.rb
+++ b/app/models/form/sales/questions/buyer1_ethnic_background_mixed.rb
@@ -6,7 +6,6 @@ class Form::Sales::Questions::Buyer1EthnicBackgroundMixed < ::Form::Question
     @header = "Which of the following best describes the buyer 1’s Mixed or Multiple ethnic groups background?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
     @hint_text = "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest."
     @check_answers_card_number = 1
   end
diff --git a/app/models/form/sales/questions/buyer1_ethnic_background_white.rb b/app/models/form/sales/questions/buyer1_ethnic_background_white.rb
index 52e771191..4b7ec9182 100644
--- a/app/models/form/sales/questions/buyer1_ethnic_background_white.rb
+++ b/app/models/form/sales/questions/buyer1_ethnic_background_white.rb
@@ -6,7 +6,6 @@ class Form::Sales::Questions::Buyer1EthnicBackgroundWhite < ::Form::Question
     @header = "Which of the following best describes the buyer 1’s White background?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
     @hint_text = "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest."
     @check_answers_card_number = 1
   end
diff --git a/app/models/form/sales/questions/buyer1_ethnic_group.rb b/app/models/form/sales/questions/buyer1_ethnic_group.rb
index 85a809aae..a9c52dbed 100644
--- a/app/models/form/sales/questions/buyer1_ethnic_group.rb
+++ b/app/models/form/sales/questions/buyer1_ethnic_group.rb
@@ -6,7 +6,6 @@ class Form::Sales::Questions::Buyer1EthnicGroup < ::Form::Question
     @header = "What is buyer 1’s ethnic group?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
     @hint_text = "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest."
     @inferred_check_answers_value = {
       "condition" => {
diff --git a/app/models/form/sales/questions/buyer1_income.rb b/app/models/form/sales/questions/buyer1_income.rb
index aa4a9df09..4a7e43e55 100644
--- a/app/models/form/sales/questions/buyer1_income.rb
+++ b/app/models/form/sales/questions/buyer1_income.rb
@@ -5,7 +5,6 @@ class Form::Sales::Questions::Buyer1Income < ::Form::Question
     @check_answer_label = "Buyer 1’s gross annual income"
     @header = "Buyer 1’s gross annual income"
     @type = "numeric"
-    @page = page
     @min = 0
     @max = 999_999
     @step = 1
diff --git a/app/models/form/sales/questions/buyer1_income_known.rb b/app/models/form/sales/questions/buyer1_income_known.rb
index 4e7ef182e..36b5ec3f4 100644
--- a/app/models/form/sales/questions/buyer1_income_known.rb
+++ b/app/models/form/sales/questions/buyer1_income_known.rb
@@ -6,7 +6,6 @@ class Form::Sales::Questions::Buyer1IncomeKnown < ::Form::Question
     @header = "Do you know buyer 1’s annual income?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
     @guidance_position = GuidancePosition::BOTTOM
     @guidance_partial = "what_counts_as_income_sales"
     @conditional_for = {
diff --git a/app/models/form/sales/questions/buyer1_income_value_check.rb b/app/models/form/sales/questions/buyer1_income_value_check.rb
index 9b0f21660..0913dd788 100644
--- a/app/models/form/sales/questions/buyer1_income_value_check.rb
+++ b/app/models/form/sales/questions/buyer1_income_value_check.rb
@@ -20,6 +20,5 @@ class Form::Sales::Questions::Buyer1IncomeValueCheck < ::Form::Question
       ],
     }
     @check_answers_card_number = 1
-    @page = page
   end
 end
diff --git a/app/models/form/sales/questions/buyer1_live_in_property.rb b/app/models/form/sales/questions/buyer1_live_in_property.rb
index 31111ce81..4f18f60df 100644
--- a/app/models/form/sales/questions/buyer1_live_in_property.rb
+++ b/app/models/form/sales/questions/buyer1_live_in_property.rb
@@ -6,7 +6,6 @@ class Form::Sales::Questions::Buyer1LiveInProperty < ::Form::Question
     @header = "Will buyer 1 live in the property?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
     @hint_text = "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest."
     @check_answers_card_number = 1
   end
diff --git a/app/models/form/sales/questions/buyer1_mortgage.rb b/app/models/form/sales/questions/buyer1_mortgage.rb
index 76f25085c..f226f956c 100644
--- a/app/models/form/sales/questions/buyer1_mortgage.rb
+++ b/app/models/form/sales/questions/buyer1_mortgage.rb
@@ -6,7 +6,6 @@ class Form::Sales::Questions::Buyer1Mortgage < ::Form::Question
     @header = "Was buyer 1's income used for a mortgage application?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
     @check_answers_card_number = 1
   end
 
diff --git a/app/models/form/sales/questions/buyer1_previous_tenure.rb b/app/models/form/sales/questions/buyer1_previous_tenure.rb
index b2d3e01c4..f075e615c 100644
--- a/app/models/form/sales/questions/buyer1_previous_tenure.rb
+++ b/app/models/form/sales/questions/buyer1_previous_tenure.rb
@@ -6,7 +6,6 @@ class Form::Sales::Questions::Buyer1PreviousTenure < ::Form::Question
     @header = "What was buyer 1's previous tenure?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/buyer1_working_situation.rb b/app/models/form/sales/questions/buyer1_working_situation.rb
index 5b933d794..d9c22ea03 100644
--- a/app/models/form/sales/questions/buyer1_working_situation.rb
+++ b/app/models/form/sales/questions/buyer1_working_situation.rb
@@ -6,7 +6,6 @@ class Form::Sales::Questions::Buyer1WorkingSituation < ::Form::Question
     @header = "Which of these best describes buyer 1's working situation?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
     @hint_text = "Buyer 1 is the person in the household who does the most paid work. If it's a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest."
     @check_answers_card_number = 1
   end
diff --git a/app/models/form/sales/questions/buyer2_age_known.rb b/app/models/form/sales/questions/buyer2_age_known.rb
index d4cd6a777..c100d0b67 100644
--- a/app/models/form/sales/questions/buyer2_age_known.rb
+++ b/app/models/form/sales/questions/buyer2_age_known.rb
@@ -6,7 +6,6 @@ class Form::Sales::Questions::Buyer2AgeKnown < ::Form::Question
     @header = "Do you know buyer 2’s age?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
     @conditional_for = {
       "age2" => [0],
     }
diff --git a/app/models/form/sales/questions/buyer2_income.rb b/app/models/form/sales/questions/buyer2_income.rb
index 8e4d66278..2bda83544 100644
--- a/app/models/form/sales/questions/buyer2_income.rb
+++ b/app/models/form/sales/questions/buyer2_income.rb
@@ -5,7 +5,6 @@ class Form::Sales::Questions::Buyer2Income < ::Form::Question
     @check_answer_label = "Buyer 2’s gross annual income"
     @header = "Buyer 2’s gross annual income"
     @type = "numeric"
-    @page = page
     @min = 0
     @step = 1
     @width = 5
diff --git a/app/models/form/sales/questions/buyer2_income_known.rb b/app/models/form/sales/questions/buyer2_income_known.rb
index fd312776b..385bd9562 100644
--- a/app/models/form/sales/questions/buyer2_income_known.rb
+++ b/app/models/form/sales/questions/buyer2_income_known.rb
@@ -6,7 +6,6 @@ class Form::Sales::Questions::Buyer2IncomeKnown < ::Form::Question
     @header = "Do you know buyer 2’s annual income?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
     @guidance_position = GuidancePosition::BOTTOM
     @guidance_partial = "what_counts_as_income_sales"
     @conditional_for = {
diff --git a/app/models/form/sales/questions/buyer2_live_in_property.rb b/app/models/form/sales/questions/buyer2_live_in_property.rb
index 654832cfb..162627905 100644
--- a/app/models/form/sales/questions/buyer2_live_in_property.rb
+++ b/app/models/form/sales/questions/buyer2_live_in_property.rb
@@ -5,9 +5,7 @@ class Form::Sales::Questions::Buyer2LiveInProperty < ::Form::Question
     @check_answer_label = "Will buyer 2 live in the property?"
     @header = "Will buyer 2 live in the property?"
     @type = "radio"
-    @hint_text = ""
     @answer_options = ANSWER_OPTIONS
-    @page = page
     @check_answers_card_number = 2
   end
 
diff --git a/app/models/form/sales/questions/buyer2_mortgage.rb b/app/models/form/sales/questions/buyer2_mortgage.rb
index 329567d3c..5697aea15 100644
--- a/app/models/form/sales/questions/buyer2_mortgage.rb
+++ b/app/models/form/sales/questions/buyer2_mortgage.rb
@@ -6,7 +6,6 @@ class Form::Sales::Questions::Buyer2Mortgage < ::Form::Question
     @header = "Was buyer 2's income used for a mortgage application?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
     @check_answers_card_number = 2
   end
 
diff --git a/app/models/form/sales/questions/buyer2_relationship_to_buyer1.rb b/app/models/form/sales/questions/buyer2_relationship_to_buyer1.rb
index 4564a2381..a37605332 100644
--- a/app/models/form/sales/questions/buyer2_relationship_to_buyer1.rb
+++ b/app/models/form/sales/questions/buyer2_relationship_to_buyer1.rb
@@ -5,8 +5,6 @@ class Form::Sales::Questions::Buyer2RelationshipToBuyer1 < ::Form::Question
     @check_answer_label = "Buyer 2's relationship to buyer 1"
     @header = "What is buyer 2's relationship to buyer 1?"
     @type = "radio"
-    @hint_text = ""
-    @page = page
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = 2
   end
diff --git a/app/models/form/sales/questions/buyer2_working_situation.rb b/app/models/form/sales/questions/buyer2_working_situation.rb
index bc9bcbe1a..cf1ca3940 100644
--- a/app/models/form/sales/questions/buyer2_working_situation.rb
+++ b/app/models/form/sales/questions/buyer2_working_situation.rb
@@ -5,8 +5,6 @@ class Form::Sales::Questions::Buyer2WorkingSituation < ::Form::Question
     @check_answer_label = "Buyer 2's working situation"
     @header = "Which of these best describes buyer 2's working situation?"
     @type = "radio"
-    @hint_text = ""
-    @page = page
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = 2
   end
diff --git a/app/models/form/sales/questions/buyer_company.rb b/app/models/form/sales/questions/buyer_company.rb
index 70c732866..1dac995b0 100644
--- a/app/models/form/sales/questions/buyer_company.rb
+++ b/app/models/form/sales/questions/buyer_company.rb
@@ -4,10 +4,8 @@ class Form::Sales::Questions::BuyerCompany < ::Form::Question
     @id = "companybuy"
     @check_answer_label = "Company buyer"
     @header = "Is the buyer a company?"
-    @hint_text = ""
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/buyer_interview.rb b/app/models/form/sales/questions/buyer_interview.rb
index 1b354b1d5..b157c05cc 100644
--- a/app/models/form/sales/questions/buyer_interview.rb
+++ b/app/models/form/sales/questions/buyer_interview.rb
@@ -6,7 +6,6 @@ class Form::Sales::Questions::BuyerInterview < ::Form::Question
     @header = "Was the buyer interviewed for any of the answers you will provide on this log?"
     @type = "radio"
     @hint_text = "You should still try to answer all questions even if the buyer wasn't interviewed in person"
-    @page = page
     @answer_options = ANSWER_OPTIONS
   end
 
diff --git a/app/models/form/sales/questions/buyer_live.rb b/app/models/form/sales/questions/buyer_live.rb
index ad5ec7f22..a8aeb0401 100644
--- a/app/models/form/sales/questions/buyer_live.rb
+++ b/app/models/form/sales/questions/buyer_live.rb
@@ -6,7 +6,6 @@ class Form::Sales::Questions::BuyerLive < ::Form::Question
     @header = "Will the buyers live in the property?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/buyer_previous.rb b/app/models/form/sales/questions/buyer_previous.rb
index ae9ac22ea..18ac019cb 100644
--- a/app/models/form/sales/questions/buyer_previous.rb
+++ b/app/models/form/sales/questions/buyer_previous.rb
@@ -6,7 +6,6 @@ class Form::Sales::Questions::BuyerPrevious < ::Form::Question
     @header = "Was the buyer a private registered provider, housing association or local authority tenant immediately before this sale?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/buyer_still_serving.rb b/app/models/form/sales/questions/buyer_still_serving.rb
index a15994e19..04929fb42 100644
--- a/app/models/form/sales/questions/buyer_still_serving.rb
+++ b/app/models/form/sales/questions/buyer_still_serving.rb
@@ -5,9 +5,7 @@ class Form::Sales::Questions::BuyerStillServing < ::Form::Question
     @check_answer_label = "Are they still serving in the UK armed forces?"
     @header = "Is the buyer still serving in the UK armed forces?"
     @type = "radio"
-    @hint_text = ""
     @answer_options = ANSWER_OPTIONS
-    @page = page
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/buyers_organisations.rb b/app/models/form/sales/questions/buyers_organisations.rb
index dd3d87bd0..6457b6866 100644
--- a/app/models/form/sales/questions/buyers_organisations.rb
+++ b/app/models/form/sales/questions/buyers_organisations.rb
@@ -6,7 +6,6 @@ class Form::Sales::Questions::BuyersOrganisations < ::Form::Question
     @header = "What organisations were the buyers registered with?"
     @type = "checkbox"
     @hint_text = "Select all that apply"
-    @page = page
     @answer_options = ANSWER_OPTIONS
   end
 
diff --git a/app/models/form/sales/questions/deposit_amount.rb b/app/models/form/sales/questions/deposit_amount.rb
index 8252ad8d7..b054f76f2 100644
--- a/app/models/form/sales/questions/deposit_amount.rb
+++ b/app/models/form/sales/questions/deposit_amount.rb
@@ -5,7 +5,6 @@ class Form::Sales::Questions::DepositAmount < ::Form::Question
     @check_answer_label = "Cash deposit"
     @header = "How much cash deposit was paid on the property?"
     @type = "numeric"
-    @page = page
     @min = 0
     @width = 5
     @prefix = "£"
diff --git a/app/models/form/sales/questions/deposit_discount.rb b/app/models/form/sales/questions/deposit_discount.rb
index 9496f90fd..dd3f98939 100644
--- a/app/models/form/sales/questions/deposit_discount.rb
+++ b/app/models/form/sales/questions/deposit_discount.rb
@@ -5,7 +5,6 @@ class Form::Sales::Questions::DepositDiscount < ::Form::Question
     @check_answer_label = "Cash discount through SocialHomeBuy"
     @header = "How much cash discount was given through Social HomeBuy?"
     @type = "numeric"
-    @page = page
     @min = 0
     @width = 5
     @prefix = "£"
diff --git a/app/models/form/sales/questions/deposit_value_check.rb b/app/models/form/sales/questions/deposit_value_check.rb
index 86bc0d226..f3cd27e3a 100644
--- a/app/models/form/sales/questions/deposit_value_check.rb
+++ b/app/models/form/sales/questions/deposit_value_check.rb
@@ -20,6 +20,5 @@ class Form::Sales::Questions::DepositValueCheck < ::Form::Question
       ],
     }
     @check_answers_card_number = 0
-    @page = page
   end
 end
diff --git a/app/models/form/sales/questions/discount.rb b/app/models/form/sales/questions/discount.rb
index d7b9fa33b..01ae38fd5 100644
--- a/app/models/form/sales/questions/discount.rb
+++ b/app/models/form/sales/questions/discount.rb
@@ -5,7 +5,6 @@ class Form::Sales::Questions::Discount < ::Form::Question
     @check_answer_label = "Percentage discount"
     @header = "What was the percentage discount?"
     @type = "numeric"
-    @page = page
     @min = 0
     @max = 100
     @width = 5
diff --git a/app/models/form/sales/questions/discounted_ownership_type.rb b/app/models/form/sales/questions/discounted_ownership_type.rb
index b04e76c1e..2cbef6117 100644
--- a/app/models/form/sales/questions/discounted_ownership_type.rb
+++ b/app/models/form/sales/questions/discounted_ownership_type.rb
@@ -6,7 +6,6 @@ class Form::Sales::Questions::DiscountedOwnershipType < ::Form::Question
     @header = "What is the type of discounted ownership sale?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/equity.rb b/app/models/form/sales/questions/equity.rb
index 585a14c36..7dec2ac37 100644
--- a/app/models/form/sales/questions/equity.rb
+++ b/app/models/form/sales/questions/equity.rb
@@ -5,7 +5,6 @@ class Form::Sales::Questions::Equity < ::Form::Question
     @check_answer_label = "Initial percentage equity stake"
     @header = "What was the initial percentage equity stake purchased?"
     @type = "numeric"
-    @page = page
     @min = 0
     @max = 100
     @width = 5
diff --git a/app/models/form/sales/questions/exchange_date.rb b/app/models/form/sales/questions/exchange_date.rb
index 2c726e441..69b8ec39f 100644
--- a/app/models/form/sales/questions/exchange_date.rb
+++ b/app/models/form/sales/questions/exchange_date.rb
@@ -5,6 +5,5 @@ class Form::Sales::Questions::ExchangeDate < ::Form::Question
     @check_answer_label = "Exchange of contracts date"
     @header = "What is the exchange of contracts date?"
     @type = "date"
-    @page = page
   end
 end
diff --git a/app/models/form/sales/questions/gender_identity1.rb b/app/models/form/sales/questions/gender_identity1.rb
index bfc98f3a0..9c4788b25 100644
--- a/app/models/form/sales/questions/gender_identity1.rb
+++ b/app/models/form/sales/questions/gender_identity1.rb
@@ -6,7 +6,6 @@ class Form::Sales::Questions::GenderIdentity1 < ::Form::Question
     @header = "Which of these best describes buyer 1’s gender identity?"
     @type = "radio"
     @hint_text = "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest."
-    @page = page
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = 1
   end
diff --git a/app/models/form/sales/questions/gender_identity2.rb b/app/models/form/sales/questions/gender_identity2.rb
index 8e27c0cb5..8783cc76c 100644
--- a/app/models/form/sales/questions/gender_identity2.rb
+++ b/app/models/form/sales/questions/gender_identity2.rb
@@ -5,7 +5,6 @@ class Form::Sales::Questions::GenderIdentity2 < ::Form::Question
     @check_answer_label = "Buyer 2’s gender identity"
     @header = "Which of these best describes buyer 2’s gender identity?"
     @type = "radio"
-    @page = page
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = 2
   end
diff --git a/app/models/form/sales/questions/grant.rb b/app/models/form/sales/questions/grant.rb
index edab388ac..181e2281d 100644
--- a/app/models/form/sales/questions/grant.rb
+++ b/app/models/form/sales/questions/grant.rb
@@ -5,7 +5,6 @@ class Form::Sales::Questions::Grant < ::Form::Question
     @check_answer_label = "Amount of any loan, grant or subsidy"
     @header = "What was the amount of any loan, grant, discount or subsidy given?"
     @type = "numeric"
-    @page = page
     @min = 0
     @width = 5
     @prefix = "£"
diff --git a/app/models/form/sales/questions/handover_date.rb b/app/models/form/sales/questions/handover_date.rb
index b00f39601..06a89eb04 100644
--- a/app/models/form/sales/questions/handover_date.rb
+++ b/app/models/form/sales/questions/handover_date.rb
@@ -5,7 +5,6 @@ class Form::Sales::Questions::HandoverDate < ::Form::Question
     @check_answer_label = "Practical completion or handover date"
     @header = "What is the practical completion or handover date?"
     @type = "date"
-    @page = page
     @hint_text = "This is the date on which the building contractor hands over responsibility for the completed property to the private registered provider (PRP)"
   end
 end
diff --git a/app/models/form/sales/questions/household_disability.rb b/app/models/form/sales/questions/household_disability.rb
index d0990f17a..c0edef69c 100644
--- a/app/models/form/sales/questions/household_disability.rb
+++ b/app/models/form/sales/questions/household_disability.rb
@@ -6,7 +6,6 @@ class Form::Sales::Questions::HouseholdDisability < ::Form::Question
     @check_answer_label = "Does anyone in the household have a disability?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
     @hint_text = "This includes any long-term health condition that has an impact on the person's day-to-day life"
   end
 
diff --git a/app/models/form/sales/questions/household_wheelchair.rb b/app/models/form/sales/questions/household_wheelchair.rb
index 43acfcc24..9266909dc 100644
--- a/app/models/form/sales/questions/household_wheelchair.rb
+++ b/app/models/form/sales/questions/household_wheelchair.rb
@@ -5,7 +5,6 @@ class Form::Sales::Questions::HouseholdWheelchair < ::Form::Question
     @header = "Does anyone in the household use a wheelchair?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
     @hint_text = "This can be inside or outside the home"
   end
 
diff --git a/app/models/form/sales/questions/household_wheelchair_check.rb b/app/models/form/sales/questions/household_wheelchair_check.rb
index 71cfcc23e..1a9db3f3a 100644
--- a/app/models/form/sales/questions/household_wheelchair_check.rb
+++ b/app/models/form/sales/questions/household_wheelchair_check.rb
@@ -5,7 +5,6 @@ class Form::Sales::Questions::HouseholdWheelchairCheck < ::Form::Question
     @check_answer_label = "Does anyone in the household use a wheelchair?"
     @header = "Are you sure? You said previously that somebody in household uses a wheelchair"
     @type = "interruption_screen"
-    @page = page
     @answer_options = {
       "0" => { "value" => "Yes" },
       "1" => { "value" => "No" },
@@ -20,6 +19,5 @@ class Form::Sales::Questions::HouseholdWheelchairCheck < ::Form::Question
         },
       ],
     }
-    @page = page
   end
 end
diff --git a/app/models/form/sales/questions/housing_benefits.rb b/app/models/form/sales/questions/housing_benefits.rb
index 7b19473ab..db3e14c88 100644
--- a/app/models/form/sales/questions/housing_benefits.rb
+++ b/app/models/form/sales/questions/housing_benefits.rb
@@ -5,8 +5,6 @@ class Form::Sales::Questions::HousingBenefits < ::Form::Question
     @check_answer_label = "Housing-related benefits buyer received before buying this property"
     @header = "Was the buyer receiving any of these housing-related benefits immediately before buying this property?"
     @type = "radio"
-    @page = page
-    @hint_text = ""
     @answer_options = ANSWER_OPTIONS
   end
 
diff --git a/app/models/form/sales/questions/joint_purchase.rb b/app/models/form/sales/questions/joint_purchase.rb
index 893398399..e2bf0f754 100644
--- a/app/models/form/sales/questions/joint_purchase.rb
+++ b/app/models/form/sales/questions/joint_purchase.rb
@@ -4,10 +4,8 @@ class Form::Sales::Questions::JointPurchase < ::Form::Question
     @id = "jointpur"
     @check_answer_label = "Joint purchase"
     @header = "Is this a joint purchase?"
-    @hint_text = ""
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/la_nominations.rb b/app/models/form/sales/questions/la_nominations.rb
index 5db0178b6..806f7cfdd 100644
--- a/app/models/form/sales/questions/la_nominations.rb
+++ b/app/models/form/sales/questions/la_nominations.rb
@@ -6,7 +6,6 @@ class Form::Sales::Questions::LaNominations < ::Form::Question
     @header = "Was the household rehoused under a 'local authority nominations agreement'?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
     @hint_text = "A local authority nominations agreement is a written agreement between a local authority and private registered provider (PRP) that some or all of its sales vacancies are offered to local authorities for rehousing"
   end
 
diff --git a/app/models/form/sales/questions/leasehold_charges.rb b/app/models/form/sales/questions/leasehold_charges.rb
index eb19a7377..ef9260c56 100644
--- a/app/models/form/sales/questions/leasehold_charges.rb
+++ b/app/models/form/sales/questions/leasehold_charges.rb
@@ -5,7 +5,6 @@ class Form::Sales::Questions::LeaseholdCharges < ::Form::Question
     @check_answer_label = "Monthly leasehold charges"
     @header = "Enter the total monthly charge"
     @type = "numeric"
-    @page = page
     @min = 0
     @width = 5
     @prefix = "£"
diff --git a/app/models/form/sales/questions/leasehold_charges_known.rb b/app/models/form/sales/questions/leasehold_charges_known.rb
index a94e7f63e..2c28e1814 100644
--- a/app/models/form/sales/questions/leasehold_charges_known.rb
+++ b/app/models/form/sales/questions/leasehold_charges_known.rb
@@ -7,7 +7,6 @@ class Form::Sales::Questions::LeaseholdChargesKnown < ::Form::Question
     @hint_text = "For example, service and management charges"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
     @conditional_for = {
       "mscharge" => [1],
     }
diff --git a/app/models/form/sales/questions/living_before_purchase.rb b/app/models/form/sales/questions/living_before_purchase.rb
index 0486fa4d7..feedaac63 100644
--- a/app/models/form/sales/questions/living_before_purchase.rb
+++ b/app/models/form/sales/questions/living_before_purchase.rb
@@ -6,7 +6,6 @@ class Form::Sales::Questions::LivingBeforePurchase < ::Form::Question
     @header = "How long did the buyer(s) live in the property before purchase?"
     @hint_text = "You should round this up to the nearest year. If the buyers haven't been living in the property, enter '0'"
     @type = "numeric"
-    @page = page
     @min = 0
     @max = 80
     @step = 1
diff --git a/app/models/form/sales/questions/monthly_rent.rb b/app/models/form/sales/questions/monthly_rent.rb
index 4195b1238..34ac1bed9 100644
--- a/app/models/form/sales/questions/monthly_rent.rb
+++ b/app/models/form/sales/questions/monthly_rent.rb
@@ -5,7 +5,6 @@ class Form::Sales::Questions::MonthlyRent < ::Form::Question
     @check_answer_label = "Monthly rent"
     @header = "What is the basic monthly rent?"
     @type = "numeric"
-    @page = page
     @min = 0
     @width = 5
     @prefix = "£"
diff --git a/app/models/form/sales/questions/mortgage_amount.rb b/app/models/form/sales/questions/mortgage_amount.rb
index c385563c5..5ad85bd31 100644
--- a/app/models/form/sales/questions/mortgage_amount.rb
+++ b/app/models/form/sales/questions/mortgage_amount.rb
@@ -5,10 +5,8 @@ class Form::Sales::Questions::MortgageAmount < ::Form::Question
     @check_answer_label = "Mortgage amount"
     @header = "What is the mortgage amount?"
     @type = "numeric"
-    @page = page
     @min = 0
     @width = 5
     @prefix = "£"
-    @hint_text = ""
   end
 end
diff --git a/app/models/form/sales/questions/mortgage_length.rb b/app/models/form/sales/questions/mortgage_length.rb
index 3c06e6e12..317489763 100644
--- a/app/models/form/sales/questions/mortgage_length.rb
+++ b/app/models/form/sales/questions/mortgage_length.rb
@@ -5,10 +5,8 @@ class Form::Sales::Questions::MortgageLength < ::Form::Question
     @check_answer_label = "Length of mortgage"
     @header = "What is the length of the mortgage?"
     @type = "numeric"
-    @page = page
     @min = 0
     @width = 5
     @suffix = " years"
-    @hint_text = ""
   end
 end
diff --git a/app/models/form/sales/questions/mortgage_value_check.rb b/app/models/form/sales/questions/mortgage_value_check.rb
index 9d063f428..39079d40e 100644
--- a/app/models/form/sales/questions/mortgage_value_check.rb
+++ b/app/models/form/sales/questions/mortgage_value_check.rb
@@ -20,6 +20,5 @@ class Form::Sales::Questions::MortgageValueCheck < ::Form::Question
       ],
     }
     @check_answers_card_number = 1
-    @page = page
   end
 end
diff --git a/app/models/form/sales/questions/mortgageused.rb b/app/models/form/sales/questions/mortgageused.rb
index 2374056a8..8c75750d8 100644
--- a/app/models/form/sales/questions/mortgageused.rb
+++ b/app/models/form/sales/questions/mortgageused.rb
@@ -6,8 +6,6 @@ class Form::Sales::Questions::Mortgageused < ::Form::Question
     @header = "Was a mortgage used for the purchase of this property?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
-    @hint_text = ""
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/nationality1.rb b/app/models/form/sales/questions/nationality1.rb
index 4d3dabb01..82a40df4e 100644
--- a/app/models/form/sales/questions/nationality1.rb
+++ b/app/models/form/sales/questions/nationality1.rb
@@ -6,7 +6,6 @@ class Form::Sales::Questions::Nationality1 < ::Form::Question
     @header = "What is buyer 1’s nationality?"
     @type = "radio"
     @hint_text = "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest."
-    @page = page
     @answer_options = ANSWER_OPTIONS
     @conditional_for = {
       "othernational" => [12],
diff --git a/app/models/form/sales/questions/number_joint_buyers.rb b/app/models/form/sales/questions/number_joint_buyers.rb
index 2370d03c6..b9c2fc2e2 100644
--- a/app/models/form/sales/questions/number_joint_buyers.rb
+++ b/app/models/form/sales/questions/number_joint_buyers.rb
@@ -7,7 +7,6 @@ class Form::Sales::Questions::NumberJointBuyers < ::Form::Question
     @hint_text = "You should still try to answer all questions even if the buyer wasn't interviewed in person"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/number_of_others_in_property.rb b/app/models/form/sales/questions/number_of_others_in_property.rb
index ddf2adb31..136cabcfb 100644
--- a/app/models/form/sales/questions/number_of_others_in_property.rb
+++ b/app/models/form/sales/questions/number_of_others_in_property.rb
@@ -6,7 +6,6 @@ class Form::Sales::Questions::NumberOfOthersInProperty < ::Form::Question
     @header = "Besides the buyers, how many other people live in the property?"
     @type = "numeric"
     @hint_text = "You can provide details for a maximum of 4 other people."
-    @page = page
     @width = 2
   end
 end
diff --git a/app/models/form/sales/questions/other_nationality1.rb b/app/models/form/sales/questions/other_nationality1.rb
index 293d4a2f3..3eb6a48d7 100644
--- a/app/models/form/sales/questions/other_nationality1.rb
+++ b/app/models/form/sales/questions/other_nationality1.rb
@@ -5,7 +5,6 @@ class Form::Sales::Questions::OtherNationality1 < ::Form::Question
     @check_answer_label = "Buyer 1’s nationality"
     @header = "Nationality"
     @type = "text"
-    @page = page
     @check_answers_card_number = 1
   end
 end
diff --git a/app/models/form/sales/questions/other_ownership_type.rb b/app/models/form/sales/questions/other_ownership_type.rb
index 23995bb9e..428691381 100644
--- a/app/models/form/sales/questions/other_ownership_type.rb
+++ b/app/models/form/sales/questions/other_ownership_type.rb
@@ -6,6 +6,5 @@ class Form::Sales::Questions::OtherOwnershipType < ::Form::Question
     @header = "What type of sale is it?"
     @type = "text"
     @width = 10
-    @page = page
   end
 end
diff --git a/app/models/form/sales/questions/outright_ownership_type.rb b/app/models/form/sales/questions/outright_ownership_type.rb
index 494722031..baead7f5a 100644
--- a/app/models/form/sales/questions/outright_ownership_type.rb
+++ b/app/models/form/sales/questions/outright_ownership_type.rb
@@ -6,7 +6,6 @@ class Form::Sales::Questions::OutrightOwnershipType < ::Form::Question
     @header = "What is the type of outright sale?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
     @conditional_for = {
       "othtype" => [12],
     }
diff --git a/app/models/form/sales/questions/ownership_scheme.rb b/app/models/form/sales/questions/ownership_scheme.rb
index 6db17550a..fc30ce3b4 100644
--- a/app/models/form/sales/questions/ownership_scheme.rb
+++ b/app/models/form/sales/questions/ownership_scheme.rb
@@ -6,7 +6,6 @@ class Form::Sales::Questions::OwnershipScheme < ::Form::Question
     @header = "Was this purchase made through an ownership scheme?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/person_age.rb b/app/models/form/sales/questions/person_age.rb
index 73dcce914..74e140f32 100644
--- a/app/models/form/sales/questions/person_age.rb
+++ b/app/models/form/sales/questions/person_age.rb
@@ -4,7 +4,6 @@ class Form::Sales::Questions::PersonAge < Form::Sales::Questions::Person
     @check_answer_label = "Person #{person_display_number}’s age"
     @header = "Age"
     @type = "numeric"
-    @page = page
     @width = 3
     @inferred_check_answers_value = {
       "condition" => { field_for_person("age", "_known") => 1 },
diff --git a/app/models/form/sales/questions/person_age_known.rb b/app/models/form/sales/questions/person_age_known.rb
index 1b0643f7f..a7e145739 100644
--- a/app/models/form/sales/questions/person_age_known.rb
+++ b/app/models/form/sales/questions/person_age_known.rb
@@ -5,8 +5,6 @@ class Form::Sales::Questions::PersonAgeKnown < ::Form::Sales::Questions::Person
     @header = "Do you know person #{person_display_number}’s age?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
-    @hint_text = ""
     @conditional_for = {
       field_for_person("age") => [0],
     }
diff --git a/app/models/form/sales/questions/person_gender_identity.rb b/app/models/form/sales/questions/person_gender_identity.rb
index db1f44f0f..71bebd818 100644
--- a/app/models/form/sales/questions/person_gender_identity.rb
+++ b/app/models/form/sales/questions/person_gender_identity.rb
@@ -4,7 +4,6 @@ class Form::Sales::Questions::PersonGenderIdentity < ::Form::Sales::Questions::P
     @check_answer_label = "Person #{person_display_number}’s gender identity"
     @header = "Which of these best describes Person #{person_display_number}’s gender identity?"
     @type = "radio"
-    @page = page
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = person_index
   end
diff --git a/app/models/form/sales/questions/person_known.rb b/app/models/form/sales/questions/person_known.rb
index 487b3f6d9..d03456989 100644
--- a/app/models/form/sales/questions/person_known.rb
+++ b/app/models/form/sales/questions/person_known.rb
@@ -5,8 +5,6 @@ class Form::Sales::Questions::PersonKnown < Form::Sales::Questions::Person
     @header = "Do you know the details for person #{person_display_number}?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
-    @hint_text = ""
     @hidden_in_check_answers = {
       "depends_on" => [
         {
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 a6c898796..72ee945f5 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
@@ -4,8 +4,6 @@ class Form::Sales::Questions::PersonRelationshipToBuyer1 < ::Form::Sales::Questi
     @check_answer_label = "Person #{person_display_number}’s relationship to Buyer 1"
     @header = "What is Person #{person_display_number}’s relationship to Buyer 1?"
     @type = "radio"
-    @hint_text = ""
-    @page = page
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = person_index
   end
diff --git a/app/models/form/sales/questions/person_working_situation.rb b/app/models/form/sales/questions/person_working_situation.rb
index 6c48d1844..5393ce80d 100644
--- a/app/models/form/sales/questions/person_working_situation.rb
+++ b/app/models/form/sales/questions/person_working_situation.rb
@@ -4,7 +4,6 @@ class Form::Sales::Questions::PersonWorkingSituation < ::Form::Sales::Questions:
     @check_answer_label = "Person #{person_display_number}’s working situation"
     @header = "Which of these best describes Person #{person_display_number}’s working situation?"
     @type = "radio"
-    @page = page
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = person_index
   end
diff --git a/app/models/form/sales/questions/previous_bedrooms.rb b/app/models/form/sales/questions/previous_bedrooms.rb
index 60f361499..e63a1b3cf 100644
--- a/app/models/form/sales/questions/previous_bedrooms.rb
+++ b/app/models/form/sales/questions/previous_bedrooms.rb
@@ -5,7 +5,6 @@ class Form::Sales::Questions::PreviousBedrooms < ::Form::Question
     @check_answer_label = "Number of bedrooms in previous property"
     @header = "How many bedrooms did the property have?"
     @type = "numeric"
-    @page = page
     @width = 5
     @min = 0
     @hint_text = "For bedsits enter 1"
diff --git a/app/models/form/sales/questions/previous_la_known.rb b/app/models/form/sales/questions/previous_la_known.rb
index 686a60e58..b38f5c560 100644
--- a/app/models/form/sales/questions/previous_la_known.rb
+++ b/app/models/form/sales/questions/previous_la_known.rb
@@ -6,7 +6,6 @@ class Form::Sales::Questions::PreviousLaKnown < ::Form::Question
     @header = "Do you know the local authority of buyer 1’s last settled accommodation?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
     @hint_text = "This is also known as the household’s 'last settled home'"
     @hidden_in_check_answers = {
       "depends_on" => [
diff --git a/app/models/form/sales/questions/previous_postcode.rb b/app/models/form/sales/questions/previous_postcode.rb
index a5bb7c54a..039450102 100644
--- a/app/models/form/sales/questions/previous_postcode.rb
+++ b/app/models/form/sales/questions/previous_postcode.rb
@@ -4,10 +4,8 @@ class Form::Sales::Questions::PreviousPostcode < ::Form::Question
     @id = "ppostcode_full"
     @check_answer_label = "Postcode of buyer 1’s last settled accommodation"
     @header = "Postcode"
-    @page = page
     @type = "text"
     @width = 5
-    @hint_text = ""
     @inferred_check_answers_value = {
       "condition" => {
         "ppcodenk" => 1,
diff --git a/app/models/form/sales/questions/previous_postcode_known.rb b/app/models/form/sales/questions/previous_postcode_known.rb
index 7c85aabe5..25ee906f8 100644
--- a/app/models/form/sales/questions/previous_postcode_known.rb
+++ b/app/models/form/sales/questions/previous_postcode_known.rb
@@ -6,7 +6,6 @@ class Form::Sales::Questions::PreviousPostcodeKnown < ::Form::Question
     @header = "Do you know the postcode of buyer 1’s last settled accommodation?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
     @conditional_for = {
       "ppostcode_full" => [0],
     }
diff --git a/app/models/form/sales/questions/prevloc.rb b/app/models/form/sales/questions/prevloc.rb
index ea7b9cf3b..53f5e5090 100644
--- a/app/models/form/sales/questions/prevloc.rb
+++ b/app/models/form/sales/questions/prevloc.rb
@@ -6,8 +6,6 @@ class Form::Sales::Questions::Prevloc < ::Form::Question
     @header = "Select a local authority"
     @type = "select"
     @answer_options = ANSWER_OPTIONS
-    @page = page
-    @hint_text = ""
     @inferred_check_answers_value = {
       "condition" => {
         "previous_la_known" => 0,
diff --git a/app/models/form/sales/questions/prevown.rb b/app/models/form/sales/questions/prevown.rb
index 9127a84c1..a9a3b086b 100644
--- a/app/models/form/sales/questions/prevown.rb
+++ b/app/models/form/sales/questions/prevown.rb
@@ -6,8 +6,6 @@ class Form::Sales::Questions::Prevown < ::Form::Question
     @header = "Has the buyer previously owned a property?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
-    @hint_text = ""
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/privacy_notice.rb b/app/models/form/sales/questions/privacy_notice.rb
index e853b38de..5bc84bce6 100644
--- a/app/models/form/sales/questions/privacy_notice.rb
+++ b/app/models/form/sales/questions/privacy_notice.rb
@@ -5,8 +5,6 @@ class Form::Sales::Questions::PrivacyNotice < ::Form::Question
     @check_answer_label = "Buyer has seen the privacy notice?"
     @header = "Declaration"
     @type = "checkbox"
-    @hint_text = ""
-    @page = page
     @answer_options = ANSWER_OPTIONS
     @guidance_position = GuidancePosition::TOP
     @guidance_partial = "privacy_notice_buyer"
diff --git a/app/models/form/sales/questions/property_building_type.rb b/app/models/form/sales/questions/property_building_type.rb
index 416c9928e..80102cc7a 100644
--- a/app/models/form/sales/questions/property_building_type.rb
+++ b/app/models/form/sales/questions/property_building_type.rb
@@ -6,8 +6,6 @@ class Form::Sales::Questions::PropertyBuildingType < ::Form::Question
     @header = "What type of building is the property?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
-    @hint_text = ""
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/property_local_authority.rb b/app/models/form/sales/questions/property_local_authority.rb
index 462956eeb..8def2d9f3 100644
--- a/app/models/form/sales/questions/property_local_authority.rb
+++ b/app/models/form/sales/questions/property_local_authority.rb
@@ -6,7 +6,6 @@ class Form::Sales::Questions::PropertyLocalAuthority < ::Form::Question
     @header = "What is the local authority of the property?"
     @type = "select"
     @answer_options = ANSWER_OPTIONS
-    @page = page
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/property_local_authority_known.rb b/app/models/form/sales/questions/property_local_authority_known.rb
index 11ebeca6a..cbb534a06 100644
--- a/app/models/form/sales/questions/property_local_authority_known.rb
+++ b/app/models/form/sales/questions/property_local_authority_known.rb
@@ -14,7 +14,6 @@ class Form::Sales::Questions::PropertyLocalAuthorityKnown < ::Form::Question
         },
       ],
     }
-    @page = page
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/property_number_of_bedrooms.rb b/app/models/form/sales/questions/property_number_of_bedrooms.rb
index 34b319240..d06d943cf 100644
--- a/app/models/form/sales/questions/property_number_of_bedrooms.rb
+++ b/app/models/form/sales/questions/property_number_of_bedrooms.rb
@@ -7,6 +7,5 @@ class Form::Sales::Questions::PropertyNumberOfBedrooms < ::Form::Question
     @hint_text = "A bedsit has 1 bedroom"
     @type = "text"
     @width = 10
-    @page = page
   end
 end
diff --git a/app/models/form/sales/questions/property_unit_type.rb b/app/models/form/sales/questions/property_unit_type.rb
index 2ebc1a8c2..afa4f0f38 100644
--- a/app/models/form/sales/questions/property_unit_type.rb
+++ b/app/models/form/sales/questions/property_unit_type.rb
@@ -6,7 +6,6 @@ class Form::Sales::Questions::PropertyUnitType < ::Form::Question
     @header = "What type of unit is the property?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/property_wheelchair_accessible.rb b/app/models/form/sales/questions/property_wheelchair_accessible.rb
index 0290815ef..bfdd133c2 100644
--- a/app/models/form/sales/questions/property_wheelchair_accessible.rb
+++ b/app/models/form/sales/questions/property_wheelchair_accessible.rb
@@ -6,7 +6,6 @@ class Form::Sales::Questions::PropertyWheelchairAccessible < ::Form::Question
     @header = "Is the property build or adapted to wheelchair-user standards?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/purchase_price.rb b/app/models/form/sales/questions/purchase_price.rb
index da714d9df..af7e8afb9 100644
--- a/app/models/form/sales/questions/purchase_price.rb
+++ b/app/models/form/sales/questions/purchase_price.rb
@@ -5,10 +5,8 @@ class Form::Sales::Questions::PurchasePrice < ::Form::Question
     @check_answer_label = "Purchase price"
     @header = "What is the full purchase price?"
     @type = "numeric"
-    @page = page
     @min = 0
     @width = 5
     @prefix = "£"
-    @hint_text = ""
   end
 end
diff --git a/app/models/form/sales/questions/purchaser_code.rb b/app/models/form/sales/questions/purchaser_code.rb
index 1f9551d05..7a5cc4bf7 100644
--- a/app/models/form/sales/questions/purchaser_code.rb
+++ b/app/models/form/sales/questions/purchaser_code.rb
@@ -7,6 +7,5 @@ class Form::Sales::Questions::PurchaserCode < ::Form::Question
     @hint_text = "This is how you usually refer to the purchaser on your own systems."
     @type = "text"
     @width = 10
-    @page = page
   end
 end
diff --git a/app/models/form/sales/questions/resale.rb b/app/models/form/sales/questions/resale.rb
index 8da7d8abd..e67491d65 100644
--- a/app/models/form/sales/questions/resale.rb
+++ b/app/models/form/sales/questions/resale.rb
@@ -6,7 +6,6 @@ class Form::Sales::Questions::Resale < ::Form::Question
     @header = "Is this a resale?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
     @hint_text = "If the social landlord has previously sold the property to another buyer and is now reselling the property, select 'yes'. If this is the first time the property has been sold, select 'no'."
   end
 
diff --git a/app/models/form/sales/questions/sale_date.rb b/app/models/form/sales/questions/sale_date.rb
index 2b0a3d171..ce085b646 100644
--- a/app/models/form/sales/questions/sale_date.rb
+++ b/app/models/form/sales/questions/sale_date.rb
@@ -5,6 +5,5 @@ class Form::Sales::Questions::SaleDate < ::Form::Question
     @check_answer_label = "Sale completion date"
     @header = "What is the sale completion date?"
     @type = "date"
-    @page = page
   end
 end
diff --git a/app/models/form/sales/questions/savings.rb b/app/models/form/sales/questions/savings.rb
index d605b4a47..920b87d4f 100644
--- a/app/models/form/sales/questions/savings.rb
+++ b/app/models/form/sales/questions/savings.rb
@@ -5,7 +5,6 @@ class Form::Sales::Questions::Savings < ::Form::Question
     @check_answer_label = "Buyer’s total savings (to nearest £10) before any deposit paid"
     @header = "Enter their total savings to the nearest £10"
     @type = "numeric"
-    @page = page
     @width = 5
     @prefix = "£"
     @step = 1
diff --git a/app/models/form/sales/questions/savings_nk.rb b/app/models/form/sales/questions/savings_nk.rb
index bce9d849d..f68b45560 100644
--- a/app/models/form/sales/questions/savings_nk.rb
+++ b/app/models/form/sales/questions/savings_nk.rb
@@ -6,8 +6,6 @@ class Form::Sales::Questions::SavingsNk < ::Form::Question
     @header = "Do you know how much the buyer had in savings before they paid any deposit for the property?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
-    @hint_text = ""
     @conditional_for = {
       "savings" => [0],
     }
diff --git a/app/models/form/sales/questions/savings_value_check.rb b/app/models/form/sales/questions/savings_value_check.rb
index 6af93ee03..bcd16827a 100644
--- a/app/models/form/sales/questions/savings_value_check.rb
+++ b/app/models/form/sales/questions/savings_value_check.rb
@@ -20,6 +20,5 @@ class Form::Sales::Questions::SavingsValueCheck < ::Form::Question
       ],
     }
     @check_answers_card_number = 0
-    @page = page
   end
 end
diff --git a/app/models/form/sales/questions/shared_ownership_type.rb b/app/models/form/sales/questions/shared_ownership_type.rb
index 27d6ea074..6351cc185 100644
--- a/app/models/form/sales/questions/shared_ownership_type.rb
+++ b/app/models/form/sales/questions/shared_ownership_type.rb
@@ -7,7 +7,6 @@ class Form::Sales::Questions::SharedOwnershipType < ::Form::Question
     @hint_text = "A shared ownership sale is when the purchaser buys up to 75% of the property value and pays rent to the Private Registered Provider (PRP) on the remaining portion"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/staircase.rb b/app/models/form/sales/questions/staircase.rb
index e204414b9..c03c24089 100644
--- a/app/models/form/sales/questions/staircase.rb
+++ b/app/models/form/sales/questions/staircase.rb
@@ -6,7 +6,6 @@ class Form::Sales::Questions::Staircase < ::Form::Question
     @header = "Is this a staircasing transaction?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
     @hint_text = "A staircasing transaction is when the household purchases more shares in their property, increasing the proportion they own and decreasing the proportion the housing association owns. Once the household purchases 100% of the shares, they own the property"
   end
 
diff --git a/app/models/form/sales/questions/staircase_bought.rb b/app/models/form/sales/questions/staircase_bought.rb
index 5afca794d..bdb5ac965 100644
--- a/app/models/form/sales/questions/staircase_bought.rb
+++ b/app/models/form/sales/questions/staircase_bought.rb
@@ -5,7 +5,6 @@ class Form::Sales::Questions::StaircaseBought < ::Form::Question
     @check_answer_label = "Percentage bought in this staircasing transaction"
     @header = "What percentage of the property has been bought in this staircasing transaction?"
     @type = "numeric"
-    @page = page
     @width = 5
     @min = 0
     @max = 100
diff --git a/app/models/form/sales/questions/staircase_owned.rb b/app/models/form/sales/questions/staircase_owned.rb
index 0fa37ec7a..6f9e13b14 100644
--- a/app/models/form/sales/questions/staircase_owned.rb
+++ b/app/models/form/sales/questions/staircase_owned.rb
@@ -5,7 +5,6 @@ class Form::Sales::Questions::StaircaseOwned < ::Form::Question
     @check_answer_label = "Percentage the buyer now owns in total"
     @header = "What percentage of the property does the buyer now own in total?"
     @type = "numeric"
-    @page = page
     @width = 5
     @min = 0
     @max = 100
diff --git a/app/models/form/sales/questions/value.rb b/app/models/form/sales/questions/value.rb
index 0686d6610..24e20e5ca 100644
--- a/app/models/form/sales/questions/value.rb
+++ b/app/models/form/sales/questions/value.rb
@@ -5,7 +5,6 @@ class Form::Sales::Questions::Value < ::Form::Question
     @check_answer_label = "Full purchase price"
     @header = "What was the full purchase price?"
     @type = "numeric"
-    @page = page
     @min = 0
     @width = 5
     @prefix = "£"
diff --git a/app/models/form/sales/sections/finances.rb b/app/models/form/sales/sections/finances.rb
index eb5c1a7f5..fb12e9923 100644
--- a/app/models/form/sales/sections/finances.rb
+++ b/app/models/form/sales/sections/finances.rb
@@ -4,7 +4,6 @@ class Form::Sales::Sections::Finances < ::Form::Section
     @id = "finances"
     @label = "Finances"
     @description = ""
-    @form = form
     @subsections = [
       Form::Sales::Subsections::IncomeBenefitsAndSavings.new(nil, nil, self),
     ]
diff --git a/app/models/form/sales/sections/household.rb b/app/models/form/sales/sections/household.rb
index 3c7eae085..e8bcc1451 100644
--- a/app/models/form/sales/sections/household.rb
+++ b/app/models/form/sales/sections/household.rb
@@ -4,7 +4,6 @@ class Form::Sales::Sections::Household < ::Form::Section
     @id = "household"
     @label = "About the household"
     @description = ""
-    @form = form
     @subsections = [
       Form::Sales::Subsections::HouseholdCharacteristics.new(nil, nil, self),
       Form::Sales::Subsections::HouseholdSituation.new(nil, nil, self),
diff --git a/app/models/form/sales/sections/property_information.rb b/app/models/form/sales/sections/property_information.rb
index 39f6609ae..f098cafa6 100644
--- a/app/models/form/sales/sections/property_information.rb
+++ b/app/models/form/sales/sections/property_information.rb
@@ -4,7 +4,6 @@ class Form::Sales::Sections::PropertyInformation < ::Form::Section
     @id = "property_information"
     @label = "Property information"
     @description = ""
-    @form = form
     @subsections = [Form::Sales::Subsections::PropertyInformation.new(nil, nil, self)] || []
   end
 end
diff --git a/app/models/form/sales/sections/sale_information.rb b/app/models/form/sales/sections/sale_information.rb
index 941abad3a..b57eb70a6 100644
--- a/app/models/form/sales/sections/sale_information.rb
+++ b/app/models/form/sales/sections/sale_information.rb
@@ -4,7 +4,6 @@ class Form::Sales::Sections::SaleInformation < ::Form::Section
     @id = "sale_information"
     @label = "Sale information"
     @description = ""
-    @form = form
     @subsections = [
       Form::Sales::Subsections::SharedOwnershipScheme.new(nil, nil, self),
       Form::Sales::Subsections::DiscountedOwnershipScheme.new(nil, nil, self),
diff --git a/app/models/form/sales/sections/setup.rb b/app/models/form/sales/sections/setup.rb
index d90c72036..c2c105a60 100644
--- a/app/models/form/sales/sections/setup.rb
+++ b/app/models/form/sales/sections/setup.rb
@@ -4,7 +4,6 @@ class Form::Sales::Sections::Setup < ::Form::Section
     @id = "setup"
     @label = "Before you start"
     @description = ""
-    @form = form
     @subsections = [Form::Sales::Subsections::Setup.new(nil, nil, self)] || []
   end
 end
diff --git a/app/models/form/sales/subsections/discounted_ownership_scheme.rb b/app/models/form/sales/subsections/discounted_ownership_scheme.rb
index 773d619df..bf98c292b 100644
--- a/app/models/form/sales/subsections/discounted_ownership_scheme.rb
+++ b/app/models/form/sales/subsections/discounted_ownership_scheme.rb
@@ -3,7 +3,6 @@ class Form::Sales::Subsections::DiscountedOwnershipScheme < ::Form::Subsection
     super
     @id = "discounted_ownership_scheme"
     @label = "Discounted ownership scheme"
-    @section = section
     @depends_on = [{ "ownershipsch" => 2, "setup_completed?" => true }]
   end
 
diff --git a/app/models/form/sales/subsections/household_characteristics.rb b/app/models/form/sales/subsections/household_characteristics.rb
index 5fe1175e3..38a71cf41 100644
--- a/app/models/form/sales/subsections/household_characteristics.rb
+++ b/app/models/form/sales/subsections/household_characteristics.rb
@@ -3,7 +3,6 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection
     super
     @id = "household_characteristics"
     @label = "Household characteristics"
-    @section = section
     @depends_on = [{ "setup_completed?" => true }]
   end
 
diff --git a/app/models/form/sales/subsections/household_needs.rb b/app/models/form/sales/subsections/household_needs.rb
index 4e9cab5f5..d411d5101 100644
--- a/app/models/form/sales/subsections/household_needs.rb
+++ b/app/models/form/sales/subsections/household_needs.rb
@@ -3,7 +3,6 @@ class Form::Sales::Subsections::HouseholdNeeds < ::Form::Subsection
     super
     @id = "household_needs"
     @label = "Household needs"
-    @section = section
     @depends_on = [{ "setup_completed?" => true }]
   end
 
diff --git a/app/models/form/sales/subsections/household_situation.rb b/app/models/form/sales/subsections/household_situation.rb
index afc782028..a9d9306d6 100644
--- a/app/models/form/sales/subsections/household_situation.rb
+++ b/app/models/form/sales/subsections/household_situation.rb
@@ -3,7 +3,6 @@ class Form::Sales::Subsections::HouseholdSituation < ::Form::Subsection
     super
     @id = "household_situation"
     @label = "Household situation"
-    @section = section
     @depends_on = [{ "setup_completed?" => true }]
   end
 
diff --git a/app/models/form/sales/subsections/income_benefits_and_savings.rb b/app/models/form/sales/subsections/income_benefits_and_savings.rb
index 409d50270..e2eb32b08 100644
--- a/app/models/form/sales/subsections/income_benefits_and_savings.rb
+++ b/app/models/form/sales/subsections/income_benefits_and_savings.rb
@@ -3,7 +3,6 @@ class Form::Sales::Subsections::IncomeBenefitsAndSavings < ::Form::Subsection
     super
     @id = "income_benefits_and_savings"
     @label = "Income, benefits and savings"
-    @section = section
     @depends_on = [{ "setup_completed?" => true }]
   end
 
diff --git a/app/models/form/sales/subsections/outright_sale.rb b/app/models/form/sales/subsections/outright_sale.rb
index e3bebb6c8..0f60e51bd 100644
--- a/app/models/form/sales/subsections/outright_sale.rb
+++ b/app/models/form/sales/subsections/outright_sale.rb
@@ -3,7 +3,6 @@ class Form::Sales::Subsections::OutrightSale < ::Form::Subsection
     super
     @id = "outright_sale"
     @label = "Outright sale"
-    @section = section
     @depends_on = [{ "ownershipsch" => 3, "setup_completed?" => true }]
   end
 
diff --git a/app/models/form/sales/subsections/property_information.rb b/app/models/form/sales/subsections/property_information.rb
index 02d7b4037..47a0c83e3 100644
--- a/app/models/form/sales/subsections/property_information.rb
+++ b/app/models/form/sales/subsections/property_information.rb
@@ -3,7 +3,6 @@ class Form::Sales::Subsections::PropertyInformation < ::Form::Subsection
     super
     @id = "property_information"
     @label = "Property information"
-    @section = section
     @depends_on = [{ "setup_completed?" => true }]
   end
 
diff --git a/app/models/form/sales/subsections/setup.rb b/app/models/form/sales/subsections/setup.rb
index f39926db3..d2261a33b 100644
--- a/app/models/form/sales/subsections/setup.rb
+++ b/app/models/form/sales/subsections/setup.rb
@@ -3,7 +3,6 @@ class Form::Sales::Subsections::Setup < ::Form::Subsection
     super
     @id = "setup"
     @label = "Set up this sales log"
-    @section = section
   end
 
   def pages
diff --git a/app/models/form/sales/subsections/shared_ownership_scheme.rb b/app/models/form/sales/subsections/shared_ownership_scheme.rb
index eee58a56e..1f3163673 100644
--- a/app/models/form/sales/subsections/shared_ownership_scheme.rb
+++ b/app/models/form/sales/subsections/shared_ownership_scheme.rb
@@ -3,7 +3,6 @@ class Form::Sales::Subsections::SharedOwnershipScheme < ::Form::Subsection
     super
     @id = "shared_ownership_scheme"
     @label = "Shared ownership scheme"
-    @section = section
     @depends_on = [{ "ownershipsch" => 1, "setup_completed?" => true }]
   end
 
diff --git a/spec/models/form/common/pages/created_by_spec.rb b/spec/models/form/common/pages/created_by_spec.rb
index 1f11a5889..db9561ac2 100644
--- a/spec/models/form/common/pages/created_by_spec.rb
+++ b/spec/models/form/common/pages/created_by_spec.rb
@@ -22,11 +22,11 @@ RSpec.describe Form::Common::Pages::CreatedBy, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has the correct depends_on" do
diff --git a/spec/models/form/common/pages/organisation_spec.rb b/spec/models/form/common/pages/organisation_spec.rb
index ae7a1027c..bc56adbd7 100644
--- a/spec/models/form/common/pages/organisation_spec.rb
+++ b/spec/models/form/common/pages/organisation_spec.rb
@@ -22,11 +22,11 @@ RSpec.describe Form::Common::Pages::Organisation, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has the correct depends_on" do
diff --git a/spec/models/form/common/questions/created_by_id_spec.rb b/spec/models/form/common/questions/created_by_id_spec.rb
index b00e21f90..dde117f43 100644
--- a/spec/models/form/common/questions/created_by_id_spec.rb
+++ b/spec/models/form/common/questions/created_by_id_spec.rb
@@ -39,7 +39,7 @@ RSpec.describe Form::Common::Questions::CreatedById, type: :model do
   end
 
   it "has the correct hint_text" do
-    expect(question.hint_text).to eq("")
+    expect(question.hint_text).to be_nil
   end
 
   it "has the correct answer options" do
diff --git a/spec/models/form/common/questions/owning_organisation_id_spec.rb b/spec/models/form/common/questions/owning_organisation_id_spec.rb
index 9ee32e342..8b57bebe1 100644
--- a/spec/models/form/common/questions/owning_organisation_id_spec.rb
+++ b/spec/models/form/common/questions/owning_organisation_id_spec.rb
@@ -40,7 +40,7 @@ RSpec.describe Form::Common::Questions::OwningOrganisationId, type: :model do
   end
 
   it "has the correct hint_text" do
-    expect(question.hint_text).to eq("")
+    expect(question.hint_text).to be_nil
   end
 
   it "has the correct answer options" do
diff --git a/spec/models/form/lettings/pages/created_by_spec.rb b/spec/models/form/lettings/pages/created_by_spec.rb
index c4fd460cb..b1ac0853e 100644
--- a/spec/models/form/lettings/pages/created_by_spec.rb
+++ b/spec/models/form/lettings/pages/created_by_spec.rb
@@ -42,11 +42,11 @@ RSpec.describe Form::Lettings::Pages::CreatedBy, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has the correct depends_on" do
diff --git a/spec/models/form/lettings/pages/location_spec.rb b/spec/models/form/lettings/pages/location_spec.rb
index bdf08c244..85cfd0a21 100644
--- a/spec/models/form/lettings/pages/location_spec.rb
+++ b/spec/models/form/lettings/pages/location_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Lettings::Pages::Location, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has the correct depends_on" do
diff --git a/spec/models/form/lettings/pages/managing_organisation_spec.rb b/spec/models/form/lettings/pages/managing_organisation_spec.rb
index 01d6ba9b2..e6b2b95ee 100644
--- a/spec/models/form/lettings/pages/managing_organisation_spec.rb
+++ b/spec/models/form/lettings/pages/managing_organisation_spec.rb
@@ -21,11 +21,11 @@ RSpec.describe Form::Lettings::Pages::ManagingOrganisation, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has the correct depends_on" do
diff --git a/spec/models/form/lettings/pages/needs_type_spec.rb b/spec/models/form/lettings/pages/needs_type_spec.rb
index 37978fdf8..1f0cabdfa 100644
--- a/spec/models/form/lettings/pages/needs_type_spec.rb
+++ b/spec/models/form/lettings/pages/needs_type_spec.rb
@@ -20,10 +20,10 @@ RSpec.describe Form::Lettings::Pages::NeedsType, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 end
diff --git a/spec/models/form/lettings/pages/property_reference_spec.rb b/spec/models/form/lettings/pages/property_reference_spec.rb
index cb2f2c76a..d412f9b8a 100644
--- a/spec/models/form/lettings/pages/property_reference_spec.rb
+++ b/spec/models/form/lettings/pages/property_reference_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Lettings::Pages::PropertyReference, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has the correct depends_on" do
diff --git a/spec/models/form/lettings/pages/renewal_spec.rb b/spec/models/form/lettings/pages/renewal_spec.rb
index 0fceb1a99..b4bfb213b 100644
--- a/spec/models/form/lettings/pages/renewal_spec.rb
+++ b/spec/models/form/lettings/pages/renewal_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Lettings::Pages::Renewal, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has the correct depends_on" do
diff --git a/spec/models/form/lettings/pages/rent_type_spec.rb b/spec/models/form/lettings/pages/rent_type_spec.rb
index 6541d542d..ffe9bf15f 100644
--- a/spec/models/form/lettings/pages/rent_type_spec.rb
+++ b/spec/models/form/lettings/pages/rent_type_spec.rb
@@ -20,10 +20,10 @@ RSpec.describe Form::Lettings::Pages::RentType, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 end
diff --git a/spec/models/form/lettings/pages/scheme_spec.rb b/spec/models/form/lettings/pages/scheme_spec.rb
index d369caf72..764ff34f0 100644
--- a/spec/models/form/lettings/pages/scheme_spec.rb
+++ b/spec/models/form/lettings/pages/scheme_spec.rb
@@ -20,10 +20,10 @@ RSpec.describe Form::Lettings::Pages::Scheme, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 end
diff --git a/spec/models/form/lettings/pages/stock_owner_spec.rb b/spec/models/form/lettings/pages/stock_owner_spec.rb
index ae66c829e..b90fe966e 100644
--- a/spec/models/form/lettings/pages/stock_owner_spec.rb
+++ b/spec/models/form/lettings/pages/stock_owner_spec.rb
@@ -21,11 +21,11 @@ RSpec.describe Form::Lettings::Pages::StockOwner, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has the correct depends_on" do
diff --git a/spec/models/form/lettings/pages/tenancy_start_date_spec.rb b/spec/models/form/lettings/pages/tenancy_start_date_spec.rb
index 99597e428..8f8330395 100644
--- a/spec/models/form/lettings/pages/tenancy_start_date_spec.rb
+++ b/spec/models/form/lettings/pages/tenancy_start_date_spec.rb
@@ -24,7 +24,7 @@ RSpec.describe Form::Lettings::Pages::TenancyStartDate, type: :model do
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has the correct depends_on" do
diff --git a/spec/models/form/lettings/pages/tenant_code_spec.rb b/spec/models/form/lettings/pages/tenant_code_spec.rb
index e91303bc3..724b93ad0 100644
--- a/spec/models/form/lettings/pages/tenant_code_spec.rb
+++ b/spec/models/form/lettings/pages/tenant_code_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Lettings::Pages::TenantCode, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has the correct depends_on" do
diff --git a/spec/models/form/lettings/questions/created_by_id_spec.rb b/spec/models/form/lettings/questions/created_by_id_spec.rb
index b1ee1de49..c82ec13e1 100644
--- a/spec/models/form/lettings/questions/created_by_id_spec.rb
+++ b/spec/models/form/lettings/questions/created_by_id_spec.rb
@@ -40,7 +40,7 @@ RSpec.describe Form::Lettings::Questions::CreatedById, type: :model do
   end
 
   it "has the correct hint_text" do
-    expect(question.hint_text).to eq("")
+    expect(question.hint_text).to be_nil
   end
 
   it "has the correct answer options" do
diff --git a/spec/models/form/lettings/questions/renewal_spec.rb b/spec/models/form/lettings/questions/renewal_spec.rb
index 961d65153..820ff7c98 100644
--- a/spec/models/form/lettings/questions/renewal_spec.rb
+++ b/spec/models/form/lettings/questions/renewal_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe Form::Lettings::Questions::Renewal, type: :model do
   end
 
   it "has the correct hint_text" do
-    expect(question.hint_text).to eq("")
+    expect(question.hint_text).to be_nil
   end
 
   it "has the correct answer_options" do
diff --git a/spec/models/form/lettings/questions/rent_type_spec.rb b/spec/models/form/lettings/questions/rent_type_spec.rb
index 45906ec81..4609b0568 100644
--- a/spec/models/form/lettings/questions/rent_type_spec.rb
+++ b/spec/models/form/lettings/questions/rent_type_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe Form::Lettings::Questions::RentType, type: :model do
   end
 
   it "has the correct hint_text" do
-    expect(question.hint_text).to eq("")
+    expect(question.hint_text).to be_nil
   end
 
   it "has the correct conditional_for" do
diff --git a/spec/models/form/sales/pages/about_deposit_with_discount_spec.rb b/spec/models/form/sales/pages/about_deposit_with_discount_spec.rb
index 692f17a75..cc33a9641 100644
--- a/spec/models/form/sales/pages/about_deposit_with_discount_spec.rb
+++ b/spec/models/form/sales/pages/about_deposit_with_discount_spec.rb
@@ -24,7 +24,7 @@ RSpec.describe Form::Sales::Pages::AboutDepositWithDiscount, type: :model do
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/about_deposit_without_discount_spec.rb b/spec/models/form/sales/pages/about_deposit_without_discount_spec.rb
index 07f9c983d..8d5bd84f2 100644
--- a/spec/models/form/sales/pages/about_deposit_without_discount_spec.rb
+++ b/spec/models/form/sales/pages/about_deposit_without_discount_spec.rb
@@ -24,7 +24,7 @@ RSpec.describe Form::Sales::Pages::AboutDepositWithoutDiscount, type: :model do
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/about_price_not_rtb_spec.rb b/spec/models/form/sales/pages/about_price_not_rtb_spec.rb
index 584455d25..07d168368 100644
--- a/spec/models/form/sales/pages/about_price_not_rtb_spec.rb
+++ b/spec/models/form/sales/pages/about_price_not_rtb_spec.rb
@@ -24,7 +24,7 @@ RSpec.describe Form::Sales::Pages::AboutPriceNotRtb, type: :model do
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/about_price_rtb_spec.rb b/spec/models/form/sales/pages/about_price_rtb_spec.rb
index 29e59f52c..c73a83b61 100644
--- a/spec/models/form/sales/pages/about_price_rtb_spec.rb
+++ b/spec/models/form/sales/pages/about_price_rtb_spec.rb
@@ -24,7 +24,7 @@ RSpec.describe Form::Sales::Pages::AboutPriceRtb, type: :model do
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/about_price_shared_ownership_spec.rb b/spec/models/form/sales/pages/about_price_shared_ownership_spec.rb
index c4e8d6ccc..097a45298 100644
--- a/spec/models/form/sales/pages/about_price_shared_ownership_spec.rb
+++ b/spec/models/form/sales/pages/about_price_shared_ownership_spec.rb
@@ -24,7 +24,7 @@ RSpec.describe Form::Sales::Pages::AboutPriceSharedOwnership, type: :model do
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/about_staircase_spec.rb b/spec/models/form/sales/pages/about_staircase_spec.rb
index 9fe34ba86..a2fba103e 100644
--- a/spec/models/form/sales/pages/about_staircase_spec.rb
+++ b/spec/models/form/sales/pages/about_staircase_spec.rb
@@ -24,7 +24,7 @@ RSpec.describe Form::Sales::Pages::AboutStaircase, type: :model do
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/age1_spec.rb b/spec/models/form/sales/pages/age1_spec.rb
index c70143a68..0c8130bad 100644
--- a/spec/models/form/sales/pages/age1_spec.rb
+++ b/spec/models/form/sales/pages/age1_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::Age1, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/age2_spec.rb b/spec/models/form/sales/pages/age2_spec.rb
index cc3e99189..eabb6a2e8 100644
--- a/spec/models/form/sales/pages/age2_spec.rb
+++ b/spec/models/form/sales/pages/age2_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::Age2, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/armed_forces_spec.rb b/spec/models/form/sales/pages/armed_forces_spec.rb
index ac9c38e5d..542c94475 100644
--- a/spec/models/form/sales/pages/armed_forces_spec.rb
+++ b/spec/models/form/sales/pages/armed_forces_spec.rb
@@ -20,10 +20,10 @@ RSpec.describe Form::Sales::Pages::ArmedForces, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 end
diff --git a/spec/models/form/sales/pages/armed_forces_spouse_spec.rb b/spec/models/form/sales/pages/armed_forces_spouse_spec.rb
index 75be2b3f3..bf72a573c 100644
--- a/spec/models/form/sales/pages/armed_forces_spouse_spec.rb
+++ b/spec/models/form/sales/pages/armed_forces_spouse_spec.rb
@@ -20,10 +20,10 @@ RSpec.describe Form::Sales::Pages::ArmedForcesSpouse, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 end
diff --git a/spec/models/form/sales/pages/buyer1_ethnic_background_arab_spec.rb b/spec/models/form/sales/pages/buyer1_ethnic_background_arab_spec.rb
index 821874a0f..823c07592 100644
--- a/spec/models/form/sales/pages/buyer1_ethnic_background_arab_spec.rb
+++ b/spec/models/form/sales/pages/buyer1_ethnic_background_arab_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::Buyer1EthnicBackgroundArab, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/buyer1_ethnic_background_asian_spec.rb b/spec/models/form/sales/pages/buyer1_ethnic_background_asian_spec.rb
index ad8b47846..dbb9e8478 100644
--- a/spec/models/form/sales/pages/buyer1_ethnic_background_asian_spec.rb
+++ b/spec/models/form/sales/pages/buyer1_ethnic_background_asian_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::Buyer1EthnicBackgroundAsian, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/buyer1_ethnic_background_black_spec.rb b/spec/models/form/sales/pages/buyer1_ethnic_background_black_spec.rb
index 1f5618a0b..1b84a60d5 100644
--- a/spec/models/form/sales/pages/buyer1_ethnic_background_black_spec.rb
+++ b/spec/models/form/sales/pages/buyer1_ethnic_background_black_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::Buyer1EthnicBackgroundBlack, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/buyer1_ethnic_background_mixed_spec.rb b/spec/models/form/sales/pages/buyer1_ethnic_background_mixed_spec.rb
index 648734242..9112ff4ac 100644
--- a/spec/models/form/sales/pages/buyer1_ethnic_background_mixed_spec.rb
+++ b/spec/models/form/sales/pages/buyer1_ethnic_background_mixed_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::Buyer1EthnicBackgroundMixed, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/buyer1_ethnic_background_white_spec.rb b/spec/models/form/sales/pages/buyer1_ethnic_background_white_spec.rb
index 620918b0e..8a3796025 100644
--- a/spec/models/form/sales/pages/buyer1_ethnic_background_white_spec.rb
+++ b/spec/models/form/sales/pages/buyer1_ethnic_background_white_spec.rb
@@ -20,10 +20,10 @@ RSpec.describe Form::Sales::Pages::Buyer1EthnicBackgroundWhite, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 end
diff --git a/spec/models/form/sales/pages/buyer1_ethnic_group_spec.rb b/spec/models/form/sales/pages/buyer1_ethnic_group_spec.rb
index 406f78676..e6e6798f5 100644
--- a/spec/models/form/sales/pages/buyer1_ethnic_group_spec.rb
+++ b/spec/models/form/sales/pages/buyer1_ethnic_group_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::Buyer1EthnicGroup, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/buyer1_income_spec.rb b/spec/models/form/sales/pages/buyer1_income_spec.rb
index a95a8ee5f..c56bbabaa 100644
--- a/spec/models/form/sales/pages/buyer1_income_spec.rb
+++ b/spec/models/form/sales/pages/buyer1_income_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::Buyer1Income, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/buyer1_income_value_check_spec.rb b/spec/models/form/sales/pages/buyer1_income_value_check_spec.rb
index 18281533e..313708aaf 100644
--- a/spec/models/form/sales/pages/buyer1_income_value_check_spec.rb
+++ b/spec/models/form/sales/pages/buyer1_income_value_check_spec.rb
@@ -20,7 +20,7 @@ RSpec.describe Form::Sales::Pages::Buyer1IncomeValueCheck, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/buyer1_live_in_property_spec.rb b/spec/models/form/sales/pages/buyer1_live_in_property_spec.rb
index 2d3995d6b..444f14909 100644
--- a/spec/models/form/sales/pages/buyer1_live_in_property_spec.rb
+++ b/spec/models/form/sales/pages/buyer1_live_in_property_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::Buyer1LiveInProperty, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/buyer1_mortgage_spec.rb b/spec/models/form/sales/pages/buyer1_mortgage_spec.rb
index d3aa2e1bb..dc19a16e2 100644
--- a/spec/models/form/sales/pages/buyer1_mortgage_spec.rb
+++ b/spec/models/form/sales/pages/buyer1_mortgage_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::Buyer1Mortgage, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/buyer1_working_situation_spec.rb b/spec/models/form/sales/pages/buyer1_working_situation_spec.rb
index 4b432ed03..c8d911e18 100644
--- a/spec/models/form/sales/pages/buyer1_working_situation_spec.rb
+++ b/spec/models/form/sales/pages/buyer1_working_situation_spec.rb
@@ -20,6 +20,6 @@ RSpec.describe Form::Sales::Pages::Buyer1WorkingSituation, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 end
diff --git a/spec/models/form/sales/pages/buyer2_income_spec.rb b/spec/models/form/sales/pages/buyer2_income_spec.rb
index 0450ceed1..91f8b4014 100644
--- a/spec/models/form/sales/pages/buyer2_income_spec.rb
+++ b/spec/models/form/sales/pages/buyer2_income_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::Buyer2Income, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/buyer2_live_in_property_spec.rb b/spec/models/form/sales/pages/buyer2_live_in_property_spec.rb
index 48b003d3c..34644241f 100644
--- a/spec/models/form/sales/pages/buyer2_live_in_property_spec.rb
+++ b/spec/models/form/sales/pages/buyer2_live_in_property_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::Buyer2LiveInProperty, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/buyer2_mortgage_spec.rb b/spec/models/form/sales/pages/buyer2_mortgage_spec.rb
index ed51c0ae1..b71dc5c59 100644
--- a/spec/models/form/sales/pages/buyer2_mortgage_spec.rb
+++ b/spec/models/form/sales/pages/buyer2_mortgage_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::Buyer2Mortgage, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/buyer2_relationship_to_buyer1_spec.rb b/spec/models/form/sales/pages/buyer2_relationship_to_buyer1_spec.rb
index 2e87764d6..eef011089 100644
--- a/spec/models/form/sales/pages/buyer2_relationship_to_buyer1_spec.rb
+++ b/spec/models/form/sales/pages/buyer2_relationship_to_buyer1_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::Buyer2RelationshipToBuyer1, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/buyer2_working_situation_spec.rb b/spec/models/form/sales/pages/buyer2_working_situation_spec.rb
index ce001117a..fe339091b 100644
--- a/spec/models/form/sales/pages/buyer2_working_situation_spec.rb
+++ b/spec/models/form/sales/pages/buyer2_working_situation_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::Buyer2WorkingSituation, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/buyer_company_spec.rb b/spec/models/form/sales/pages/buyer_company_spec.rb
index 7f7683e02..2551f8700 100644
--- a/spec/models/form/sales/pages/buyer_company_spec.rb
+++ b/spec/models/form/sales/pages/buyer_company_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::BuyerCompany, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/buyer_interview_spec.rb b/spec/models/form/sales/pages/buyer_interview_spec.rb
index 1347fb782..ffc4c9a3a 100644
--- a/spec/models/form/sales/pages/buyer_interview_spec.rb
+++ b/spec/models/form/sales/pages/buyer_interview_spec.rb
@@ -20,10 +20,10 @@ RSpec.describe Form::Sales::Pages::BuyerInterview, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 end
diff --git a/spec/models/form/sales/pages/buyer_live_spec.rb b/spec/models/form/sales/pages/buyer_live_spec.rb
index 70bab20bd..685798f59 100644
--- a/spec/models/form/sales/pages/buyer_live_spec.rb
+++ b/spec/models/form/sales/pages/buyer_live_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::BuyerLive, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/buyer_previous_spec.rb b/spec/models/form/sales/pages/buyer_previous_spec.rb
index 2954d54ae..a3355c137 100644
--- a/spec/models/form/sales/pages/buyer_previous_spec.rb
+++ b/spec/models/form/sales/pages/buyer_previous_spec.rb
@@ -20,10 +20,10 @@ RSpec.describe Form::Sales::Pages::BuyerPrevious, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 end
diff --git a/spec/models/form/sales/pages/buyer_still_serving_spec.rb b/spec/models/form/sales/pages/buyer_still_serving_spec.rb
index e5b26a52e..55a312119 100644
--- a/spec/models/form/sales/pages/buyer_still_serving_spec.rb
+++ b/spec/models/form/sales/pages/buyer_still_serving_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::BuyerStillServing, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/buyers_organisations_spec.rb b/spec/models/form/sales/pages/buyers_organisations_spec.rb
index f245fe7f5..fb3e568de 100644
--- a/spec/models/form/sales/pages/buyers_organisations_spec.rb
+++ b/spec/models/form/sales/pages/buyers_organisations_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::BuyersOrganisations, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/deposit_value_check_spec.rb b/spec/models/form/sales/pages/deposit_value_check_spec.rb
index 909215f2c..961a3b6ec 100644
--- a/spec/models/form/sales/pages/deposit_value_check_spec.rb
+++ b/spec/models/form/sales/pages/deposit_value_check_spec.rb
@@ -20,7 +20,7 @@ RSpec.describe Form::Sales::Pages::DepositValueCheck, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/discounted_ownership_type_spec.rb b/spec/models/form/sales/pages/discounted_ownership_type_spec.rb
index 4c44f7ac1..8951e3323 100644
--- a/spec/models/form/sales/pages/discounted_ownership_type_spec.rb
+++ b/spec/models/form/sales/pages/discounted_ownership_type_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::DiscountedOwnershipType, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/exchange_date_spec.rb b/spec/models/form/sales/pages/exchange_date_spec.rb
index 21c4c3aab..8d3cc3d27 100644
--- a/spec/models/form/sales/pages/exchange_date_spec.rb
+++ b/spec/models/form/sales/pages/exchange_date_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::ExchangeDate, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has the correct depends_on" do
diff --git a/spec/models/form/sales/pages/gender_identity1_spec.rb b/spec/models/form/sales/pages/gender_identity1_spec.rb
index fe4e4ff87..2b06f2349 100644
--- a/spec/models/form/sales/pages/gender_identity1_spec.rb
+++ b/spec/models/form/sales/pages/gender_identity1_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::GenderIdentity1, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/gender_identity2_spec.rb b/spec/models/form/sales/pages/gender_identity2_spec.rb
index 0fdd96e27..7698f151c 100644
--- a/spec/models/form/sales/pages/gender_identity2_spec.rb
+++ b/spec/models/form/sales/pages/gender_identity2_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::GenderIdentity2, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/handover_date_spec.rb b/spec/models/form/sales/pages/handover_date_spec.rb
index fed507969..fa2156cf7 100644
--- a/spec/models/form/sales/pages/handover_date_spec.rb
+++ b/spec/models/form/sales/pages/handover_date_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::HandoverDate, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has the correct depends_on" do
diff --git a/spec/models/form/sales/pages/household_disability_spec.rb b/spec/models/form/sales/pages/household_disability_spec.rb
index 982bd797f..1838c7417 100644
--- a/spec/models/form/sales/pages/household_disability_spec.rb
+++ b/spec/models/form/sales/pages/household_disability_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::HouseholdDisability, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/household_wheelchair_check_spec.rb b/spec/models/form/sales/pages/household_wheelchair_check_spec.rb
index c1388c7d3..5a6cb34f9 100644
--- a/spec/models/form/sales/pages/household_wheelchair_check_spec.rb
+++ b/spec/models/form/sales/pages/household_wheelchair_check_spec.rb
@@ -20,7 +20,7 @@ RSpec.describe Form::Sales::Pages::HouseholdWheelchairCheck, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/household_wheelchair_spec.rb b/spec/models/form/sales/pages/household_wheelchair_spec.rb
index f727bcbac..70a103507 100644
--- a/spec/models/form/sales/pages/household_wheelchair_spec.rb
+++ b/spec/models/form/sales/pages/household_wheelchair_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::HouseholdWheelchair, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/housing_benefits_spec.rb b/spec/models/form/sales/pages/housing_benefits_spec.rb
index 477490c6e..9cf017bdc 100644
--- a/spec/models/form/sales/pages/housing_benefits_spec.rb
+++ b/spec/models/form/sales/pages/housing_benefits_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::HousingBenefits, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/joint_purchase_spec.rb b/spec/models/form/sales/pages/joint_purchase_spec.rb
index 9140b19de..bd827d7f8 100644
--- a/spec/models/form/sales/pages/joint_purchase_spec.rb
+++ b/spec/models/form/sales/pages/joint_purchase_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::JointPurchase, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/la_nominations_spec.rb b/spec/models/form/sales/pages/la_nominations_spec.rb
index 02b44ccb5..b7b40c2dd 100644
--- a/spec/models/form/sales/pages/la_nominations_spec.rb
+++ b/spec/models/form/sales/pages/la_nominations_spec.rb
@@ -20,10 +20,10 @@ RSpec.describe Form::Sales::Pages::LaNominations, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 end
diff --git a/spec/models/form/sales/pages/last_accommodation_la_spec.rb b/spec/models/form/sales/pages/last_accommodation_la_spec.rb
index 5b11779ad..fb3890cc6 100644
--- a/spec/models/form/sales/pages/last_accommodation_la_spec.rb
+++ b/spec/models/form/sales/pages/last_accommodation_la_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::LastAccommodationLa, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/last_accommodation_spec.rb b/spec/models/form/sales/pages/last_accommodation_spec.rb
index 6e4a6468c..753aa7dc8 100644
--- a/spec/models/form/sales/pages/last_accommodation_spec.rb
+++ b/spec/models/form/sales/pages/last_accommodation_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::LastAccommodation, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/leasehold_charges_spec.rb b/spec/models/form/sales/pages/leasehold_charges_spec.rb
index d35d1076b..c729bc82e 100644
--- a/spec/models/form/sales/pages/leasehold_charges_spec.rb
+++ b/spec/models/form/sales/pages/leasehold_charges_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::LeaseholdCharges, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/living_before_purchase_spec.rb b/spec/models/form/sales/pages/living_before_purchase_spec.rb
index b01e381e8..435229831 100644
--- a/spec/models/form/sales/pages/living_before_purchase_spec.rb
+++ b/spec/models/form/sales/pages/living_before_purchase_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::LivingBeforePurchase, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/monthly_rent_spec.rb b/spec/models/form/sales/pages/monthly_rent_spec.rb
index 8d953e248..b1cddac37 100644
--- a/spec/models/form/sales/pages/monthly_rent_spec.rb
+++ b/spec/models/form/sales/pages/monthly_rent_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::MonthlyRent, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/mortgage_amount_spec.rb b/spec/models/form/sales/pages/mortgage_amount_spec.rb
index 4df02d1af..1aa563d9b 100644
--- a/spec/models/form/sales/pages/mortgage_amount_spec.rb
+++ b/spec/models/form/sales/pages/mortgage_amount_spec.rb
@@ -24,7 +24,7 @@ RSpec.describe Form::Sales::Pages::MortgageAmount, type: :model do
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/mortgage_length_spec.rb b/spec/models/form/sales/pages/mortgage_length_spec.rb
index 002fb49cf..bc63bc178 100644
--- a/spec/models/form/sales/pages/mortgage_length_spec.rb
+++ b/spec/models/form/sales/pages/mortgage_length_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::MortgageLength, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/mortgage_value_check_spec.rb b/spec/models/form/sales/pages/mortgage_value_check_spec.rb
index b39daa468..bd6c0bdf5 100644
--- a/spec/models/form/sales/pages/mortgage_value_check_spec.rb
+++ b/spec/models/form/sales/pages/mortgage_value_check_spec.rb
@@ -20,7 +20,7 @@ RSpec.describe Form::Sales::Pages::MortgageValueCheck, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/mortgageused_spec.rb b/spec/models/form/sales/pages/mortgageused_spec.rb
index bbeadd301..963814074 100644
--- a/spec/models/form/sales/pages/mortgageused_spec.rb
+++ b/spec/models/form/sales/pages/mortgageused_spec.rb
@@ -20,10 +20,10 @@ RSpec.describe Form::Sales::Pages::Mortgageused, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 end
diff --git a/spec/models/form/sales/pages/nationality1_spec.rb b/spec/models/form/sales/pages/nationality1_spec.rb
index 5d156e041..c39fecdd2 100644
--- a/spec/models/form/sales/pages/nationality1_spec.rb
+++ b/spec/models/form/sales/pages/nationality1_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::Nationality1, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/number_joint_buyers_spec.rb b/spec/models/form/sales/pages/number_joint_buyers_spec.rb
index 149f081c4..674bf2883 100644
--- a/spec/models/form/sales/pages/number_joint_buyers_spec.rb
+++ b/spec/models/form/sales/pages/number_joint_buyers_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::NumberJointBuyers, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/number_of_others_in_property_spec.rb b/spec/models/form/sales/pages/number_of_others_in_property_spec.rb
index 4d7f6862b..c2efdcb21 100644
--- a/spec/models/form/sales/pages/number_of_others_in_property_spec.rb
+++ b/spec/models/form/sales/pages/number_of_others_in_property_spec.rb
@@ -20,10 +20,10 @@ RSpec.describe Form::Sales::Pages::NumberOfOthersInProperty, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 end
diff --git a/spec/models/form/sales/pages/outright_ownership_type_spec.rb b/spec/models/form/sales/pages/outright_ownership_type_spec.rb
index e7629bbf8..5ca515cc9 100644
--- a/spec/models/form/sales/pages/outright_ownership_type_spec.rb
+++ b/spec/models/form/sales/pages/outright_ownership_type_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::OutrightOwnershipType, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/ownership_scheme_spec.rb b/spec/models/form/sales/pages/ownership_scheme_spec.rb
index 7199c618b..4b27c9279 100644
--- a/spec/models/form/sales/pages/ownership_scheme_spec.rb
+++ b/spec/models/form/sales/pages/ownership_scheme_spec.rb
@@ -20,10 +20,10 @@ RSpec.describe Form::Sales::Pages::OwnershipScheme, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 end
diff --git a/spec/models/form/sales/pages/person_age_spec.rb b/spec/models/form/sales/pages/person_age_spec.rb
index f8bc96692..1a7d9087a 100644
--- a/spec/models/form/sales/pages/person_age_spec.rb
+++ b/spec/models/form/sales/pages/person_age_spec.rb
@@ -13,11 +13,11 @@ RSpec.describe Form::Sales::Pages::PersonAge, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   context "with a non joint purchase" do
diff --git a/spec/models/form/sales/pages/person_gender_identity_spec.rb b/spec/models/form/sales/pages/person_gender_identity_spec.rb
index 0aefdd3f4..4161832cf 100644
--- a/spec/models/form/sales/pages/person_gender_identity_spec.rb
+++ b/spec/models/form/sales/pages/person_gender_identity_spec.rb
@@ -15,11 +15,11 @@ RSpec.describe Form::Sales::Pages::PersonGenderIdentity, type: :model do
     end
 
     it "has the correct header" do
-      expect(page.header).to eq("")
+      expect(page.header).to be_nil
     end
 
     it "has the correct description" do
-      expect(page.description).to eq("")
+      expect(page.description).to be_nil
     end
 
     context "with person 1" do
@@ -99,11 +99,11 @@ RSpec.describe Form::Sales::Pages::PersonGenderIdentity, type: :model do
     end
 
     it "has the correct header" do
-      expect(page.header).to eq("")
+      expect(page.header).to be_nil
     end
 
     it "has the correct description" do
-      expect(page.description).to eq("")
+      expect(page.description).to be_nil
     end
 
     context "with person 1" do
diff --git a/spec/models/form/sales/pages/person_known_spec.rb b/spec/models/form/sales/pages/person_known_spec.rb
index bb73d6b63..a5afafb7e 100644
--- a/spec/models/form/sales/pages/person_known_spec.rb
+++ b/spec/models/form/sales/pages/person_known_spec.rb
@@ -14,11 +14,11 @@ RSpec.describe Form::Sales::Pages::PersonKnown, type: :model do
     end
 
     it "has the correct header" do
-      expect(page.header).to eq("")
+      expect(page.header).to be_nil
     end
 
     it "has the correct description" do
-      expect(page.description).to eq("")
+      expect(page.description).to be_nil
     end
 
     context "with person 1" do
@@ -127,11 +127,11 @@ RSpec.describe Form::Sales::Pages::PersonKnown, type: :model do
     end
 
     it "has the correct header" do
-      expect(page.header).to eq("")
+      expect(page.header).to be_nil
     end
 
     it "has the correct description" do
-      expect(page.description).to eq("")
+      expect(page.description).to be_nil
     end
 
     context "with person 1" do
diff --git a/spec/models/form/sales/pages/person_relationship_to_buyer1_spec.rb b/spec/models/form/sales/pages/person_relationship_to_buyer1_spec.rb
index 419e5a92d..f3a4896bc 100644
--- a/spec/models/form/sales/pages/person_relationship_to_buyer1_spec.rb
+++ b/spec/models/form/sales/pages/person_relationship_to_buyer1_spec.rb
@@ -15,11 +15,11 @@ RSpec.describe Form::Sales::Pages::PersonRelationshipToBuyer1, type: :model do
     end
 
     it "has the correct header" do
-      expect(page.header).to eq("")
+      expect(page.header).to be_nil
     end
 
     it "has the correct description" do
-      expect(page.description).to eq("")
+      expect(page.description).to be_nil
     end
 
     context "with person 1" do
@@ -99,11 +99,11 @@ RSpec.describe Form::Sales::Pages::PersonRelationshipToBuyer1, type: :model do
     end
 
     it "has the correct header" do
-      expect(page.header).to eq("")
+      expect(page.header).to be_nil
     end
 
     it "has the correct description" do
-      expect(page.description).to eq("")
+      expect(page.description).to be_nil
     end
 
     context "with person 1" do
diff --git a/spec/models/form/sales/pages/person_working_situation_spec.rb b/spec/models/form/sales/pages/person_working_situation_spec.rb
index 65bdb42d0..baad4b69b 100644
--- a/spec/models/form/sales/pages/person_working_situation_spec.rb
+++ b/spec/models/form/sales/pages/person_working_situation_spec.rb
@@ -15,11 +15,11 @@ RSpec.describe Form::Sales::Pages::PersonWorkingSituation, type: :model do
     end
 
     it "has the correct header" do
-      expect(page.header).to eq("")
+      expect(page.header).to be_nil
     end
 
     it "has the correct description" do
-      expect(page.description).to eq("")
+      expect(page.description).to be_nil
     end
 
     context "with person 1" do
@@ -99,11 +99,11 @@ RSpec.describe Form::Sales::Pages::PersonWorkingSituation, type: :model do
     end
 
     it "has the correct header" do
-      expect(page.header).to eq("")
+      expect(page.header).to be_nil
     end
 
     it "has the correct description" do
-      expect(page.description).to eq("")
+      expect(page.description).to be_nil
     end
 
     context "with person 1" do
diff --git a/spec/models/form/sales/pages/previous_bedrooms_spec.rb b/spec/models/form/sales/pages/previous_bedrooms_spec.rb
index 6fb8c3c5b..5e1e18a52 100644
--- a/spec/models/form/sales/pages/previous_bedrooms_spec.rb
+++ b/spec/models/form/sales/pages/previous_bedrooms_spec.rb
@@ -24,7 +24,7 @@ RSpec.describe Form::Sales::Pages::PreviousBedrooms, type: :model do
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/previous_ownership_spec.rb b/spec/models/form/sales/pages/previous_ownership_spec.rb
index 59d8611da..7fe0d2795 100644
--- a/spec/models/form/sales/pages/previous_ownership_spec.rb
+++ b/spec/models/form/sales/pages/previous_ownership_spec.rb
@@ -20,10 +20,10 @@ RSpec.describe Form::Sales::Pages::PreviousOwnership, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 end
diff --git a/spec/models/form/sales/pages/privacy_notice_spec.rb b/spec/models/form/sales/pages/privacy_notice_spec.rb
index 8a8de04f1..86a214bfa 100644
--- a/spec/models/form/sales/pages/privacy_notice_spec.rb
+++ b/spec/models/form/sales/pages/privacy_notice_spec.rb
@@ -24,7 +24,7 @@ RSpec.describe Form::Sales::Pages::PrivacyNotice, type: :model do
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/property_building_type_spec.rb b/spec/models/form/sales/pages/property_building_type_spec.rb
index fb5420105..b4bb43171 100644
--- a/spec/models/form/sales/pages/property_building_type_spec.rb
+++ b/spec/models/form/sales/pages/property_building_type_spec.rb
@@ -20,10 +20,10 @@ RSpec.describe Form::Sales::Pages::PropertyBuildingType, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 end
diff --git a/spec/models/form/sales/pages/property_local_authority_spec.rb b/spec/models/form/sales/pages/property_local_authority_spec.rb
index 17b840186..0cf653a80 100644
--- a/spec/models/form/sales/pages/property_local_authority_spec.rb
+++ b/spec/models/form/sales/pages/property_local_authority_spec.rb
@@ -25,10 +25,10 @@ RSpec.describe Form::Sales::Pages::PropertyLocalAuthority, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 end
diff --git a/spec/models/form/sales/pages/property_number_of_bedrooms_spec.rb b/spec/models/form/sales/pages/property_number_of_bedrooms_spec.rb
index 078694916..1f905091f 100644
--- a/spec/models/form/sales/pages/property_number_of_bedrooms_spec.rb
+++ b/spec/models/form/sales/pages/property_number_of_bedrooms_spec.rb
@@ -20,10 +20,10 @@ RSpec.describe Form::Sales::Pages::PropertyNumberOfBedrooms, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 end
diff --git a/spec/models/form/sales/pages/property_unit_type_spec.rb b/spec/models/form/sales/pages/property_unit_type_spec.rb
index b9e9aa450..0944589f6 100644
--- a/spec/models/form/sales/pages/property_unit_type_spec.rb
+++ b/spec/models/form/sales/pages/property_unit_type_spec.rb
@@ -20,10 +20,10 @@ RSpec.describe Form::Sales::Pages::PropertyUnitType, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 end
diff --git a/spec/models/form/sales/pages/property_wheelchair_accessible_spec.rb b/spec/models/form/sales/pages/property_wheelchair_accessible_spec.rb
index f2ffb3567..f83bb7907 100644
--- a/spec/models/form/sales/pages/property_wheelchair_accessible_spec.rb
+++ b/spec/models/form/sales/pages/property_wheelchair_accessible_spec.rb
@@ -20,10 +20,10 @@ RSpec.describe Form::Sales::Pages::PropertyWheelchairAccessible, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 end
diff --git a/spec/models/form/sales/pages/purchase_price_spec.rb b/spec/models/form/sales/pages/purchase_price_spec.rb
index f6cdef219..ab4cb6789 100644
--- a/spec/models/form/sales/pages/purchase_price_spec.rb
+++ b/spec/models/form/sales/pages/purchase_price_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::PurchasePrice, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/purchaser_code_spec.rb b/spec/models/form/sales/pages/purchaser_code_spec.rb
index 05ee6becc..4abbd4d6b 100644
--- a/spec/models/form/sales/pages/purchaser_code_spec.rb
+++ b/spec/models/form/sales/pages/purchaser_code_spec.rb
@@ -20,10 +20,10 @@ RSpec.describe Form::Sales::Pages::PurchaserCode, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 end
diff --git a/spec/models/form/sales/pages/resale_spec.rb b/spec/models/form/sales/pages/resale_spec.rb
index ce2e81182..4e0a42094 100644
--- a/spec/models/form/sales/pages/resale_spec.rb
+++ b/spec/models/form/sales/pages/resale_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::Resale, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has the correct depends_on" do
diff --git a/spec/models/form/sales/pages/sale_date_spec.rb b/spec/models/form/sales/pages/sale_date_spec.rb
index 7f78182a8..40fd51729 100644
--- a/spec/models/form/sales/pages/sale_date_spec.rb
+++ b/spec/models/form/sales/pages/sale_date_spec.rb
@@ -20,10 +20,10 @@ RSpec.describe Form::Sales::Pages::SaleDate, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 end
diff --git a/spec/models/form/sales/pages/savings_spec.rb b/spec/models/form/sales/pages/savings_spec.rb
index 37093da26..aaf3f86c4 100644
--- a/spec/models/form/sales/pages/savings_spec.rb
+++ b/spec/models/form/sales/pages/savings_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::Savings, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/savings_value_check_spec.rb b/spec/models/form/sales/pages/savings_value_check_spec.rb
index d40862da9..d4334118d 100644
--- a/spec/models/form/sales/pages/savings_value_check_spec.rb
+++ b/spec/models/form/sales/pages/savings_value_check_spec.rb
@@ -20,7 +20,7 @@ RSpec.describe Form::Sales::Pages::SavingsValueCheck, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/shared_ownership_type_spec.rb b/spec/models/form/sales/pages/shared_ownership_type_spec.rb
index 7a7f71f8e..b8b71080f 100644
--- a/spec/models/form/sales/pages/shared_ownership_type_spec.rb
+++ b/spec/models/form/sales/pages/shared_ownership_type_spec.rb
@@ -20,11 +20,11 @@ RSpec.describe Form::Sales::Pages::SharedOwnershipType, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/staircase_spec.rb b/spec/models/form/sales/pages/staircase_spec.rb
index d2155f972..4518fffbe 100644
--- a/spec/models/form/sales/pages/staircase_spec.rb
+++ b/spec/models/form/sales/pages/staircase_spec.rb
@@ -20,10 +20,10 @@ RSpec.describe Form::Sales::Pages::Staircase, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("")
+    expect(page.header).to be_nil
   end
 
   it "has the correct description" do
-    expect(page.description).to eq("")
+    expect(page.description).to be_nil
   end
 end
diff --git a/spec/models/form/sales/questions/armed_forces_spouse_spec.rb b/spec/models/form/sales/questions/armed_forces_spouse_spec.rb
index 67bf934ff..d3cc9bccc 100644
--- a/spec/models/form/sales/questions/armed_forces_spouse_spec.rb
+++ b/spec/models/form/sales/questions/armed_forces_spouse_spec.rb
@@ -32,7 +32,7 @@ RSpec.describe Form::Sales::Questions::ArmedForcesSpouse, type: :model do
   end
 
   it "has the correct hint" do
-    expect(question.hint_text).to eq("")
+    expect(question.hint_text).to be_nil
   end
 
   it "has the correct answer_options" do
diff --git a/spec/models/form/sales/questions/buyer2_live_in_property_spec.rb b/spec/models/form/sales/questions/buyer2_live_in_property_spec.rb
index 0a5ae3699..c2d276c44 100644
--- a/spec/models/form/sales/questions/buyer2_live_in_property_spec.rb
+++ b/spec/models/form/sales/questions/buyer2_live_in_property_spec.rb
@@ -32,7 +32,7 @@ RSpec.describe Form::Sales::Questions::Buyer2LiveInProperty, type: :model do
   end
 
   it "has the correct hint" do
-    expect(question.hint_text).to eq("")
+    expect(question.hint_text).to be_nil
   end
 
   it "has the correct answer_options" do
diff --git a/spec/models/form/sales/questions/buyer2_relationship_to_buyer1_spec.rb b/spec/models/form/sales/questions/buyer2_relationship_to_buyer1_spec.rb
index 742c12ac0..059e5c084 100644
--- a/spec/models/form/sales/questions/buyer2_relationship_to_buyer1_spec.rb
+++ b/spec/models/form/sales/questions/buyer2_relationship_to_buyer1_spec.rb
@@ -32,7 +32,7 @@ RSpec.describe Form::Sales::Questions::Buyer2RelationshipToBuyer1, type: :model
   end
 
   it "has the correct hint" do
-    expect(question.hint_text).to eq("")
+    expect(question.hint_text).to be_nil
   end
 
   it "has the correct answer_options" do
diff --git a/spec/models/form/sales/questions/buyer2_working_situation_spec.rb b/spec/models/form/sales/questions/buyer2_working_situation_spec.rb
index 02b7a76b0..75b6fd7cb 100644
--- a/spec/models/form/sales/questions/buyer2_working_situation_spec.rb
+++ b/spec/models/form/sales/questions/buyer2_working_situation_spec.rb
@@ -32,7 +32,7 @@ RSpec.describe Form::Sales::Questions::Buyer2WorkingSituation, type: :model do
   end
 
   it "has the correct hint" do
-    expect(question.hint_text).to eq("")
+    expect(question.hint_text).to be_nil
   end
 
   it "has the correct answer_options" do
diff --git a/spec/models/form/sales/questions/buyer_company_spec.rb b/spec/models/form/sales/questions/buyer_company_spec.rb
index 1d7d98940..714aa0986 100644
--- a/spec/models/form/sales/questions/buyer_company_spec.rb
+++ b/spec/models/form/sales/questions/buyer_company_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe Form::Sales::Questions::BuyerCompany, type: :model do
   end
 
   it "has the correct hint_text" do
-    expect(question.hint_text).to eq("")
+    expect(question.hint_text).to be_nil
   end
 
   it "has the correct answer_options" do
diff --git a/spec/models/form/sales/questions/buyer_still_serving_spec.rb b/spec/models/form/sales/questions/buyer_still_serving_spec.rb
index e5d91572e..887944a89 100644
--- a/spec/models/form/sales/questions/buyer_still_serving_spec.rb
+++ b/spec/models/form/sales/questions/buyer_still_serving_spec.rb
@@ -32,7 +32,7 @@ RSpec.describe Form::Sales::Questions::BuyerStillServing, type: :model do
   end
 
   it "has the correct hint" do
-    expect(question.hint_text).to eq("")
+    expect(question.hint_text).to be_nil
   end
 
   it "has the correct answer_options" do
diff --git a/spec/models/form/sales/questions/housing_benefits_spec.rb b/spec/models/form/sales/questions/housing_benefits_spec.rb
index 5579f3b48..8c3ae57d3 100644
--- a/spec/models/form/sales/questions/housing_benefits_spec.rb
+++ b/spec/models/form/sales/questions/housing_benefits_spec.rb
@@ -32,7 +32,7 @@ RSpec.describe Form::Sales::Questions::HousingBenefits, type: :model do
   end
 
   it "has the correct hint" do
-    expect(question.hint_text).to eq("")
+    expect(question.hint_text).to be_nil
   end
 
   it "has the correct answer_options" do
diff --git a/spec/models/form/sales/questions/joint_purchase_spec.rb b/spec/models/form/sales/questions/joint_purchase_spec.rb
index c9f548071..5d738531c 100644
--- a/spec/models/form/sales/questions/joint_purchase_spec.rb
+++ b/spec/models/form/sales/questions/joint_purchase_spec.rb
@@ -32,7 +32,7 @@ RSpec.describe Form::Sales::Questions::JointPurchase, type: :model do
   end
 
   it "has the correct hint_text" do
-    expect(question.hint_text).to eq("")
+    expect(question.hint_text).to be_nil
   end
 
   it "has the correct answer_options" do
diff --git a/spec/models/form/sales/questions/mortgage_amount_spec.rb b/spec/models/form/sales/questions/mortgage_amount_spec.rb
index ac1e5ad5e..eadec2876 100644
--- a/spec/models/form/sales/questions/mortgage_amount_spec.rb
+++ b/spec/models/form/sales/questions/mortgage_amount_spec.rb
@@ -32,7 +32,7 @@ RSpec.describe Form::Sales::Questions::MortgageAmount, type: :model do
   end
 
   it "has the correct hint" do
-    expect(question.hint_text).to eq("")
+    expect(question.hint_text).to be_nil
   end
 
   it "has correct width" do
diff --git a/spec/models/form/sales/questions/mortgage_length_spec.rb b/spec/models/form/sales/questions/mortgage_length_spec.rb
index 273c13c7b..519289607 100644
--- a/spec/models/form/sales/questions/mortgage_length_spec.rb
+++ b/spec/models/form/sales/questions/mortgage_length_spec.rb
@@ -32,7 +32,7 @@ RSpec.describe Form::Sales::Questions::MortgageLength, type: :model do
   end
 
   it "has the correct hint" do
-    expect(question.hint_text).to eq("")
+    expect(question.hint_text).to be_nil
   end
 
   it "has correct width" do
diff --git a/spec/models/form/sales/questions/mortgageused_spec.rb b/spec/models/form/sales/questions/mortgageused_spec.rb
index 19f41102d..e958de8ea 100644
--- a/spec/models/form/sales/questions/mortgageused_spec.rb
+++ b/spec/models/form/sales/questions/mortgageused_spec.rb
@@ -43,6 +43,6 @@ RSpec.describe Form::Sales::Questions::Mortgageused, type: :model do
   end
 
   it "has the correct hint" do
-    expect(question.hint_text).to eq("")
+    expect(question.hint_text).to be_nil
   end
 end
diff --git a/spec/models/form/sales/questions/person_age_known_spec.rb b/spec/models/form/sales/questions/person_age_known_spec.rb
index 2cc760fc5..d61bccfc3 100644
--- a/spec/models/form/sales/questions/person_age_known_spec.rb
+++ b/spec/models/form/sales/questions/person_age_known_spec.rb
@@ -32,7 +32,7 @@ RSpec.describe Form::Sales::Questions::PersonAgeKnown, type: :model do
   end
 
   it "has the correct hint" do
-    expect(question.hint_text).to eq("")
+    expect(question.hint_text).to be_nil
   end
 
   context "with a non joint purchase" do
diff --git a/spec/models/form/sales/questions/person_known_spec.rb b/spec/models/form/sales/questions/person_known_spec.rb
index 551ac096e..9cb7ab578 100644
--- a/spec/models/form/sales/questions/person_known_spec.rb
+++ b/spec/models/form/sales/questions/person_known_spec.rb
@@ -32,7 +32,7 @@ RSpec.describe Form::Sales::Questions::PersonKnown, type: :model do
   end
 
   it "has the correct hint" do
-    expect(question.hint_text).to eq("")
+    expect(question.hint_text).to be_nil
   end
 
   context "with a non joint purchase" do
diff --git a/spec/models/form/sales/questions/previous_postcode_spec.rb b/spec/models/form/sales/questions/previous_postcode_spec.rb
index cb763dc81..eb55b7cf1 100644
--- a/spec/models/form/sales/questions/previous_postcode_spec.rb
+++ b/spec/models/form/sales/questions/previous_postcode_spec.rb
@@ -32,7 +32,7 @@ RSpec.describe Form::Sales::Questions::PreviousPostcode, type: :model do
   end
 
   it "has the correct hint" do
-    expect(question.hint_text).to eq("")
+    expect(question.hint_text).to be_nil
   end
 
   it "has the correct width" do
diff --git a/spec/models/form/sales/questions/prevown_spec.rb b/spec/models/form/sales/questions/prevown_spec.rb
index b98ba77ef..dda2b7c70 100644
--- a/spec/models/form/sales/questions/prevown_spec.rb
+++ b/spec/models/form/sales/questions/prevown_spec.rb
@@ -44,6 +44,6 @@ RSpec.describe Form::Sales::Questions::Prevown, type: :model do
   end
 
   it "has the correct hint" do
-    expect(question.hint_text).to eq("")
+    expect(question.hint_text).to be_nil
   end
 end
diff --git a/spec/models/form/sales/questions/privacy_notice_spec.rb b/spec/models/form/sales/questions/privacy_notice_spec.rb
index f90daef1b..fc1df796c 100644
--- a/spec/models/form/sales/questions/privacy_notice_spec.rb
+++ b/spec/models/form/sales/questions/privacy_notice_spec.rb
@@ -32,7 +32,7 @@ RSpec.describe Form::Sales::Questions::PrivacyNotice, type: :model do
   end
 
   it "has the correct hint" do
-    expect(question.hint_text).to eq("")
+    expect(question.hint_text).to be_nil
   end
 
   it "has the correct answer_options" do
diff --git a/spec/models/form/sales/questions/property_building_type_spec.rb b/spec/models/form/sales/questions/property_building_type_spec.rb
index 1129bf792..9b8f94b5f 100644
--- a/spec/models/form/sales/questions/property_building_type_spec.rb
+++ b/spec/models/form/sales/questions/property_building_type_spec.rb
@@ -32,7 +32,7 @@ RSpec.describe Form::Sales::Questions::PropertyBuildingType, type: :model do
   end
 
   it "has the correct hint_text" do
-    expect(question.hint_text).to eq("")
+    expect(question.hint_text).to be_nil
   end
 
   it "has the correct answer_options" do
diff --git a/spec/models/form/sales/questions/purchase_price_spec.rb b/spec/models/form/sales/questions/purchase_price_spec.rb
index 1ee30b9a5..8894a592f 100644
--- a/spec/models/form/sales/questions/purchase_price_spec.rb
+++ b/spec/models/form/sales/questions/purchase_price_spec.rb
@@ -32,7 +32,7 @@ RSpec.describe Form::Sales::Questions::PurchasePrice, type: :model do
   end
 
   it "has the correct hint" do
-    expect(question.hint_text).to eq("")
+    expect(question.hint_text).to be_nil
   end
 
   it "has correct width" do
diff --git a/spec/models/form/sales/questions/savings_nk_spec.rb b/spec/models/form/sales/questions/savings_nk_spec.rb
index 6847c4f5a..519bdd8d4 100644
--- a/spec/models/form/sales/questions/savings_nk_spec.rb
+++ b/spec/models/form/sales/questions/savings_nk_spec.rb
@@ -45,7 +45,7 @@ RSpec.describe Form::Sales::Questions::SavingsNk, type: :model do
   end
 
   it "has the correct hint" do
-    expect(question.hint_text).to eq("")
+    expect(question.hint_text).to be_nil
   end
 
   it "has the correct hidden_in_check_answers" do