diff --git a/app/controllers/deidentified_clients_controller.rb b/app/controllers/deidentified_clients_controller.rb
index 91a394637..ff8ac9f56 100644
--- a/app/controllers/deidentified_clients_controller.rb
+++ b/app/controllers/deidentified_clients_controller.rb
@@ -44,19 +44,28 @@ def destroy
   end
 
   def choose_upload
-    @upload = DeidentifiedClientsXlsx.new
+    @upload = DeidentifiedClientsXlsx.new(agency_id: current_user.agency_id)
   end
 
   def import
     unless params[:deidentified_clients_xlsx]&.[](:file)
-      @upload = DeidentifiedClientsXlsx.new
+      @upload = DeidentifiedClientsXlsx.new(agency_id: current_user.agency_id)
       flash[:alert] = Translation.translate('You must attach a file in the form.')
       render :choose_upload
       return
     end
 
     file = import_params[:file]
+    agency = Agency.find(import_params[:agency_id].to_i)
     update_availability = import_params[:update_availability].to_s.in?(['1', 'true'])
+
+    unless agency.present?
+      @upload = DeidentifiedClientsXlsx.new(agency_id: current_user.agency_id)
+      flash[:alert] = Translation.translate('You must select a valid agency')
+      render :choose_upload
+      return
+    end
+
     begin
       @upload = DeidentifiedClientsXlsx.create(
         filename: file.original_filename,
@@ -65,20 +74,20 @@ def import
         content: file.read,
       )
     rescue StandardError
-      @upload = DeidentifiedClientsXlsx.new
+      @upload = DeidentifiedClientsXlsx.new(agency_id: current_user.agency_id)
       flash[:alert] = Translation.translate('Cannot read uploaded file, is it an XLSX?')
       render :choose_upload
       return
     end
 
     unless @upload.valid_header?
-      @upload = DeidentifiedClientsXlsx.new
+      @upload = DeidentifiedClientsXlsx.new(agency_id: current_user.agency_id)
       flash[:alert] = Translation.translate('Uploaded file does not have the correct header. Incorrect file?')
       render :choose_upload
       return
     end
 
-    @upload.import(current_user.agency, update_availability: update_availability)
+    @upload.import(agency, update_availability: update_availability)
   end
 
   def assessment_type
@@ -232,6 +241,7 @@ def filter_terms
   private def import_params
     params.require(:deidentified_clients_xlsx).permit(
       :file,
+      :agency_id,
       :update_availability,
     )
   end
diff --git a/app/models/deidentified_clients_xlsx.rb b/app/models/deidentified_clients_xlsx.rb
index 717c151cd..05b6bd31b 100644
--- a/app/models/deidentified_clients_xlsx.rb
+++ b/app/models/deidentified_clients_xlsx.rb
@@ -6,9 +6,13 @@
 
 class DeidentifiedClientsXlsx < ApplicationRecord
   mount_uploader :file, DeidentifiedClientsXlsxFileUploader
-  attr_accessor :update_availability
+  attr_accessor :agency_id, :update_availability
   attr_reader :added, :touched, :problems, :clients
 
+  def agency_options_for_select
+    Agency.order(name: :asc).pluck(:name, :id).to_h
+  end
+
   def valid_header?
     parse_xlsx unless @xlsx
 
@@ -24,13 +28,13 @@ def import(agency, update_availability: false)
 
     return unless valid_header?
 
-    DeidentifiedClient.update_all(available: false) if @update_availability
+    DeidentifiedClient.where(agency: agency).update_all(available: false) if @update_availability
 
     @xlsx.each_with_index do |raw, index|
       next if skip?(raw, index)
 
       row = Hash[file_attributes.keys.zip(raw)]
-      client = DeidentifiedClient.where(client_identifier: row[:client_identifier]).first_or_initialize
+      client = DeidentifiedClient.where(agency: agency, client_identifier: row[:client_identifier]).first_or_initialize
       @clients << client
       cleaned = begin
         clean_row(client, row)
