diff --git a/Gemfile b/Gemfile
index 075106c54..f2684000d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -75,12 +75,18 @@ group :development do
   gem "overcommit", ">= 0.37.0"
   # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
   gem "web-console", ">= 4.1.0"
-  # Display performance information such as SQL time and flame graphs for each request in your browser.
-  # Can be configured to work on production as well see: https://github.com/MiniProfiler/rack-mini-profiler/blob/master/README.md
-  gem "erb_lint", require: false
+
   gem "rubocop-govuk", "4.3.0", require: false
   gem "rubocop-performance", require: false
   gem "rubocop-rails", require: false
+
+  # Display performance information such as SQL time and flame graphs for each request in your browser.
+  # Can be configured to work on production as well see: https://github.com/MiniProfiler/rack-mini-profiler/blob/master/README.md
+  gem "erb_lint", require: false
+  gem "flamegraph"
+  gem "memory_profiler"
+  gem "rack-mini-profiler"
+  gem "stackprof"
 end
 
 group :test do
@@ -92,15 +98,11 @@ group :test do
   gem "selenium-webdriver", require: false
   gem "simplecov", require: false
   gem "timecop", "~> 0.9.4"
-  gem "webmock", require: false 
+  gem "webmock", require: false
 end
 
 group :development, :test do
-  gem "rack-mini-profiler"
-  gem "flamegraph"  
-  gem "stackprof"
   gem "bullet"
-  gem "memory_profiler"  
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
diff --git a/app/jobs/cleanup_job.rb b/app/jobs/cleanup_job.rb
deleted file mode 100644
index f2ad2af45..000000000
--- a/app/jobs/cleanup_job.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class CleanupJob < ApplicationJob
-  queue_as :default
-
-  def perform(*args)
-    # Do something later
-  end
-end
diff --git a/app/jobs/lettings_log_import_job.rb b/app/jobs/lettings_log_import_job.rb
index a7466ff56..004cca7c3 100644
--- a/app/jobs/lettings_log_import_job.rb
+++ b/app/jobs/lettings_log_import_job.rb
@@ -1,9 +1,9 @@
-
 class LettingsLogImportJob < ApplicationJob
-  self.queue_name_prefix = 'lettings_logs_import'
+  self.queue_name_prefix = "lettings_logs_import"
   queue_as :default
 
-  def perform(run_id, xml_document)
+  def perform(run_id, xml_document, logger = Rails.logger)
+    logger.info("[LettingsLogImportJob] Processing log entry for run #{run_id}")
     Imports::LettingsLogsImportProcessor.new(xml_document)
-  end    
+  end
 end
diff --git a/app/models/lettings_log.rb b/app/models/lettings_log.rb
index 8e3f8c601..f27b73ba7 100644
--- a/app/models/lettings_log.rb
+++ b/app/models/lettings_log.rb
@@ -24,12 +24,12 @@ class LettingsLog < Log
   validates_with LettingsLogValidator
   before_validation :recalculate_start_year!, if: :startdate_changed?
   before_validation :reset_scheme_location!, if: :scheme_changed?, unless: :location_changed?
-  
+
   # Warning: Postcode checks require external service request - can be slow
-  before_validation :process_postcode_changes!, if: :postcode_full_changed?  
+  before_validation :process_postcode_changes!, if: :postcode_full_changed?
   before_validation :process_previous_postcode_changes!, if: :ppostcode_full_changed?
-  
-  before_validation :reset_invalidated_dependent_fields!  
+
+  before_validation :reset_invalidated_dependent_fields!
   before_validation :reset_location_fields!, unless: :postcode_known?
   before_validation :reset_previous_location_fields!, unless: :previous_postcode_known?
   before_validation :set_derived_fields!
@@ -657,7 +657,7 @@ private
   end
 
   def upcase_and_remove_whitespace(string)
-    string&.upcase.gsub(/\s+/, "")
+    string&.upcase&.gsub(/\s+/, "")
   end
 
   def fully_wheelchair_accessible?
diff --git a/app/models/logs_import.rb b/app/models/logs_import.rb
deleted file mode 100644
index cd6d041a4..000000000
--- a/app/models/logs_import.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class LogsImport < ApplicationRecord
-end
diff --git a/app/services/imports/lettings_logs_import_service.rb b/app/services/imports/lettings_logs_import_service.rb
index 6abcbf615..2710ebb44 100644
--- a/app/services/imports/lettings_logs_import_service.rb
+++ b/app/services/imports/lettings_logs_import_service.rb
@@ -1,5 +1,5 @@
-require 'securerandom'
-require 'json'
+require "securerandom"
+require "json"
 
 module Imports
   class LettingsLogsImportService < ImportService
@@ -8,16 +8,16 @@ module Imports
     end
 
     def create_logs(folder)
-      @run_id = "LLRun-#{Time.zone.now.to_s}"
+      @run_id = "LLRun-#{Time.zone.now}"
       @logger.info("START: Importing Lettings Logs @ #{Time.zone.now.strftime('%d-%m-%Y %H:%M')}. RunId: #{@run_id}")
-      
+
       import_from(folder, :enqueue_job)
 
       @logger.info("FINISH: Importing Lettings Logs @ #{Time.zone.now.strftime('%d-%m-%Y %H:%M')}. RunId: #{@run_id}")
     end
-    
+
     def enqueue_job(xml_document)
-      LettingsLogImportJob.perform_later(@run_id, xml_document.to_s)      
+      LettingsLogImportJob.perform_later(@run_id, xml_document)
     end
   end
 
@@ -75,29 +75,30 @@ module Imports
       "Other" => "X",
       "Non-binary" => "X",
       "Refused" => "R",
-    }.freeze 
+    }.freeze
 
     FIELDS_NOT_PRESENT_IN_SOFTWIRE_DATA = %w[
-      majorrepairs 
-      illness_type_0 
-      tshortfall_known 
-      pregnancy_value_check 
-      retirement_value_check 
-      rent_value_check 
-      net_income_value_check 
-      major_repairs_date_value_check void_date_value_check 
-      housingneeds_type 
       housingneeds_other
+      housingneeds_type
+      illness_type_0
+      major_repairs_date_value_check
+      majorrepairs
+      net_income_value_check
+      pregnancy_value_check
+      rent_value_check
+      retirement_value_check
+      tshortfall_known
+      void_date_value_check
     ].freeze
 
     attr_reader :xml_doc, :logs_overridden, :discrepancy, :old_id
-  
+
     def initialize(xml_document)
       @xml_doc = xml_document
       @discrepancy = false
-      @old_id = ''
+      @old_id = ""
       @logs_overridden = false
-    end    
+    end
 
     def create_log(xml_doc)
       attributes = {}
@@ -289,7 +290,7 @@ module Imports
 
         attributes["created_by"] = user
       end
- 
+
       apply_date_consistency!(attributes)
       apply_household_consistency!(attributes)
 
@@ -345,8 +346,8 @@ module Imports
     end
 
     # @logs_overridden can only include?(lettings_log.old_id) if there was a
