diff --git a/app/models/form/lettings/pages/address_matcher.rb b/app/models/form/lettings/pages/address_matcher.rb
index 5df980b6d..aab5d94cd 100644
--- a/app/models/form/lettings/pages/address_matcher.rb
+++ b/app/models/form/lettings/pages/address_matcher.rb
@@ -26,8 +26,4 @@ class Form::Lettings::Pages::AddressMatcher < ::Form::Page
 
     "/#{log.log_type.dasherize}s/#{log.id}/property-unit-type"
   end
-
-  def routed_to?(_log, _current_user = nil)
-    false if form.start_year_2024_or_later?
-  end
 end
diff --git a/app/models/form/lettings/pages/no_address_found.rb b/app/models/form/lettings/pages/no_address_found.rb
index 24f3761f2..631d6f58e 100644
--- a/app/models/form/lettings/pages/no_address_found.rb
+++ b/app/models/form/lettings/pages/no_address_found.rb
@@ -28,8 +28,4 @@ class Form::Lettings::Pages::NoAddressFound < ::Form::Page
   def interruption_screen_question_ids
     %w[address_line1_input]
   end
-
-  def routed_to?(_log, _current_user = nil)
-    false if form.start_year_2024_or_later?
-  end
 end
diff --git a/app/models/form/lettings/pages/uprn.rb b/app/models/form/lettings/pages/uprn.rb
index dd076dfe4..b9a3a4e94 100644
--- a/app/models/form/lettings/pages/uprn.rb
+++ b/app/models/form/lettings/pages/uprn.rb
@@ -30,8 +30,4 @@ class Form::Lettings::Pages::Uprn < ::Form::Page
       "address"
     end
   end
-
-  def routed_to?(_log, _current_user = nil)
-    false if form.start_year_2024_or_later?
-  end
 end
diff --git a/app/models/form/lettings/pages/uprn_confirmation.rb b/app/models/form/lettings/pages/uprn_confirmation.rb
index faef87669..26cde2d97 100644
--- a/app/models/form/lettings/pages/uprn_confirmation.rb
+++ b/app/models/form/lettings/pages/uprn_confirmation.rb
@@ -12,8 +12,6 @@ class Form::Lettings::Pages::UprnConfirmation < ::Form::Page
   end
 
   def routed_to?(log, _current_user = nil)
-    return false if form.start_year_2024_or_later?
-
     log.uprn.present? && log.uprn_known == 1
   end
 end
diff --git a/app/models/form/lettings/pages/uprn_selection.rb b/app/models/form/lettings/pages/uprn_selection.rb
index cc12b5767..96bfe68e8 100644
--- a/app/models/form/lettings/pages/uprn_selection.rb
+++ b/app/models/form/lettings/pages/uprn_selection.rb
@@ -16,8 +16,6 @@ class Form::Lettings::Pages::UprnSelection < ::Form::Page
   end
 
   def routed_to?(log, _current_user = nil)
-    return false if form.start_year_2024_or_later?
-
     !log.is_supported_housing? && (log.uprn_known.nil? || log.uprn_known.zero?) && log.address_line1_input.present? && log.postcode_full_input.present? && (1..10).cover?(log.address_options&.count)
   end
 
diff --git a/app/models/form/lettings/subsections/property_information.rb b/app/models/form/lettings/subsections/property_information.rb
index 5bd04f2c6..a24cd1092 100644
--- a/app/models/form/lettings/subsections/property_information.rb
+++ b/app/models/form/lettings/subsections/property_information.rb
@@ -32,12 +32,7 @@ class Form::Lettings::Subsections::PropertyInformation < ::Form::Subsection
   def uprn_questions
     if form.start_year_2024_or_later?
       [
-        Form::Lettings::Pages::Uprn.new(nil, nil, self),
-        Form::Lettings::Pages::UprnConfirmation.new(nil, nil, self),
         Form::Lettings::Pages::AddressSearch.new(nil, nil, self),
-        Form::Lettings::Pages::AddressMatcher.new(nil, nil, self),
-        Form::Lettings::Pages::NoAddressFound.new(nil, nil, self), # soft validation
-        Form::Lettings::Pages::UprnSelection.new(nil, nil, self),
         Form::Lettings::Pages::AddressFallback.new(nil, nil, self),
       ]
     else
