diff --git a/src/app/group-monitor/test-session.service.ts b/src/app/group-monitor/test-session.service.ts
index 3ebf24e30dbb5977d848e4b00089ae5ee6047602..66158713f92d49d65424d4caac302d0992801e35 100644
--- a/src/app/group-monitor/test-session.service.ts
+++ b/src/app/group-monitor/test-session.service.ts
@@ -9,7 +9,6 @@ import {
   TestSessionSuperState,
   UnitContext
 } from './group-monitor.interfaces';
-import { TestMode } from '../config/test-mode';
 
 @Injectable()
 export class TestSessionService {
@@ -49,22 +48,7 @@ export class TestSessionService {
     return session.personId * 10000 + session.testId;
   }
 
-  private static getMode = (modeString: string): { modeId: string, modeLabel: string } => {
-    const testMode = new TestMode(modeString);
-    return {
-      modeId: testMode.modeId,
-      modeLabel: testMode.modeLabel
-    };
-  };
-
   private static getSuperState(session: TestSessionData): TestSessionSuperState {
-    if (session.mode === 'monitor-group') { // TODO deprecated?
-      return 'monitor_group';
-    }
-    if (TestSessionService.getMode(session.mode).modeId !== 'HOT') { // TODO deprecated?
-      return 'demo';
-    }
-
     const state = session.testState;
 
     if (this.hasState(state, 'status', 'pending')) {