diff --git a/app/views/deidentified_clients/choose_upload.haml b/app/views/deidentified_clients/choose_upload.haml
index e755d1917..45fa00aa7 100644
--- a/app/views/deidentified_clients/choose_upload.haml
+++ b/app/views/deidentified_clients/choose_upload.haml
@@ -8,10 +8,13 @@
 %ul
   - DeidentifiedClientsXlsx.file_header.each do |label|
     %ul= label
-= simple_form_for @upload, url: import_deidentified_clients_path, method: :post do |f|
-  = f.error_notification
-  .form-inputs
-    = f.input :file, as: :file, label: false
-    = f.input :update_availability, as: :boolean, label: 'Update client availability', hint: 'Make only the clients that appear in the selected file available'
-  .form-actions
-    = f.button :submit, value: 'Upload Excel'
+  .row
+    .col-sm-6
+      = simple_form_for @upload, url: import_deidentified_clients_path, method: :post do |f|
+        = f.error_notification
+        .form-inputs
+          = f.input :file, as: :file, label: false
+          = f.input :agency_id, as: :select_2, collection: @upload.agency_options_for_select, required: true
+          = f.input :update_availability, as: :boolean, label: 'Update client availability', hint: 'Make only the clients in the selected agency that appear in the selected file available'
+        .form-actions
+          = f.button :submit, value: 'Upload Excel'
diff --git a/db/schema.rb b/db/schema.rb
index 2b05aea6f..54f69239e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -28,15 +28,6 @@
     t.text "referrer"
     t.datetime "created_at", precision: nil
     t.datetime "updated_at", precision: nil
-    t.index ["controller_name"], name: "index_activity_logs_on_controller_name"
-    t.index ["created_at", "item_model", "user_id"], name: "index_activity_logs_on_created_at_and_item_model_and_user_id"
-    t.index ["created_at"], name: "activity_logs_created_at_idx", using: :brin
-    t.index ["created_at"], name: "created_at_idx", using: :brin
-    t.index ["item_model", "user_id", "created_at"], name: "index_activity_logs_on_item_model_and_user_id_and_created_at"
-    t.index ["item_model", "user_id"], name: "index_activity_logs_on_item_model_and_user_id"
-    t.index ["item_model"], name: "index_activity_logs_on_item_model"
-    t.index ["user_id", "item_model", "created_at"], name: "index_activity_logs_on_user_id_and_item_model_and_created_at"
-    t.index ["user_id"], name: "index_activity_logs_on_user_id"
   end
 
   create_table "agencies", id: :serial, force: :cascade do |t|
@@ -51,9 +42,6 @@
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
     t.datetime "deleted_at", precision: nil
-    t.index ["building_id"], name: "index_building_contacts_on_building_id"
-    t.index ["contact_id"], name: "index_building_contacts_on_contact_id"
-    t.index ["deleted_at"], name: "index_building_contacts_on_deleted_at"
   end
 
   create_table "building_services", id: :serial, force: :cascade do |t|
@@ -62,9 +50,6 @@
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
     t.datetime "deleted_at", precision: nil
-    t.index ["building_id"], name: "index_building_services_on_building_id"
-    t.index ["deleted_at"], name: "index_building_services_on_deleted_at"
-    t.index ["service_id"], name: "index_building_services_on_service_id"
   end
 
   create_table "buildings", id: :serial, force: :cascade do |t|
@@ -82,8 +67,6 @@
     t.string "state"
     t.string "zip_code"
     t.string "geo_code"
-    t.index ["id_in_data_source"], name: "index_buildings_on_id_in_data_source"
-    t.index ["subgrantee_id"], name: "index_buildings_on_subgrantee_id"
   end
 
   create_table "client_contacts", id: :serial, force: :cascade do |t|
