diff --git a/app/legacy_lib/delayed_job_helper.rb b/app/legacy_lib/delayed_job_helper.rb
index c54a86292..c810d90d0 100644
--- a/app/legacy_lib/delayed_job_helper.rb
+++ b/app/legacy_lib/delayed_job_helper.rb
@@ -1,6 +1,4 @@
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
-require "qx"
-require "delayed_job"
 
 module DelayedJobHelper
   # Create a serialized delayed job handler for use in inserting new delayed jobs with raw sql
diff --git a/app/legacy_lib/format/csv.rb b/app/legacy_lib/format/csv.rb
index 4c2b2f9a3..7b3b6c4c3 100644
--- a/app/legacy_lib/format/csv.rb
+++ b/app/legacy_lib/format/csv.rb
@@ -1,6 +1,5 @@
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 require "csv"
-require "format/currency"
 
 module Format
   module Csv
diff --git a/app/legacy_lib/hash.rb b/app/legacy_lib/hash.rb
deleted file mode 100644
index 80b806864..000000000
--- a/app/legacy_lib/hash.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
-class Hash
-  # Prefills a new Hash from the values in other_hash. If a value in other_hash is nil, then it isn't copied over.
-  def self.with_defaults_unless_nil(other_hash)
-    try_convert(other_hash.compact)
-  end
-end
diff --git a/app/legacy_lib/health_report.rb b/app/legacy_lib/health_report.rb
index 41ad53861..a9f3f28cb 100644
--- a/app/legacy_lib/health_report.rb
+++ b/app/legacy_lib/health_report.rb
@@ -1,7 +1,4 @@
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
-require "qx"
-require "format/csv"
-require "format/currency"
 
 module HealthReport
   # Send an email report about what has happend on the servers and database in the last 24hrs, and how things are running
diff --git a/app/legacy_lib/insert_activities.rb b/app/legacy_lib/insert_activities.rb
index 6b6cce178..3cd17ecfa 100644
--- a/app/legacy_lib/insert_activities.rb
+++ b/app/legacy_lib/insert_activities.rb
@@ -1,8 +1,4 @@
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
-require "qx"
-require "active_support/core_ext"
-require "format/currency"
-require "format/date"
 
 module InsertActivities
   def self.insert_cols
diff --git a/app/legacy_lib/insert_charge.rb b/app/legacy_lib/insert_charge.rb
index 155f86391..e96b299d2 100644
--- a/app/legacy_lib/insert_charge.rb
+++ b/app/legacy_lib/insert_charge.rb
@@ -1,12 +1,4 @@
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
-# require 'psql'
-# require 'qexpr'
-# require 'calculate/calculate_fees'
-# require 'stripe'
-# require 'get_data'
-# require 'active_support/core_ext'
-
-require "stripe_account" unless !Settings.payment_provider.stripe_connect
 
 module InsertCharge
   # In data, pass in: amount, nonprofit_id, supporter_id, card_id, statement
diff --git a/app/legacy_lib/insert_email_lists.rb b/app/legacy_lib/insert_email_lists.rb
index 9714b386e..ac386b54d 100644
--- a/app/legacy_lib/insert_email_lists.rb
+++ b/app/legacy_lib/insert_email_lists.rb
@@ -1,5 +1,4 @@
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
-require "qx"
 
 module InsertEmailLists
   def self.for_mailchimp(npo_id, tag_master_ids)
diff --git a/app/legacy_lib/insert_import.rb b/app/legacy_lib/insert_import.rb
index dac4c95bc..5428038c3 100644
--- a/app/legacy_lib/insert_import.rb
+++ b/app/legacy_lib/insert_import.rb
@@ -1,12 +1,4 @@
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
-# require 'qx'
-# require 'required_keys'
-# require 'open-uri'
-# require 'csv'
-# require 'insert/insert_supporter'
-# require 'insert/insert_full_contact_infos'
-# require 'insert/insert_custom_field_joins'
-# require 'insert/insert_tag_joins'
 
 module InsertImport
   # Wrap the import in a transaction and email any errors
diff --git a/app/legacy_lib/insert_nonprofit_keys.rb b/app/legacy_lib/insert_nonprofit_keys.rb
index 25b2a847c..a4cae22a4 100644
--- a/app/legacy_lib/insert_nonprofit_keys.rb
+++ b/app/legacy_lib/insert_nonprofit_keys.rb
@@ -1,6 +1,4 @@
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
-require "httparty"
-require "cypher"
 
 module InsertNonprofitKeys
   include HTTParty
diff --git a/app/legacy_lib/insert_payout.rb b/app/legacy_lib/insert_payout.rb
index 38520c07c..f44ba1c25 100644
--- a/app/legacy_lib/insert_payout.rb
+++ b/app/legacy_lib/insert_payout.rb
@@ -1,14 +1,6 @@
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 # Create a new payout
 
-# require 'psql'
-# require 'qexpr'
-# require 'query/query_payments'
-# require 'update/update_charges'
-# require 'update/update_refunds'
-# require 'update/update_disputes'
-# require 'param_validation'
-
 module InsertPayout
   # Pass in the following inside the data hash:
   # - stripe_account_id
diff --git a/app/legacy_lib/insert_tag_joins.rb b/app/legacy_lib/insert_tag_joins.rb
index a7c1f3640..b46607187 100644
--- a/app/legacy_lib/insert_tag_joins.rb
+++ b/app/legacy_lib/insert_tag_joins.rb
@@ -1,6 +1,4 @@
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
-require "psql"
-require "qx"
 
 module InsertTagJoins
   # @param [Integer] np_id id for a [Nonprofit]
