diff --git a/server.ts b/server.ts
index 875c4acc70..f857050ed5 100644
--- a/server.ts
+++ b/server.ts
@@ -118,11 +118,6 @@ export function app() {
    */
   server.use('/sitemap**', createProxyMiddleware({ target: `${environment.rest.baseUrl}/sitemaps`, changeOrigin: true }));
 
-  // TODO: implement data requests securely
-  server.get('/api/**', (req, res) => {
-    res.status(404).send('data requests are not yet supported');
-  });
-
   /**
    * Checks if the rateLimiter property is present
    * When it is present, the rateLimiter will be enabled. When it is undefined, the rateLimiter will be disabled.
diff --git a/src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.ts b/src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.ts
index 4e7492b091..b17807b9d3 100644
--- a/src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.ts
+++ b/src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.ts
@@ -148,7 +148,6 @@ export class GroupFormComponent implements OnInit, OnDestroy {
     this.canEdit$ = this.groupDataService.getActiveGroup().pipe(
       hasValueOperator(),
       switchMap((group: Group) => {
-        console.log(group);
         return observableCombineLatest(
           this.authorizationService.isAuthorized(FeatureID.CanDelete, isNotEmpty(group) ? group.self : undefined),
           this.hasLinkedDSO(group),
diff --git a/src/app/core/services/hard-redirect.service.ts b/src/app/core/services/hard-redirect.service.ts
index 8d4db48614..a09521dae5 100644
--- a/src/app/core/services/hard-redirect.service.ts
+++ b/src/app/core/services/hard-redirect.service.ts
@@ -5,7 +5,7 @@ import { URLCombiner } from '../url-combiner/url-combiner';
 /**
  * Service to take care of hard redirects
  */
-@Injectable({providedIn: 'root'})
+@Injectable()
 export abstract class HardRedirectService {
 
   /**
diff --git a/src/app/core/services/server-cookie.service.ts b/src/app/core/services/server-cookie.service.ts
index 36d26bd490..6ae3525c74 100644
--- a/src/app/core/services/server-cookie.service.ts
+++ b/src/app/core/services/server-cookie.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { CookieAttributes } from 'js-cookie';
 import { CookieService, ICookieService } from './cookie.service';
 
-@Injectable({providedIn: 'root'})
+@Injectable()
 export class ServerCookieService extends CookieService implements ICookieService {
 
   public set(name: string, value: any, options?: CookieAttributes): void {
diff --git a/src/app/core/services/server-hard-redirect.service.ts b/src/app/core/services/server-hard-redirect.service.ts
index 65f3fa4580..65b404ca6c 100644
--- a/src/app/core/services/server-hard-redirect.service.ts
+++ b/src/app/core/services/server-hard-redirect.service.ts
@@ -6,7 +6,7 @@ import { HardRedirectService } from './hard-redirect.service';
 /**
  * Service for performing hard redirects within the server app module
  */
-@Injectable({providedIn: 'root'})
+@Injectable()
 export class ServerHardRedirectService extends HardRedirectService {
 
   constructor(
diff --git a/src/app/shared/mocks/angulartics.service.mock.ts b/src/app/shared/mocks/angulartics.service.mock.ts
index 50245ad23e..e471ff2512 100644
--- a/src/app/shared/mocks/angulartics.service.mock.ts
+++ b/src/app/shared/mocks/angulartics.service.mock.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 
 /* tslint:disable:no-empty */
-@Injectable({providedIn: 'root'})
+@Injectable()
 export class AngularticsMock {
   public eventTrack(action, properties) { }
   public startTracking(): void {}
diff --git a/tsconfig.server.json b/tsconfig.server.json
index 2a7db5b171..a2ad1b2995 100644
--- a/tsconfig.server.json
+++ b/tsconfig.server.json
@@ -5,8 +5,7 @@
     "module": "commonjs"
   },
   "files": [
-    "src/main.server.ts",
-    "server.ts"
+    "src/main.server.ts"
   ],
   "angularCompilerOptions": {
     "entryModule": "./src/modules/app/server-app.module#ServerAppModule"