@@ -99,9 +82,6 @@
     t.boolean "ssp", default: false, null: false
     t.boolean "hsp", default: false, null: false
     t.boolean "do", default: false, null: false
-    t.index ["client_id"], name: "index_client_contacts_on_client_id"
-    t.index ["contact_id"], name: "index_client_contacts_on_contact_id"
-    t.index ["deleted_at"], name: "index_client_contacts_on_deleted_at"
   end
 
   create_table "client_notes", id: :serial, force: :cascade do |t|
@@ -127,9 +107,6 @@
     t.boolean "ssp", default: false, null: false
     t.boolean "hsp", default: false, null: false
     t.boolean "do", default: false, null: false
-    t.index ["contact_id"], name: "index_client_opportunity_match_contacts_on_contact_id"
-    t.index ["deleted_at"], name: "index_client_opportunity_match_contacts_on_deleted_at"
-    t.index ["match_id"], name: "index_client_opportunity_match_contacts_on_match_id"
   end
 
   create_table "client_opportunity_matches", id: :serial, force: :cascade do |t|
@@ -152,13 +129,6 @@
     t.datetime "stall_contacts_notified", precision: nil
     t.datetime "dnd_notified", precision: nil
     t.integer "match_route_id"
-    t.index ["active"], name: "index_client_opportunity_matches_on_active"
-    t.index ["client_id"], name: "index_client_opportunity_matches_on_client_id"
-    t.index ["closed"], name: "index_client_opportunity_matches_on_closed"
-    t.index ["closed_reason"], name: "index_client_opportunity_matches_on_closed_reason"
-    t.index ["contact_id"], name: "index_client_opportunity_matches_on_contact_id"
-    t.index ["deleted_at"], name: "index_client_opportunity_matches_on_deleted_at", where: "(deleted_at IS NULL)"
-    t.index ["opportunity_id"], name: "index_client_opportunity_matches_on_opportunity_id"
   end
 
   create_table "clients", id: :serial, force: :cascade do |t|
@@ -200,7 +170,7 @@
     t.boolean "disabling_condition", default: false
     t.datetime "release_of_information", precision: nil
     t.date "prevent_matching_until"
-    t.boolean "dmh_eligible", default: false, null: false
+    t.boolean "dmh_eligible", default: false
     t.boolean "va_eligible", default: false, null: false
     t.boolean "hues_eligible", default: false, null: false
     t.datetime "disability_verified_on", precision: nil
@@ -332,18 +302,6 @@
     t.jsonb "ongoing_es_enrollments"
     t.jsonb "ongoing_so_enrollments"
     t.jsonb "last_seen_projects"
-    t.index ["active_cohort_ids"], name: "index_clients_on_active_cohort_ids"
-    t.index ["available"], name: "index_clients_on_available"
-    t.index ["calculated_last_homeless_night"], name: "index_clients_on_calculated_last_homeless_night"
-    t.index ["date_of_birth"], name: "index_clients_on_date_of_birth"
-    t.index ["days_homeless_in_last_three_years"], name: "index_clients_on_days_homeless_in_last_three_years"
-    t.index ["deleted_at"], name: "index_clients_on_deleted_at"
-    t.index ["disabling_condition"], name: "index_clients_on_disabling_condition"
-    t.index ["enrolled_project_ids"], name: "index_clients_on_enrolled_project_ids"
-    t.index ["family_member"], name: "index_clients_on_family_member"
-    t.index ["health_prioritized"], name: "index_clients_on_health_prioritized"
-    t.index ["vispdat_priority_score"], name: "index_clients_on_vispdat_priority_score"
-    t.index ["vispdat_score"], name: "index_clients_on_vispdat_score"
   end
 
   create_table "configs", id: :serial, force: :cascade do |t|
@@ -381,8 +339,6 @@
     t.string "role_in_organization"
     t.string "cell_phone"
     t.string "middle_name"