-    # validation error raised therefore no need to do @logs_overridden.include? but rather 
-    # enough to set a flag for logs_overriden  
+    # validation error raised therefore no need to do @logs_overridden.include? but rather
+    # enough to set a flag for logs_overriden
     def check_status_completed(lettings_log, previous_status)
       return if @logs_overridden
 
@@ -367,7 +368,7 @@ module Imports
     def safe_string_as_decimal(xml_doc, attribute)
       str = string_or_nil(xml_doc, attribute)
       return if str.nil?
-      
+
       BigDecimal(str, exception: false)
     end
 
@@ -375,7 +376,7 @@ module Imports
     def unsafe_string_as_integer(xml_doc, attribute)
       str = string_or_nil(xml_doc, attribute)
       return if str.nil?
-      
+
       str.to_i
     end
 
@@ -385,8 +386,8 @@ module Imports
       year = Integer(field_value(xml_doc, "xmlns", year_str), exception: false)
 
       return if [day, month, year].any?(&:nil?)
-      
-      Time.zone.local(year, month, day)      
+
+      Time.zone.local(year, month, day)
     end
 
     def get_form_name_component(xml_doc, index)
@@ -456,9 +457,9 @@ module Imports
       return nil if hhmemb.present? && index > hhmemb
 
       age_refused = string_or_nil(xml_doc, "P#{index}AR")
-      return 0 unless age_refused.present?
-      
-      (age_refused.casecmp?("AGE_REFUSED") || age_refused.casecmp?("No")) ? 1 : 0
+      return 0 if age_refused.blank?
+
+      age_refused.casecmp?("AGE_REFUSED") || age_refused.casecmp?("No") ? 1 : 0
     end
 
     def details_known(index, attributes)
@@ -488,21 +489,21 @@ module Imports
     def compose_postcode(xml_doc, outcode, incode)
       outcode_value = string_or_nil(xml_doc, outcode)
       incode_value = string_or_nil(xml_doc, incode)
-      
+
       if outcode_value.nil? || incode_value.nil? || !"#{outcode_value} #{incode_value}".match(POSTCODE_REGEXP)
         nil
       else
         "#{outcode_value} #{incode_value}"
       end
     end
-    
+
     # Default to No (2) for any other values (nil, not known)
-    def london_affordable_rent(xml_doc)      
+    def london_affordable_rent(xml_doc)
       unsafe_string_as_integer(xml_doc, "LAR") == 1 ? 1 : 2
     end
 
     #  Relet – renewal of fixed-term tenancy
-    def renewal(rsnvac)      
+    def renewal(rsnvac)
       rsnvac == 14 ? 1 : 0
     end
 
@@ -584,7 +585,7 @@ module Imports
 
     def household_members(xml_doc, previous_status)
       hhmemb = safe_string_as_integer(xml_doc, "HHMEMB")
-      
+
       if previous_status.include?("submitted") && hhmemb.nil?
         hhmemb = people_with_details(xml_doc).count
         return nil if hhmemb.zero?
@@ -605,8 +606,8 @@ module Imports
       end
     end
 
-    def allocation_system(value)     
-      value == 1 ? 1 : 0 
+    def allocation_system(value)
+      value == 1 ? 1 : 0
     end
 
     def allocation_system_unknown(cbl, chr, cap)
@@ -676,6 +677,6 @@ module Imports
 
     def discrepancy?
       !!@discrepancy
-    end    
+    end
   end
 end
