Merge remote-tracking branch 'origin/CLDC-3717-Sales-remove-q9' into CLDC-3717-Sales-remove-q9

# Conflicts:
#	spec/models/form/sales/subsections/setup_spec.rb

spec/models/form/sales/subsections/setup_spec.rb

@@ -78,35 +78,6 @@ RSpec.describe Form::Sales::Subsections::Setup, type: :model do
     end
   end
 
-  context "when start year is >= 2024" do
-    before do
-      allow(section.form).to receive(:start_year_after_2024?).and_return(true)
-    end
-
-    it "has correct pages" do
-      expect(setup.pages.map(&:id)).to eq(
-        %w[
-          completion_date
-          owning_organisation
-          managing_organisation
-          assigned_to
-          purchaser_code
-          ownership_scheme
-          shared_ownership_type
-          discounted_ownership_type
-          buyer_company
-          buyer_live
-          joint_purchase
-          number_joint_buyers
-          buyer_interview_joint_purchase
-          buyer_interview
-          privacy_notice_joint_purchase
-          privacy_notice
-        ],
-      )
-    end
-  end
-
   context "when start year is >= 2025" do
     before do
       allow(section.form).to receive(:start_year_2024_or_later?).and_return(true)
@@ -116,15 +87,14 @@ RSpec.describe Form::Sales::Subsections::Setup, type: :model do
     it "has correct pages" do
       expect(setup.pages.map(&:id)).to eq(
         %w[
+          completion_date
           owning_organisation
           managing_organisation
           assigned_to
-          completion_date
           purchaser_code
           ownership_scheme
           shared_ownership_type
           discounted_ownership_type
-          outright_ownership_type
           buyer_live
           joint_purchase
           number_joint_buyers