-    t.index ["deleted_at"], name: "index_contacts_on_deleted_at"
-    t.index ["user_id"], name: "index_contacts_on_user_id"
   end
 
   create_table "data_sources", id: :serial, force: :cascade do |t|
@@ -422,7 +378,6 @@
     t.string "queue"
     t.datetime "created_at", precision: nil
     t.datetime "updated_at", precision: nil
-    t.index ["priority", "run_at"], name: "delayed_jobs_priority"
   end
 
   create_table "disabling_conditions", id: :serial, force: :cascade do |t|
@@ -453,9 +408,6 @@
     t.boolean "editable"
     t.datetime "deleted_at", precision: nil
     t.bigint "agency_id"
-    t.index ["agency_id"], name: "index_entity_view_permissions_on_agency_id"
-    t.index ["entity_type", "entity_id"], name: "index_entity_view_permissions_on_entity_type_and_entity_id"
-    t.index ["user_id"], name: "index_entity_view_permissions_on_user_id"
   end
 
   create_table "ethnicities", id: :serial, force: :cascade do |t|
@@ -472,10 +424,6 @@
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
     t.datetime "deleted_at", precision: nil
-    t.index ["client_id"], name: "index_external_referrals_on_client_id"
-    t.index ["created_at"], name: "index_external_referrals_on_created_at"
-    t.index ["updated_at"], name: "index_external_referrals_on_updated_at"
-    t.index ["user_id"], name: "index_external_referrals_on_user_id"
   end
 
   create_table "file_tags", id: :serial, force: :cascade do |t|
@@ -490,9 +438,6 @@
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
     t.datetime "deleted_at", precision: nil
-    t.index ["deleted_at"], name: "index_funding_source_services_on_deleted_at"
-    t.index ["funding_source_id"], name: "index_funding_source_services_on_funding_source_id"
-    t.index ["service_id"], name: "index_funding_source_services_on_service_id"
   end
 
   create_table "funding_sources", id: :serial, force: :cascade do |t|
@@ -549,7 +494,6 @@
     t.datetime "deleted_at", precision: nil
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
-    t.index ["housingable_type", "housingable_id"], name: "index_housing_attributes_on_housingable_type_and_housingable_id"
   end
 
   create_table "housing_media_links", force: :cascade do |t|
@@ -560,7 +504,6 @@
     t.datetime "deleted_at", precision: nil
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
-    t.index ["housingable_type", "housingable_id"], name: "index_housing_media_links_on_housingable_type_and_id"
   end
 
   create_table "imported_clients_csvs", id: :serial, force: :cascade do |t|
@@ -617,10 +560,6 @@
     t.integer "match_prioritization_id"
     t.integer "active_client_prioritization_value"
     t.string "prioritization_method_used"
-    t.index ["date"], name: "index_match_census_on_date"
-    t.index ["match_id"], name: "index_match_census_on_match_id"
-    t.index ["match_prioritization_id"], name: "index_match_census_on_match_prioritization_id"
-    t.index ["opportunity_id"], name: "index_match_census_on_opportunity_id"
   end
 
   create_table "match_decision_reasons", id: :serial, force: :cascade do |t|
@@ -632,7 +571,6 @@
     t.boolean "ineligible_in_warehouse", default: false, null: false
     t.integer "referral_result"
     t.boolean "limited", default: false
-    t.index ["type"], name: "index_match_decision_reasons_on_type"
   end
 
   create_table "match_decisions", id: :serial, force: :cascade do |t|
@@ -661,10 +599,6 @@
     t.boolean "include_note_in_email"
     t.datetime "date_voucher_issued", precision: nil
     t.string "manager"