diff --git a/app/services/imports/lettings_logs_import_service_altered.rb.exclude b/app/services/imports/lettings_logs_import_service_altered.rb.exclude
deleted file mode 100644
index c93d14d97..000000000
--- a/app/services/imports/lettings_logs_import_service_altered.rb.exclude
+++ /dev/null
@@ -1,912 +0,0 @@
-require 'securerandom'
-require 'json'
-
-module Imports
-  class LettingsLogsImportService < ImportService
-    include Wisper::Publisher
-
-    def initialize(storage_service, logger = Rails.logger)      
-      super
-    
-      Wisper.subscribe(LettingsLogImportListener.new, prefix: :on)
-    end
-
-    def create_logs(folder)
-      import_from(folder, :create_log)
-      if @logs_with_discrepancies.count.positive?
-        @logger.warn("The following lettings logs had status discrepancies: [#{@logs_with_discrepancies.join(', ')}]")
-      end
-    end
-
-    def import_from(folder, create_method)
-      filenames = @storage_service.list_files(folder)
-      filenames.each do |filename|
-        file_io = @storage_service.get_file_io(filename)
-        xml_document = Nokogiri::XML(file_io)
-        send(create_method, xml_document)
-      rescue StandardError => e
-        @logger.error "#{e.class} in #{filename}: #{e.message}. Caller: #{e.backtrace.first}"
-      end
-    end
-
-    def local_load(folder)      
-      filenames = Dir["#{folder}/**/*.xml"]
-      puts "FILENAMES (#{filenames.size}): #{filenames}"
-      
-      @run_id = SecureRandom.uuid.to_s
-      logs_import = LogsImport.create!(
-        run_id: @run_id,
-        started_at: Time.zone.now,
-        total: filenames.size,
-        discrepancies: [],
-        filenames: filenames
-      )
-
-      redis = Redis.new
-      redis.set(@run_id, Marshal.dump(logs_import))
-      broadcast(::Import::STARTED, @run_id)
-
-      filenames.each do |filename|
-        puts "Loading filename: #{filename}"
-        Rack::MiniProfiler.step("Start Processing file #{filename}") do
-          # Generate background job to process file completely          
-          xml_document = Nokogiri::XML(File.open(filename))
-          
-          LettingsLogImportJob.perform_later(@run_id, xml_document.to_s)
-          #send(:create_log, xml_document)
-        end
-      rescue StandardError => e
-        @logger.error "#{e.class} in #{filename}: #{e.message}. Caller: #{e.backtrace.first}"
-      end   
-      
-      if @logs_with_discrepancies.count.positive?
-        @logger.warn("The following lettings logs had status discrepancies: [#{@logs_with_discrepancies.join(', ')}]")
-      end      
-    end
-  end
-
-
-  class LettingsLogsImportProcessor
-    FORM_NAME_INDEX = {
-      start_year: 0,
-      rent_type: 2,
-      needs_type: 3,
-    }.freeze
-  
-    GN_SH = {
-      general_needs: 1,
-      supported_housing: 2,
-    }.freeze
-  
-    SR_AR_IR = {
-      social_rent: 1,
-      affordable_rent: 2,
-      intermediate_rent: 3,
-    }.freeze
-  
-    # For providertype, values are reversed!!!
-    PRP_LA = {
-      private_registered_provider: 1,
-      local_authority: 2,
-    }.freeze
-  
-    IRPRODUCT = {
-      rent_to_buy: 1,
-      london_living_rent: 2,
-      other_intermediate_rent_product: 3,
-    }.freeze
-  
-    # These must match our form
-    RENT_TYPE = {
-      social_rent: 0,
-      affordable_rent: 1,
-      london_affordable_rent: 2,
-      rent_to_buy: 3,
-      london_living_rent: 4,
-      other_intermediate_rent_product: 5,
-    }.freeze
-  
-      attr_reader :xml_doc, :logs_with_discrepancies, :logs_overridden, :discrepancy, :old_id
-  
-      def initialize(xml_doc)
-        @xml_doc = xml_doc
-        @discrepancy = false
-        @old_id = ''
-        
-        @logs_with_discrepancies = Set.new
-        @logs_overridden = Set.new
-  
-      end
-
-  
-      def create_log
-        attributes = {}
-        lettings_log = nil
-        previous_status = field_value(xml_doc, "meta", "status")
-  
-    Rack::MiniProfiler.step("Loading attributes") do      
-        # Required fields for status complete or logic to work
-        # Note: order matters when we derive from previous values (attributes parameter)
-        attributes["startdate"] = compose_date(xml_doc, "DAY", "MONTH", "YEAR")
-        attributes["owning_organisation_id"] = find_organisation_id(xml_doc, "OWNINGORGID")
-        attributes["managing_organisation_id"] = find_organisation_id(xml_doc, "MANINGORGID")
-        attributes["joint"] = unsafe_string_as_integer(xml_doc, "joint")
-        attributes["startertenancy"] = unsafe_string_as_integer(xml_doc, "_2a")
-        attributes["tenancy"] = unsafe_string_as_integer(xml_doc, "Q2b")
-        attributes["tenancycode"] = string_or_nil(xml_doc, "_2bTenCode")
-        attributes["tenancyother"] = string_or_nil(xml_doc, "Q2ba")
-        attributes["tenancylength"] = safe_string_as_integer(xml_doc, "_2cYears")
-        attributes["needstype"] = needs_type(xml_doc)
-        attributes["lar"] = london_affordable_rent(xml_doc)
-        attributes["irproduct"] = unsafe_string_as_integer(xml_doc, "IRProduct")
-        attributes["irproduct_other"] = string_or_nil(xml_doc, "IRProductOther")
-        attributes["rent_type"] = rent_type(xml_doc, attributes["lar"], attributes["irproduct"])
-        attributes["hhmemb"] = household_members(xml_doc, previous_status)
-        (1..8).each do |index|
-          attributes["age#{index}"] = safe_string_as_integer(xml_doc, "P#{index}Age")
-          attributes["age#{index}_known"] = age_known(xml_doc, index, attributes["hhmemb"])
-          attributes["sex#{index}"] = sex(xml_doc, index)
-          attributes["ecstat#{index}"] = unsafe_string_as_integer(xml_doc, "P#{index}Eco")
-        end
-        (2..8).each do |index|
-          attributes["relat#{index}"] = relat(xml_doc, index)
-          attributes["details_known_#{index}"] = details_known(index, attributes)
-        end
-        attributes["ethnic"] = unsafe_string_as_integer(xml_doc, "P1Eth")
-        attributes["ethnic_group"] = ethnic_group(attributes["ethnic"])
-        attributes["national"] = unsafe_string_as_integer(xml_doc, "P1Nat")
-        attributes["preg_occ"] = unsafe_string_as_integer(xml_doc, "Preg")
-  
-        attributes["armedforces"] = unsafe_string_as_integer(xml_doc, "ArmedF")
-        attributes["leftreg"] = unsafe_string_as_integer(xml_doc, "LeftAF")
-        attributes["reservist"] = unsafe_string_as_integer(xml_doc, "Inj")
-  
-        attributes["hb"] = unsafe_string_as_integer(xml_doc, "Q6Ben")
-        attributes["benefits"] = unsafe_string_as_integer(xml_doc, "Q7Ben")
-        attributes["earnings"] = safe_string_as_decimal(xml_doc, "Q8Money")
-        attributes["net_income_known"] = net_income_known(xml_doc, attributes["earnings"])
-        attributes["incfreq"] = unsafe_string_as_integer(xml_doc, "Q8a")
-  
-        attributes["reason"] = unsafe_string_as_integer(xml_doc, "Q9a")
-        attributes["reasonother"] = string_or_nil(xml_doc, "Q9aa")
-        attributes["underoccupation_benefitcap"] = unsafe_string_as_integer(xml_doc, "_9b")
-        %w[a b c f g h].each do |letter|
-          attributes["housingneeds_#{letter}"] = housing_needs(xml_doc, letter)
-        end
-        attributes["housingneeds"] = 1 if [attributes["housingneeds_a"], attributes["housingneeds_b"], attributes["housingneeds_c"], attributes["housingneeds_f"]].any? { |housingneed| housingneed == 1 }
-        attributes["housingneeds"] = 2 if attributes["housingneeds_g"] == 1
-        attributes["housingneeds"] = 3 if attributes["housingneeds_h"] == 1
-        attributes["housingneeds_type"] = 0 if attributes["housingneeds_a"] == 1
-        attributes["housingneeds_type"] = 1 if attributes["housingneeds_b"] == 1
-        attributes["housingneeds_type"] = 2 if attributes["housingneeds_c"] == 1
-        attributes["housingneeds_type"] = 3 if attributes["housingneeds_f"] == 1 && [attributes["housingneeds_a"], attributes["housingneeds_b"], attributes["housingneeds_c"]].all? { |housingneed| housingneed != 1 }
-        attributes["housingneeds_other"] = attributes["housingneeds_f"] == 1 ? 1 : 0
-  
-        attributes["illness"] = unsafe_string_as_integer(xml_doc, "Q10ia")
-        (1..10).each do |index|
-          attributes["illness_type_#{index}"] = illness_type(xml_doc, index, attributes["illness"])
-        end
-        attributes["illness_type_0"] = 1 if (1..10).all? { |idx| attributes["illness_type_#{idx}"].nil? || attributes["illness_type_#{idx}"].zero? }
-  
-        attributes["prevten"] = unsafe_string_as_integer(xml_doc, "Q11")
-        attributes["prevloc"] = string_or_nil(xml_doc, "Q12aONS")
-        attributes["ppostcode_full"] = compose_postcode(xml_doc, "PPOSTC1", "PPOSTC2")
-        attributes["ppcodenk"] = previous_postcode_known(xml_doc, attributes["ppostcode_full"], attributes["prevloc"])
-        attributes["layear"] = unsafe_string_as_integer(xml_doc, "Q12c")
-        attributes["waityear"] = unsafe_string_as_integer(xml_doc, "Q12d")
-        attributes["homeless"] = unsafe_string_as_integer(xml_doc, "Q13")
-  
-        attributes["reasonpref"] = unsafe_string_as_integer(xml_doc, "Q14a")
-        attributes["rp_homeless"] = unsafe_string_as_integer(xml_doc, "Q14b1").present? ? 1 : nil
-        attributes["rp_insan_unsat"] = unsafe_string_as_integer(xml_doc, "Q14b2").present? ? 1 : nil
-        attributes["rp_medwel"] = unsafe_string_as_integer(xml_doc, "Q14b3").present? ? 1 : nil
-        attributes["rp_hardship"] = unsafe_string_as_integer(xml_doc, "Q14b4").present? ? 1 : nil
-        attributes["rp_dontknow"] = unsafe_string_as_integer(xml_doc, "Q14b5").present? ? 1 : nil
-  
-        attributes["cbl"] = allocation_system(unsafe_string_as_integer(xml_doc, "Q15CBL"))
-        attributes["chr"] = allocation_system(unsafe_string_as_integer(xml_doc, "Q15CHR"))
-        attributes["cap"] = allocation_system(unsafe_string_as_integer(xml_doc, "Q15CAP"))
-        attributes["letting_allocation_unknown"] = allocation_system_unknown(attributes["cbl"], attributes["chr"], attributes["cap"])
-  
-        attributes["referral"] = unsafe_string_as_integer(xml_doc, "Q16")
-        attributes["period"] = unsafe_string_as_integer(xml_doc, "Q17")
-  
-        attributes["brent"] = safe_string_as_decimal(xml_doc, "Q18ai")
-        attributes["scharge"] = safe_string_as_decimal(xml_doc, "Q18aii")
-        attributes["pscharge"] = safe_string_as_decimal(xml_doc, "Q18aiii")
-        attributes["supcharg"] = safe_string_as_decimal(xml_doc, "Q18aiv")
-        attributes["tcharge"] = safe_string_as_decimal(xml_doc, "Q18av")
-  
-        attributes["hbrentshortfall"] = unsafe_string_as_integer(xml_doc, "Q18d")
-        attributes["tshortfall"] = safe_string_as_decimal(xml_doc, "Q18dyes")
-        attributes["tshortfall_known"] = tshortfall_known?(xml_doc, attributes)
-  
-        attributes["voiddate"] = compose_date(xml_doc, "VDAY", "VMONTH", "VYEAR")
-        attributes["mrcdate"] = compose_date(xml_doc, "MRCDAY", "MRCMONTH", "MRCYEAR")
-        attributes["majorrepairs"] = if attributes["mrcdate"].present? && previous_status.include?("submitted")
-                                       1
-                                     elsif previous_status.include?("submitted")
-                                       0
-                                     end
-  
-        attributes["offered"] = safe_string_as_integer(xml_doc, "Q20")
-        attributes["propcode"] = string_or_nil(xml_doc, "Q21a")
-        attributes["beds"] = safe_string_as_integer(xml_doc, "Q22")
-        attributes["unittype_gn"] = unsafe_string_as_integer(xml_doc, "Q23")
-        attributes["builtype"] = unsafe_string_as_integer(xml_doc, "Q24")
-        attributes["wchair"] = unsafe_string_as_integer(xml_doc, "Q25")
-        attributes["unitletas"] = unsafe_string_as_integer(xml_doc, "Q26")
-        attributes["rsnvac"] = unsafe_string_as_integer(xml_doc, "Q27")
-        attributes["renewal"] = renewal(attributes["rsnvac"])
-  
-        attributes["la"] = string_or_nil(xml_doc, "Q28ONS")
-        attributes["postcode_full"] = compose_postcode(xml_doc, "POSTCODE", "POSTCOD2")
-        attributes["postcode_known"] = postcode_known(attributes)
-  
-        # Not specific to our form but required for consistency (present in import)
-        attributes["old_form_id"] = safe_string_as_integer(xml_doc, "FORM")
-        attributes["created_at"] = Time.zone.parse(field_value(xml_doc, "meta", "created-date"))
-        attributes["updated_at"] = Time.zone.parse(field_value(xml_doc, "meta", "modified-date"))
-        attributes["old_id"] = field_value(xml_doc, "meta", "document-id")
-        @old_id = attributes["old_id"]
-  
-        # Required for our form invalidated questions (not present in import)
-        attributes["previous_la_known"] = attributes["prevloc"].nil? ? 0 : 1
-        attributes["is_la_inferred"] = attributes["postcode_full"].present?
-        attributes["first_time_property_let_as_social_housing"] = first_time_let(attributes["rsnvac"])
-        attributes["declaration"] = declaration(xml_doc)
-  
-        set_partial_charges_to_zero(attributes)
-  
-        # Supported Housing fields
-        if attributes["needstype"] == GN_SH[:supported_housing]
-          location_old_visible_id = safe_string_as_integer(xml_doc, "_1cschemecode")
-          scheme_old_visible_id = safe_string_as_integer(xml_doc, "_1cmangroupcode")
-  
-          schemes = Scheme.where(old_visible_id: scheme_old_visible_id, owning_organisation_id: attributes["owning_organisation_id"])
-          location = Location.find_by(old_visible_id: location_old_visible_id, scheme: schemes)
-          raise "No matching location for scheme #{scheme_old_visible_id} and location #{location_old_visible_id} (visible IDs)" if location.nil?
-  
-          # Set the scheme via location, because the scheme old visible ID can be duplicated at import
-          attributes["location_id"] = location.id
-          attributes["scheme_id"] = location.scheme.id
-          attributes["sheltered"] = unsafe_string_as_integer(xml_doc, "Q1e")
-          attributes["chcharge"] = safe_string_as_decimal(xml_doc, "Q18b")
-          attributes["household_charge"] = household_charge(xml_doc)
-          attributes["is_carehome"] = is_carehome(location.scheme)
-        end
-  
-        # Handles confidential schemes
-        if attributes["postcode_full"] == "******"
-          attributes["postcode_known"] = 0
-          attributes["postcode_full"] = nil
-        end
-  
-        # Soft validations can become required answers, set them to yes by default
-        attributes["pregnancy_value_check"] = 0
-        attributes["major_repairs_date_value_check"] = 0
-        attributes["void_date_value_check"] = 0
-        attributes["retirement_value_check"] = 0
-        attributes["rent_value_check"] = 0
-        attributes["net_income_value_check"] = 0
-  
-        # Sets the log creator
-        owner_id = field_value(xml_doc, "meta", "owner-user-id").strip
-        if owner_id.present?
-          attributes["created_by"] = User.find_by(old_user_id: owner_id)
-        end
-  
-        apply_date_consistency!(attributes)
-        apply_household_consistency!(attributes)
-  end # ENDPROFILER
-  
-  
-        lettings_log = save_lettings_log(attributes)
-  
-        compute_differences(lettings_log, attributes)
-        check_status_completed(lettings_log, previous_status) unless @logs_overridden.include?(lettings_log.old_id)
-   
-      end
-  
-
-
-      (2..8).each do |index|
-        attributes["relat#{index}"] = relat(xml_doc, index)
-        attributes["details_known_#{index}"] = details_known(index, attributes)
-
-        # Trips validation
-        if attributes["age#{index}"].present? && attributes["age#{index}"] < 16 && attributes["relat#{index}"].present? && attributes["relat#{index}"] != "C" && attributes["relat#{index}"] != "R"
-          attributes["age#{index}"] = nil
-          attributes["relat#{index}"] = nil
-        end
-      end
-      attributes["ethnic"] = unsafe_string_as_integer(xml_doc, "P1Eth")
-      attributes["ethnic_group"] = ethnic_group(attributes["ethnic"])
-      attributes["national"] = unsafe_string_as_integer(xml_doc, "P1Nat")
-      attributes["preg_occ"] = unsafe_string_as_integer(xml_doc, "Preg")
-
-      attributes["armedforces"] = unsafe_string_as_integer(xml_doc, "ArmedF")
-      attributes["leftreg"] = unsafe_string_as_integer(xml_doc, "LeftAF")
-      attributes["reservist"] = unsafe_string_as_integer(xml_doc, "Inj")
-
-      attributes["hb"] = unsafe_string_as_integer(xml_doc, "Q6Ben")
-      attributes["benefits"] = unsafe_string_as_integer(xml_doc, "Q7Ben")
-      attributes["earnings"] = safe_string_as_decimal(xml_doc, "Q8Money")
-      attributes["net_income_known"] = net_income_known(xml_doc, attributes["earnings"])
-      attributes["incfreq"] = unsafe_string_as_integer(xml_doc, "Q8a")
-
-      attributes["reason"] = unsafe_string_as_integer(xml_doc, "Q9a")
-      attributes["reasonother"] = string_or_nil(xml_doc, "Q9aa")
-      attributes["underoccupation_benefitcap"] = unsafe_string_as_integer(xml_doc, "_9b")
-      %w[a b c f g h].each do |letter|
-        attributes["housingneeds_#{letter}"] = housing_needs(xml_doc, letter)
-      end
-      attributes["housingneeds"] = 1 if [attributes["housingneeds_a"], attributes["housingneeds_b"], attributes["housingneeds_c"], attributes["housingneeds_f"]].any? { |housingneed| housingneed == 1 }
-      attributes["housingneeds"] = 2 if attributes["housingneeds_g"] == 1
-      attributes["housingneeds"] = 3 if attributes["housingneeds_h"] == 1
-      attributes["housingneeds_type"] = 0 if attributes["housingneeds_a"] == 1
-      attributes["housingneeds_type"] = 1 if attributes["housingneeds_b"] == 1
-      attributes["housingneeds_type"] = 2 if attributes["housingneeds_c"] == 1
-      attributes["housingneeds_type"] = 3 if attributes["housingneeds_f"] == 1 && [attributes["housingneeds_a"], attributes["housingneeds_b"], attributes["housingneeds_c"]].all? { |housingneed| housingneed != 1 }
-      attributes["housingneeds_other"] = attributes["housingneeds_f"] == 1 ? 1 : 0
-
-      attributes["illness"] = unsafe_string_as_integer(xml_doc, "Q10ia")
-      (1..10).each do |index|
-        attributes["illness_type_#{index}"] = illness_type(xml_doc, index, attributes["illness"])
-      end
-      attributes["illness_type_0"] = 1 if (1..10).all? { |idx| attributes["illness_type_#{idx}"].nil? || attributes["illness_type_#{idx}"].zero? }
-
-      attributes["prevten"] = unsafe_string_as_integer(xml_doc, "Q11")
-      attributes["prevloc"] = string_or_nil(xml_doc, "Q12aONS")
-      attributes["ppostcode_full"] = compose_postcode(xml_doc, "PPOSTC1", "PPOSTC2")
-      attributes["ppcodenk"] = previous_postcode_known(xml_doc, attributes["ppostcode_full"], attributes["prevloc"])
-      attributes["layear"] = unsafe_string_as_integer(xml_doc, "Q12c")
-      attributes["waityear"] = unsafe_string_as_integer(xml_doc, "Q12d")
-      attributes["homeless"] = unsafe_string_as_integer(xml_doc, "Q13")
-
-      attributes["reasonpref"] = unsafe_string_as_integer(xml_doc, "Q14a")
-      attributes["rp_homeless"] = unsafe_string_as_integer(xml_doc, "Q14b1").present? ? 1 : nil
-      attributes["rp_insan_unsat"] = unsafe_string_as_integer(xml_doc, "Q14b2").present? ? 1 : nil
-      attributes["rp_medwel"] = unsafe_string_as_integer(xml_doc, "Q14b3").present? ? 1 : nil
-      attributes["rp_hardship"] = unsafe_string_as_integer(xml_doc, "Q14b4").present? ? 1 : nil
-      attributes["rp_dontknow"] = unsafe_string_as_integer(xml_doc, "Q14b5").present? ? 1 : nil
-
-      # Trips validation
-      if attributes["homeless"] == 1 && attributes["rp_homeless"] == 1
-        attributes["homeless"] = nil
-        attributes["rp_homeless"] = nil
-      end
-
-      attributes["cbl"] = allocation_system(unsafe_string_as_integer(xml_doc, "Q15CBL"))
-      attributes["chr"] = allocation_system(unsafe_string_as_integer(xml_doc, "Q15CHR"))
-      attributes["cap"] = allocation_system(unsafe_string_as_integer(xml_doc, "Q15CAP"))
-      attributes["letting_allocation_unknown"] = allocation_system_unknown(attributes["cbl"], attributes["chr"], attributes["cap"])
-
-      attributes["referral"] = unsafe_string_as_integer(xml_doc, "Q16")
-      attributes["period"] = unsafe_string_as_integer(xml_doc, "Q17")
-
-      attributes["brent"] = safe_string_as_decimal(xml_doc, "Q18ai")
-      attributes["scharge"] = safe_string_as_decimal(xml_doc, "Q18aii")
-      attributes["pscharge"] = safe_string_as_decimal(xml_doc, "Q18aiii")
-      attributes["supcharg"] = safe_string_as_decimal(xml_doc, "Q18aiv")
-      attributes["tcharge"] = safe_string_as_decimal(xml_doc, "Q18av")
-
-      attributes["hbrentshortfall"] = unsafe_string_as_integer(xml_doc, "Q18d")
-      attributes["tshortfall"] = safe_string_as_decimal(xml_doc, "Q18dyes")
-      attributes["tshortfall_known"] = tshortfall_known?(xml_doc, attributes)
-
-      attributes["voiddate"] = compose_date(xml_doc, "VDAY", "VMONTH", "VYEAR")
-      attributes["mrcdate"] = compose_date(xml_doc, "MRCDAY", "MRCMONTH", "MRCYEAR")
-      attributes["majorrepairs"] = if attributes["mrcdate"].present? && previous_status.include?("submitted")
-                                     1
-                                   elsif previous_status.include?("submitted")
-                                     0
-                                   end
-
-      attributes["offered"] = safe_string_as_integer(xml_doc, "Q20")
-      attributes["propcode"] = string_or_nil(xml_doc, "Q21a")
-      attributes["beds"] = safe_string_as_integer(xml_doc, "Q22")
-      attributes["unittype_gn"] = unsafe_string_as_integer(xml_doc, "Q23")
-      attributes["builtype"] = unsafe_string_as_integer(xml_doc, "Q24")
-      attributes["wchair"] = unsafe_string_as_integer(xml_doc, "Q25")
-      attributes["unitletas"] = unsafe_string_as_integer(xml_doc, "Q26")
-      attributes["rsnvac"] = unsafe_string_as_integer(xml_doc, "Q27")
-      attributes["renewal"] = renewal(attributes["rsnvac"])
-
-      attributes["la"] = string_or_nil(xml_doc, "Q28ONS")
-      attributes["postcode_full"] = compose_postcode(xml_doc, "POSTCODE", "POSTCOD2")
-      attributes["postcode_known"] = postcode_known(attributes)
-
-      # Not specific to our form but required for consistency (present in import)
-      attributes["old_form_id"] = safe_string_as_integer(xml_doc, "FORM")
-      attributes["created_at"] = Time.zone.parse(field_value(xml_doc, "meta", "created-date"))
-      attributes["updated_at"] = Time.zone.parse(field_value(xml_doc, "meta", "modified-date"))
-      attributes["old_id"] = field_value(xml_doc, "meta", "document-id")
-
-      # Required for our form invalidated questions (not present in import)
-      attributes["previous_la_known"] = attributes["prevloc"].nil? ? 0 : 1
-      attributes["is_la_inferred"] = attributes["postcode_full"].present?
-      attributes["first_time_property_let_as_social_housing"] = first_time_let(attributes["rsnvac"])
-      attributes["declaration"] = declaration(xml_doc)
-
-      set_partial_charges_to_zero(attributes)
-
-      # Supported Housing fields
-      if attributes["needstype"] == GN_SH[:supported_housing]
-        location_old_visible_id = safe_string_as_integer(xml_doc, "_1cschemecode")
-        scheme_old_visible_id = safe_string_as_integer(xml_doc, "_1cmangroupcode")
-
-        schemes = Scheme.where(old_visible_id: scheme_old_visible_id, owning_organisation_id: attributes["owning_organisation_id"])
-        location = Location.find_by(old_visible_id: location_old_visible_id, scheme: schemes)
-        raise "No matching location for scheme #{scheme_old_visible_id} and location #{location_old_visible_id} (visible IDs)" if location.nil?
-
-        # Set the scheme via location, because the scheme old visible ID can be duplicated at import
-        attributes["location_id"] = location.id
-        attributes["scheme_id"] = location.scheme.id
-        attributes["sheltered"] = unsafe_string_as_integer(xml_doc, "Q1e")
-        attributes["chcharge"] = safe_string_as_decimal(xml_doc, "Q18b")
-        attributes["household_charge"] = household_charge(xml_doc)
-        attributes["is_carehome"] = is_carehome(location.scheme)
-      end
-
-      # Handles confidential schemes
-      if attributes["postcode_full"] == "******"
-        attributes["postcode_known"] = 0
-        attributes["postcode_full"] = nil
-      end
-
-      # Soft validations can become required answers, set them to yes by default
-      attributes["pregnancy_value_check"] = 0
-      attributes["major_repairs_date_value_check"] = 0
-      attributes["void_date_value_check"] = 0
-      attributes["retirement_value_check"] = 0
-      attributes["rent_value_check"] = 0
-      attributes["net_income_value_check"] = 0
-
-      # Sets the log creator
-      owner_id = field_value(xml_doc, "meta", "owner-user-id").strip
-      if owner_id.present?
-        user = LegacyUser.find_by(old_user_id: owner_id)&.user
-        @logger.warn "Missing user! We expected to find a legacy user with old_user_id #{owner_id}" unless user
-
-        attributes["created_by"] = user
-      end
-
-      apply_date_consistency!(attributes)
-      apply_household_consistency!(attributes)
-
-      lettings_log = save_lettings_log(attributes)
-      compute_differences(lettings_log, attributes)
-      check_status_completed(lettings_log, previous_status) unless @logs_overridden.include?(lettings_log.old_id)
-    end
-
-    def save_lettings_log(attributes)
-      lettings_log = LettingsLog.new(attributes)
-      begin
-        lettings_log.save!
-        lettings_log
-      rescue ActiveRecord::RecordNotUnique
-        legacy_id = attributes["old_id"]
-        record = LettingsLog.find_by(old_id: legacy_id)
-        @logger.info "Updating lettings log #{record.id} with legacy ID #{legacy_id}"
-        record.update!(attributes)
-        record
-      rescue ActiveRecord::RecordInvalid => e
-        rescue_validation_or_raise(lettings_log, attributes, e)
-      end
-    end
-  
-      def rescue_validation_or_raise(lettings_log, attributes, exception)
-        if lettings_log.errors.of_kind?(:referral, :internal_transfer_non_social_housing)
-          @logger.warn("Log #{lettings_log.old_id}: Removing internal transfer referral since previous tenancy is a non social housing")
-          @logs_overridden << lettings_log.old_id
-          attributes.delete("referral")
-          save_lettings_log(attributes)
-        elsif lettings_log.errors.of_kind?(:referral, :internal_transfer_fixed_or_lifetime)
-          @logger.warn("Log #{lettings_log.old_id}: Removing internal transfer referral since previous tenancy is fixed terms or lifetime")
-          @logs_overridden << lettings_log.old_id
-          attributes.delete("referral")
-          save_lettings_log(attributes)
-        else
-          raise exception
-        end
-      end
-  
-      def compute_differences(lettings_log, attributes)
-        differences = []
-        attributes.each do |key, value|
-          lettings_log_value = lettings_log.send(key.to_sym)
-          next if fields_not_present_in_softwire_data.include?(key)
-  
-          if value != lettings_log_value
-            differences.push("#{key} #{value.inspect} #{lettings_log_value.inspect}")
-          end
-        end
-        @logger.warn "Differences found when saving log #{lettings_log.old_id}: #{differences}" unless differences.empty?
-      end
-  
-      def fields_not_present_in_softwire_data
-        %w[majorrepairs illness_type_0 tshortfall_known pregnancy_value_check retirement_value_check rent_value_check net_income_value_check major_repairs_date_value_check void_date_value_check housingneeds_type housingneeds_other]
-      end
-  
-      def check_status_completed(lettings_log, previous_status)
-        if previous_status.include?("submitted") && lettings_log.status != "completed"
-          @logger.warn "lettings log #{lettings_log.id} is not completed"
-          @logger.warn "lettings log with old id:#{lettings_log.old_id} is incomplete but status should be complete"
-          @logs_with_discrepancies << lettings_log.old_id
-          @discrepancy = true
-        end
-      end
-  
-      # Safe: A string that represents only an integer (or empty/nil)
-      def safe_string_as_integer(xml_doc, attribute)
-        str = field_value(xml_doc, "xmlns", attribute)
-        Integer(str, exception: false)
-      end
-  
-      # Safe: A string that represents only a decimal (or empty/nil)
-      def safe_string_as_decimal(xml_doc, attribute)
-        str = string_or_nil(xml_doc, attribute)
-        if str.nil?
-          nil
-        else
-          BigDecimal(str, exception: false)
-        end
-      end
-  
-      # Unsafe: A string that has more than just the integer value
-      def unsafe_string_as_integer(xml_doc, attribute)
-        str = string_or_nil(xml_doc, attribute)
-        if str.nil?
-          nil
-        else
-          str.to_i
-        end
-      end
-  
-      def compose_date(xml_doc, day_str, month_str, year_str)
-        day = Integer(field_value(xml_doc, "xmlns", day_str), exception: false)
-        month = Integer(field_value(xml_doc, "xmlns", month_str), exception: false)
-        year = Integer(field_value(xml_doc, "xmlns", year_str), exception: false)
-        if day.nil? || month.nil? || year.nil?
-          nil
-        else
-          Time.zone.local(year, month, day)
-        end
-      end
-  
-      def get_form_name_component(xml_doc, index)
-        form_name = field_value(xml_doc, "meta", "form-name")
-        form_type_components = form_name.split("-")
-        form_type_components[index]
-      end
-  
-      def needs_type(xml_doc)
-        gn_sh = get_form_name_component(xml_doc, FORM_NAME_INDEX[:needs_type])
-        case gn_sh
-        when "GN"
-          GN_SH[:general_needs]
-        when "SH"
-          GN_SH[:supported_housing]
-        else
-          raise "Unknown needstype value: #{gn_sh}"
-        end
-      end
-  
-      # This does not match renttype (CDS) which is derived by lettings log logic
-      def rent_type(xml_doc, lar, irproduct)
-        sr_ar_ir = get_form_name_component(xml_doc, FORM_NAME_INDEX[:rent_type])
-  
-        case sr_ar_ir
-        when "SR"
-          RENT_TYPE[:social_rent]
-        when "AR"
-          if lar == 1
-            RENT_TYPE[:london_affordable_rent]
-          else
-            RENT_TYPE[:affordable_rent]
-          end
-        when "IR"
-          if irproduct == IRPRODUCT[:rent_to_buy]
-            RENT_TYPE[:rent_to_buy]
-          elsif irproduct == IRPRODUCT[:london_living_rent]
-            RENT_TYPE[:london_living_rent]
-          elsif irproduct == IRPRODUCT[:other_intermediate_rent_product]
-            RENT_TYPE[:other_intermediate_rent_product]
-          end
-        else
-          raise "Could not infer rent type with '#{sr_ar_ir}'"
-        end
-      end
-  
-      def find_organisation_id(xml_doc, id_field)
-        old_visible_id = unsafe_string_as_integer(xml_doc, id_field)
-        organisation = Organisation.find_by(old_visible_id:)
-        raise "Organisation not found with legacy ID #{old_visible_id}" if organisation.nil?
-  
-        organisation.id
-      end
-  
-      def sex(xml_doc, index)
-        sex = string_or_nil(xml_doc, "P#{index}Sex")
-        case sex
-        when "Male"
-          "M"
-        when "Female"
-          "F"
-        when "Other", "Non-binary"
-          "X"
-        when "Refused"
-          "R"
-        end
-      end
-  
-      def relat(xml_doc, index)
-        relat = string_or_nil(xml_doc, "P#{index}Rel")
-        case relat
-        when "Child"
-          "C"
-        when "Partner"
-          "P"
-        when "Other", "Non-binary"
-          "X"
-        when "Refused"
-          "R"
-        end
-      end
-  
-      def age_known(xml_doc, index, hhmemb)
-        return nil if hhmemb.present? && index > hhmemb
-  
-        age_refused = string_or_nil(xml_doc, "P#{index}AR")
-        if age_refused.present?
-          if age_refused.casecmp?("AGE_REFUSED") || age_refused.casecmp?("No")
-            return 1 # No
-          else
-            return 0 # Yes
-          end
-        end
-        0
-      end
-  
-      def details_known(index, attributes)
-        return nil if attributes["hhmemb"].nil? || index > attributes["hhmemb"]
-  
-        if attributes["age#{index}_known"] == 1 &&
-            attributes["sex#{index}"] == "R" &&
-            attributes["relat#{index}"] == "R" &&
-            attributes["ecstat#{index}"] == 10
-          1 # No
-        else
-          0 # Yes
-        end
-      end
-  
-      def previous_postcode_known(xml_doc, previous_postcode, prevloc)
-        previous_postcode_known = string_or_nil(xml_doc, "Q12bnot")
-        if previous_postcode_known == "Temporary_or_Unknown" || (previous_postcode.nil? && prevloc.present?)
-          0
-        elsif previous_postcode.nil?
-          nil
-        else
-          1
-        end
-      end
-  
-      def compose_postcode(xml_doc, outcode, incode)
-        outcode_value = string_or_nil(xml_doc, outcode)
-        incode_value = string_or_nil(xml_doc, incode)
-        if outcode_value.nil? || incode_value.nil? || !"#{outcode_value} #{incode_value}".match(POSTCODE_REGEXP)
-          nil
-        else
-          "#{outcode_value} #{incode_value}"
-        end
-      end
-  
-      def london_affordable_rent(xml_doc)
-        lar = unsafe_string_as_integer(xml_doc, "LAR")
-        if lar == 1
-          1
-        else
-          # We default to No for any other values (nil, not known)
-          2
-        end
-      end
-  
-      def renewal(rsnvac)
-        #  Relet – renewal of fixed-term tenancy
-        if rsnvac == 14
-          1
-        else
-          0
-        end
-      end
-  
-      def string_or_nil(xml_doc, attribute)
-        str = field_value(xml_doc, "xmlns", attribute)
-        str.presence
-      end
-  
-      def ethnic_group(ethnic)
-        case ethnic
-        when 1, 2, 3, 18
-          # White
-          0
-        when 4, 5, 6, 7
-          # Mixed
-          1
-        when 8, 9, 10, 11, 15
-          # Asian
-          2
-        when 12, 13, 14
-          # Black
-          3
-        when 16, 19
-          # Others
-          4
-        when 17
-          # Refused
-          17
-        end
-      end
-  
-      # Letters should be lowercase to match case
-      def housing_needs(xml_doc, letter)
-        housing_need = string_or_nil(xml_doc, "Q10-#{letter}")
-        if housing_need == "Yes"
-          1
-        else
-          0
-        end
-      end
-  
-      def net_income_known(xml_doc, earnings)
-        incref = string_or_nil(xml_doc, "Q8Refused")
-        if incref == "Refused"
-          # Tenant prefers not to say
-          2
-        elsif earnings.nil?
-          # No
-          1
-        else
-          # Yes
-          0
-        end
-      end
-  
-      def illness_type(xml_doc, index, illness)
-        illness_type = string_or_nil(xml_doc, "Q10ib-#{index}")
-        if illness_type == "Yes" && illness == 1
-          1
-        elsif illness == 1
-          0
-        end
-      end
-  
-      def first_time_let(rsnvac)
-        if [15, 16, 17].include?(rsnvac)
-          1
-        else
-          0
-        end
-      end
-  
-      def declaration(xml_doc)
-        declaration = string_or_nil(xml_doc, "Qdp")
-        if declaration == "Yes"
-          1
-        end
-      end
-  
-      def postcode_known(attributes)
-        if attributes["postcode_full"].nil? && attributes["la"].nil?
-          nil
-        elsif attributes["postcode_full"].nil?
-          0 # Assumes we selected No in the form since the LA is present
-        else
-          1
-        end
-      end
-  
-      def household_members(xml_doc, previous_status)
-        hhmemb = safe_string_as_integer(xml_doc, "HHMEMB")
-        if previous_status.include?("submitted") && hhmemb.nil?
-          hhmemb = people_with_details(xml_doc).count
-          return nil if hhmemb.zero?
-        end
-        hhmemb
-      end
-  
-      def people_with_details(xml_doc)
-        ((2..8).map { |x| string_or_nil(xml_doc, "P#{x}Rel") } + [string_or_nil(xml_doc, "P1Sex")]).compact
-      end
-  
-      def tshortfall_known?(xml_doc, attributes)
-        if attributes["tshortfall"].blank? && attributes["hbrentshortfall"] == 1 && overridden?(xml_doc, "xmlns", "Q18dyes")
-          1
-        else
-          0
-        end
-      end
-  
-      def allocation_system(value)
-        case value
-        when 1
-          1
-        when 2
-          0
-        end
-      end
-  
-      def allocation_system_unknown(cbl, chr, cap)
-        allocation_values = [cbl, chr, cap]
-        if allocation_values.all?(&:nil?)
-          nil
-        elsif allocation_values.all? { |att| att&.zero? }
-          1
-        else
-          0
-        end
-      end
-  
-      def apply_date_consistency!(attributes)
-        return if attributes["voiddate"].nil? || attributes["startdate"].nil?
-  
-        if attributes["voiddate"] > attributes["startdate"]
-          attributes.delete("voiddate")
-        end
-      end
-  
-      def apply_household_consistency!(attributes)
-        (2..8).each do |index|
-          next if attributes["age#{index}"].nil?
-  
-          if attributes["age#{index}"] < 16 && attributes["relat#{index}"] == "R"
-            attributes["relat#{index}"] = "C"
-          end
-        end
-      end
-  
-      def household_charge(xml_doc)
-        value = string_or_nil(xml_doc, "Q18c")
-        start_year = Integer(get_form_name_component(xml_doc, FORM_NAME_INDEX[:start_year]))
-  
-        if start_year <= 2021
-          # Yes means that there are no charges (2021 or earlier)
-          value && value.include?("Yes") ? 1 : 0
-        else
-          # Yes means that there are charges (2022 onwards)
-          value && value.include?("Yes") ? 0 : 1
-        end
-      end
-  
-      def set_partial_charges_to_zero(attributes)
-        unless attributes["brent"].nil? &&
-            attributes["scharge"].nil? &&
-            attributes["pscharge"].nil? &&
-            attributes["supcharg"].nil?
-          attributes["brent"] ||= BigDecimal("0.0")
-          attributes["scharge"] ||= BigDecimal("0.0")
-          attributes["pscharge"] ||= BigDecimal("0.0")
-          attributes["supcharg"] ||= BigDecimal("0.0")
-        end
-      end
-  
-      def is_carehome(scheme)
-        return nil unless scheme
-  
-        if [2, 3, 4].include?(scheme.registered_under_care_act_before_type_cast)
-          1
-        else
-          0
-        end
-      end 
-      
-      def discrepancy?
-        !!@discrepancy
-      end
-    end
-  
-
-
-end
diff --git a/app/views/lettings_test/index.html.erb b/app/views/lettings_test/index.html.erb
deleted file mode 100644
index 3dd8b2162..000000000
--- a/app/views/lettings_test/index.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<h1>Lettings Test</h1>
\ No newline at end of file
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 3e5f108aa..1cc7e8d2c 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -90,7 +90,7 @@ Rails.application.configure do
   # config.action_cable.disable_request_forgery_protection = true
 
   # see https://discuss.rubyonrails.org/t/cve-2022-32224-possible-rce-escalation-bug-with-serialized-columns-in-active-record/81017
