diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index df2e2ce..08eaad9 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -1,9 +1,5 @@
 import {NgModule} from '@angular/core';
 import {PreloadAllModules, RouterModule, Routes} from '@angular/router';
-
-import {EnvironmentSpecificResolver} from './openaireLibrary/utils/properties/environmentSpecificResolver';
-import {EnvironmentSpecificService} from './openaireLibrary/utils/properties/environment-specific.service';
-
 import {OpenaireErrorPageComponent} from './error/errorPage.component';
 import {AdminLoginGuard} from "./openaireLibrary/login/adminLoginGuard.guard";
 import {AdminDashboardGuard} from "./utils/adminDashboard.guard";
@@ -69,8 +65,7 @@ const routes: Routes = [
     onSameUrlNavigation: "reload",
     relativeLinkResolution: 'corrected'
   })],
-  exports: [RouterModule],
-  providers: [EnvironmentSpecificResolver, EnvironmentSpecificService]
+  exports: [RouterModule]
 })
 export class AppRoutingModule {
 }
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 5d01bdd..8b6cc14 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -1,7 +1,6 @@
 import {ChangeDetectorRef, Component, HostListener, OnDestroy, OnInit} from '@angular/core';
 import {ActivatedRoute, NavigationEnd, Params, Router} from '@angular/router';
 import {EnvProperties} from './openaireLibrary/utils/properties/env-properties';
-import {EnvironmentSpecificService} from './openaireLibrary/utils/properties/environment-specific.service';
 import {Role, Session, User} from './openaireLibrary/login/utils/helper.class';
 import {UserManagementService} from "./openaireLibrary/services/user-management.service";
 import {StakeholderService} from "./openaireLibrary/monitor/services/stakeholder.service";