-    t.index ["administrative_cancel_reason_id"], name: "index_match_decisions_on_administrative_cancel_reason_id"
-    t.index ["decline_reason_id"], name: "index_match_decisions_on_decline_reason_id"
-    t.index ["match_id"], name: "index_match_decisions_on_match_id"
-    t.index ["not_working_with_client_reason_id"], name: "index_match_decisions_on_not_working_with_client_reason_id"
   end
 
   create_table "match_events", id: :serial, force: :cascade do |t|
@@ -682,10 +616,6 @@
     t.date "client_last_seen_date"
     t.boolean "admin_note", default: false, null: false
     t.integer "client_id"
-    t.index ["decision_id"], name: "index_match_events_on_decision_id"
-    t.index ["match_id"], name: "index_match_events_on_match_id"
-    t.index ["not_working_with_client_reason_id"], name: "index_match_events_on_not_working_with_client_reason_id"
-    t.index ["notification_id"], name: "index_match_events_on_notification_id"
   end
 
   create_table "match_mitigation_reasons", force: :cascade do |t|
@@ -694,8 +624,6 @@
     t.boolean "addressed", default: false
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
-    t.index ["client_opportunity_match_id"], name: "index_match_mitigation_reasons_on_client_opportunity_match_id"
-    t.index ["mitigation_reason_id"], name: "index_match_mitigation_reasons_on_mitigation_reason_id"
   end
 
   create_table "match_prioritizations", id: :serial, force: :cascade do |t|
@@ -722,11 +650,6 @@
     t.datetime "updated_at", precision: nil
     t.datetime "deleted_at", precision: nil
     t.date "client_last_seen"
-    t.index ["contact_id"], name: "index_match_progress_updates_on_contact_id"
-    t.index ["decision_id"], name: "index_match_progress_updates_on_decision_id"
-    t.index ["match_id"], name: "index_match_progress_updates_on_match_id"
-    t.index ["notification_id"], name: "index_match_progress_updates_on_notification_id"
-    t.index ["type"], name: "index_match_progress_updates_on_type"
   end
 
   create_table "match_routes", id: :serial, force: :cascade do |t|
@@ -737,7 +660,7 @@
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
     t.integer "stalled_interval", default: 7, null: false
-    t.integer "match_prioritization_id", default: 6, null: false
+    t.integer "match_prioritization_id", default: 5, null: false
     t.boolean "should_cancel_other_matches", default: true, null: false
     t.boolean "should_activate_match", default: true, null: false
     t.boolean "should_prevent_multiple_matches_per_client", default: true, null: false
@@ -753,7 +676,6 @@
     t.boolean "show_referral_source", default: false
     t.boolean "show_move_in_date", default: false
     t.boolean "show_address_field", default: false
-    t.index ["tag_id"], name: "index_match_routes_on_tag_id"
   end
 
   create_table "messages", id: :serial, force: :cascade do |t|
@@ -1001,8 +923,6 @@
     t.text "partner_warehouse_id"
     t.text "partner_name"
     t.boolean "share_information_permission"
-    t.index ["agency_id"], name: "index_non_hmis_assessments_on_agency_id"
-    t.index ["user_id"], name: "index_non_hmis_assessments_on_user_id"
   end
 
   create_table "non_hmis_clients", id: :serial, force: :cascade do |t|
@@ -1097,7 +1017,6 @@
     t.boolean "no_single_gender", default: false
     t.boolean "transgender", default: false
     t.boolean "questioning", default: false
-    t.index ["deleted_at"], name: "index_non_hmis_clients_on_deleted_at"
   end
 
   create_table "notifications", id: :serial, force: :cascade do |t|
@@ -1122,9 +1041,6 @@
     t.integer "voucher_id"
     t.float "matchability"
     t.boolean "success", default: false
-    t.index ["deleted_at"], name: "index_opportunities_on_deleted_at", where: "(deleted_at IS NULL)"
-    t.index ["unit_id"], name: "index_opportunities_on_unit_id"
-    t.index ["voucher_id"], name: "index_opportunities_on_voucher_id"
   end
 
   create_table "opportunity_contacts", id: :serial, force: :cascade do |t|
