diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 55edd3e9ce..f072784435 100755
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -4,6 +4,7 @@ import { HttpModule } from '@angular/http';
 import { FormsModule } from '@angular/forms';
 import { RouterModule } from '@angular/router';
 
+import { EffectsModule } from '@ngrx/effects';
 import { StoreModule, MetaReducer, META_REDUCERS } from '@ngrx/store';
 import { StoreDevtoolsModule } from '@ngrx/store-devtools';
 import { RouterStateSerializer, StoreRouterConnectingModule } from '@ngrx/router-store';
@@ -14,14 +15,12 @@ import { TranslateModule } from '@ngx-translate/core';
 
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 
-import { appReducers, AppState } from './app.reducer';
 import { appEffects } from './app.effects';
+import { appReducers, AppState } from './app.reducer';
+import { appMetaReducers } from './app.metareducers';
 
 import { CoreModule } from './core/core.module';
-import { SharedModule } from './shared/shared.module';
-
 import { AppRoutingModule } from './app-routing.module';
-
 import { TransferHttpModule } from '../modules/transfer-http/transfer-http.module';
 
 import { AppComponent } from './app.component';
@@ -30,8 +29,6 @@ import { FooterComponent } from './footer/footer.component';
 import { PageNotFoundComponent } from './pagenotfound/pagenotfound.component';
 
 import { GLOBAL_CONFIG, ENV_CONFIG, GlobalConfig } from '../config';
-import { EffectsModule } from '@ngrx/effects';
-import { appMetaReducers } from './app.metareducers';
 
 import { DSpaceRouterStateSerializer } from './shared/ngrx/dspace-router-state-serializer';
 
@@ -47,6 +44,12 @@ export function getMetaReducers(config: GlobalConfig): Array<MetaReducer<AppStat
   return config.production ? appMetaReducers : [...appMetaReducers, storeFreeze];
 }
 
+const DEV_MODULES: any[] = [];
+
+if (!ENV_CONFIG.production) {
+  DEV_MODULES.push(StoreDevtoolsModule.instrument({ maxAge: 50 }));
+}
+
 @NgModule({
   imports: [
     CommonModule,
@@ -58,9 +61,9 @@ export function getMetaReducers(config: GlobalConfig): Array<MetaReducer<AppStat
     TranslateModule.forRoot(),
     EffectsModule.forRoot(appEffects),
     StoreModule.forRoot(appReducers),
-    StoreDevtoolsModule.instrument({ maxAge: 50 }),
     StoreRouterConnectingModule,
     TransferHttpModule,
+    ...DEV_MODULES
   ],
   providers: [
     {
diff --git a/src/app/browser-app.module.ts b/src/app/browser-app.module.ts
index 346642f051..571a5266fe 100644
--- a/src/app/browser-app.module.ts
+++ b/src/app/browser-app.module.ts
@@ -1,5 +1,4 @@
 import { NgModule, APP_INITIALIZER } from '@angular/core';
-import { Http } from '@angular/http';
 import { HttpClientModule, HttpClient } from '@angular/common/http';
 import { RouterModule } from '@angular/router';
 import { BrowserModule } from '@angular/platform-browser';
@@ -18,9 +17,8 @@ import { BrowserTransferStateModule } from '../modules/transfer-state/browser-tr
 import { BrowserTransferStoreEffects } from '../modules/transfer-store/browser-transfer-store.effects';
 import { BrowserTransferStoreModule } from '../modules/transfer-store/browser-transfer-store.module';
 
-import { SharedModule } from './shared/shared.module';
-import { CoreModule } from './core/core.module';
 import { AppModule } from './app.module';
+import { CoreModule } from './core/core.module';
 
 import { AppComponent } from './app.component';
 
diff --git a/yarn.lock b/yarn.lock
index 47204afd69..91359669f0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1893,6 +1893,10 @@ deep-extend@~0.4.0:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
 
+deep-freeze-strict@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/deep-freeze-strict/-/deep-freeze-strict-1.1.1.tgz#77d0583ca24a69be4bbd9ac2fae415d55523e5b0"
+
 deep-freeze@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/deep-freeze/-/deep-freeze-0.0.1.tgz#3a0b0005de18672819dfd38cd31f91179c893e84"
@@ -4716,6 +4720,12 @@ negotiator@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
 
+ngrx-store-freeze@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/ngrx-store-freeze/-/ngrx-store-freeze-0.2.0.tgz#74c231947bbe1938af722f6a72624dc69788d39f"
+  dependencies:
+    deep-freeze-strict "^1.1.1"
+
 ngx-pagination@3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/ngx-pagination/-/ngx-pagination-3.0.1.tgz#5a8000e40c0424d9c41c9d6d592562e1547abf24"
@@ -7590,9 +7600,9 @@ typescript@2.4.1, typescript@^2.1.6:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.4.1.tgz#c3ccb16ddaa0b2314de031e7e6fee89e5ba346bc"
 
-typescript@2.5.2:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.5.2.tgz#038a95f7d9bbb420b1bf35ba31d4c5c1dd3ffe34"
+typescript@2.5.3:
+  version "2.5.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.5.3.tgz#df3dcdc38f3beb800d4bc322646b04a3f6ca7f0d"
 
 uglify-js@3.0.x, uglify-js@^3.0.9:
   version "3.0.24"