diff --git a/app/legacy_lib/periodic_report_adapter.rb b/app/legacy_lib/periodic_report_adapter.rb
index 8687cc93b..8848a1aac 100644
--- a/app/legacy_lib/periodic_report_adapter.rb
+++ b/app/legacy_lib/periodic_report_adapter.rb
@@ -1,12 +1,5 @@
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class PeriodicReportAdapter
-  extend ActiveSupport::Autoload
-
-  autoload :CancelledRecurringDonationsReport
-  autoload :FailedRecurringDonationsReport
-  autoload :ActiveRecurringDonationsToCsvReport
-  autoload :StartedRecurringDonationsToCsvReport
-
   REPORT = "Report"
   private_constant :REPORT
 
diff --git a/app/legacy_lib/query_campaign_gifts.rb b/app/legacy_lib/query_campaign_gifts.rb
index 5dccf9538..5ffe0062b 100644
--- a/app/legacy_lib/query_campaign_gifts.rb
+++ b/app/legacy_lib/query_campaign_gifts.rb
@@ -1,8 +1,6 @@
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 # Query code for both campaign_gift_options and campaign_gifts
 
-require "psql"
-
 module QueryCampaignGifts
   # Create a mapping of: {
   # 'total_donations' => Integer, # total donations for gift options
diff --git a/app/legacy_lib/query_campaigns.rb b/app/legacy_lib/query_campaigns.rb
index 9dc157adf..ad90d825b 100644
--- a/app/legacy_lib/query_campaigns.rb
+++ b/app/legacy_lib/query_campaigns.rb
@@ -1,5 +1,4 @@
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
-require "qexpr"
 
 module QueryCampaigns
   def self.timeline(campaign_id)
diff --git a/app/legacy_lib/query_supporters.rb b/app/legacy_lib/query_supporters.rb
index 1553f7d1c..edc7af05b 100644
--- a/app/legacy_lib/query_supporters.rb
+++ b/app/legacy_lib/query_supporters.rb
@@ -1,9 +1,4 @@
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
-require "qexpr"
-require "psql"
-require "email"
-require "format/currency"
-require "format/csv"
 
 module QuerySupporters
   # Query supporters and their donations and gift levels for a campaign
diff --git a/config/application.rb b/config/application.rb
index 292d6770f..035c00299 100755
--- a/config/application.rb
+++ b/config/application.rb
@@ -13,6 +13,8 @@ class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
     config.load_defaults 7.0
 
+    config.add_autoload_paths_to_load_path = false # only until line above is set to 7.1
+
     # Please, add to the `ignore` list any other `lib` subdirectories that do
     # not contain `.rb` files, or that should not be reloaded or eager loaded.
     # Common ones are `templates`, `generators`, or `middleware`, for example.
diff --git a/config/initializers/mailchimp.rb b/config/initializers/mailchimp.rb
index 521023be9..bd530010f 100644
--- a/config/initializers/mailchimp.rb
+++ b/config/initializers/mailchimp.rb
@@ -1,7 +1,7 @@
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
-require "mailchimp"
-
-Mailchimp.config({
-  api_key: ENV["MAILCHIMP_API_KEY"],
-  username: ENV["MAILCHIMP_USERNAME"]
-})
+Rails.application.config.after_initialize do
+  Mailchimp.config({
+    api_key: ENV["MAILCHIMP_API_KEY"],
+    username: ENV["MAILCHIMP_USERNAME"]
+  })
+end
diff --git a/config/initializers/new_framework_defaults_7_1.rb b/config/initializers/new_framework_defaults_7_1.rb
index 3865fff53..0425c954f 100644
--- a/config/initializers/new_framework_defaults_7_1.rb
+++ b/config/initializers/new_framework_defaults_7_1.rb
@@ -56,7 +56,7 @@
 # 3. If you don't currently have data encrypted with Active Record encryption, you can disable this setting to
 # configure the default behavior starting 7.1+:
 #++
-Rails.application.config.active_record.encryption.support_sha1_for_non_deterministic_encryption = false
+# Rails.application.config.active_record.encryption.support_sha1_for_non_deterministic_encryption = false
 
 ###
 # No longer run after_commit callbacks on the first of multiple Active Record
@@ -101,7 +101,7 @@
 # Options are `true`, and `false`. If `false`, the exception will be reported
 # as `handled` and logged instead.
 #++
-# Rails.application.config.active_support.raise_on_invalid_cache_expiration_time = true
+Rails.application.config.active_support.raise_on_invalid_cache_expiration_time = true
 
 ###
 # Specify whether Query Logs will format tags using the SQLCommenter format
diff --git a/config/initializers/to_deprecated_h.rb b/config/initializers/to_deprecated_h.rb
index 578e390cc..71a6e4bf0 100644
--- a/config/initializers/to_deprecated_h.rb
+++ b/config/initializers/to_deprecated_h.rb
@@ -1,3 +1,5 @@
-ActiveSupport.on_load(:action_controller_base) do
-  require "to_deprecated_h"
+# License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
+Rails.application.config.after_initialize do
+  # this is hacky way to autoload app/legacy_lib/to_deprecated_h.rb on startup
+  ToDeprecatedH
 end
diff --git a/spec/lib/hash_spec.rb b/spec/lib/hash_spec.rb
deleted file mode 100644
index fa8d7b406..000000000
--- a/spec/lib/hash_spec.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
-require_relative "../../app/legacy_lib/hash"
-
-describe Hash do
-  describe "::with_defaults_unless_nil" do
-    subject {
-      Hash.with_defaults_unless_nil({new_key: "good", key_with_nil_default: nil})
-    }
-    it { is_expected.to eq({new_key: "good"}) }
-  end
-end