diff --git a/cache-interceptor.service.ts b/cache-interceptor.service.ts
index d5f137b1..24dcbceb 100644
--- a/cache-interceptor.service.ts
+++ b/cache-interceptor.service.ts
@@ -1,6 +1,6 @@
 import { Injectable, Inject, PLATFORM_ID } from '@angular/core';
 import { HttpInterceptor, HttpRequest, HttpHandler } from '@angular/common/http';
-import { TransferState } from '@angular/platform-browser';
+import { TransferState } from '@angular/core';
 import { properties } from "../../environments/environment";
 
 @Injectable({
diff --git a/error/isRouteEnabled.guard.ts b/error/isRouteEnabled.guard.ts
index 4d05d73b..26ba92f4 100644
--- a/error/isRouteEnabled.guard.ts
+++ b/error/isRouteEnabled.guard.ts
@@ -1,13 +1,13 @@
 import {Observable} from 'rxjs';
 import {take, tap} from 'rxjs/operators';
 import {Injectable} from '@angular/core';
-import {ActivatedRouteSnapshot, CanActivate, Data, Router, RouterStateSnapshot, UrlTree} from '@angular/router';
+import { ActivatedRouteSnapshot, Data, Router, RouterStateSnapshot, UrlTree } from '@angular/router';
 import {ConfigurationService} from '../utils/configuration/configuration.service';
 import {ConnectHelper} from '../connect/connectHelper';
 import {properties} from "../../../environments/environment";
 
 @Injectable()
-export class IsRouteEnabled implements CanActivate {
+export class IsRouteEnabled  {
   
   constructor(private router: Router,
               private config: ConfigurationService) {
diff --git a/http-interceptor.service.ts b/http-interceptor.service.ts
index 00c4cfb2..5ff8c6a2 100644
--- a/http-interceptor.service.ts
+++ b/http-interceptor.service.ts
@@ -2,7 +2,7 @@ import { Injectable, Inject, PLATFORM_ID } from '@angular/core';
 import { HttpInterceptor, HttpRequest, HttpHandler, HttpEvent, HttpResponse } from '@angular/common/http';
 import { Observable, of } from 'rxjs';
 import { tap } from 'rxjs/operators';
-import { TransferState, makeStateKey, StateKey } from '@angular/platform-browser';
+import { TransferState, makeStateKey, StateKey } from '@angular/core';
 import { isPlatformServer } from '@angular/common';
 import {properties} from "../../environments/environment";
 
diff --git a/login/freeGuard.guard.ts b/login/freeGuard.guard.ts
index c2141a70..13d5941e 100644
--- a/login/freeGuard.guard.ts
+++ b/login/freeGuard.guard.ts
@@ -1,16 +1,10 @@
 import { Injectable } from '@angular/core';
-import {
-  Router,
-  CanActivate,
-  ActivatedRouteSnapshot,
-  RouterStateSnapshot,
-  UrlTree
-} from '@angular/router';
+import { Router, ActivatedRouteSnapshot, RouterStateSnapshot, UrlTree } from '@angular/router';
 import {Observable} from 'rxjs';
 import {LoginErrorCodes} from './utils/guardHelper.class';
 
 @Injectable()
-export class FreeGuard implements CanActivate {
+export class FreeGuard  {
 
   constructor(private router: Router) {
   }
diff --git a/utils/piwik/previousRouteRecorder.guard.ts b/utils/piwik/previousRouteRecorder.guard.ts
index e4961b7a..4d050618 100644
--- a/utils/piwik/previousRouteRecorder.guard.ts
+++ b/utils/piwik/previousRouteRecorder.guard.ts
@@ -1,13 +1,13 @@
 
 import { Injectable } from '@angular/core';
-import { CanDeactivate, Router} from '@angular/router';
+import { Router } from '@angular/router';
 import {Observable}       from 'rxjs';
 import {properties} from "../../../../environments/environment";
 
 @Injectable({
   providedIn: 'root'
 }) // do not forget to register this class as a provider
-export class PreviousRouteRecorder implements CanDeactivate<any> {
+export class PreviousRouteRecorder  {
   constructor(private router: Router) {
   }
   canDeactivate(component: any): Observable<boolean> | boolean {