-  config.active_record.yaml_column_permitted_classes = [Time] 
+  config.active_record.yaml_column_permitted_classes = [Time]
 
   Rack::MiniProfiler.config.storage = Rack::MiniProfiler::MemoryStore
 end
diff --git a/config/initializers/rack_profiler.rb b/config/initializers/rack_profiler.rb
deleted file mode 100644
index 23c4fb8d0..000000000
--- a/config/initializers/rack_profiler.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-if Rails.env == 'development' || Rails.env == 'test'
-  # Rack::MiniProfilerRails.initialize!(Rails.application)
-end
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 5a910d25b..0c4409713 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -121,6 +121,4 @@ Rails.application.routes.draw do
     match "/422", to: "errors#unprocessable_entity"
     match "/500", to: "errors#internal_server_error"
   end
-
-  resources :lettings_test
 end
diff --git a/db/migrate/20220928002015_logs_imports.rb b/db/migrate/20220928002015_logs_imports.rb
deleted file mode 100644
index 8d9e102d8..000000000
--- a/db/migrate/20220928002015_logs_imports.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-class LogsImports < ActiveRecord::Migration[7.0]
-  def change
-    create_table :logs_imports do |t|
-      t.string :run_id, null: false
-      t.datetime :started_at
-      t.datetime :finished_at
-      t.integer :duration_seconds, default: 0
-      t.integer :total, default: 0 # Total logs to import in batch
-      t.integer :num_saved, default: 0
-      t.integer :num_skipped, default: 0
-
-      t.jsonb :discrepancies # List of files with errors, etc
-      t.jsonb :filenames # List of filenames processed
-
-      t.timestamps
-    end    
-  end
-end
diff --git a/dump.rdb b/dump.rdb
deleted file mode 100644
index 67e2b80de..000000000
Binary files a/dump.rdb and /dev/null differ
diff --git a/spec/services/imports/lettings_logs_import_service_spec.rb b/spec/services/imports/lettings_logs_import_service_spec.rb
index 6f6999855..54773824c 100644
--- a/spec/services/imports/lettings_logs_import_service_spec.rb
+++ b/spec/services/imports/lettings_logs_import_service_spec.rb
@@ -68,15 +68,8 @@ RSpec.describe Imports::LettingsLogsImportService do
       expect(logger).not_to receive(:error)
       expect(logger).not_to receive(:warn)
       expect(logger).not_to receive(:info)
-      #expect { lettings_log_service.create_logs(remote_folder) }
-      #  .to change(LettingsLog, :count).by(4)
-      total_logs = LettingsLog.all.size
-      Rack::MiniProfiler.config.storage = Rack::MiniProfiler::MemoryStore
-      Rack::MiniProfiler.step('Create Case Logs') do
-        puts "Creating case logs, profiling!"
-        lettings_log_service.create_logs(remote_folder)
-      end 
-      expect(LettingsLog.all.size).to eq(total_logs + 4)     
+      expect { lettings_log_service.create_logs(remote_folder) }
+       .to change(LettingsLog, :count).by(4)
     end
 
     it "only updates existing lettings logs" do