@@ -1134,16 +1050,12 @@
     t.datetime "updated_at", precision: nil, null: false
     t.datetime "deleted_at", precision: nil
     t.boolean "housing_subsidy_admin", default: false, null: false
-    t.index ["contact_id"], name: "index_opportunity_contacts_on_contact_id"
-    t.index ["deleted_at"], name: "index_opportunity_contacts_on_deleted_at"
-    t.index ["opportunity_id"], name: "index_opportunity_contacts_on_opportunity_id"
   end
 
   create_table "opportunity_properties", id: :serial, force: :cascade do |t|
     t.integer "opportunity_id", null: false
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
-    t.index ["opportunity_id"], name: "index_opportunity_properties_on_opportunity_id"
   end
 
   create_table "outreach_histories", force: :cascade do |t|
@@ -1152,8 +1064,6 @@
     t.string "outreach_name"
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
-    t.index ["non_hmis_client_id"], name: "index_outreach_histories_on_non_hmis_client_id"
-    t.index ["user_id"], name: "index_outreach_histories_on_user_id"
   end
 
   create_table "physical_disabilities", id: :serial, force: :cascade do |t|
@@ -1177,8 +1087,6 @@
     t.boolean "ssp", default: false, null: false
     t.boolean "hsp", default: false, null: false
     t.boolean "do", default: false, null: false
-    t.index ["contact_id"], name: "index_program_contacts_on_contact_id"
-    t.index ["program_id"], name: "index_program_contacts_on_program_id"
   end
 
   create_table "program_services", id: :serial, force: :cascade do |t|
@@ -1187,9 +1095,6 @@
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
     t.datetime "deleted_at", precision: nil
-    t.index ["deleted_at"], name: "index_program_services_on_deleted_at"
-    t.index ["program_id"], name: "index_program_services_on_program_id"
-    t.index ["service_id"], name: "index_program_services_on_service_id"
   end
 
   create_table "programs", id: :serial, force: :cascade do |t|
@@ -1204,10 +1109,6 @@
     t.boolean "confidential", default: false, null: false
     t.integer "match_route_id", default: 1
     t.text "description"
-    t.index ["contact_id"], name: "index_programs_on_contact_id"
-    t.index ["deleted_at"], name: "index_programs_on_deleted_at"
-    t.index ["funding_source_id"], name: "index_programs_on_funding_source_id"
-    t.index ["subgrantee_id"], name: "index_programs_on_subgrantee_id"
   end
 
   create_table "project_clients", id: :serial, force: :cascade do |t|
@@ -1255,7 +1156,7 @@
     t.string "workphone"
     t.string "pager"
     t.string "email"
-    t.boolean "dmh_eligible", default: false, null: false
+    t.boolean "dmh_eligible", default: false
     t.boolean "va_eligible", default: false, null: false
     t.boolean "hues_eligible", default: false, null: false
     t.datetime "disability_verified_on", precision: nil
@@ -1381,10 +1282,6 @@
     t.jsonb "ongoing_es_enrollments"
     t.jsonb "ongoing_so_enrollments"
     t.jsonb "last_seen_projects"
-    t.index ["calculated_chronic_homelessness"], name: "index_project_clients_on_calculated_chronic_homelessness"
-    t.index ["client_id"], name: "index_project_clients_on_client_id"
-    t.index ["date_of_birth"], name: "index_project_clients_on_date_of_birth"
-    t.index ["source_last_changed"], name: "index_project_clients_on_source_last_changed"
   end
 
   create_table "project_programs", id: :serial, force: :cascade do |t|
@@ -1404,9 +1301,6 @@
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
     t.datetime "request_sent_at", precision: nil
