diff --git a/app/models/case_log.rb b/app/models/case_log.rb
index 5f638cfa4..666387f63 100644
--- a/app/models/case_log.rb
+++ b/app/models/case_log.rb
@@ -114,7 +114,8 @@ class CaseLog < ApplicationRecord
   enum unitletas: DbEnums.unitletas, _suffix: true
 
   AUTOGENERATED_FIELDS = %w[id status created_at updated_at discarded_at].freeze
-  OPTIONAL_FIELDS = %w[do_you_know_the_postcode do_you_know_the_local_authority].freeze
+  OPTIONAL_FIELDS = %w[do_you_know_the_postcode do_you_know_the_local_authority
+                       first_time_property_let_as_social_housing].freeze
 
   def self.editable_fields
     attribute_names - AUTOGENERATED_FIELDS
@@ -240,6 +241,10 @@ private
       dynamically_not_required << "sale_completion_date"
     end
 
+    if la.present?
+      dynamically_not_required << "why_dont_you_know_la"
+    end
+
     if tenancy == "Secure (including flexible)"
       dynamically_not_required << "tenancylength"
     end
diff --git a/db/schema.rb b/db/schema.rb
index f3120334b..5a00db28f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -35,7 +35,6 @@ ActiveRecord::Schema.define(version: 2021_11_24_152204) do
     t.integer "ethnic"
     t.integer "national"
     t.integer "prevten"
-    t.string "armed_forces"
     t.integer "ecstat1"
     t.integer "hhmemb"
     t.string "relat2"
@@ -70,7 +69,6 @@ ActiveRecord::Schema.define(version: 2021_11_24_152204) do
     t.integer "underoccupation_benefitcap"
     t.integer "leftreg"
     t.integer "reservist"
-    t.string "armed_forces_partner"
     t.integer "illness"
     t.integer "preg_occ"
     t.string "accessibility_requirements"
@@ -165,7 +163,6 @@ ActiveRecord::Schema.define(version: 2021_11_24_152204) do
     t.datetime "sale_completion_date"
     t.datetime "startdate"
     t.integer "armedforces"
-    t.string "property_postcode"
     t.integer "first_time_property_let_as_social_housing"
     t.string "why_dont_you_know_la"
     t.integer "unitletas"
diff --git a/spec/factories/case_log.rb b/spec/factories/case_log.rb
index 393a2042e..2e904ad86 100644
--- a/spec/factories/case_log.rb
+++ b/spec/factories/case_log.rb
@@ -135,6 +135,8 @@ FactoryBot.define do
       sale_completion_date { nil }
       startdate { Time.zone.now }
       armedforces { 1 }
+      builtype { 1 }
+      unitletas { 2 }
     end
     created_at { Time.zone.now }
     updated_at { Time.zone.now }