diff --git a/app/models/form/sales/pages/address_matcher.rb b/app/models/form/sales/pages/address_matcher.rb
index b6727ed4a..fd7e95499 100644
--- a/app/models/form/sales/pages/address_matcher.rb
+++ b/app/models/form/sales/pages/address_matcher.rb
@@ -26,8 +26,4 @@ class Form::Sales::Pages::AddressMatcher < ::Form::Page
 
     "/#{log.log_type.dasherize}s/#{log.id}/property-number-of-bedrooms"
   end
-
-  def routed_to?(_log, _current_user)
-    false if form.start_year_2024_or_later?
-  end
 end
diff --git a/app/models/form/sales/pages/no_address_found.rb b/app/models/form/sales/pages/no_address_found.rb
index e633cf23a..e0ff5bcb2 100644
--- a/app/models/form/sales/pages/no_address_found.rb
+++ b/app/models/form/sales/pages/no_address_found.rb
@@ -28,8 +28,4 @@ class Form::Sales::Pages::NoAddressFound < ::Form::Page
   def interruption_screen_question_ids
     %w[address_line1_input]
   end
-
-  def routed_to?(_log, _current_user)
-    false if form.start_year_2024_or_later?
-  end
 end
diff --git a/app/models/form/sales/pages/uprn.rb b/app/models/form/sales/pages/uprn.rb
index ceb6d4805..a78b87c2f 100644
--- a/app/models/form/sales/pages/uprn.rb
+++ b/app/models/form/sales/pages/uprn.rb
@@ -29,8 +29,4 @@ class Form::Sales::Pages::Uprn < ::Form::Page
       "address"
     end
   end
-
-  def routed_to?(_log, _current_user = nil)
-    false if form.start_year_2024_or_later?
-  end
 end
diff --git a/app/models/form/sales/pages/uprn_confirmation.rb b/app/models/form/sales/pages/uprn_confirmation.rb
index 582db59eb..9cc2ccf94 100644
--- a/app/models/form/sales/pages/uprn_confirmation.rb
+++ b/app/models/form/sales/pages/uprn_confirmation.rb
@@ -11,8 +11,6 @@ class Form::Sales::Pages::UprnConfirmation < ::Form::Page
   end
 
   def routed_to?(log, _current_user = nil)
-    return false if form.start_year_2024_or_later?
-
     log.uprn.present? && log.uprn_known == 1
   end
 end
diff --git a/app/models/form/sales/pages/uprn_selection.rb b/app/models/form/sales/pages/uprn_selection.rb
index b1ba76b08..6dc5bb2bc 100644
--- a/app/models/form/sales/pages/uprn_selection.rb
+++ b/app/models/form/sales/pages/uprn_selection.rb
@@ -16,8 +16,6 @@ class Form::Sales::Pages::UprnSelection < ::Form::Page
   end
 
   def routed_to?(log, _current_user = nil)
-    return false if form.start_year_2024_or_later?
-
     (log.uprn_known.nil? || log.uprn_known.zero?) && log.address_line1_input.present? && log.postcode_full_input.present? && (1..10).cover?(log.address_options&.count)
   end
 
diff --git a/app/models/form/sales/questions/uprn_known.rb b/app/models/form/sales/questions/uprn_known.rb
index eb68d967e..e35642bee 100644
--- a/app/models/form/sales/questions/uprn_known.rb
+++ b/app/models/form/sales/questions/uprn_known.rb
@@ -5,7 +5,7 @@ class Form::Sales::Questions::UprnKnown < ::Form::Question
     @copy_key = "sales.property_information.uprn.uprn_known"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    # @conditional_for = { "uprn" => [1] } #TODO: DELETE