-    t.index ["deleted_at"], name: "index_reissue_requests_on_deleted_at"
-    t.index ["notification_id"], name: "index_reissue_requests_on_notification_id"
-    t.index ["reissued_by"], name: "index_reissue_requests_on_reissued_by"
   end
 
   create_table "rejected_matches", id: :serial, force: :cascade do |t|
@@ -1414,8 +1308,6 @@
     t.integer "opportunity_id", null: false
     t.datetime "created_at", precision: nil
     t.datetime "updated_at", precision: nil
-    t.index ["client_id"], name: "index_rejected_matches_on_client_id"
-    t.index ["opportunity_id"], name: "index_rejected_matches_on_opportunity_id"
   end
 
   create_table "report_definitions", force: :cascade do |t|
@@ -1471,7 +1363,6 @@
     t.boolean "confidential", default: false
     t.string "current_status"
     t.string "step_tag"
-    t.index ["client_id", "match_id", "decision_id"], name: "index_reporting_decisions_c_m_d", unique: true
   end
 
   create_table "requirements", id: :serial, force: :cascade do |t|
@@ -1483,9 +1374,6 @@
     t.datetime "created_at", precision: nil
     t.datetime "updated_at", precision: nil
     t.string "variable"
-    t.index ["deleted_at"], name: "index_requirements_on_deleted_at"
-    t.index ["requirer_type", "requirer_id"], name: "index_requirements_on_requirer_type_and_requirer_id"
-    t.index ["rule_id"], name: "index_requirements_on_rule_id"
   end
 
   create_table "roles", id: :serial, force: :cascade do |t|
@@ -1566,7 +1454,6 @@
     t.boolean "can_view_all_covid_pathways", default: false
     t.boolean "can_manage_sessions", default: false
     t.boolean "can_edit_voucher_rules", default: false
-    t.index ["name"], name: "index_roles_on_name"
   end
 
   create_table "rules", id: :serial, force: :cascade do |t|
@@ -1577,7 +1464,6 @@
     t.string "type"
     t.string "verb"
     t.string "alternate_name"
-    t.index ["deleted_at"], name: "index_rules_on_deleted_at"
   end
 
   create_table "service_rules", id: :serial, force: :cascade do |t|
@@ -1586,9 +1472,6 @@
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
     t.datetime "deleted_at", precision: nil
-    t.index ["deleted_at"], name: "index_service_rules_on_deleted_at"
-    t.index ["rule_id"], name: "index_service_rules_on_rule_id"
-    t.index ["service_id"], name: "index_service_rules_on_service_id"
   end
 
   create_table "services", id: :serial, force: :cascade do |t|
@@ -1613,8 +1496,6 @@
     t.string "shelter_name"
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
-    t.index ["non_hmis_client_id"], name: "index_shelter_histories_on_non_hmis_client_id"
-    t.index ["user_id"], name: "index_shelter_histories_on_user_id"
   end
 
   create_table "social_security_number_quality_codes", id: :serial, force: :cascade do |t|
@@ -1647,8 +1528,6 @@
     t.boolean "ssp", default: false, null: false
     t.boolean "hsp", default: false, null: false
     t.boolean "do", default: false, null: false
-    t.index ["contact_id"], name: "index_sub_program_contacts_on_contact_id"
-    t.index ["sub_program_id"], name: "index_sub_program_contacts_on_sub_program_id"
   end
 
   create_table "sub_programs", id: :serial, force: :cascade do |t|
@@ -1671,10 +1550,6 @@
     t.boolean "closed", default: false
     t.integer "event"
     t.boolean "weighting_rules_active", default: true
-    t.index ["building_id"], name: "index_sub_programs_on_building_id"
-    t.index ["deleted_at"], name: "index_sub_programs_on_deleted_at"
-    t.index ["program_id"], name: "index_sub_programs_on_program_id"
-    t.index ["subgrantee_id"], name: "index_sub_programs_on_subgrantee_id"
   end
 
   create_table "subgrantee_contacts", id: :serial, force: :cascade do |t|