@@ -59,7 +58,6 @@ export class AppComponent implements OnInit, OnDestroy {
   private subscriptions: any[] = [];
   
   constructor(private route: ActivatedRoute,
-              private propertiesService: EnvironmentSpecificService,
               private router: Router,
               private userManagementService: UserManagementService,
               private layoutService: LayoutService,
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 476b8f9..16b0562 100755
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -12,8 +12,6 @@ import {CookieLawModule} from './openaireLibrary/sharedComponents/cookie-law/coo
 import {BottomModule} from './openaireLibrary/sharedComponents/bottom.module';
 import {ErrorModule} from './openaireLibrary/error/error.module';
 import {NavigationBarModule} from './openaireLibrary/sharedComponents/navigationBar.module';
-
-import {EnvironmentSpecificResolver} from './openaireLibrary/utils/properties/environmentSpecificResolver';
 import {SideBarModule} from "./openaireLibrary/dashboard/sharedComponents/sidebar/sideBar.module";
 import {SharedModule} from "./openaireLibrary/shared/shared.module";
 import {Schema2jsonldModule} from "./openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module";
@@ -47,7 +45,7 @@ import {LoginGuard} from "./openaireLibrary/login/loginGuard.guard";
   declarations: [AppComponent, OpenaireErrorPageComponent],
   exports: [AppComponent],
   providers: [
-    EnvironmentSpecificResolver, AdminLoginGuard, AdminDashboardGuard, LoginGuard,
+    AdminLoginGuard, AdminDashboardGuard, LoginGuard,
     {
       provide: HTTP_INTERCEPTORS,
       useClass: HttpInterceptorService,
diff --git a/src/app/manageStakeholders/manageStakeholders.component.ts b/src/app/manageStakeholders/manageStakeholders.component.ts
index 0e52be2..ca77f81 100644
--- a/src/app/manageStakeholders/manageStakeholders.component.ts
+++ b/src/app/manageStakeholders/manageStakeholders.component.ts
@@ -1,7 +1,6 @@
 import {Component, OnDestroy, OnInit, ViewChild} from "@angular/core";
 import {StakeholderService} from "../openaireLibrary/monitor/services/stakeholder.service";
 import {EnvProperties} from "../openaireLibrary/utils/properties/env-properties";
-import {EnvironmentSpecificService} from "../openaireLibrary/utils/properties/environment-specific.service";
 import {Stakeholder, Visibility} from "../openaireLibrary/monitor/entities/stakeholder";
 import {Subscriber, zip} from "rxjs";
 import {StakeholderUtils} from "../utils/indicator-utils";
@@ -63,7 +62,6 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy {
   
   constructor(private stakeholderService: StakeholderService,
               private userManagementService: UserManagementService,
-              private propertiesService: EnvironmentSpecificService,
               private route: ActivatedRoute,
               private title: Title,
               private fb: FormBuilder) {
diff --git a/src/app/monitor/monitor-routing.module.ts b/src/app/monitor/monitor-routing.module.ts
index 73f2635..c6420a8 100644
--- a/src/app/monitor/monitor-routing.module.ts
+++ b/src/app/monitor/monitor-routing.module.ts
@@ -2,7 +2,6 @@ import {NgModule} from '@angular/core';
 import {RouterModule} from '@angular/router';
 import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
 import {MonitorComponent} from "./monitor.component";
-import {EnvironmentSpecificResolver} from "../openaireLibrary/utils/properties/environmentSpecificResolver";
 
 @NgModule({
   imports: [
diff --git a/src/app/search/search.module.ts b/src/app/search/search.module.ts
index 0de820a..e1ab3b0 100644
--- a/src/app/search/search.module.ts
+++ b/src/app/search/search.module.ts
@@ -1,33 +1,28 @@
 import {NgModule} from "@angular/core";
 import {CommonModule} from "@angular/common";
 import {RouterModule} from "@angular/router";
-import {EnvironmentSpecificResolver} from "../openaireLibrary/utils/properties/environmentSpecificResolver";
-
 @NgModule({
   imports: [CommonModule, RouterModule.forChild([
     // Search Pages
     { path: '', redirectTo: 'find/research-outcomes'},
-    { path: 'find/research-outcomes', loadChildren:  './searchPages/simple/searchResearchResults.module#MonitorSearchResearchResultsModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
-    { path: 'find/projects', loadChildren: './searchPages/simple/searchProjects.module#MonitorSearchProjectsModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
-    { path: 'find/dataproviders', loadChildren: './searchPages/simple/searchDataProviders.module#MonitorSearchDataProvidersModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
-    { path: 'find/organizations', loadChildren: './searchPages/simple/searchOrganizations.module#MonitorSearchOrganizationsModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
-  
+    { path: 'find/research-outcomes', loadChildren:  './searchPages/simple/searchResearchResults.module#MonitorSearchResearchResultsModule'},
+    { path: 'find/projects', loadChildren: './searchPages/simple/searchProjects.module#MonitorSearchProjectsModule'},
+    { path: 'find/dataproviders', loadChildren: './searchPages/simple/searchDataProviders.module#MonitorSearchDataProvidersModule'},
+    { path: 'find/organizations', loadChildren: './searchPages/simple/searchOrganizations.module#MonitorSearchOrganizationsModule'},
     // Advanced Search Pages
-    { path: 'advanced/research-outcomes', loadChildren:  './searchPages/advanced/searchResearchResults.module#MonitorAdvancedSearchResearchResultsModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
-    { path: 'advanced/projects', loadChildren: './searchPages/advanced/searchProjects.module#MonitorAdvancedSearchProjectsModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
-    { path: 'advanced/dataproviders', loadChildren: './searchPages/advanced/searchDataProviders.module#MonitorAdvancedSearchDataProvidersModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
-    { path: 'advanced/organizations', loadChildren: './searchPages/advanced/searchOrganizations.module#MonitorAdvancedSearchOrganizationsModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
-    
+    { path: 'advanced/research-outcomes', loadChildren:  './searchPages/advanced/searchResearchResults.module#MonitorAdvancedSearchResearchResultsModule'},
+    { path: 'advanced/projects', loadChildren: './searchPages/advanced/searchProjects.module#MonitorAdvancedSearchProjectsModule'},
+    { path: 'advanced/dataproviders', loadChildren: './searchPages/advanced/searchDataProviders.module#MonitorAdvancedSearchDataProvidersModule'},
+    { path: 'advanced/organizations', loadChildren: './searchPages/advanced/searchOrganizations.module#MonitorAdvancedSearchOrganizationsModule'},
     // Landing Pages
-    { path: 'result', loadChildren: './landingPages/result/libResult.module#LibResultModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
-    { path: 'publication', loadChildren: './landingPages/publication/libPublication.module#LibPublicationModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
-    { path: 'dataset', loadChildren: './landingPages/dataset/libDataset.module#LibDatasetModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
-    { path: 'software', loadChildren: './landingPages/software/libSoftware.module#LibSoftwareModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
-    { path: 'other', loadChildren: './landingPages/orp/libOrp.module#LibOrpModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
-    { path: 'project', loadChildren: './landingPages/project/libProject.module#LibProjectModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
-    { path: 'dataprovider', loadChildren: './landingPages/dataProvider/libDataProvider.module#LibDataProviderModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
-    { path: 'organization', loadChildren: './landingPages/organization/libOrganization.module#LibOrganizationModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
-  ])],
-  providers:[EnvironmentSpecificResolver]
+    { path: 'result', loadChildren: './landingPages/result/libResult.module#LibResultModule'},
+    { path: 'publication', loadChildren: './landingPages/publication/libPublication.module#LibPublicationModule'},
+    { path: 'dataset', loadChildren: './landingPages/dataset/libDataset.module#LibDatasetModule'},
+    { path: 'software', loadChildren: './landingPages/software/libSoftware.module#LibSoftwareModule'},
+    { path: 'other', loadChildren: './landingPages/orp/libOrp.module#LibOrpModule'},
+    { path: 'project', loadChildren: './landingPages/project/libProject.module#LibProjectModule'},
+    { path: 'dataprovider', loadChildren: './landingPages/dataProvider/libDataProvider.module#LibDataProviderModule'},
+    { path: 'organization', loadChildren: './landingPages/organization/libOrganization.module#LibOrganizationModule'},
+  ])]
 })
 export class SearchModule {}