diff --git a/app/controllers/concepts/alphabetical_controller.rb b/app/controllers/concepts/alphabetical_controller.rb
index 27b097dbc..20db925cf 100644
--- a/app/controllers/concepts/alphabetical_controller.rb
+++ b/app/controllers/concepts/alphabetical_controller.rb
@@ -14,8 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'concerns/dataset_initialization'
-
 class Concepts::AlphabeticalController < ConceptsController
   include DatasetInitialization
 
diff --git a/app/controllers/concepts_controller.rb b/app/controllers/concepts_controller.rb
index aed77c994..234dd2f20 100644
--- a/app/controllers/concepts_controller.rb
+++ b/app/controllers/concepts_controller.rb
@@ -14,9 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'concerns/dataset_initialization'
-require 'reverse_match_job'
-
 class ConceptsController < ApplicationController
   include DatasetInitialization
 
diff --git a/app/controllers/remote_labels_controller.rb b/app/controllers/remote_labels_controller.rb
index 5f6fdd3dd..b4a5103f1 100644
--- a/app/controllers/remote_labels_controller.rb
+++ b/app/controllers/remote_labels_controller.rb
@@ -1,5 +1,3 @@
-require 'concerns/dataset_initialization'
-
 class RemoteLabelsController < ApplicationController
   include DatasetInitialization
 
diff --git a/app/controllers/search_results_controller.rb b/app/controllers/search_results_controller.rb
index 4e4ba94f9..a79c55202 100644
--- a/app/controllers/search_results_controller.rb
+++ b/app/controllers/search_results_controller.rb
@@ -14,8 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'concerns/dataset_initialization'
-
 class SearchResultsController < ApplicationController
   include DatasetInitialization
 
diff --git a/config/application.rb b/config/application.rb
index 36c3652c6..87d42922e 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -35,8 +35,5 @@ class Application < Rails::Application
     #
     # config.time_zone = "Central Time (US & Canada)"
     # config.eager_load_paths << Rails.root.join("extras")
-
-    # FIXME: fix loading issues and remove line below
-    config.add_autoload_paths_to_load_path = true
   end
 end
diff --git a/app/helpers/iqvoc_module_helper.rb b/lib/iqvoc_module_helper.rb
similarity index 100%
rename from app/helpers/iqvoc_module_helper.rb
rename to lib/iqvoc_module_helper.rb
diff --git a/app/models/concerns/search_extension.rb b/lib/search_extension.rb
similarity index 100%
rename from app/models/concerns/search_extension.rb
rename to lib/search_extension.rb