@@ -1683,9 +1558,6 @@
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
     t.datetime "deleted_at", precision: nil
-    t.index ["contact_id"], name: "index_subgrantee_contacts_on_contact_id"
-    t.index ["deleted_at"], name: "index_subgrantee_contacts_on_deleted_at"
-    t.index ["subgrantee_id"], name: "index_subgrantee_contacts_on_subgrantee_id"
   end
 
   create_table "subgrantee_services", id: :serial, force: :cascade do |t|
@@ -1694,9 +1566,6 @@
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
     t.datetime "deleted_at", precision: nil
-    t.index ["deleted_at"], name: "index_subgrantee_services_on_deleted_at"
-    t.index ["service_id"], name: "index_subgrantee_services_on_service_id"
-    t.index ["subgrantee_id"], name: "index_subgrantee_services_on_subgrantee_id"
   end
 
   create_table "subgrantees", id: :serial, force: :cascade do |t|
@@ -1753,9 +1622,7 @@
     t.bigint "user_id"
     t.bigint "match_id"
     t.string "reason"
-    t.index ["client_id"], name: "index_unavailable_as_candidate_fors_on_client_id"
     t.index ["match_id"], name: "index_unavailable_as_candidate_fors_on_match_id"
-    t.index ["match_route_type"], name: "index_unavailable_as_candidate_fors_on_match_route_type"
     t.index ["user_id"], name: "index_unavailable_as_candidate_fors_on_user_id"
   end
 
@@ -1779,9 +1646,6 @@
     t.string "data_source_id_column_name"
     t.boolean "elevator_accessible", default: false, null: false
     t.boolean "active", default: true, null: false
-    t.index ["building_id"], name: "index_units_on_building_id"
-    t.index ["deleted_at"], name: "index_units_on_deleted_at", where: "(deleted_at IS NULL)"
-    t.index ["id_in_data_source"], name: "index_units_on_id_in_data_source"
   end
 
   create_table "user_roles", id: :serial, force: :cascade do |t|
@@ -1790,8 +1654,6 @@
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
     t.datetime "deleted_at", precision: nil
-    t.index ["role_id"], name: "index_user_roles_on_role_id"
-    t.index ["user_id"], name: "index_user_roles_on_user_id"
   end
 
   create_table "users", id: :serial, force: :cascade do |t|
@@ -1833,13 +1695,6 @@
     t.boolean "exclude_phone_from_directory", default: false
     t.string "unique_session_id"
     t.boolean "receive_weekly_match_summary_email", default: true
-    t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
-    t.index ["email"], name: "index_users_on_email", unique: true
-    t.index ["invitation_token"], name: "index_users_on_invitation_token", unique: true
-    t.index ["invitations_count"], name: "index_users_on_invitations_count"
-    t.index ["invited_by_id"], name: "index_users_on_invited_by_id"
-    t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
-    t.index ["unlock_token"], name: "index_users_on_unlock_token", unique: true
   end
 
   create_table "versions", id: :serial, force: :cascade do |t|
@@ -1876,9 +1731,6 @@
     t.integer "user_id"
     t.datetime "made_available_at", precision: nil
     t.datetime "archived_at", precision: nil
-    t.index ["deleted_at"], name: "index_vouchers_on_deleted_at"
-    t.index ["sub_program_id"], name: "index_vouchers_on_sub_program_id"
-    t.index ["unit_id"], name: "index_vouchers_on_unit_id"
   end
 
   create_table "weighting_rules", force: :cascade do |t|
@@ -1888,8 +1740,6 @@
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
     t.datetime "deleted_at", precision: nil
-    t.index ["requirement_id"], name: "index_weighting_rules_on_requirement_id"
-    t.index ["route_id"], name: "index_weighting_rules_on_route_id"
   end
 
   add_foreign_key "non_hmis_assessments", "users", name: "non_hmis_assessments_user_id_fkey"