diff --git a/backend/analytics_server/mhq/api/deployment_analytics.py b/backend/analytics_server/mhq/api/deployment_analytics.py
index 1d0ee6bad..7d427d2ae 100644
--- a/backend/analytics_server/mhq/api/deployment_analytics.py
+++ b/backend/analytics_server/mhq/api/deployment_analytics.py
@@ -11,7 +11,7 @@
     DeploymentsFactoryService,
 )
 from mhq.service.deployments.factory import get_deployments_factory
-from mhq.service.pr_analytics import get_pr_analytics_service
+from mhq.service.code.pr_analytics import get_pr_analytics_service
 from mhq.service.code.pr_filter import apply_pr_filter
 
 from mhq.api.request_utils import coerce_workflow_filter, queryschema
diff --git a/backend/analytics_server/mhq/api/pull_requests.py b/backend/analytics_server/mhq/api/pull_requests.py
index f72cd7dc2..a8b2e277d 100644
--- a/backend/analytics_server/mhq/api/pull_requests.py
+++ b/backend/analytics_server/mhq/api/pull_requests.py
@@ -20,7 +20,7 @@
     get_non_paginated_pr_response,
 )
 from mhq.store.models.code.pull_requests import PullRequest
-from mhq.service.pr_analytics import get_pr_analytics_service
+from mhq.service.code.pr_analytics import get_pr_analytics_service
 from mhq.service.settings.models import ExcludedPRsSetting
 
 from mhq.utils.time import Interval
diff --git a/backend/analytics_server/mhq/service/pr_analytics.py b/backend/analytics_server/mhq/service/code/pr_analytics.py
similarity index 100%
rename from backend/analytics_server/mhq/service/pr_analytics.py
rename to backend/analytics_server/mhq/service/code/pr_analytics.py
diff --git a/backend/analytics_server/mhq/service/settings/configuration_settings.py b/backend/analytics_server/mhq/service/settings/configuration_settings.py
index d5ec985cb..0fa72e099 100644
--- a/backend/analytics_server/mhq/service/settings/configuration_settings.py
+++ b/backend/analytics_server/mhq/service/settings/configuration_settings.py
@@ -105,40 +105,6 @@ def get_settings(
 
         return self._adapt_config_setting_from_db_setting(setting)
 
-    def get_or_set_settings_for_multiple_entity_ids(
-        self,
-        setting_type: SettingType,
-        entity_type: EntityType,
-        entity_ids: List[str],
-        setter: Users = None,
-    ) -> List[ConfigurationSettings]:
-
-        settings = self._settings_repo.get_settings_for_multiple_entity_ids(
-            entity_ids, entity_type, setting_type
-        )
-
-        current_entity_ids = set([str(setting.entity_id) for setting in settings])
-        missing_entity_ids = set(entity_ids).difference(current_entity_ids)
-        if missing_entity_ids:
-            data = get_default_setting_data(setting_type)
-            settings_to_create = [
-                Settings(
-                    entity_id=entity_id,
-                    entity_type=entity_type,
-                    setting_type=setting_type,
-                    updated_by=setter.id if setter else None,
-                    data=data,
-                    created_at=time_now(),
-                    updated_at=time_now(),
-                    is_deleted=False,
-                )
-                for entity_id in missing_entity_ids
-            ]
-            new_settings = self._settings_repo.create_settings(settings_to_create)
-            settings.extend(new_settings)
-
-        return list(map(self._adapt_config_setting_from_db_setting, settings))
-
     def _adapt_specific_incident_setting_from_json(
         self, data: Dict[str, any]
     ) -> IncidentSettings: