diff --git a/src/lib/components/user-area/AuthArea.module.scss b/src/lib/components/user-area/AuthArea.module.scss
deleted file mode 100644
index 0e702715..00000000
--- a/src/lib/components/user-area/AuthArea.module.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-@import 'lib/styles/mixins.scss';
-
-.btnsWrap {
-  display: flex;
-  align-items: center;
-  gap: 28px;
-
-  > * {
-    position: relative;
-  }
-
-  @include smallMobile {
-    gap: 16px;
-  }
-}
diff --git a/src/lib/components/user-area/AuthArea.svelte b/src/lib/components/user-area/AuthArea.svelte
deleted file mode 100644
index ffbefb58..00000000
--- a/src/lib/components/user-area/AuthArea.svelte
+++ /dev/null
@@ -1,44 +0,0 @@
-<script lang="ts">
-  import { onMount } from 'svelte';
-
-  import Button from '../Button.svelte';
-
-  import styles from './AuthArea.module.scss'
-  import SigninPopup from './SigninPopup.svelte';
-  import { appPubSub } from '../../../main';
-
-  export let hideSignup = false;
-  let signinPopupVisible = false;
-  let signinMethod: 'login'|'signup';
-  let signInConfig: {talentURL: string, customerURL: string};
-
-  onMount(async () => {
-    appPubSub.subscribe('signup', (data) => handleSignin('signup', data))
-    appPubSub.subscribe('login', (data) => handleSignin('login', data))
-  });
-
-  const handleSignin = (method, data?: any) => {
-    signInConfig = data;
-    signinPopupVisible = true;
-    signinMethod = method;
-  }
-</script>
-
-<div class={styles.btnsWrap}>
-  <Button label="Log In" onClick={() => handleSignin('login')}/>
-  {#if !hideSignup}
-  <Button
-    variant="primary"
-    label="Sign Up"
-    onClick={() => handleSignin('signup')}
-  />
-  {/if}
-  {#if signinPopupVisible}
-    <SigninPopup
-      signInConfig={signInConfig}
-      signinMethod={signinMethod}
-      onClose={() => signinPopupVisible = false}
-    />
-  {/if}
-</div>
-
diff --git a/src/lib/components/user-area/SigninPopup.module.scss b/src/lib/components/user-area/SigninPopup.module.scss
deleted file mode 100644
index 16977629..00000000
--- a/src/lib/components/user-area/SigninPopup.module.scss
+++ /dev/null
@@ -1,118 +0,0 @@
-@import 'lib/styles/mixins.scss';
-@import 'lib/styles/fonts.scss';
-@import 'lib/styles/colors.scss';
-
-.modal {
-  background: rgba(0, 0, 0, 0.5);
-  height: 100%;
-  left: 0;
-  position: fixed;
-  top: 0;
-  width: 100%;
-  z-index: 9999;
-}
-
-.overlay {
-  position: absolute;
-  z-index: -1;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-}
-
-.modalBox {
-  background: #f9f9f9;
-  border-radius: 4px;
-  left: 50%;
-  max-width: 714px;
-  padding: 36px 38px 52px;
-  position: absolute;
-  top: 50%;
-  transform: translate(-50%, -50%);
-  width: 90%;
-
-  h5 {
-    color: #2A2A2A;
-    font-family: 'Roboto';
-    font-size: 36px;
-    font-weight: 500;
-    line-height: 44px;
-    position: relative;
-    text-transform: none;
-    margin: 0;
-  }
-
-  @include mobile {
-    padding: 22px;
-  }
-}
-
-.closeIcon {
-  background-size: contain;
-  cursor: pointer;
-  height: 24px;
-  position: absolute;
-  right: 0;
-  top: 2px;
-  width: 24px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-
-  img {
-    display: block;
-    width: 67%;
-    height: 67%;
-  }
-}
-
-.options {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 32px;
-  margin-top: 32px;
-
-  a, .link {
-    background: #0D61BF;
-    border-radius: 4px;
-    color: #fff;
-    flex: 0 0 calc(50% - 17px);
-    font-family: 'Roboto';
-    padding: 20px;
-    transition: 0.3s;
-    cursor: pointer;
-    display: flex;
-    gap: 18px;
-    align-items: center;
-    img {
-      display: block;
-      flex: 0 0;
-    }
-    &:hover {
-      box-shadow: 0 0 30px rgba(0, 0, 0, 0.05);
-      text-decoration: none;
-      transform: scale(1.015);
-    }
-
-    strong {
-      font-size: 24px;
-      line-height: 32px;
-      font-weight: 700;
-    }
-
-    small {
-      font-size: 16px;
-      line-height: 24px;
-    }
-  }
-
-  @media (max-width: 790px) {
-    flex-direction: column;
-    gap: 26px;
-
-    a, .link {
-      padding: 30px 20px;
-    }
-  }
-}
diff --git a/src/lib/components/user-area/SigninPopup.svelte b/src/lib/components/user-area/SigninPopup.svelte
deleted file mode 100644
index cbc4fd55..00000000
--- a/src/lib/components/user-area/SigninPopup.svelte
+++ /dev/null
@@ -1,61 +0,0 @@
-<script lang="ts">
-  import styles from './SigninPopup.module.scss'
-  import { getPublicPath } from 'lib/utils/paths';
-  import { getAppContext } from 'lib/app-context';
-  import { CUSTOMER_LOGIN, CUSTOMER_SIGNUP } from "../../config";
-
-  const ctx = getAppContext();
-
-  $: ({
-    signIn: onSignIn = () => {},
-    signUp: onSignUp = () => {},
-  } = $ctx.auth);
-
-  export let onClose: () => void;
-  export let signinMethod: 'login'|'signup';
-  export let signInConfig: {talentURL: string, customerURL: string};
-
-  const closeMenuIcon = getPublicPath(`/assets/icon-close-w.svg`);
-  const talentIcon = getPublicPath(`/assets/icon-algo.png`);
-  const customerIcon = getPublicPath(`/assets/icon-tsunny.png`);
-
-  const customerSignInUrl = signinMethod === 'login' ? CUSTOMER_LOGIN : CUSTOMER_SIGNUP;
-
-  // when clicking on talent
-  const handleTalentClick = () => {
-    if (signInConfig?.talentURL) {
-      window.location.href = signInConfig.talentURL;
-      return;
-    }
-
-    (signinMethod === 'login' ? onSignIn : onSignUp)();
-  }
-</script>
-
-<div class={styles.modal}>
-  <div class={styles.overlay} on:click={onClose}/>
-  <div class={styles.modalBox}>
-    <h5>
-      Which are you?
-      <span class={styles.closeIcon} on:click={onClose}>
-        <img src={closeMenuIcon} alt="X" />
-      </span>
-    </h5>
-    <div class={styles.options}>
-      <a href={signInConfig?.customerURL ?? customerSignInUrl}>
-        <span>
-          <strong>Customer</strong><br>
-          <small>Launch and manage work</small>
-        </span>
-        <img src={customerIcon} alt="Tsunny" />
-      </a>
-      <div class={styles.link} on:click={handleTalentClick}>
-        <span>
-          <strong>Talent</strong><br>
-          <small>Find and start opportunities</small>
-        </span>
-        <img src={talentIcon} alt="Algo" width="35" />
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/src/lib/components/user-area/UserArea.svelte b/src/lib/components/user-area/UserArea.svelte
index 23bcfc7d..f46410ea 100644
--- a/src/lib/components/user-area/UserArea.svelte
+++ b/src/lib/components/user-area/UserArea.svelte
@@ -3,6 +3,7 @@
   import { getAppContext } from 'lib/app-context';
   import { checkUserAppRole, fetchUserProfile } from 'lib/functions/user-profile.provider';
   import { fetchUserProfileCompletedness } from 'lib/functions/profile-nudges';
+  import { AUTH0_AUTHENTICATOR_URL } from 'lib/config';
   import { AUTH_USER_ROLE } from 'lib/config/auth';
   import { DISABLE_NUDGES } from "lib/config/profile-toasts.config";
 
@@ -12,7 +13,7 @@
   import UserAvatar from './UserAvatar.svelte';
   import styles from './UserArea.module.scss'
   import Completedness from './Completedness.svelte';
-  import AuthArea from './AuthArea.svelte';
+  import Button from '../Button.svelte';
 
   const ctx = getAppContext();
 
@@ -74,13 +75,25 @@
     const authUser = await fetchUserProfile();
     $ctx.auth = {...$ctx.auth, ready: true, user: authUser};
   });
+
+  function onSignIn(signup?: any) {
+    const locationHref = `${window.location.origin}${window.location.pathname}`
+    window.location.href = `${AUTH0_AUTHENTICATOR_URL}?retUrl=${encodeURIComponent(locationHref)}${signup === true ? '&mode=signUp' : ''}`;
+  }
+
+  function onSignUp() {
+    onSignIn(true);
+  }
 </script>
 
 {#if isReady}
   <VerticalSeparator />
   <div class={styles.userAreaWrap}>
     {#if !user}
-      <AuthArea />
+      <div class={styles.btnsWrap}>
+        <Button label="Log in" onClick={onSignIn} />
+        <Button variant="primary" label="Sign Up" onClick={onSignUp} />
+      </div>
     {:else }
       <ToolSelector />
       <UserAvatar
diff --git a/src/lib/components/user-area/UserMenu.svelte b/src/lib/components/user-area/UserMenu.svelte
index 12270784..6ed0f461 100644
--- a/src/lib/components/user-area/UserMenu.svelte
+++ b/src/lib/components/user-area/UserMenu.svelte
@@ -35,11 +35,6 @@
         class:active={isActive(ACC_SETTINGS_URL)}
       >Account Settings</a>
     </li>
-    <li>
-      <a
-        href={`${CUSTOMER_LOGIN}/login?as=customer`}
-      >Log in as Customer</a>
-    </li>
     <li>
       <a
         href={"javascript:;"}
diff --git a/src/lib/config/nav-menu/all-nav-items.config.ts b/src/lib/config/nav-menu/all-nav-items.config.ts
index f40e4355..a6d37a9f 100644
--- a/src/lib/config/nav-menu/all-nav-items.config.ts
+++ b/src/lib/config/nav-menu/all-nav-items.config.ts
@@ -132,12 +132,6 @@ export const allNavItems: {[key: string]: NavMenuItem} = {
         icon: 'review',
         description: 'Review submissions',
     },
-    selfServiceApp: {
-        label: 'Self Service Challenges',
-        url: SELF_SERVICE_HOST,
-        icon: 'self-service',
-        description: 'Launch and manage work',
-    },
     communityHome: {
         label: 'Community Home',
         description: 'Recent challenges and news.',
@@ -162,12 +156,6 @@ export const allNavItems: {[key: string]: NavMenuItem} = {
         icon: 'tcacademy',
         description: 'Learn new skills',
     },
-    topCrowdApp: {
-        // description: 'Engage and reward your workforce',
-        icon: 'topcrowd',
-        label: 'Topcoder Platform',
-        url: 'https://app.topcoder.com',
-    },
     workManager: {
         label: 'Work Manager',
         icon: 'work-manager',
diff --git a/src/lib/config/nav-menu/tool-selector-nav-items.ts b/src/lib/config/nav-menu/tool-selector-nav-items.ts
index 0a02999b..22684ca1 100644
--- a/src/lib/config/nav-menu/tool-selector-nav-items.ts
+++ b/src/lib/config/nav-menu/tool-selector-nav-items.ts
@@ -10,8 +10,6 @@ export const toolSelectorNavItems: NavMenuItem = {
       children: [
         {
           children: [
-            allNavItems.topCrowdApp,
-            allNavItems.selfServiceApp,
             allNavItems.talentSearchApp,
           ]
         },
@@ -45,13 +43,6 @@ export const toolSelectorNavItems: NavMenuItem = {
             allNavItems.payments
           ]
         },
-        // {
-        //   label: "AI",
-        //   groupOrder: 3,
-        //   children: [
-        //     allNavItems.aiHub,
-        //   ]
-        // },
         {
           label: "Compete",
           groupOrder: 3,
diff --git a/types/src/lib/components/hover-menu/index.d.ts b/types/src/lib/components/hover-menu/index.d.ts
deleted file mode 100644
index b54a6ee6..00000000
--- a/types/src/lib/components/hover-menu/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as HoverMenu } from './HoverMenu.svelte';