diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index c46a7fc9aa0af51b4bc58a9e161810855f6feacd..24208f4d8d082fdb04d329e9490db2f78f97d42e 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -11,8 +11,6 @@ import {
   TRANSLATE,
 } from "solidify-frontend";
 
-let code: string = undefined;
-
 function getQueryParam(): string {
   // NEED FOR OAUTH 2 CODE QUERY PARAM
   const queryParam = window.location.href.split("?")[1];
@@ -114,4 +112,4 @@ const routes: DlcmRoutes = [
   exports: [RouterModule],
 })
 export class AppRoutingModule {
-}
\ No newline at end of file
+}
diff --git a/src/app/stores/app.state.ts b/src/app/stores/app.state.ts
index 0872f918e7c691fd9d217765fc3d5ee4a675d43c..164b3318617248a0c735c36a96061b3743894712 100644
--- a/src/app/stores/app.state.ts
+++ b/src/app/stores/app.state.ts
@@ -447,18 +447,16 @@ export class AppState extends BasicState<AppStateModel> {
         // Logout client side
         this.oauthService.logOut(true);
       }),
-      mergeMap(() => {
-        return ctx.dispatch(new Navigate([RoutesEnum.homePage]));
-      }),
-      tap(() => {
-        ctx.patchState({
-          ignorePreventLeavePopup: false,
-        });
-        if (isTrue(environment.reloadAfterLogout)) {
-          window.location.reload();
-        }
-      }),
-    );
+      mergeMap(() => ctx.dispatch(new Navigate([RoutesEnum.homePage])),
+        tap(() => {
+          ctx.patchState({
+            ignorePreventLeavePopup: false,
+          });
+          if (isTrue(environment.reloadAfterLogout)) {
+            window.location.reload();
+          }
+        }),
+      );
   }
 
   @Action(AppAction.CancelPreventExit)