+    @conditional_for = { "uprn" => [1] }
     @inferred_check_answers_value = [
       {
         "condition" => { "uprn_known" => 0 },
diff --git a/app/models/form/sales/subsections/property_information.rb b/app/models/form/sales/subsections/property_information.rb
index f7cef35a7..e33666208 100644
--- a/app/models/form/sales/subsections/property_information.rb
+++ b/app/models/form/sales/subsections/property_information.rb
@@ -24,12 +24,7 @@ class Form::Sales::Subsections::PropertyInformation < ::Form::Subsection
   def uprn_questions
     if form.start_year_2024_or_later?
       [
-        Form::Sales::Pages::Uprn.new(nil, nil, self),
-        Form::Sales::Pages::UprnConfirmation.new(nil, nil, self),
         Form::Sales::Pages::AddressSearch.new(nil, nil, self),
-        Form::Sales::Pages::AddressMatcher.new(nil, nil, self),
-        Form::Sales::Pages::NoAddressFound.new(nil, nil, self),
-        Form::Sales::Pages::UprnSelection.new(nil, nil, self),
         Form::Sales::Pages::AddressFallback.new(nil, nil, self),
         Form::Sales::Pages::PropertyLocalAuthority.new(nil, nil, self),
         Form::Sales::Pages::Buyer1IncomeDiscountedMaxValueCheck.new("local_authority_buyer_1_income_max_value_check", nil, self, check_answers_card_number: nil),
diff --git a/db/migrate/20250217145927_rename_address_search_input_in_logs.rb b/db/migrate/20250217145927_rename_address_search_input_in_logs.rb
index 7140d2db1..eb2d1c6b9 100644
--- a/db/migrate/20250217145927_rename_address_search_input_in_logs.rb
+++ b/db/migrate/20250217145927_rename_address_search_input_in_logs.rb
@@ -1,9 +1,17 @@
 class RenameAddressSearchInputInLogs < ActiveRecord::Migration[7.2]
-  def change
+  def up
     rename_column :sales_logs, :address_search_input, :manual_address_entry_selected
     rename_column :lettings_logs, :address_search_input, :manual_address_entry_selected
 
-    change_column :sales_logs, :manual_address_entry_selected, :boolean, :default => false
-    change_column :lettings_logs, :manual_address_entry_selected, :boolean, :default => false
+    change_column :sales_logs, :manual_address_entry_selected, :boolean, default: false
+    change_column :lettings_logs, :manual_address_entry_selected, :boolean, default: false
+  end
+
+  def down
+    rename_column :sales_logs, :manual_address_entry_selected, :address_search_input
+    rename_column :lettings_logs, :manual_address_entry_selected, :address_search_input
+
+    change_column :sales_logs, :manual_address_entry_selected, :boolean
+    change_column :lettings_logs, :manual_address_entry_selected, :boolean
   end
 end
diff --git a/spec/requests/duplicate_logs_controller_spec.rb b/spec/requests/duplicate_logs_controller_spec.rb
index 700964fcf..c2c05e748 100644
--- a/spec/requests/duplicate_logs_controller_spec.rb
+++ b/spec/requests/duplicate_logs_controller_spec.rb
@@ -77,8 +77,8 @@ RSpec.describe DuplicateLogsController, type: :request do
             end
 
             it "displays check your answers for each log with correct questions where UPRN is given" do
-              lettings_log.update!(uprn: "123", uprn_known: 1, uprn_confirmed: 1)
-              duplicate_logs[0].update!(uprn: "123", uprn_known: 1, uprn_confirmed: 1)
+              lettings_log.update!(uprn: "123", uprn_known: 1, uprn_confirmed: 1, manual_address_entry_selected: false)
+              duplicate_logs[0].update!(uprn: "123", uprn_known: 1, uprn_confirmed: 1, manual_address_entry_selected: false)
               get "/lettings-logs/#{lettings_log.id}/duplicate-logs?original_log_id=#{lettings_log.id}"
 
               expect(page).to have_content("Q5 - Tenancy start date", count: 3)
@@ -186,9 +186,9 @@ RSpec.describe DuplicateLogsController, type: :request do
             end
 
             it "displays check your answers for each log with correct questions when UPRN is given" do
-              sales_log.update!(uprn: "123", uprn_known: 1)
-              duplicate_logs[0].update!(uprn: "123", uprn_known: 1)
-              duplicate_logs[1].update!(uprn: "123", uprn_known: 1)
+              sales_log.update!(uprn: "123", uprn_known: 1, manual_address_entry_selected: false)
+              duplicate_logs[0].update!(uprn: "123", uprn_known: 1, manual_address_entry_selected: false)
+              duplicate_logs[1].update!(uprn: "123", uprn_known: 1, manual_address_entry_selected: false)
               get "/sales-logs/#{sales_log.id}/duplicate-logs?original_log_id=#{sales_log.id}"
 
               expect(page).to have_content("Q1 - Sale completion date", count: 3)