improve alert view

2026-01-25 02:08:19 +00:00 · 2023-06-17 14:28:50 +07:00 · 2023-06-17 14:27:13 +07:00
50 changed files with 687 additions and 4077 deletions
--- a/.env
+++ b/.env
@@ -11,18 +11,4 @@ VITE_DEV_BASE_URL=http://127.0.0.1:3000/v1
 ## disables Jaeger Tracing feature
 #VITE_APP_JAEGER_TRACING_DISABLED=true
 ## enable record All Calls feature
-#VITE_APP_DISABLE_CALL_RECORDING=true
-## enable Forgot password
-#VITE_APP_ENABLE_FORGOT_PASSWORD=true
-## enable hosted system
-#VITE_APP_ENABLE_HOSTED_SYSTEM=true
-## Google Client ID
-#VITE_APP_GOOGLE_CLIENT_ID=
-## Github Client ID
-#VITE_APP_GITHUB_CLIENT_ID=
-## Default jambonz service provider SID
-#VITE_APP_DEFAULT_SERVICE_PROVIDER_SID=
-## Base url for jambomz webapp
-#VITE_APP_BASE_URL="http://jambonz.one"
-## Strip publishable key
-#VITE_APP_STRIPE_PUBLISHABLE_KEY="pk_test_EChRaX9Tjk8csZZVSeoGqNvu00lsJzjaU1"
+#VITE_APP_DISABLE_CALL_RECORDING=true
--- a/index.html
+++ b/index.html
@@ -6,7 +6,7 @@
    <meta name="theme-color" content="#000000" />
    <meta
      name="description"
-      content="Build innovative voice and collaboration services with jambonz, the open-source communication platform for conversational AI providers and CSPs."
+      content="Simple provisioning webapp for jambonz."
    />
    <link rel="apple-touch-icon" href="/logo192.png" />
    <link rel="icon" href="/favicon.ico" sizes="any" />
@@ -46,7 +46,7 @@
      as="font"
      type="font/woff"
    />
-    <title>Jambonz Portal | Jambonz CPaaS</title>
+    <title>Jambonz Web App</title>
  </head>
  <body>
    <div id="root"></div>
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "jambonz-webapp",
  "description": "A simple provisioning web app for jambonz",
-  "version": "0.8.4",
+  "version": "0.8.3",
  "license": "MIT",
  "type": "module",
  "engines": {
@@ -50,9 +50,7 @@
    "react-dom": "^18.0.0",
    "react-feather": "^2.0.10",
    "react-router-dom": "^6.3.0",
-    "wavesurfer.js": "^6.6.3",
-    "@stripe/react-stripe-js": "^2.1.1",
-    "@stripe/stripe-js": "^1.54.1"
+    "wavesurfer.js": "^6.6.3"
  },
  "devDependencies": {
    "@types/cors": "^2.8.12",
--- a/src/api/constants.ts
+++ b/src/api/constants.ts
@@ -1,5 +1,4 @@
 import type {
-  Currency,
  LimitField,
  LimitUnitOption,
  PasswordSettings,
@@ -18,13 +17,7 @@ interface JambonzWindowObject {
  DISABLE_JAEGER_TRACING: string;
  DISABLE_CUSTOM_SPEECH: string;
  ENABLE_FORGOT_PASSWORD: string;
-  ENABLE_HOSTED_SYSTEM: string;
  DISABLE_CALL_RECORDING: string;
-  GITHUB_CLIENT_ID: string;
-  GOOGLE_CLIENT_ID: string;
-  BASE_URL: string;
-  DEFAULT_SERVICE_PROVIDER_SID: string;
-  STRIPE_PUBLISHABLE_KEY: string;
 }

 declare global {
@@ -48,12 +41,7 @@ export const DISABLE_CUSTOM_SPEECH: boolean =
 /** Enable Forgot Password */
 export const ENABLE_FORGOT_PASSWORD: boolean =
  window.JAMBONZ?.ENABLE_FORGOT_PASSWORD === "true" ||
-  JSON.parse(import.meta.env.VITE_APP_ENABLE_FORGOT_PASSWORD || "false");
-
-/** Enable Cloud version */
-export const ENABLE_HOSTED_SYSTEM: boolean =
-  window.JAMBONZ?.ENABLE_HOSTED_SYSTEM === "true" ||
-  JSON.parse(import.meta.env.VITE_APP_ENABLE_HOSTED_SYSTEM || "false");
+  JSON.parse(import.meta.env.VITE_ENABLE_FORGOT_PASSWORD || "false");
 /** Disable Lcr */
 export const DISABLE_LCR: boolean =
  window.JAMBONZ?.DISABLE_LCR === "true" ||
@@ -69,23 +57,6 @@ export const DISABLE_CALL_RECORDING: boolean =
  window.JAMBONZ?.DISABLE_CALL_RECORDING === "true" ||
  JSON.parse(import.meta.env.VITE_APP_DISABLE_CALL_RECORDING || "false");

-export const DEFAULT_SERVICE_PROVIDER_SID: string =
-  window.JAMBONZ?.DEFAULT_SERVICE_PROVIDER_SID ||
-  import.meta.env.VITE_APP_DEFAULT_SERVICE_PROVIDER_SID;
-
-export const GITHUB_CLIENT_ID: string =
-  window.JAMBONZ?.GITHUB_CLIENT_ID || import.meta.env.VITE_APP_GITHUB_CLIENT_ID;
-
-export const BASE_URL: string =
-  window.JAMBONZ?.BASE_URL || import.meta.env.VITE_APP_BASE_URL;
-
-export const GOOGLE_CLIENT_ID: string =
-  window.JAMBONZ?.GOOGLE_CLIENT_ID || import.meta.env.VITE_APP_GOOGLE_CLIENT_ID;
-
-export const STRIPE_PUBLISHABLE_KEY: string =
-  window.JAMBONZ?.STRIPE_PUBLISHABLE_KEY ||
-  import.meta.env.VITE_APP_STRIPE_PUBLISHABLE_KEY;
-
 /** TCP Max Port */
 export const TCP_MAX_PORT = 65535;

@@ -160,8 +131,6 @@ export const SIP_GATEWAY_PROTOCOL_OPTIONS = [
 /**
 * Record bucket type
 */
-export const BUCKET_VENDOR_AWS = "aws_s3";
-export const BUCKET_VENDOR_GOOGLE = "google";
 export const BUCKET_VENDOR_OPTIONS = [
  {
    name: "NONE",
@@ -169,11 +138,7 @@ export const BUCKET_VENDOR_OPTIONS = [
  },
  {
    name: "AWS S3",
-    value: BUCKET_VENDOR_AWS,
-  },
-  {
-    name: "Google Cloud Storage",
-    value: BUCKET_VENDOR_GOOGLE,
+    value: "aws_s3",
  },
 ];

@@ -278,16 +243,6 @@ export const DEFAULT_PSWD_SETTINGS: PasswordSettings = {
  require_special_character: 0,
 };

-export const PlanType = {
-  PAID: "paid",
-  TRIAL: "trial",
-  FREE: "free",
-};
-
-export const CurrencySymbol: Currency = {
-  usd: "$",
-};
-
 /** User scope values values */
 export const USER_ADMIN = "admin";
 export const USER_SP = "service_provider";
@@ -302,9 +257,6 @@ export const CRED_NOT_TESTED = "not tested";
 export const CARRIER_REG_OK = "ok";
 export const CARRIER_REG_FAIL = "fail";

-export const PRIVACY_POLICY = "https://jambonz.org/privacy";
-export const TERMS_OF_SERVICE = "https://jambonz.org/terms";
-
 /** API base paths */
 export const API_LOGIN = `${API_BASE_URL}/login`;
 export const API_LOGOUT = `${API_BASE_URL}/logout`;
@@ -327,10 +279,3 @@ export const API_LCR_ROUTES = `${API_BASE_URL}/LcrRoutes`;
 export const API_LCR_CARRIER_SET_ENTRIES = `${API_BASE_URL}/LcrCarrierSetEntries`;
 export const API_TTS_CACHE = `${API_BASE_URL}/TtsCache`;
 export const API_CLIENTS = `${API_BASE_URL}/Clients`;
-export const API_REGISTER = `${API_BASE_URL}/register`;
-export const API_ACTIVATION_CODE = `${API_BASE_URL}/ActivationCode`;
-export const API_AVAILABILITY = `${API_BASE_URL}/Availability`;
-export const API_PRICE = `${API_BASE_URL}/Prices`;
-export const API_SUBSCRIPTIONS = `${API_BASE_URL}/Subscriptions`;
-export const API_CHANGE_PASSWORD = `${API_BASE_URL}/change-password`;
-export const API_SIGNIN = `${API_BASE_URL}/signin`;
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -26,13 +26,6 @@ import {
  API_LCRS,
  API_TTS_CACHE,
  API_CLIENTS,
-  API_REGISTER,
-  API_ACTIVATION_CODE,
-  API_AVAILABILITY,
-  API_PRICE,
-  API_SUBSCRIPTIONS,
-  API_CHANGE_PASSWORD,
-  API_SIGNIN,
 } from "./constants";
 import { ROUTE_LOGIN } from "src/router/routes";
 import {
@@ -81,17 +74,8 @@ import type {
  BucketCredential,
  BucketCredentialTestResult,
  Client,
-  RegisterRequest,
-  RegisterResponse,
-  ActivationCode,
-  CurrentUserData,
-  PriceInfo,
-  Subscription,
-  DeleteAccount,
-  ChangePassword,
-  SignIn,
 } from "./types";
-import { Availability, StatusCodes } from "./types";
+import { StatusCodes } from "./types";
 import { JaegerRoot } from "./jaeger-types";

 /** Wrap all requests to normalize response handling */
@@ -179,7 +163,7 @@ const getAuthHeaders = () => {

  return {
    "Content-Type": "application/json",
-    ...(token && { Authorization: `Bearer ${token}` }),
+    Authorization: `Bearer ${token}`,
  };
 };

@@ -255,17 +239,6 @@ export const deleteFetch = <Type>(url: string) => {
  });
 };

-export const deleteFetchWithPayload = <Type, Payload>(
-  url: string,
-  payload: Payload
-) => {
-  return fetchTransport<Type>(url, {
-    method: "DELETE",
-    headers: getAuthHeaders(),
-    body: JSON.stringify(payload),
-  });
-};
-
 /** All APIs need a wrapper utility that uses the FetchTransport */

 export const postLogin = (payload: UserLoginPayload) => {
@@ -440,37 +413,6 @@ export const postLcrCarrierSetEntry = (
 export const postClient = (payload: Partial<Client>) => {
  return postFetch<SidResponse, Partial<Client>>(API_CLIENTS, payload);
 };
-
-export const postRegister = (payload: Partial<RegisterRequest>) => {
-  return postFetch<RegisterResponse, Partial<RegisterRequest>>(
-    API_REGISTER,
-    payload
-  );
-};
-
-export const postSipRealms = (accountSid: string, domain: string) => {
-  return postFetch<EmptyResponse>(
-    `${API_ACCOUNTS}/${accountSid}/SipRealms/${domain}`
-  );
-};
-
-export const postSubscriptions = (payload: Partial<Subscription>) => {
-  return postFetch<Subscription, Partial<Subscription>>(
-    API_SUBSCRIPTIONS,
-    payload
-  );
-};
-
-export const postChangepassword = (payload: Partial<ChangePassword>) => {
-  return postFetch<EmptyResponse, Partial<ChangePassword>>(
-    API_CHANGE_PASSWORD,
-    payload
-  );
-};
-
-export const postSignIn = (payload: Partial<SignIn>) => {
-  return postFetch<SignIn, Partial<SignIn>>(API_SIGNIN, payload);
-};
 /** Named wrappers for `putFetch` */

 export const putUser = (sid: string, payload: Partial<UserUpdatePayload>) => {
@@ -590,16 +532,6 @@ export const putClient = (sid: string, payload: Partial<Client>) => {
    payload
  );
 };
-
-export const putActivationCode = (
-  code: string,
-  payload: Partial<ActivationCode>
-) => {
-  return putFetch<EmptyResponse, Partial<ActivationCode>>(
-    `${API_ACTIVATION_CODE}/${code}`,
-    payload
-  );
-};
 /** Named wrappers for `deleteFetch` */

 export const deleteUser = (sid: string) => {
@@ -614,11 +546,8 @@ export const deleteApiKey = (sid: string) => {
  return deleteFetch<EmptyResponse>(`${API_API_KEYS}/${sid}`);
 };

-export const deleteAccount = (sid: string, payload: Partial<DeleteAccount>) => {
-  return deleteFetchWithPayload<EmptyResponse, Partial<DeleteAccount>>(
-    `${API_ACCOUNTS}/${sid}`,
-    payload
-  );
+export const deleteAccount = (sid: string) => {
+  return deleteFetch<EmptyResponse>(`${API_ACCOUNTS}/${sid}`);
 };

 export const deleteApplication = (sid: string) => {
@@ -731,18 +660,8 @@ export const getClient = (sid: string) => {
  return getFetch<Client[]>(`${API_CLIENTS}/${sid}`);
 };

-export const getAvailability = (domain: string) => {
-  return getFetch<Availability>(
-    `${API_AVAILABILITY}?type=subdomain&value=${domain}`
-  );
-};
-
 /** Wrappers for APIs that can have a mock dev server response */

-export const getMe = () => {
-  return getFetch<CurrentUserData>(`${API_USERS}/me`);
-};
-
 export const getRecentCalls = (sid: string, query: Partial<CallQuery>) => {
  const qryStr = getQuery<Partial<CallQuery>>(query);

@@ -810,10 +729,6 @@ export const getAlerts = (sid: string, query: Partial<PageQuery>) => {
  );
 };

-export const getPrice = () => {
-  return getFetch<PriceInfo[]>(API_PRICE);
-};
-
 /** Hooks for components to fetch data with refetch method */

 /** :GET /{apiPath} -- this is generic for any fetch of data collections */
--- a/src/api/types.ts
+++ b/src/api/types.ts
@@ -148,7 +148,6 @@ export interface User {
  service_provider_name?: string | null;
  initial_password?: string;
  permissions?: UserPermissions[];
-  provider?: null | string;
 }

 export interface UserLogin {
@@ -187,8 +186,6 @@ export interface UserJWT {

 export interface CurrentUserData {
  user: User;
-  account?: Account;
-  subscription?: null | Subscription;
 }

 export interface ServiceProvider {
@@ -248,7 +245,6 @@ export interface Smpp {
 export interface Account {
  name: string;
  sip_realm: null | string;
-  root_domain?: null | string;
  account_sid: string;
  webhook_secret: string;
  siprec_hook_sid: null | string;
@@ -259,37 +255,6 @@ export interface Account {
  record_all_calls: number;
  record_format?: null | string;
  bucket_credential: null | BucketCredential;
-  plan_type?: string;
-  device_to_call_ratio?: number;
-  trial_end_date?: null | string;
-}
-
-export interface Product {
-  price_id?: null | string;
-  product_sid?: null | string;
-  name?: string;
-  quantity?: number;
-}
-
-export interface Subscription {
-  action?: null | string;
-  payment_method_id?: null | string;
-  account_subscription_sid?: null | string;
-  stripe_customer_id?: null | string;
-  products?: null | Product[];
-  start_date?: string;
-  status?: string;
-  client_secret?: null | string;
-  last4?: null | string;
-  exp_month?: null | string;
-  exp_year?: null | string;
-  card_type?: null | string;
-  reason?: null | string;
-  dry_run?: boolean;
-  currency?: null | string;
-  prorated_cost?: number;
-  monthly_cost?: number;
-  next_invoice_date?: null | string;
 }

 export interface AwsTag {
@@ -304,7 +269,6 @@ export interface BucketCredential {
  access_key_id?: null | string;
  secret_access_key?: null | string;
  tags?: null | AwsTag[];
-  service_key?: null | string;
 }

 export interface Application {
@@ -539,121 +503,3 @@ export interface EmptyResponse {
 export interface TotalResponse {
  total: number;
 }
-
-export interface RegisterRequest {
-  service_provider_sid: string;
-  provider: string;
-  oauth2_code?: string;
-  oauth2_state?: string;
-  oauth2_client_id?: string;
-  oauth2_redirect_uri?: string;
-  locationBeforeAuth?: string;
-  name?: string;
-  email?: string;
-  password?: string;
-  email_activation_code?: string;
-  inviteCode?: string;
-}
-
-export interface RegisterResponse {
-  jwt: string;
-  user_sid: string;
-  account_sid: string;
-  root_domain: string;
-}
-
-export interface ActivationCode {
-  user_sid: string;
-  type: string;
-}
-
-export interface Availability {
-  available: boolean;
-}
-
-export interface Invoice {
-  total: number;
-  currency: null | string;
-  next_payment_attempt: null | string;
-}
-
-export type Currency = {
-  [key: string]: null | string;
-};
-
-export interface Recurring {
-  aggregate_usage: null | string;
-  interval: null | string;
-  interval_count: number;
-  trial_period_days: null | string;
-  usage_type: string;
-}
-
-export interface Price {
-  billing_scheme: string;
-  currency: string;
-  recurring: Recurring;
-  stripe_price_id: null | string;
-  tiers_mode: null | string;
-  type: null | string;
-  unit_amount: number;
-  unit_amount_decimal: null | string;
-}
-
-export interface PriceInfo {
-  category: null | string;
-  description: null | string;
-  name: null | string;
-  prices: Price[];
-  product_sid: null | string;
-  stripe_product_id: null | string;
-  unit_label: null | string;
-}
-
-export interface StripeCustomerId {
-  stripe_customer_id: null | string;
-}
-
-export interface Tier {
-  up_to: number;
-  flat_amount: number;
-  unit_amount: number;
-}
-
-export interface ServiceData {
-  category: null | string;
-  name: null | string;
-  service: null | string;
-  fees: number;
-  feesLabel: null | string;
-  cost: number;
-  capacity: number;
-  invalid: boolean;
-  currency: null | string;
-  min: number;
-  max: number;
-  dirty: boolean;
-  visible: boolean;
-  required: boolean;
-  billing_scheme?: null | string;
-  stripe_price_id?: null | string;
-  unit_label?: null | string;
-  product_sid?: null | string;
-  stripe_product_id?: null | string;
-  tiers?: Tier[];
-}
-
-export interface DeleteAccount {
-  password: string;
-}
-
-export interface ChangePassword {
-  old_password: null | string;
-  new_password: null | string;
-}
-
-export interface SignIn {
-  link?: null | string;
-  jwt?: null | string;
-  account_sid?: null | string;
-}
--- a/src/components/domain-input/index.tsx
+++ b/src/components/domain-input/index.tsx
@@ -1,48 +0,0 @@
-import React from "react";
-import { Icons } from "../icons";
-import "./styles.scss";
-
-type DomainInputProbs = {
-  id?: string;
-  name?: string;
-  value: string;
-  setValue: React.Dispatch<React.SetStateAction<string>>;
-  root_domain: string;
-  placeholder?: string;
-  is_valid: boolean;
-};
-
-export const DomainInput = ({
-  id,
-  name,
-  value,
-  setValue,
-  root_domain,
-  is_valid,
-  placeholder,
-}: DomainInputProbs) => {
-  return (
-    <>
-      <div className="clipboard clipboard-domain">
-        <div className="input-container">
-          <input
-            id={id}
-            name={name}
-            type="text"
-            value={value}
-            placeholder={placeholder}
-            onChange={(e) => setValue(e.target.value)}
-          />
-          <div className={`input-icon txt--${is_valid ? "teal" : "red"}`}>
-            {is_valid ? <Icons.CheckCircle /> : <Icons.XCircle />}
-          </div>
-        </div>
-        <div className="root-domain">
-          <p>{root_domain}</p>
-        </div>
-      </div>
-    </>
-  );
-};
-
-export default DomainInput;
--- a/src/components/domain-input/styles.scss
+++ b/src/components/domain-input/styles.scss
@@ -1,55 +0,0 @@
-@use "../../styles/vars";
-@use "../../styles/mixins";
-@use "@jambonz/ui-kit/src/styles/vars" as ui-vars;
-@use "@jambonz/ui-kit/src/styles/mixins" as ui-mixins;
-
-.input-container {
-  position: relative;
-  display: inline-block;
-  width: 100%;
-}
-
-.clipboard-domain {
-  display: flex;
-  align-items: center;
-
-  input[type="text"],
-  input[type="number"] {
-    border-bottom-right-radius: 0;
-    border-top-right-radius: 0;
-    width: 100%;
-    height: vars.$clipheight;
-
-    &:focus-visible {
-      outline: 0;
-    }
-  }
-
-  .internal form & {
-    max-width: calc(#{vars.$widthinput} - #{vars.$clipheight});
-  }
-
-  .input-icon {
-    position: absolute;
-    right: 5%;
-    top: 50%;
-    transform: translateY(-50%);
-    border-left: 0;
-  }
-
-  .root-domain {
-    height: vars.$clipheight;
-    border-bottom-right-radius: ui-vars.$px01;
-    border-top-right-radius: ui-vars.$px01;
-    border: 2px solid ui-vars.$grey;
-    border-left: 0;
-    background-color: ui-vars.$pink;
-    padding: ui-vars.$px01;
-    display: flex;
-    align-items: center;
-
-    &[disabled] {
-      @include mixins.disabled();
-    }
-  }
-}
--- a/src/components/editboard/index.tsx
+++ b/src/components/editboard/index.tsx
@@ -1,39 +0,0 @@
-import React from "react";
-import { useNavigate } from "react-router-dom";
-
-import { Icons } from "src/components/icons";
-
-type EditBoardProps = {
-  id?: string;
-  name?: string;
-  text: string;
-  path: string;
-  title?: string;
-};
-
-export const EditBoard = ({
-  text,
-  id = "",
-  name = "",
-  path,
-  title,
-}: EditBoardProps) => {
-  const navigate = useNavigate();
-  const handleClick = () => {
-    navigate(path);
-  };
-
-  return (
-    <div className="clipboard inpbtn">
-      <input id={id} name={name} type="text" readOnly value={text} />
-      <button
-        className="btnty"
-        type="button"
-        title={title ? title : "Edit"}
-        onClick={handleClick}
-      >
-        <Icons.Edit />
-      </button>
-    </div>
-  );
-};
--- a/src/components/forms/checkzone/index.tsx
+++ b/src/components/forms/checkzone/index.tsx
@@ -7,7 +7,6 @@ type CheckzoneProps = {
  id?: string;
  name: string;
  label: string;
-  labelNode?: React.ReactNode;
  hidden?: boolean;
  children: React.ReactNode;
  initialCheck: boolean;
@@ -23,7 +22,6 @@ export const Checkzone = forwardRef<CheckzoneRef, CheckzoneProps>(
      id,
      name,
      label,
-      labelNode,
      hidden = false,
      children,
      initialCheck,
@@ -49,24 +47,21 @@ export const Checkzone = forwardRef<CheckzoneRef, CheckzoneProps>(
    return (
      <div className={classesTop}>
        <label>
-          <div className="label-container">
-            <input
-              ref={ref}
-              type="checkbox"
-              name={name}
-              id={id || name}
-              onChange={(e) => {
-                setChecked(e.target.checked);
+          <input
+            ref={ref}
+            type="checkbox"
+            name={name}
+            id={id || name}
+            onChange={(e) => {
+              setChecked(e.target.checked);

-                if (handleChecked) {
-                  handleChecked(e);
-                }
-              }}
-              checked={checked}
-            />
-            {label && <div>{label}</div>}
-            {labelNode && labelNode}
-          </div>
+              if (handleChecked) {
+                handleChecked(e);
+              }
+            }}
+            checked={checked}
+          />
+          <div>{label}</div>
        </label>
        {checked && <div className={classesIn}>{children}</div>}
      </div>
--- a/src/components/forms/checkzone/styles.scss
+++ b/src/components/forms/checkzone/styles.scss
@@ -9,14 +9,11 @@
  width: 100%;
  max-width: vars.$widthinput;

-  .label-container {
-    display: flex;
-    justify-content: center;
-  }
-
  > label {
+    display: flex;
+    align-items: center;
+
    input {
-      margin-top: ui-vars.$px01;
      margin-right: ui-vars.$px02;
    }
  }
@@ -38,10 +35,6 @@
      margin-top: ui-vars.$px01;
    }

-    > a {
-      width: 100%;
-    }
-
    &.active {
      cursor: auto;
      opacity: 1;
--- a/src/components/icons.ts
+++ b/src/components/icons.ts
@@ -48,8 +48,6 @@ import {
  ChevronsRight,
  Download,
  Smartphone,
-  Youtube,
-  Mail,
 } from "react-feather";

 import type { Icon } from "react-feather";
@@ -108,6 +106,4 @@ export const Icons: IconMap = {
  ChevronsRight,
  Download,
  Smartphone,
-  Youtube,
-  Mail,
 };
--- a/src/components/modal/index.tsx
+++ b/src/components/modal/index.tsx
@@ -3,7 +3,6 @@ import ReactDOM from "react-dom";
 import { Button, ButtonGroup } from "@jambonz/ui-kit";

 import "./styles.scss";
-import { Spinner } from "../spinner";

 type ModalProps = {
  disabled?: boolean;
@@ -70,7 +69,6 @@ export const ModalForm = ({
        }}
      >
        <div className="modal__stuff">{children}</div>
-
        <ButtonGroup right>
          <Button
            small
@@ -116,37 +114,3 @@ export const ModalClose = ({ children, handleClose }: CloseProps) => {
    portal
  );
 };
-
-type LoaderProps = {
-  children: React.ReactNode;
-};
-
-export const ModalLoader = ({ children }: LoaderProps) => {
-  return ReactDOM.createPortal(
-    <div className="modal" role="presentation">
-      <div
-        className="modal__box"
-        role="presentation"
-        onClick={(e) => e.stopPropagation()}
-      >
-        <div
-          className="modal__stuff"
-          role="presentation"
-          onClick={(e) => e.stopPropagation()}
-        >
-          {children}
-        </div>
-        <div
-          style={{
-            display: "flex",
-            alignItems: "center",
-            justifyContent: "center",
-          }}
-        >
-          <Spinner />
-        </div>
-      </div>
-    </div>,
-    portal
-  );
-};
--- a/src/constants/index.tsx
+++ b/src/constants/index.tsx
@@ -1,6 +1,6 @@
 import React from "react";

-export const TOAST_TIME = 5000;
+export const TOAST_TIME = 3000;
 export const SESS_FLASH_MSG = "SESS_FLASH_MSG";
 export const SESS_USER_SID = "SESS_USER_SID";
 export const SESS_OLD_PASSWORD = "SESS_OLD_PASSWORD";
--- a/src/containers/internal/navi/items.ts
+++ b/src/containers/internal/navi/items.ts
@@ -18,10 +18,7 @@ import { Scope, UserData } from "src/store/types";
 import type { Icon } from "react-feather";
 import type { ACL } from "src/store/types";
 import { Lcr } from "src/api/types";
-import {
-  DISABLE_LCR,
-  ENABLE_HOSTED_SYSTEM as ENABLE_HOSTED_SYSTEM,
-} from "src/api/constants";
+import { DISABLE_LCR } from "src/api/constants";

 export interface NaviItem {
  label: string;
@@ -33,17 +30,11 @@ export interface NaviItem {
 }

 export const naviTop: NaviItem[] = [
-  // User is not allowed in hosted app
-  ...(!ENABLE_HOSTED_SYSTEM
-    ? [
-        {
-          label: "Users",
-          icon: Icons.UserCheck,
-          route: () => ROUTE_INTERNAL_USERS,
-        },
-      ]
-    : []),
-
+  {
+    label: "Users",
+    icon: Icons.UserCheck,
+    route: () => ROUTE_INTERNAL_USERS,
+  },
  {
    label: "Settings",
    icon: Icons.Settings,
--- a/src/containers/internal/user-me/index.tsx
+++ b/src/containers/internal/user-me/index.tsx
@@ -1,32 +1,18 @@
-import React, { useEffect } from "react";
-import { Link, useNavigate } from "react-router-dom";
+import React from "react";
+import { Link } from "react-router-dom";

 import { Icons } from "src/components";
-import {
-  ROUTE_INTERNAL_USERS,
-  ROUTE_REGISTER_SUB_DOMAIN,
-} from "src/router/routes";
+import { ROUTE_INTERNAL_USERS } from "src/router/routes";
 import { useApiData } from "src/api";
 import { useSelectState } from "src/store";

 import type { CurrentUserData } from "src/api/types";

 import "./styles.scss";
-import { ENABLE_HOSTED_SYSTEM } from "src/api/constants";
-import { setRootDomain } from "src/store/localStore";

 export const UserMe = () => {
  const user = useSelectState("user");
  const [userData] = useApiData<CurrentUserData>("Users/me");
-  const navigate = useNavigate();
-
-  useEffect(() => {
-    // If hosted platform is enabled, the account should have sip realm
-    if (ENABLE_HOSTED_SYSTEM && userData && !userData.account?.sip_realm) {
-      setRootDomain(userData?.account?.root_domain || "");
-      navigate(ROUTE_REGISTER_SUB_DOMAIN);
-    }
-  }, [userData]);

  return (
    <div className="user">
--- a/src/containers/internal/views/accounts/edit-sip-realm.tsx
+++ b/src/containers/internal/views/accounts/edit-sip-realm.tsx
@@ -1,100 +0,0 @@
-import { Button, ButtonGroup, H1, MS } from "@jambonz/ui-kit";
-import React, { useEffect, useRef, useState } from "react";
-import { Link, useNavigate } from "react-router-dom";
-import { getAvailability, postSipRealms, useApiData } from "src/api";
-import { CurrentUserData } from "src/api/types";
-import { Section } from "src/components";
-import DomainInput from "src/components/domain-input";
-import { Message } from "src/components/forms";
-import { ROUTE_INTERNAL_ACCOUNTS } from "src/router/routes";
-import { hasValue } from "src/utils";
-
-export const EditSipRealm = () => {
-  const [name, setName] = useState("");
-  const [errorMessage, setErrorMessage] = useState("");
-  const navigate = useNavigate();
-  const [userData] = useApiData<CurrentUserData>("Users/me");
-  const typingTimeoutRef = useRef<number | null>(null);
-  const [isValidDomain, setIsValidDomain] = useState(false);
-  const handleSubmit = (e: React.FormEvent) => {
-    e.preventDefault();
-
-    const rootDomain = userData?.account?.root_domain;
-    const account_sid = userData?.account?.account_sid;
-
-    postSipRealms(account_sid || "", `${name}.${rootDomain}`)
-      .then(() => {
-        navigate(`${ROUTE_INTERNAL_ACCOUNTS}/${account_sid}/edit`);
-      })
-      .catch((error) => {
-        setErrorMessage(error.msg);
-      });
-  };
-
-  useEffect(() => {
-    if (typingTimeoutRef.current) {
-      clearTimeout(typingTimeoutRef.current);
-    }
-    if (!name || name.length < 3) {
-      setIsValidDomain(false);
-      return;
-    }
-    setIsValidDomain(false);
-    typingTimeoutRef.current = setTimeout(() => {
-      getAvailability(`${name}.${userData?.account?.root_domain}`)
-        .then(({ json }) =>
-          setIsValidDomain(
-            Boolean(json.available) && hasValue(name) && name.length != 0
-          )
-        )
-        .catch((error) => {
-          setErrorMessage(error.msg);
-          setIsValidDomain(false);
-        });
-    }, 500);
-  }, [name]);
-
-  return (
-    <>
-      <H1 className="h2">Edit Sip Realm</H1>
-      <Section slim>
-        <form className="form form--internal" onSubmit={handleSubmit}>
-          <fieldset>
-            <MS>
-              This is the domain name where your carrier will send calls, and
-              where you can register devices to.
-            </MS>
-            {errorMessage && <Message message={errorMessage} />}
-            <br />
-            <DomainInput
-              id="sip_realm"
-              name="sip_realm"
-              value={name}
-              setValue={setName}
-              placeholder="Your name here"
-              root_domain={`.${userData?.account?.root_domain || ""}`}
-              is_valid={isValidDomain}
-            />
-          </fieldset>
-          <fieldset>
-            <ButtonGroup left>
-              <Button
-                small
-                subStyle="grey"
-                as={Link}
-                to={`${ROUTE_INTERNAL_ACCOUNTS}/${userData?.account?.account_sid}/edit`}
-              >
-                Cancel
-              </Button>
-              <Button type="submit" small disabled={!isValidDomain}>
-                Change Sip Realm
-              </Button>
-            </ButtonGroup>
-          </fieldset>
-        </form>
-      </Section>
-    </>
-  );
-};
-
-export default EditSipRealm;
--- a/src/containers/internal/views/accounts/form.tsx
+++ b/src/containers/internal/views/accounts/form.tsx
@@ -1,6 +1,6 @@
-import React, { useState, useEffect, useRef } from "react";
-import { P, Button, ButtonGroup, MS, Icon, H1 } from "@jambonz/ui-kit";
-import { Link, useNavigate, useParams } from "react-router-dom";
+import React, { useState, useEffect } from "react";
+import { P, Button, ButtonGroup, MS, Icon } from "@jambonz/ui-kit";
+import { Link, useNavigate } from "react-router-dom";

 import { toastError, toastSuccess, useSelectState } from "src/store";
 import {
@@ -12,7 +12,6 @@ import {
  deleteAccountLimit,
  deleteAccountTtsCache,
  postAccountBucketCredentialTest,
-  deleteAccount,
 } from "src/api";
 import { ClipBoard, Icons, Modal, Section, Tooltip } from "src/components";
 import {
@@ -22,26 +21,20 @@ import {
  Message,
  ApplicationSelect,
  LocalLimits,
-  FileUpload,
 } from "src/components/forms";
 import { ROUTE_INTERNAL_ACCOUNTS } from "src/router/routes";
 import {
  AUDIO_FORMAT_OPTIONS,
-  BUCKET_VENDOR_AWS,
-  BUCKET_VENDOR_GOOGLE,
  BUCKET_VENDOR_OPTIONS,
  CRED_OK,
-  CurrencySymbol,
  DEFAULT_WEBHOOK,
  DISABLE_CALL_RECORDING,
-  ENABLE_HOSTED_SYSTEM,
-  PlanType,
  USER_ACCOUNT,
  WEBHOOK_METHODS,
 } from "src/api/constants";
 import { MSG_REQUIRED_FIELDS, MSG_WEBHOOK_FIELDS } from "src/constants";

-import {
+import type {
  WebHook,
  Account,
  Application,
@@ -51,19 +44,9 @@ import {
  TtsCache,
  BucketCredential,
  AwsTag,
-  Invoice,
-  CurrentUserData,
-  Carrier,
-  SpeechCredential,
 } from "src/api/types";
 import { hasLength, hasValue } from "src/utils";
 import { useRegionVendors } from "src/vendor";
-import { GoogleServiceKey } from "src/vendor/types";
-import { getObscuredGoogleServiceKey } from "../speech-services/utils";
-import dayjs from "dayjs";
-import { EditBoard } from "src/components/editboard";
-import { ModalLoader } from "src/components/modal";
-import { useAuth } from "src/router/auth";

 type AccountFormProps = {
  apps?: Application[];
@@ -78,22 +61,14 @@ export const AccountForm = ({
  account,
  ttsCache,
 }: AccountFormProps) => {
-  const params = useParams();
  const navigate = useNavigate();
  const user = useSelectState("user");
  const currentServiceProvider = useSelectState("currentServiceProvider");
  const [accounts] = useApiData<Account[]>("Accounts");
-  const [invoice] = useApiData<Invoice>("Invoices");
-  const [userData] = useApiData<CurrentUserData>("Users/me");
-  const [userCarriers] = useApiData<Carrier[]>(`VoipCarriers`);
-  const [userSpeechs] = useApiData<SpeechCredential[]>(
-    `/Accounts/${params.account_sid}/SpeechCredentials`
-  );
  const [name, setName] = useState("");
  const [realm, setRealm] = useState("");
  const [appId, setAppId] = useState("");
  const [recId, setRecId] = useState("");
-  const { signout } = useAuth();
  const [regHook, setRegHook] = useState<WebHook>(DEFAULT_WEBHOOK);
  const [queueHook, setQueueHook] = useState<WebHook>(DEFAULT_WEBHOOK);
  const [modal, setModal] = useState(false);
@@ -106,29 +81,14 @@ export const AccountForm = ({
  const [initialCheckRecordAllCall, setInitialCheckRecordAllCall] =
    useState(false);
  const [bucketVendor, setBucketVendor] = useState("");
-  const [tmpBucketVendor, setTmpBucketVendor] = useState("");
  const [recordFormat, setRecordFormat] = useState("mp3");
  const [bucketRegion, setBucketRegion] = useState("us-east-1");
  const [bucketName, setBucketName] = useState("");
-  const [tmpBucketName, setTmpBucketName] = useState("");
  const [bucketAccessKeyId, setBucketAccessKeyId] = useState("");
  const [bucketSecretAccessKey, setBucketSecretAccessKey] = useState("");
  const [bucketCredentialChecked, setBucketCredentialChecked] = useState(false);
  const [bucketTags, setBucketTags] = useState<AwsTag[]>([]);
-  const [bucketGoogleServiceKey, setBucketGoogleServiceKey] =
-    useState<GoogleServiceKey | null>(null);
-  const [tmpBucketGoogleServiceKey, setTmpBucketGoogleServiceKey] =
-    useState<GoogleServiceKey | null>(null);
  const regions = useRegionVendors();
-  const [subscriptionDescription, setSubscriptionDescription] = useState("");
-  const [isDeleteAccount, setIsDeleteAccount] = useState(false);
-  const [requiresPassword, setRequiresPassword] = useState(true);
-  const [deleteAccountPasswd, setDeleteAccountPasswd] = useState("");
-  const [deleteMessage, setDeleteMessage] = useState("");
-  const [isDisableDeleteAccountButton, setIsDisableDeleteAccountButton] =
-    useState(false);
-  const deleteMessageRef = useRef<HTMLInputElement | null>(null);
-  const [isShowModalLoader, setIsShowModalLoader] = useState(false);

  /** This lets us map and render the same UI for each... */
  const webhooks = [
@@ -164,49 +124,6 @@ export const AccountForm = ({
    },
  ];

-  useEffect(() => {
-    if (
-      isDeleteAccount &&
-      deleteMessageRef.current &&
-      deleteMessageRef.current !== document.activeElement
-    ) {
-      deleteMessageRef.current.focus();
-    }
-  }, [isDeleteAccount]);
-
-  const handleDeleteAccount = (e: React.FormEvent) => {
-    e.preventDefault();
-
-    if (deleteMessage !== "delete my account") {
-      toastError(
-        "You must type the delete message correctly in order to delete your account."
-      );
-      if (
-        deleteMessageRef.current &&
-        deleteMessageRef.current !== document.activeElement
-      ) {
-        deleteMessageRef.current.focus();
-      }
-      return;
-    }
-    setIsDisableDeleteAccountButton(true);
-    setIsShowModalLoader(true);
-
-    deleteAccount(userData?.account?.account_sid || "", {
-      password: deleteAccountPasswd,
-    })
-      .then(() => {
-        signout();
-      })
-      .catch((error) => {
-        toastError(error.msg);
-      })
-      .finally(() => {
-        setIsDisableDeleteAccountButton(false);
-        setIsShowModalLoader(false);
-      });
-  };
-
  const handleConfirm = (e: React.FormEvent) => {
    e.preventDefault();
    e.stopPropagation();
@@ -217,49 +134,15 @@ export const AccountForm = ({
    setModal(false);
  };

-  const handleFile = (file: File) => {
-    const handleError = () => {
-      setBucketGoogleServiceKey(null);
-      setTmpBucketGoogleServiceKey(null);
-      toastError("Invalid service key file, could not parse as JSON.");
-    };
-
-    file
-      .text()
-      .then((text) => {
-        try {
-          const json: GoogleServiceKey = JSON.parse(text);
-
-          if (json.private_key && json.client_email) {
-            setBucketGoogleServiceKey(json);
-            setTmpBucketGoogleServiceKey(json);
-          } else {
-            setBucketGoogleServiceKey(null);
-            setTmpBucketGoogleServiceKey(null);
-          }
-        } catch (error) {
-          handleError();
-        }
-      })
-      .catch(() => {
-        handleError();
-      });
-  };
-
  const handleTestBucketCredential = (e: React.FormEvent) => {
    e.preventDefault();
    if (!account || !account.data) return;
    const cred: BucketCredential = {
      vendor: bucketVendor,
+      region: bucketRegion,
      name: bucketName,
-      ...(bucketVendor === BUCKET_VENDOR_AWS && {
-        region: bucketRegion,
-        access_key_id: bucketAccessKeyId,
-        secret_access_key: bucketSecretAccessKey,
-      }),
-      ...(bucketVendor === BUCKET_VENDOR_GOOGLE && {
-        service_key: JSON.stringify(bucketGoogleServiceKey),
-      }),
+      access_key_id: bucketAccessKeyId,
+      secret_access_key: bucketSecretAccessKey,
    };

    postAccountBucketCredentialTest(account?.data?.account_sid, cred).then(
@@ -365,7 +248,7 @@ export const AccountForm = ({
    if (account && account.data) {
      putAccount(account.data.account_sid, {
        name,
-        ...(!ENABLE_HOSTED_SYSTEM && { sip_realm: realm || null }),
+        sip_realm: realm || null,
        webhook_secret: account.data.webhook_secret,
        siprec_hook_sid: recId || null,
        queue_event_hook: queueHook || account.data.queue_event_hook,
@@ -373,7 +256,7 @@ export const AccountForm = ({
        device_calling_application_sid: appId || null,
        record_all_calls: recordAllCalls ? 1 : 0,
        record_format: recordFormat ? recordFormat : "mp3",
-        ...(bucketVendor === BUCKET_VENDOR_AWS && {
+        ...(bucketVendor === "aws_s3" && {
          bucket_credential: {
            vendor: bucketVendor || null,
            region: bucketRegion || "us-east-1",
@@ -383,14 +266,6 @@ export const AccountForm = ({
            ...(hasLength(bucketTags) && { tags: bucketTags }),
          },
        }),
-        ...(bucketVendor === BUCKET_VENDOR_GOOGLE && {
-          bucket_credential: {
-            vendor: bucketVendor || null,
-            service_key: JSON.stringify(bucketGoogleServiceKey),
-            name: bucketName || null,
-            ...(hasLength(bucketTags) && { tags: bucketTags }),
-          },
-        }),
        ...(!bucketCredentialChecked && {
          record_all_calls: 0,
          bucket_credential: {
@@ -472,15 +347,11 @@ export const AccountForm = ({
        }
      }

-      if (tmpBucketVendor) {
-        setBucketVendor(tmpBucketVendor);
-      } else if (account.data.bucket_credential?.vendor) {
+      if (account.data.bucket_credential?.vendor) {
        setBucketVendor(account.data.bucket_credential?.vendor);
      }

-      if (tmpBucketName) {
-        setBucketName(tmpBucketName);
-      } else if (account.data.bucket_credential?.name) {
+      if (account.data.bucket_credential?.name) {
        setBucketName(account.data.bucket_credential?.name);
      }

@@ -507,82 +378,12 @@ export const AccountForm = ({
      if (account.data.record_format) {
        setRecordFormat(account.data.record_format || "mp3");
      }
-      if (tmpBucketGoogleServiceKey) {
-        setBucketGoogleServiceKey(tmpBucketGoogleServiceKey);
-      } else if (account.data.bucket_credential?.service_key) {
-        setBucketGoogleServiceKey(
-          JSON.parse(account.data.bucket_credential?.service_key)
-        );
-      }
      setInitialCheckRecordAllCall(
        hasValue(bucketVendor) && bucketVendor.length !== 0
      );
    }
  }, [account]);

-  if (ENABLE_HOSTED_SYSTEM) {
-    useEffect(() => {
-      if (userData && userData.user) {
-        setRequiresPassword(userData.user.provider === "local");
-      }
-      if (userData && userData.account) {
-        const pType = userData.account.plan_type;
-        const { products } = userData.subscription || {};
-        const registeredDeviceRecord = products
-          ? products.find((item) => item.name === "registered device") || {
-              quantity: 0,
-            }
-          : { quantity: 0 };
-        const callSessionRecord = products
-          ? products.find(
-              (item) => item.name === "concurrent call session"
-            ) || { quantity: 0 }
-          : { quantity: 0 };
-        const quantity =
-          (userData.account.device_to_call_ratio || 0) *
-            (callSessionRecord.quantity || 0) +
-          (registeredDeviceRecord.quantity || 0);
-        const { trial_end_date } = userData.account || {};
-        switch (pType) {
-          case PlanType.TRIAL:
-            setSubscriptionDescription(
-              `You are currently on the Free plan (trial period). You are limited to ${
-                callSessionRecord.quantity
-              } simultaneous calls and ${quantity} registered devices.${
-                trial_end_date
-                  ? ` Your free trial will end on ${dayjs(
-                      trial_end_date
-                    ).format("MMM DD, YYYY")}.`
-                  : ""
-              }`
-            );
-            break;
-          case PlanType.PAID:
-            if (invoice) {
-              setSubscriptionDescription(
-                `Your paid subscription includes capacity for ${
-                  callSessionRecord.quantity
-                } simultaneous calls, and ${quantity} registered devices. You are billed ${
-                  CurrencySymbol[invoice.currency || "usd"]
-                }${(invoice.total || 0) / 100} on ${dayjs
-                  .unix(Number(invoice.next_payment_attempt))
-                  .format("MMM DD, YYYY")}.`
-              );
-            }
-
-            break;
-          case PlanType.FREE:
-            setSubscriptionDescription(
-              `You are currently on the Free plan (trial period expired). You are limited to ${callSessionRecord.quantity} simultaneous calls and ${quantity} registered devices`
-            );
-            break;
-        }
-        // Make sure Account page is alway scroll to top to see subscription
-        window.scrollTo(0, 0);
-      }
-    }, [userData, invoice]);
-  }
-
  const updateBucketTags = (
    index: number,
    key: string,
@@ -605,164 +406,6 @@ export const AccountForm = ({

  return (
    <>
-      {ENABLE_HOSTED_SYSTEM && (
-        <>
-          <Section>
-            <H1 className="h5">Your Subscription</H1>
-            <P>{subscriptionDescription}</P>
-            <br />
-
-            <div className="mast">
-              <ButtonGroup left>
-                <Button
-                  type="button"
-                  mainStyle="hollow"
-                  subStyle="grey"
-                  small
-                  onClick={() => setIsDeleteAccount(true)}
-                >
-                  Delete Account
-                </Button>
-              </ButtonGroup>
-              <ButtonGroup right>
-                {userData?.account?.plan_type === PlanType.PAID ? (
-                  <>
-                    <Button
-                      small
-                      as={Link}
-                      to={`${ROUTE_INTERNAL_ACCOUNTS}/${user?.account_sid}/manage-payment`}
-                    >
-                      Manage Payment Info
-                    </Button>
-                    <Button
-                      small
-                      as={Link}
-                      to={`${ROUTE_INTERNAL_ACCOUNTS}/${user?.account_sid}/modify-subscription`}
-                    >
-                      Modify My Subscription
-                    </Button>
-                  </>
-                ) : (
-                  <Button
-                    as={Link}
-                    to={`${ROUTE_INTERNAL_ACCOUNTS}/${user?.account_sid}/subscription`}
-                  >
-                    Upgrade to a Paid Subscription
-                  </Button>
-                )}
-              </ButtonGroup>
-            </div>
-          </Section>
-          {isDeleteAccount && (
-            <Section slim>
-              <form
-                className="form form--internal"
-                onSubmit={handleDeleteAccount}
-              >
-                <fieldset>
-                  <H1 className="h4">Delete Account</H1>
-                  <P>
-                    <span>
-                      <strong>Warning!</strong>
-                    </span>{" "}
-                    This will permantly delete all of your data from our
-                    database. You will not be able to restore your account. You
-                    must {requiresPassword && "provide your password and"} type
-                    “delete my account” into the Delete Message field.
-                  </P>
-                </fieldset>
-                <fieldset>
-                  {requiresPassword && (
-                    <>
-                      <label htmlFor="password">
-                        Password<span>*</span>
-                      </label>
-                      <Passwd
-                        id="delete_account_password"
-                        name="delete_account_password"
-                        value={deleteAccountPasswd}
-                        placeholder="Password"
-                        required
-                        onChange={(e) => {
-                          setDeleteAccountPasswd(e.target.value);
-                        }}
-                      />
-                    </>
-                  )}
-                  <label htmlFor="deleteMessage">
-                    Delete Message<span>*</span>
-                  </label>
-                  <input
-                    id="deleteMessage"
-                    required
-                    type="text"
-                    name="deleteMessage"
-                    placeholder="Delete Message"
-                    value={deleteMessage}
-                    ref={deleteMessageRef}
-                    onChange={(e) => setDeleteMessage(e.target.value)}
-                  />
-                </fieldset>
-                <fieldset>
-                  <ButtonGroup right>
-                    <Button
-                      subStyle="grey"
-                      type="button"
-                      onClick={() => setIsDeleteAccount(false)}
-                      small
-                    >
-                      Cancel
-                    </Button>
-
-                    <Button
-                      type="submit"
-                      disabled={isDisableDeleteAccountButton}
-                      small
-                    >
-                      PERMANENTLY DELETE MY ACCOUNT
-                    </Button>
-                  </ButtonGroup>
-                </fieldset>
-              </form>
-            </Section>
-          )}
-          {(!userCarriers ||
-            userCarriers.length === 0 ||
-            !userSpeechs ||
-            userSpeechs.length === 0) && (
-            <Section>
-              <H1 className="h5">Finish Account Setup</H1>
-              <H1 className="h6">To do</H1>
-              {(!userCarriers || userCarriers.length === 0) && (
-                <>
-                  <br />
-                  <div>
-                    <span>
-                      <Icons.Edit />
-                      Add a <Link to="/internal/carriers">carrier</Link> to
-                      route calls
-                    </span>
-                  </div>
-                </>
-              )}
-              {(!userSpeechs || userSpeechs.length === 0) && (
-                <>
-                  <br />
-                  <div>
-                    <span>
-                      <Icons.Edit />
-                      Add <Link to="/internal/speech-services">
-                        speech
-                      </Link>{" "}
-                      credentials for text-to-speech and speech-to-text
-                    </span>
-                  </div>
-                </>
-              )}
-            </Section>
-          )}
-        </>
-      )}
      <Section slim>
        <form className="form form--internal" onSubmit={handleSubmit}>
          <fieldset>
@@ -792,34 +435,22 @@ export const AccountForm = ({
              onChange={(e) => setName(e.target.value)}
            />
          </fieldset>
-          {!ENABLE_HOSTED_SYSTEM && (
-            <fieldset>
-              <LocalLimits
-                data={limits && limits.data}
-                limits={[localLimits, setLocalLimits]}
-              />
-            </fieldset>
-          )}
+          <fieldset>
+            <LocalLimits
+              data={limits && limits.data}
+              limits={[localLimits, setLocalLimits]}
+            />
+          </fieldset>
          <fieldset>
            <label htmlFor="sip_realm">SIP realm</label>
-            {ENABLE_HOSTED_SYSTEM ? (
-              <EditBoard
-                id="sip_realm"
-                name="sip_realm"
-                text={realm}
-                title="Change SIP Realm"
-                path={`/internal/accounts/${user?.account_sid}/sip-realm/edit`}
-              />
-            ) : (
-              <input
-                id="sip_realm"
-                type="text"
-                name="sip_realm"
-                placeholder="The domain name that SIP devices will register with"
-                value={realm}
-                onChange={(e) => setRealm(e.target.value)}
-              />
-            )}
+            <input
+              id="sip_realm"
+              type="text"
+              name="sip_realm"
+              placeholder="The domain name that SIP devices will register with"
+              value={realm}
+              onChange={(e) => setRealm(e.target.value)}
+            />
          </fieldset>
          {account && account.data && (
            <fieldset>
@@ -1008,27 +639,25 @@ export const AccountForm = ({
                      options={BUCKET_VENDOR_OPTIONS}
                      onChange={(e) => {
                        setBucketVendor(e.target.value);
-                        setTmpBucketVendor(e.target.value);
                      }}
                    />
                  </div>
-                  <label htmlFor="bucket_name">
-                    Bucket Name<span>*</span>
-                  </label>
-                  <input
-                    id="bucket_name"
-                    required
-                    type="text"
-                    name="bucket_name"
-                    placeholder="Bucket"
-                    value={bucketName}
-                    onChange={(e) => {
-                      setBucketName(e.target.value);
-                      setTmpBucketName(e.target.value);
-                    }}
-                  />
-                  {bucketVendor === BUCKET_VENDOR_AWS && (
+                  {bucketVendor === "aws_s3" && (
                    <>
+                      <label htmlFor="bucket_name">
+                        Bucket Name<span>*</span>
+                      </label>
+                      <input
+                        id="bucket_name"
+                        required
+                        type="text"
+                        name="bucket_name"
+                        placeholder="Bucket"
+                        value={bucketName}
+                        onChange={(e) => {
+                          setBucketName(e.target.value);
+                        }}
+                      />
                      {regions && regions["aws"] && (
                        <>
                          <label htmlFor="bucket_aws_region">
@@ -1076,120 +705,86 @@ export const AccountForm = ({
                          setBucketSecretAccessKey(e.target.value);
                        }}
                      />
-                    </>
-                  )}
-                  {bucketVendor === BUCKET_VENDOR_GOOGLE && (
-                    <>
-                      <label htmlFor="google_service_key">
-                        Service key<span>*</span>
-                        <Tooltip text="Provide a JSON key for a Service Account with APIs enabled for Cloud Storage and Storage Transfer API">
-                          {" "}
-                        </Tooltip>
-                      </label>
-                      <FileUpload
-                        id="google_service_key"
-                        name="google_service_key"
-                        handleFile={handleFile}
-                        placeholder="Choose a file"
-                        required={!bucketGoogleServiceKey}
-                      />
-                      {bucketGoogleServiceKey && (
-                        <pre>
-                          <code>
-                            {JSON.stringify(
-                              getObscuredGoogleServiceKey(
-                                bucketGoogleServiceKey
-                              ),
-                              null,
-                              2
-                            )}
-                          </code>
-                        </pre>
-                      )}
-                    </>
-                  )}
-                  <label htmlFor="aws_s3_tags">
-                    {bucketVendor === BUCKET_VENDOR_AWS
-                      ? "S3"
-                      : bucketVendor === BUCKET_VENDOR_GOOGLE
-                      ? "Google Cloud Storage"
-                      : ""}{" "}
-                    Tags
-                  </label>
-                  {hasLength(bucketTags) &&
-                    bucketTags.map((b, i) => (
-                      <div key={`s3_tags_${i}`} className="bucket_tag">
-                        <div>
-                          <div>
-                            <input
-                              id={`bucket_tag_name_${i}`}
-                              name={`bucket_tag_name_${i}`}
-                              type="text"
-                              placeholder="Name"
-                              required
-                              value={b.Key}
-                              onChange={(e) => {
-                                updateBucketTags(i, "Key", e.target.value);
+                      <label htmlFor="aws_s3_tags">S3 Tags</label>
+                      {hasLength(bucketTags) &&
+                        bucketTags.map((b, i) => (
+                          <div key={`s3_tags_${i}`} className="bucket_tag">
+                            <div>
+                              <div>
+                                <input
+                                  id={`bucket_tag_name_${i}`}
+                                  name={`bucket_tag_name_${i}`}
+                                  type="text"
+                                  placeholder="Name"
+                                  required
+                                  value={b.Key}
+                                  onChange={(e) => {
+                                    updateBucketTags(i, "Key", e.target.value);
+                                  }}
+                                />
+                              </div>
+                              <div>
+                                <input
+                                  id={`bucket_tag_value_${i}`}
+                                  name={`bucket_tag_value_${i}`}
+                                  type="text"
+                                  placeholder="Value"
+                                  required
+                                  value={b.Value}
+                                  onChange={(e) => {
+                                    updateBucketTags(
+                                      i,
+                                      "Value",
+                                      e.target.value
+                                    );
+                                  }}
+                                />
+                              </div>
+                            </div>
+                            <button
+                              className="btnty"
+                              title="Delete Aws Tag"
+                              type="button"
+                              onClick={() => {
+                                setBucketTags(
+                                  bucketTags.filter((g2, i2) => i2 !== i)
+                                );
                              }}
-                            />
+                            >
+                              <Icon>
+                                <Icons.Trash2 />
+                              </Icon>
+                            </button>
                          </div>
-                          <div>
-                            <input
-                              id={`bucket_tag_value_${i}`}
-                              name={`bucket_tag_value_${i}`}
-                              type="text"
-                              placeholder="Value"
-                              required
-                              value={b.Value}
-                              onChange={(e) => {
-                                updateBucketTags(i, "Value", e.target.value);
-                              }}
-                            />
-                          </div>
-                        </div>
+                        ))}
+                      <ButtonGroup left>
                        <button
                          className="btnty"
-                          title="Delete Aws Tag"
                          type="button"
-                          onClick={() => {
-                            setBucketTags(
-                              bucketTags.filter((g2, i2) => i2 !== i)
-                            );
-                          }}
+                          onClick={addBucketTag}
+                          title="Add S3 Tags"
                        >
-                          <Icon>
-                            <Icons.Trash2 />
+                          <Icon subStyle="teal">
+                            <Icons.Plus />
                          </Icon>
                        </button>
-                      </div>
-                    ))}
-                  <ButtonGroup left>
-                    <button
-                      className="btnty"
-                      type="button"
-                      onClick={addBucketTag}
-                      title="Add S3 Tags"
-                    >
-                      <Icon subStyle="teal">
-                        <Icons.Plus />
-                      </Icon>
-                    </button>
-                  </ButtonGroup>
-                  <ButtonGroup left>
-                    <Button
-                      onClick={handleTestBucketCredential}
-                      small
-                      disabled={
-                        !bucketName ||
-                        (bucketVendor === BUCKET_VENDOR_AWS &&
-                          (!bucketAccessKeyId || !bucketSecretAccessKey)) ||
-                        (bucketVendor === BUCKET_VENDOR_GOOGLE &&
-                          !bucketGoogleServiceKey)
-                      }
-                    >
-                      Test
-                    </Button>
-                  </ButtonGroup>
+                      </ButtonGroup>
+
+                      <ButtonGroup left>
+                        <Button
+                          onClick={handleTestBucketCredential}
+                          small
+                          disabled={
+                            !bucketName ||
+                            !bucketAccessKeyId ||
+                            !bucketSecretAccessKey
+                          }
+                        >
+                          Test
+                        </Button>
+                      </ButtonGroup>
+                    </>
+                  )}
                  <label htmlFor="record_all_call" className="chk">
                    <input
                      id="record_all_call"
@@ -1198,7 +793,11 @@ export const AccountForm = ({
                      onChange={(e) => setRecordAllCalls(e.target.checked)}
                      checked={recordAllCalls}
                    />
-                    <Tooltip text="You can also record calls only to specific applications">
+                    <div></div>
+                    <Tooltip
+                      text="You can also record calls only to specific applications"
+                      subStyle="info"
+                    >
                      Record all calls for this account
                    </Tooltip>
                  </label>
@@ -1214,17 +813,14 @@ export const AccountForm = ({
          )}
          <fieldset>
            <ButtonGroup left>
-              {user?.scope != USER_ACCOUNT && (
-                <Button
-                  small
-                  subStyle="grey"
-                  as={Link}
-                  to={ROUTE_INTERNAL_ACCOUNTS}
-                >
-                  Cancel
-                </Button>
-              )}
-
+              <Button
+                small
+                subStyle="grey"
+                as={Link}
+                to={ROUTE_INTERNAL_ACCOUNTS}
+              >
+                Cancel
+              </Button>
              <Button type="submit" small>
                Save
              </Button>
@@ -1248,14 +844,6 @@ export const AccountForm = ({
          <P>Are you sure you want to clean TTS cache for this account?</P>
        </Modal>
      )}
-      {isShowModalLoader && (
-        <ModalLoader>
-          <P>
-            Your requested changes are being processed. Please do not leave the
-            page or hit the back button until complete.
-          </P>
-        </ModalLoader>
-      )}
    </>
  );
 };
--- a/src/containers/internal/views/accounts/index.tsx
+++ b/src/containers/internal/views/accounts/index.tsx
@@ -45,7 +45,7 @@ export const Accounts = () => {
        return;
      }

-      deleteAccount(account.account_sid, {})
+      deleteAccount(account.account_sid)
        .then(() => {
          refetch();
          setAccount(null);
--- a/src/containers/internal/views/accounts/manage-payment-form.tsx
+++ b/src/containers/internal/views/accounts/manage-payment-form.tsx
@@ -1,191 +0,0 @@
-import { Button, ButtonGroup, H1, P } from "@jambonz/ui-kit";
-import {
-  PaymentElement,
-  useElements,
-  useStripe,
-} from "@stripe/react-stripe-js";
-import React, { useState } from "react";
-import { Link, useNavigate } from "react-router-dom";
-import { postSubscriptions, useApiData } from "src/api";
-import { CurrentUserData, Subscription } from "src/api/types";
-import { Section } from "src/components";
-import { ROUTE_INTERNAL_ACCOUNTS } from "src/router/routes";
-import { toastError, toastSuccess, useSelectState } from "src/store";
-import { PaymentMethod } from "@stripe/stripe-js";
-import { ModalLoader } from "src/components/modal";
-
-export const ManagePaymentForm = () => {
-  const user = useSelectState("user");
-  const stripe = useStripe();
-  const elements = useElements();
-  const [userData] = useApiData<CurrentUserData>("Users/me");
-  const [isChangePayment, setIsChangePayment] = useState(false);
-  const [isSavingNewCard, setIsSavingNewCard] = useState(false);
-  const [isShowModalLoader, setIsShowModalLoader] = useState(false);
-  const navigate = useNavigate();
-
-  const createSubscription = async (paymentMethod: PaymentMethod) => {
-    const body: Subscription = {
-      action: "update-payment-method",
-      payment_method_id: paymentMethod.id,
-    };
-
-    postSubscriptions(body)
-      .then(({ json }) => {
-        if (json.status === "success") {
-          toastSuccess("Payment completed successfully");
-          navigate(
-            `${ROUTE_INTERNAL_ACCOUNTS}/${userData?.account?.account_sid}/edit`
-          );
-        } else if (json.status === "action required") {
-          if (stripe) {
-            const location = window.location;
-            stripe
-              .confirmPayment({
-                clientSecret: json.client_secret || "",
-                confirmParams: {
-                  return_url: `${location.protocol}//${location.host}${ROUTE_INTERNAL_ACCOUNTS}/${userData?.account?.account_sid}/edit`,
-                },
-              })
-              .then((error) => {
-                if (error) {
-                  toastError(error.error.message || "");
-                  return;
-                }
-              })
-              .finally(() => {
-                setIsSavingNewCard(false);
-                setIsShowModalLoader(false);
-              });
-          }
-        } else if (json.status === "card error") {
-          setIsSavingNewCard(false);
-          setIsShowModalLoader(false);
-          toastError(json.reason || "Something went wrong, please try again.");
-        }
-      })
-      .catch((error) => {
-        toastError(error.msg || "Something went wrong, please try again.");
-      })
-      .finally(() => {
-        setIsSavingNewCard(false);
-        setIsShowModalLoader(false);
-      });
-  };
-
-  const handleSaveNewCard = async (e: React.FormEvent) => {
-    e.preventDefault();
-
-    if (!stripe || !elements) {
-      return;
-    }
-
-    const card = elements.getElement(PaymentElement);
-    if (!card) {
-      return;
-    }
-    const { error: elementsError } = await elements.submit();
-    if (elementsError) {
-      toastError(elementsError.message || "");
-      return;
-    }
-    const { error, paymentMethod } = await stripe.createPaymentMethod({
-      element: card,
-    });
-
-    if (error) {
-      toastError(error.message || "Something went wrong, please try again.");
-      return;
-    }
-    setIsSavingNewCard(true);
-    setIsShowModalLoader(true);
-    createSubscription(paymentMethod);
-  };
-  return (
-    <>
-      <H1 className="h2">Manage Payment Information</H1>
-      {userData?.subscription && (
-        <Section>
-          <H1 className="h3">Current Payment Information</H1>
-          <div className="item__details">
-            <div className="pre-grid-white">
-              <div>Card Type:</div>
-              <div>{userData.subscription.card_type}</div>
-              <div>Card Number:</div>
-              <div>
-                {userData.subscription.last4
-                  ? `**** **** **** ${userData.subscription.last4}`
-                  : ""}
-              </div>
-              <div>Expiration:</div>
-              <div>
-                {userData.subscription.exp_year
-                  ? `${userData.subscription.exp_month}/${userData.subscription.exp_year}`
-                  : ""}
-              </div>
-            </div>
-          </div>
-          <ButtonGroup right>
-            <Button
-              type="button"
-              subStyle="grey"
-              as={Link}
-              to={`${ROUTE_INTERNAL_ACCOUNTS}/${user?.account_sid}/edit`}
-              small
-            >
-              Cancel
-            </Button>
-            <Button onClick={() => setIsChangePayment(true)} small>
-              Change Payment Info
-            </Button>
-          </ButtonGroup>
-        </Section>
-      )}
-      {isChangePayment && (
-        <Section>
-          <div className="grid--col4--users">
-            <H1 className="h3">New Payment Information</H1>
-            <div className="grid__row">
-              <div></div>
-              <div>
-                <PaymentElement
-                  options={{
-                    paymentMethodOrder: ["card"],
-                  }}
-                />
-              </div>
-            </div>
-          </div>
-          <ButtonGroup right>
-            <Button
-              type="button"
-              subStyle="grey"
-              onClick={() => setIsChangePayment(false)}
-              small
-            >
-              Cancel
-            </Button>
-            <Button
-              type="button"
-              onClick={handleSaveNewCard}
-              disabled={!stripe || isSavingNewCard}
-              small
-            >
-              Save New Card
-            </Button>
-          </ButtonGroup>
-        </Section>
-      )}
-      {isShowModalLoader && (
-        <ModalLoader>
-          <P>
-            Your requested changes are being processed. Please do not leave the
-            page or hit the back button until complete.
-          </P>
-        </ModalLoader>
-      )}
-    </>
-  );
-};
-
-export default ManagePaymentForm;
--- a/src/containers/internal/views/accounts/manage-payment.tsx
+++ b/src/containers/internal/views/accounts/manage-payment.tsx
@@ -1,23 +0,0 @@
-import { Elements } from "@stripe/react-stripe-js";
-import { stripePromise } from "./subscription";
-import ManagePaymentForm from "./manage-payment-form";
-import React from "react";
-
-export const ManagePayment = () => {
-  return (
-    <>
-      <Elements
-        stripe={stripePromise}
-        options={{
-          mode: "setup",
-          currency: "usd",
-          paymentMethodCreation: "manual",
-        }}
-      >
-        <ManagePaymentForm />
-      </Elements>
-    </>
-  );
-};
-
-export default ManagePayment;
--- a/src/containers/internal/views/accounts/subscription-form.tsx
+++ b/src/containers/internal/views/accounts/subscription-form.tsx
@@ -1,633 +0,0 @@
-import { Button, ButtonGroup, H1, P } from "@jambonz/ui-kit";
-import React, { useEffect, useState } from "react";
-import { Link, useLocation, useNavigate } from "react-router-dom";
-import { postSubscriptions, useApiData } from "src/api";
-import { CurrencySymbol } from "src/api/constants";
-import {
-  CurrentUserData,
-  PriceInfo,
-  ServiceData,
-  StripeCustomerId,
-  Subscription,
-} from "src/api/types";
-import { Modal, Section } from "src/components";
-import { ROUTE_INTERNAL_ACCOUNTS } from "src/router/routes";
-import { hasValue } from "src/utils";
-import {
-  PaymentElement,
-  useElements,
-  useStripe,
-} from "@stripe/react-stripe-js";
-import { PaymentMethod } from "@stripe/stripe-js";
-import { toastError, toastSuccess } from "src/store";
-import { ModalLoader } from "src/components/modal";
-
-const SubscriptionForm = () => {
-  const [userData] = useApiData<CurrentUserData>("Users/me");
-  const [priceInfo] = useApiData<PriceInfo[]>("/Prices");
-  const [userStripeInfo] = useApiData<StripeCustomerId>("/StripeCustomerId");
-  const [total, setTotal] = useState(0);
-  const [cardErrorCase, setCardErrorCase] = useState(false);
-  const [isReviewChanges, setIsReviewChanges] = useState(false);
-  const [isReturnToFreePlan, setIsReturnToFreePlan] = useState(false);
-  const navigate = useNavigate();
-  const location = useLocation();
-  const isModifySubscription = location.pathname.includes(
-    "modify-subscription"
-  );
-  const [billingCharge, setBillingCharge] = useState<Subscription | null>(null);
-  const [isShowModalLoader, setIsShowModalLoader] = useState(false);
-  const [isDisableSubmitButton, setIsDisableSubmitButton] =
-    useState(isModifySubscription);
-
-  const stripe = useStripe();
-  const elements = useElements();
-
-  const createSubscription = async (paymentMethod: PaymentMethod) => {
-    let body: Subscription = {};
-
-    if (cardErrorCase) {
-      body = {
-        action: "update-payment-method",
-        payment_method_id: paymentMethod.id,
-      };
-    } else {
-      body = {
-        action: "upgrade-to-paid",
-        payment_method_id: paymentMethod.id,
-        stripe_customer_id: userStripeInfo?.stripe_customer_id,
-        products: serviceData.map((service) => ({
-          price_id: service.stripe_price_id,
-          product_sid: service.product_sid,
-          quantity: service.capacity || 0,
-        })),
-      };
-    }
-
-    postSubscriptions(body)
-      .then(({ json }) => {
-        if (json.status === "success") {
-          toastSuccess("Payment completed successfully");
-          navigate(
-            `${ROUTE_INTERNAL_ACCOUNTS}/${userData?.account?.account_sid}/edit`
-          );
-        } else if (json.status === "action required") {
-          if (stripe) {
-            const location = window.location;
-            stripe
-              .confirmPayment({
-                clientSecret: json.client_secret || "",
-                confirmParams: {
-                  return_url: `${location.protocol}//${location.host}${ROUTE_INTERNAL_ACCOUNTS}/${userData?.account?.account_sid}/edit`,
-                },
-              })
-              .then((error) => {
-                if (error) {
-                  toastError(error.error.message || "");
-                  return;
-                }
-              })
-              .finally(() => {
-                setIsDisableSubmitButton(false);
-                setIsShowModalLoader(false);
-              });
-          }
-        } else if (json.status === "card error") {
-          setIsDisableSubmitButton(false);
-          setIsShowModalLoader(false);
-          setCardErrorCase(true);
-        }
-      })
-      .catch((error) => {
-        setIsDisableSubmitButton(false);
-        setIsShowModalLoader(false);
-        toastError(error.msg || "Something went wrong, please try again.");
-      });
-  };
-
-  const retrieveBillingChanges = async () => {
-    const updatedProducts = serviceData.map((product) => ({
-      price_id: product.stripe_price_id,
-      product_sid: product.product_sid,
-      quantity: product.capacity || 0,
-    }));
-
-    postSubscriptions({
-      action: "update-quantities",
-      dry_run: true,
-      products: updatedProducts,
-    })
-      .then(({ json }) => {
-        setBillingCharge(json);
-        setIsReviewChanges(true);
-      })
-      .catch((error) => {
-        toastError(error.msg || "Something went wrong, please try again.");
-        setIsDisableSubmitButton(false);
-      });
-  };
-
-  const handleSubmit = async (e: React.FormEvent) => {
-    e.preventDefault();
-    if (!stripe || !elements) {
-      return;
-    }
-
-    setIsDisableSubmitButton(true);
-    if (isModifySubscription) {
-      retrieveBillingChanges();
-      return;
-    }
-    setIsShowModalLoader(true);
-    const { error: elementsError } = await elements.submit();
-    if (elementsError) {
-      setIsDisableSubmitButton(false);
-      setIsShowModalLoader(false);
-      toastError(elementsError.message || "");
-      return;
-    }
-    const card = elements.getElement(PaymentElement);
-    if (!card) {
-      setIsDisableSubmitButton(false);
-      setIsShowModalLoader(false);
-      return;
-    }
-    const { error, paymentMethod } = await stripe.createPaymentMethod({
-      element: card,
-    });
-    if (error) {
-      setIsDisableSubmitButton(false);
-      setIsShowModalLoader(false);
-      toastError(error.message || "");
-      return;
-    }
-
-    createSubscription(paymentMethod);
-  };
-
-  const handleReturnToFreePlan = () => {
-    setIsReturnToFreePlan(false);
-    setIsShowModalLoader(true);
-    const body: Subscription = {
-      action: "downgrade-to-free",
-    };
-
-    postSubscriptions(body)
-      .then(() => {
-        toastSuccess("Downgrade to free plan completed successfully");
-        navigate(
-          `${ROUTE_INTERNAL_ACCOUNTS}/${userData?.account?.account_sid}/edit`
-        );
-      })
-      .catch((error) => {
-        toastError(error.msg);
-      })
-      .finally(() => setIsShowModalLoader(false));
-  };
-
-  const handleReviewChangeSubmit = async (e: React.FormEvent) => {
-    e.preventDefault();
-    setIsShowModalLoader(true);
-
-    const updatedProducts = serviceData.map((product) => ({
-      price_id: product.stripe_price_id,
-      product_sid: product.product_sid,
-      quantity: product.capacity,
-    }));
-
-    postSubscriptions({
-      action: "update-quantities",
-      products: updatedProducts,
-    })
-      .then(() => {
-        toastSuccess(
-          "Your subscription capacity has been successfully modified."
-        );
-        navigate(
-          `${ROUTE_INTERNAL_ACCOUNTS}/${userData?.account?.account_sid}/edit`
-        );
-      })
-      .catch(() => {
-        toastError(
-          `The additional capacity you that you requested could not be granted due to a failure processing payment.
-          Please configure a valid credit card for your account and the upgrade will be automatically processed`
-        );
-      })
-      .finally(() => {
-        setIsShowModalLoader(false);
-        setIsDisableSubmitButton(false);
-      });
-  };
-  // subscription categories
-  const [serviceData, setServiceData] = useState<ServiceData[]>([
-    {
-      category: "voice_call_session",
-      name: "concurrent call session",
-      service: "Maximum concurrent call sessions",
-      fees: 0,
-      feesLabel: "",
-      cost: 0,
-      capacity: 0,
-      invalid: false,
-      currency: "usd",
-      min: 5,
-      max: 1000,
-      dirty: false,
-      visible: true,
-      required: true,
-    },
-    {
-      category: "device",
-      name: "registered device",
-      service: "Additional device registrations",
-      fees: 0,
-      feesLabel: "",
-      cost: 0,
-      capacity: 0,
-      invalid: false,
-      currency: "usd",
-      min: 0,
-      max: 200,
-      dirty: false,
-      visible: false,
-      required: false,
-    },
-  ]);
-  const [originalServiceData, setOriginalServiceData] = useState<ServiceData[]>(
-    []
-  );
-
-  const initFeesAndCost = (priceData: PriceInfo[]) => {
-    serviceData.forEach((service) => {
-      const record = priceData.find(
-        (item) => item.category === service.category
-      );
-
-      if (record) {
-        const price = record.prices.find(
-          (item) => item.currency === service.currency
-        );
-
-        if (price) {
-          let fees = 0;
-          switch (price.billing_scheme) {
-            case "per_unit":
-              fees = (price.unit_amount * 1) / 100;
-              break;
-            default:
-              break;
-          }
-          service.billing_scheme = price.billing_scheme;
-          service.stripe_price_id = price.stripe_price_id;
-          service.unit_label = record.unit_label;
-          service.product_sid = record.product_sid;
-          service.stripe_product_id = record.stripe_product_id;
-          service.fees = fees;
-          service.feesLabel = `${
-            CurrencySymbol[service.currency || "usd"]
-          }${fees} per ${
-            record.unit_label?.slice(0, 3) === "per"
-              ? record.unit_label.slice(3)
-              : record.unit_label
-          }`;
-        }
-      }
-    });
-
-    setServiceData([...serviceData]);
-  };
-
-  const getServicePrice = (
-    service: ServiceData,
-    capacity: number
-  ): [number, string, number] => {
-    let fees = 0;
-    let feesLabel = "";
-    let cost = 0;
-    const capacityNum = capacity;
-    if (service.billing_scheme === "per_unit") {
-      fees = service.fees;
-      cost = fees * capacityNum;
-    } else if (service.billing_scheme === "tiered") {
-      const filteredTiers = service.tiers
-        ? service.tiers.filter(
-            (item) => !item.up_to || item.up_to >= capacityNum
-          )
-        : [];
-      if (filteredTiers.length) {
-        const tier = filteredTiers[0];
-        if (typeof tier.flat_amount === "number") {
-          fees = tier.flat_amount / 100;
-          cost = fees;
-        } else {
-          fees = tier.unit_amount / 100;
-          cost = fees * capacityNum;
-        }
-      }
-    }
-    feesLabel = `${CurrencySymbol[service.currency || "usd"]}${fees} per ${
-      service.unit_label && service.unit_label.slice(0, 3) === "per"
-        ? service.unit_label.slice(3)
-        : service.unit_label
-    }`;
-
-    return [fees, feesLabel, cost];
-  };
-
-  const setProductsInfo = (data: CurrentUserData) => {
-    const { products } = data.subscription || {};
-
-    const services = serviceData.map((service) => {
-      const { quantity } = products
-        ? products.find((item) => item.name === service.name) || {}
-        : { quantity: null };
-      const [fees, feesLabel, cost] = getServicePrice(service, quantity || 0);
-      return {
-        ...service,
-        capacity: quantity || 0,
-        invalid: false,
-        fees,
-        feesLabel,
-        cost,
-        visible: hasValue(quantity) && quantity > 0,
-      };
-    });
-
-    setServiceData(services);
-    setOriginalServiceData([...services]);
-  };
-
-  const updateServiceData = (
-    index: number,
-    key: string,
-    value: typeof serviceData[number][keyof ServiceData]
-  ) => {
-    setServiceData(
-      serviceData.map((g, i) =>
-        i === index
-          ? {
-              ...g,
-              [key]: value,
-              ...(key === "capacity" && { cost: Number(value) * g.fees }),
-            }
-          : g
-      )
-    );
-  };
-
-  useEffect(() => {
-    if (priceInfo) {
-      initFeesAndCost(priceInfo);
-    }
-
-    if (userData && priceInfo) {
-      setProductsInfo(userData);
-    }
-  }, [priceInfo, userData]);
-
-  useEffect(() => {
-    if (isModifySubscription && originalServiceData.length > 0) {
-      setIsDisableSubmitButton(
-        serviceData[0].capacity === originalServiceData[0].capacity &&
-          serviceData[1].capacity === originalServiceData[1].capacity
-      );
-    }
-    setTotal(serviceData.reduce((res, service) => res + service.cost || 0, 0));
-  }, [serviceData]);
-
-  return (
-    <>
-      <H1 className="h2">
-        {isModifySubscription
-          ? "Configure Your Subscription"
-          : "Upgrade your Subscription"}
-      </H1>
-      {isShowModalLoader && (
-        <ModalLoader>
-          <P>
-            Your requested changes are being processed. Please do not leave the
-            page or hit the back button until complete.
-          </P>
-        </ModalLoader>
-      )}
-      {isReviewChanges && !isShowModalLoader && (
-        <Modal
-          handleCancel={() => {
-            setIsReviewChanges(false);
-            setIsDisableSubmitButton(false);
-          }}
-          handleSubmit={handleReviewChangeSubmit}
-        >
-          <H1 className="h4">Confirm Changes</H1>
-          <P>
-            By pressing{" "}
-            <span>
-              <strong>Confirm</strong>
-            </span>{" "}
-            below, your plan will be immediately adjusted to the following
-            levels:
-          </P>
-          <ul className="m">
-            <li>{`- ${serviceData[0].capacity} simultaneous calls`}</li>
-            {userData?.account && userData?.account.device_to_call_ratio && (
-              <li>{`- ${
-                userData?.account.device_to_call_ratio *
-                (serviceData[0].capacity + serviceData[1].capacity)
-              } registered devices`}</li>
-            )}
-          </ul>
-          <P>
-            {(billingCharge?.prorated_cost || 0) > 0 &&
-              `Your new monthly charge will be $${
-                (billingCharge?.monthly_cost || 0) / 100
-              }, and you will immediately be charged a one-time prorated amount of $${
-                (billingCharge?.prorated_cost || 0) / 100
-              } to cover the remainder of the current billing period.`}
-            {billingCharge?.prorated_cost === 0 &&
-              `Your monthly charge will be $${
-                (billingCharge.monthly_cost || 0) / 100
-              }.`}
-            {(billingCharge?.prorated_cost || 0) < 0 &&
-              `Your new monthly charge will be $${
-                (billingCharge?.monthly_cost || 0) / 100
-              }, and you will receive a credit of $${
-                -(billingCharge?.prorated_cost || 0) / 100
-              } on your next invoice to reflect changes made during the current billing period.`}
-          </P>
-        </Modal>
-      )}
-      {isReturnToFreePlan && !isShowModalLoader && (
-        <Modal
-          handleCancel={() => setIsReturnToFreePlan(false)}
-          handleSubmit={handleReturnToFreePlan}
-        >
-          <H1 className="h4">Return to Free Plan</H1>
-          <P>
-            Returning to the free plan will reduce your capacity to a maximum of
-            1 simultaneous call session and 1 registered device. Your current
-            plan and capacity will continue through the rest of the billing
-            cycle and your plan change will take effect at the beginning of the
-            next billing cycle. Are you sure you want to continue?
-          </P>
-        </Modal>
-      )}
-      <Section slim>
-        <form className="form form--internal" onSubmit={handleSubmit}>
-          <div className="grid grid--col4--users">
-            <div className="grid__row grid__th">
-              <div>Service</div>
-              <div>Capacity</div>
-              <div>Price</div>
-              <div>Cost</div>
-            </div>
-
-            {serviceData &&
-              serviceData
-                .filter((service) => service.visible)
-                .map((service, idx) => (
-                  <React.Fragment key={`subscription-${idx}`}>
-                    <div className="grid__row">
-                      <div>
-                        <label htmlFor={service.name || ""}>
-                          {service.service}
-                          <span>*</span>
-                        </label>
-                      </div>
-                      <div>
-                        <input
-                          id="tech_prefix"
-                          name="tech_prefix"
-                          type="number"
-                          value={service.capacity}
-                          required
-                          min={service.min}
-                          max={service.max}
-                          onChange={(e) => {
-                            updateServiceData(
-                              idx,
-                              "capacity",
-                              e.target.value ? Number(e.target.value) : ""
-                            );
-                          }}
-                        />
-                      </div>
-
-                      <div>
-                        <em>{service.feesLabel}</em>
-                      </div>
-
-                      <div>
-                        <P>
-                          <strong>
-                            {CurrencySymbol[service.currency || "usd"]}
-                            {service.cost}
-                          </strong>
-                        </P>
-                      </div>
-                    </div>
-                  </React.Fragment>
-                ))}
-            {serviceData[0].capacity !== 0 && !serviceData[1].visible && (
-              <>
-                <div className="grid__row">
-                  <label htmlFor="max_concurrent_call_sessons">
-                    {`With ${
-                      serviceData[0].capacity
-                    } call sessions you can register ${
-                      serviceData[0].capacity *
-                      (userData?.account?.device_to_call_ratio || 0)
-                    } concurrent devices`}
-                  </label>
-
-                  <div>
-                    <Button
-                      mainStyle="hollow"
-                      onClick={() =>
-                        setServiceData((prev) => {
-                          prev[1].visible = true;
-                          return [...prev];
-                        })
-                      }
-                    >
-                      Would you like to purchase additional device
-                      registrations?
-                    </Button>
-                  </div>
-                </div>
-              </>
-            )}
-            <div className="grid__row">
-              <div>
-                <label htmlFor="total">Total Monthly Cost</label>
-              </div>
-              <div></div>
-              <div></div>
-              <div>
-                <P>
-                  <strong>
-                    {CurrencySymbol[serviceData[0].currency || "usd"]}
-                    {total}
-                  </strong>
-                </P>
-              </div>
-            </div>
-            {!isModifySubscription && (
-              <fieldset>
-                <label htmlFor="total">Payment Information</label>
-                <div className="grid__row">
-                  <div></div>
-                  <div>
-                    <PaymentElement
-                      options={{
-                        paymentMethodOrder: ["card"],
-                      }}
-                    />
-                  </div>
-                </div>
-              </fieldset>
-            )}
-          </div>
-          <fieldset>
-            <>
-              <div className={isModifySubscription ? "mast" : ""}>
-                {isModifySubscription && (
-                  <ButtonGroup right>
-                    <Button
-                      type="button"
-                      subStyle="grey"
-                      mainStyle="hollow"
-                      onClick={() => setIsReturnToFreePlan(true)}
-                      small
-                    >
-                      Return to free plan
-                    </Button>
-                  </ButtonGroup>
-                )}
-
-                <ButtonGroup right>
-                  <Button
-                    subStyle="grey"
-                    as={Link}
-                    to={`${ROUTE_INTERNAL_ACCOUNTS}/${userData?.account?.account_sid}/edit`}
-                    small
-                  >
-                    Cancel
-                  </Button>
-
-                  <Button type="submit" disabled={isDisableSubmitButton} small>
-                    {isModifySubscription
-                      ? "Review Changes"
-                      : `Pay ${CurrencySymbol[serviceData[0].currency || "usd"]}
-                ${total} and Upgrade to Paid Plan`}
-                  </Button>
-                </ButtonGroup>
-              </div>
-            </>
-          </fieldset>
-        </form>
-      </Section>
-    </>
-  );
-};
-
-export default SubscriptionForm;
--- a/src/containers/internal/views/accounts/subscription.tsx
+++ b/src/containers/internal/views/accounts/subscription.tsx
@@ -1,32 +0,0 @@
-import React from "react";
-import {
-  ENABLE_HOSTED_SYSTEM,
-  STRIPE_PUBLISHABLE_KEY,
-} from "src/api/constants";
-
-import { Elements } from "@stripe/react-stripe-js";
-import { loadStripe } from "@stripe/stripe-js";
-import SubscriptionForm from "./subscription-form";
-
-export const stripePromise = ENABLE_HOSTED_SYSTEM
-  ? loadStripe(STRIPE_PUBLISHABLE_KEY)
-  : null;
-
-export const Subscription = () => {
-  return (
-    <>
-      <Elements
-        stripe={stripePromise}
-        options={{
-          mode: "setup",
-          currency: "usd",
-          paymentMethodCreation: "manual",
-        }}
-      >
-        <SubscriptionForm />
-      </Elements>
-    </>
-  );
-};
-
-export default Subscription;
--- a/src/containers/internal/views/carriers/form.tsx
+++ b/src/containers/internal/views/carriers/form.tsx
@@ -776,7 +776,7 @@ export const CarrierForm = ({
                  Does your carrier require authentication on outbound calls?
                </MS>
                <label htmlFor="sip_username">
-                  Auth username {sipPass || sipRegister ? <span>*</span> : ""}
+                  Username {sipPass || sipRegister ? <span>*</span> : ""}
                </label>
                <input
                  id="sip_username"
@@ -831,7 +831,7 @@ export const CarrierForm = ({
                      required={sipRegister}
                      onChange={(e) => setSipRealm(e.target.value)}
                    />
-                    <label htmlFor="from_user">Username</label>
+                    <label htmlFor="from_user">SIP from user</label>
                    <input
                      id="from_user"
                      name="from_user"
--- a/src/containers/internal/views/carriers/index.tsx
+++ b/src/containers/internal/views/carriers/index.tsx
@@ -30,24 +30,16 @@ import {
  API_SIP_GATEWAY,
  API_SMPP_GATEWAY,
  CARRIER_REG_OK,
-  ENABLE_HOSTED_SYSTEM,
  USER_ACCOUNT,
 } from "src/api/constants";
 import { DeleteCarrier } from "./delete";

-import type {
-  Account,
-  Carrier,
-  CurrentUserData,
-  SipGateway,
-  SmppGateway,
-} from "src/api/types";
+import type { Account, Carrier, SipGateway, SmppGateway } from "src/api/types";
 import { Scope } from "src/store/types";
 import { getAccountFilter, setLocation } from "src/store/localStore";

 export const Carriers = () => {
  const user = useSelectState("user");
-  const [userData] = useApiData<CurrentUserData>("Users/me");
  const currentServiceProvider = useSelectState("currentServiceProvider");
  const [apiUrl, setApiUrl] = useState("");
  const [carrier, setCarrier] = useState<Carrier | null>(null);
@@ -138,16 +130,7 @@ export const Carriers = () => {
  return (
    <>
      <section className="mast">
-        <div>
-          <H1 className="h2">Carriers</H1>
-          {ENABLE_HOSTED_SYSTEM && (
-            <M>
-              Have your carrier send calls to{" "}
-              <span>{userData?.account?.sip_realm}</span>
-            </M>
-          )}
-        </div>
-
+        <H1 className="h2">Carriers</H1>
        <Link to={`${ROUTE_INTERNAL_CARRIERS}/add`} title="Add a Carrier">
          {" "}
          <Icon>
--- a/src/containers/internal/views/clients/add.tsx
+++ b/src/containers/internal/views/clients/add.tsx
@@ -5,7 +5,7 @@ import ClientsForm from "./form";
 export const ClientsAdd = () => {
  return (
    <>
-      <H1 className="h2">Add sip client</H1>
+      <H1 className="h2">Add client</H1>
      <ClientsForm />
    </>
  );
--- a/src/containers/internal/views/clients/delete.tsx
+++ b/src/containers/internal/views/clients/delete.tsx
@@ -17,7 +17,7 @@ export const ClientsDelete = ({
    <>
      <Modal handleCancel={handleCancel} handleSubmit={handleSubmit}>
        <P>
-          Are you sure you want to delete the sip client{" "}
+          Are you sure you want to delete the client{" "}
          <strong>{client.username}</strong>?
        </P>
      </Modal>
--- a/src/containers/internal/views/clients/edit.tsx
+++ b/src/containers/internal/views/clients/edit.tsx
@@ -21,7 +21,7 @@ export const ClientsEdit = () => {

  return (
    <>
-      <H1 className="h2">Edit sip client</H1>
+      <H1 className="h2">Edit client</H1>
      <ClientsForm client={{ data, refetch, error }} />
    </>
  );
--- a/src/containers/internal/views/clients/index.tsx
+++ b/src/containers/internal/views/clients/index.tsx
@@ -2,7 +2,7 @@ import { Button, H1, Icon, M } from "@jambonz/ui-kit";
 import React, { useMemo, useState } from "react";
 import { Link } from "react-router-dom";
 import { deleteClient, useApiData, useServiceProviderData } from "src/api";
-import { Account, Client, CurrentUserData } from "src/api/types";
+import { Account, Client } from "src/api/types";
 import {
  AccountFilter,
  Icons,
@@ -20,14 +20,10 @@ import { USER_ACCOUNT } from "src/api/constants";

 export const Clients = () => {
  const user = useSelectState("user");
-  const [userData] = useApiData<CurrentUserData>("Users/me");
  const [accounts] = useServiceProviderData<Account[]>("Accounts");
  const [clients, refetch] = useApiData<Client[]>("Clients");

  const [accountSid, setAccountSid] = useState("");
-  const [selectedAccount, setSelectedAccount] = useState<
-    Account | null | undefined
-  >(null);
  const [filter, setFilter] = useState("");
  const [client, setClient] = useState<Client | null>();

@@ -37,22 +33,12 @@ export const Clients = () => {
      return clients;
    }

-    setSelectedAccount(
-      accountSid
-        ? accounts?.find((a: Account) => a.account_sid === accountSid)
-        : null
-    );
-
    return clients
      ? clients.filter((c) => {
-          return accountSid
-            ? c.account_sid === accountSid
-            : accounts
-            ? accounts.map((a) => a.account_sid).includes(c.account_sid || "")
-            : false;
+          return accountSid ? c.account_sid === accountSid : true;
        })
      : [];
-  }, [accountSid, clients, accounts]);
+  }, [accountSid, clients]);

  const filteredClients = useFilteredResults(filter, tmpFilteredClients);

@@ -62,7 +48,7 @@ export const Clients = () => {
        .then(() => {
          toastSuccess(
            <>
-              Deleted sip client <strong>{client.username}</strong>
+              Deleted outbound call route <strong>{client.username}</strong>
            </>
          );
          setClient(null);
@@ -77,48 +63,8 @@ export const Clients = () => {
  return (
    <>
      <section className="mast">
-        <div>
-          <H1 className="h2">SIP client credentials</H1>
-          {user?.scope === USER_ACCOUNT ? (
-            userData?.account?.sip_realm ? (
-              <>
-                <M>
-                  Your sip realm is <span>{userData?.account?.sip_realm}</span>
-                </M>
-                <M>
-                  You can add sip credentials below to allow sip devices to
-                  register to this realm and make calls.
-                </M>
-              </>
-            ) : (
-              <M>
-                You need to associate a sip realm to this account in order to
-                add sip credentials.
-              </M>
-            )
-          ) : selectedAccount ? (
-            selectedAccount?.sip_realm ? (
-              <>
-                <M>
-                  Your sip realm is <span>{selectedAccount.sip_realm}</span>
-                </M>
-                <M>
-                  You can add sip credentials below to allow sip devices to
-                  register to this realm and make calls.
-                </M>
-              </>
-            ) : (
-              <M>
-                You need to associate a sip realm to this account in order to
-                add sip credentials.
-              </M>
-            )
-          ) : (
-            <></>
-          )}
-        </div>
-
-        <Link to={`${ROUTE_INTERNAL_CLIENTS}/add`} title="Add sip client">
+        <H1 className="h2">Clients</H1>
+        <Link to={`${ROUTE_INTERNAL_CLIENTS}/add`} title="Add a client">
          {" "}
          <Icon>
            <Icons.Plus />
@@ -206,13 +152,13 @@ export const Clients = () => {
              </div>
            ))
          ) : (
-            <M>No sip clients.</M>
+            <M>No Clients.</M>
          )}
        </div>
      </Section>
      <Section clean>
        <Button small as={Link} to={`${ROUTE_INTERNAL_CLIENTS}/add`}>
-          Add sip client
+          Add client
        </Button>
      </Section>
      {client && (
--- a/src/containers/internal/views/least-cost-routing/card.tsx
+++ b/src/containers/internal/views/least-cost-routing/card.tsx
@@ -122,7 +122,6 @@ export const Card = ({
      className={`lcr lcr--route lcr-card lcr-card-${
        isDragging ? "disappear" : "appear"
      }`}
-      // eslint-disable-next-line react/no-unknown-property
      handler-id={handlerId}
    >
      <div>
--- a/src/containers/internal/views/recent-calls/details.tsx
+++ b/src/containers/internal/views/recent-calls/details.tsx
@@ -76,7 +76,7 @@ export const DetailsItem = ({ call }: DetailsItemProps) => {
              <CallDetail call={transformRecentCall(call)} />
            </Tab>
            <Tab id="tracing" label="Tracing">
-              {open && <CallTracing call={call} />}
+              <CallTracing call={call} />
            </Tab>
          </Tabs>
        )}
--- a/src/containers/internal/views/recent-calls/index.tsx
+++ b/src/containers/internal/views/recent-calls/index.tsx
@@ -48,7 +48,8 @@ export const RecentCalls = () => {
  const [dateFilter, setDateFilter] = useState("today");
  const [directionFilter, setDirectionFilter] = useState("io");
  const [statusFilter, setStatusFilter] = useState("all");
-  const [filter, setFilter] = useState("");
+  const [fromFilter, setFromFilter] = useState("");
+  const [toFilter, setToFilter] = useState("");

  const [pageNumber, setPageNumber] = useState(1);
  const [perPageFilter, setPerPageFilter] = useState("25");
@@ -66,7 +67,8 @@ export const RecentCalls = () => {
        : { days: Number(dateFilter) }),
      ...(statusFilter !== "all" && { answered: statusFilter }),
      ...(directionFilter !== "io" && { direction: directionFilter }),
-      ...(filter && { filter }),
+      ...(fromFilter && { from: fromFilter }),
+      ...(toFilter && { to: toFilter }),
    };

    getRecentCalls(accountSid, payload)
@@ -103,7 +105,8 @@ export const RecentCalls = () => {
    dateFilter,
    directionFilter,
    statusFilter,
-    filter,
+    fromFilter,
+    toFilter,
  ]);

  /** Reset page number when filters change */
@@ -147,8 +150,13 @@ export const RecentCalls = () => {
          options={statusSelection}
        />
        <SearchFilter
-          placeholder="Filter"
-          filter={[filter, setFilter]}
+          placeholder="Filter From"
+          filter={[fromFilter, setFromFilter]}
+          delay={1000}
+        />
+        <SearchFilter
+          placeholder="Filter To"
+          filter={[toFilter, setToFilter]}
          delay={1000}
        />
      </section>
--- a/src/containers/login/forgot-password.tsx
+++ b/src/containers/login/forgot-password.tsx
@@ -8,7 +8,6 @@ import { useNavigate } from "react-router-dom";
 import { MSG_SOMETHING_WRONG } from "src/constants";

 import { ROUTE_LOGIN } from "src/router/routes";
-import { toastSuccess } from "src/store";

 export const ForgotPassword = () => {
  const [message, setMessage] = useState("");
@@ -23,9 +22,6 @@ export const ForgotPassword = () => {
    postForgotPassword({ email })
      .then((response) => {
        if (response.status === StatusCodes.NO_CONTENT) {
-          toastSuccess(
-            "A password reset email has been sent to your email. Please check your inbox (and, possibly, spam folder) and follow the instructions to reset your password."
-          );
          navigate(ROUTE_LOGIN);
        } else {
          setMessage(MSG_SOMETHING_WRONG);
--- a/src/containers/login/login.tsx
+++ b/src/containers/login/login.tsx
@@ -2,8 +2,8 @@ import React, { useEffect, useState } from "react";
 import { Button, H1 } from "@jambonz/ui-kit";
 import { useLocation, Navigate, Link } from "react-router-dom";

-import { toastError, toastSuccess } from "src/store";
-import { getToken, parseJwt, useAuth } from "src/router/auth";
+import { toastError, toastSuccess, useSelectState } from "src/store";
+import { useAuth } from "src/router/auth";
 import {
  SESS_FLASH_MSG,
  SESS_OLD_PASSWORD,
@@ -13,26 +13,15 @@ import { Passwd, Message } from "src/components/forms";
 import {
  ROUTE_INTERNAL_ACCOUNTS,
  ROUTE_CREATE_PASSWORD,
+  ROUTE_INTERNAL_APPLICATIONS,
  ROUTE_FORGOT_PASSWORD,
-  ROUTE_REGISTER,
 } from "src/router/routes";
-import {
-  USER_ACCOUNT,
-  ENABLE_FORGOT_PASSWORD,
-  ENABLE_HOSTED_SYSTEM,
-} from "src/api/constants";
-import { Icons } from "src/components";
-import { v4 as uuid } from "uuid";
-import { setLocationBeforeOauth, setOauthState } from "src/store/localStore";
-import { getGithubOauthUrl, getGoogleOauthUrl } from "./utils";
-import { UserData } from "src/store/types";
+import { USER_ACCOUNT, ENABLE_FORGOT_PASSWORD } from "src/api/constants";

 export const Login = () => {
-  const state = uuid();
-  setOauthState(state);
-  setLocationBeforeOauth("/sign-in");
  const { signin, authorized } = useAuth();
  const location = useLocation();
+  const user = useSelectState("user");
  const [username, setUsername] = useState("");
  const [password, setPassword] = useState("");
  const [message, setMessage] = useState("");
@@ -67,13 +56,13 @@ export const Login = () => {
        />
      );
    }
-    const userData: UserData = parseJwt(getToken());
+
    return (
      <Navigate
        to={
-          userData?.scope !== USER_ACCOUNT
+          user?.scope !== USER_ACCOUNT
            ? ROUTE_INTERNAL_ACCOUNTS
-            : `${ROUTE_INTERNAL_ACCOUNTS}/${userData.account_sid}/edit`
+            : ROUTE_INTERNAL_APPLICATIONS
        }
        state={{ from: location }}
        replace
@@ -102,36 +91,13 @@ export const Login = () => {
        />
        {message && <Message message={message} />}
        <Button type="submit">Log in</Button>
-        {(ENABLE_FORGOT_PASSWORD || ENABLE_HOSTED_SYSTEM) && (
-          <div className={ENABLE_HOSTED_SYSTEM ? "mast" : ""}>
-            {ENABLE_HOSTED_SYSTEM && (
-              <Link to={ROUTE_REGISTER} title="Forgot Password">
-                <p>Register</p>
-              </Link>
-            )}
-            {ENABLE_FORGOT_PASSWORD && (
-              <Link to={ROUTE_FORGOT_PASSWORD} title="Forgot Password">
-                <p>Forgot Password</p>
-              </Link>
-            )}
+        {ENABLE_FORGOT_PASSWORD && (
+          <div>
+            <Link to={ROUTE_FORGOT_PASSWORD} title="Forgot Password">
+              <p>Forgot Password</p>
+            </Link>
          </div>
        )}
-        {ENABLE_HOSTED_SYSTEM && (
-          <>
-            <a href={getGoogleOauthUrl(state)} className="btn btn--hollow">
-              <div className="mast">
-                <Icons.Youtube />
-                <span>Sign In With Google</span>
-              </div>
-            </a>
-            <a href={getGithubOauthUrl(state)} className="btn btn--hollow">
-              <div className="mast">
-                <Icons.GitHub />
-                <span>Sign In With Github</span>
-              </div>
-            </a>
-          </>
-        )}
      </form>
    </>
  );
--- a/src/containers/login/oauth-callback.tsx
+++ b/src/containers/login/oauth-callback.tsx
@@ -1,95 +0,0 @@
-import React, { useEffect } from "react";
-import { useNavigate, useParams } from "react-router-dom";
-import { getMe, postRegister } from "src/api";
-import {
-  DEFAULT_SERVICE_PROVIDER_SID,
-  GITHUB_CLIENT_ID,
-  GOOGLE_CLIENT_ID,
-  BASE_URL,
-} from "src/api/constants";
-import { Spinner } from "src/components";
-import { setToken } from "src/router/auth";
-import {
-  ROUTE_INTERNAL_ACCOUNTS,
-  ROUTE_LOGIN,
-  ROUTE_REGISTER,
-  ROUTE_REGISTER_SUB_DOMAIN,
-} from "src/router/routes";
-import { toastError } from "src/store";
-import {
-  getLocationBeforeOauth,
-  getOauthState,
-  removeLocationBeforeOauth,
-  removeOauthState,
-  setRootDomain,
-} from "src/store/localStore";
-
-export const OauthCallback = () => {
-  const queryParams = new URLSearchParams(location.search);
-  const code = queryParams.get("code");
-  const newState = queryParams.get("state");
-  const originalState = getOauthState();
-  const previousLocation = getLocationBeforeOauth();
-  const { provider } = useParams();
-  const navigate = useNavigate();
-  useEffect(() => {
-    if (provider !== "github" && provider !== "google") {
-      toastError(`${provider} is not a valid OAuth provider`);
-      navigate(ROUTE_LOGIN);
-      return;
-    }
-    if (!code || !originalState || !newState || newState !== originalState) {
-      toastError("Invalid state");
-      navigate(ROUTE_LOGIN);
-    }
-
-    let oauth2_client_id;
-    let oauth2_redirect_uri;
-
-    if (provider === "github") {
-      oauth2_client_id = GITHUB_CLIENT_ID;
-      oauth2_redirect_uri = `${BASE_URL}/oauth-callback/github`;
-    } else if (provider === "google") {
-      oauth2_client_id = GOOGLE_CLIENT_ID;
-      oauth2_redirect_uri = `${BASE_URL}/oauth-callback/google`;
-    }
-
-    removeOauthState();
-    removeLocationBeforeOauth();
-
-    postRegister({
-      service_provider_sid: DEFAULT_SERVICE_PROVIDER_SID,
-      provider,
-      oauth2_code: code || "",
-      oauth2_state: originalState,
-      oauth2_client_id,
-      oauth2_redirect_uri,
-      locationBeforeAuth: previousLocation,
-    })
-      .then(({ json }) => {
-        setToken(json.jwt);
-        setRootDomain(json.root_domain);
-        if (previousLocation === "/register") {
-          navigate(ROUTE_REGISTER_SUB_DOMAIN);
-        } else {
-          getMe()
-            .then(({ json: me }) => {
-              if (!me.account?.sip_realm) {
-                navigate(ROUTE_REGISTER_SUB_DOMAIN);
-              } else {
-                navigate(`${ROUTE_INTERNAL_ACCOUNTS}/${json.account_sid}/edit`);
-              }
-            })
-            .catch((error) => {
-              toastError(error.msg);
-            });
-        }
-      })
-      .catch(() => {
-        navigate(ROUTE_REGISTER);
-      });
-  }, []);
-  return <Spinner />;
-};
-
-export default OauthCallback;
--- a/src/containers/login/register-email.tsx
+++ b/src/containers/login/register-email.tsx
@@ -1,67 +0,0 @@
-import { Button, H1 } from "@jambonz/ui-kit";
-import React, { useState } from "react";
-import { Link, useNavigate } from "react-router-dom";
-import { postRegister } from "src/api";
-import { DEFAULT_SERVICE_PROVIDER_SID } from "src/api/constants";
-import { Passwd } from "src/components/forms";
-import { ROUTE_LOGIN, ROUTE_REGISTER_EMAIL_VERIFY } from "src/router/routes";
-import { generateActivationCode } from "./utils";
-import { setToken } from "src/router/auth";
-import { toastError } from "src/store";
-import { setRootDomain } from "src/store/localStore";
-
-export const RegisterEmail = () => {
-  const [email, setEmail] = useState("");
-  const [password, setPassword] = useState("");
-  const navigate = useNavigate();
-  const handleSubmit = (e: React.FormEvent) => {
-    e.preventDefault();
-
-    const email_activation_code = generateActivationCode();
-    postRegister({
-      service_provider_sid: DEFAULT_SERVICE_PROVIDER_SID,
-      provider: "local",
-      email,
-      password,
-      email_activation_code,
-      inviteCode: undefined, // reserved for inviteCode.
-    })
-      .then(({ json }) => {
-        setToken(json.jwt);
-        setRootDomain(json.root_domain);
-        navigate(ROUTE_REGISTER_EMAIL_VERIFY);
-      })
-      .catch((error) => {
-        toastError(error.msg);
-      });
-  };
-  return (
-    <>
-      <H1 className="h2">Register</H1>
-
-      <form className="form form--login" onSubmit={handleSubmit}>
-        <input
-          required
-          type="text"
-          name="email"
-          placeholder="email"
-          value={email}
-          onChange={(e) => setEmail(e.target.value)}
-        />
-        <Passwd
-          required
-          name="password"
-          value={password}
-          placeholder="Password"
-          setValue={setPassword}
-        />
-        <Button type="submit">Continue →</Button>
-        <Link to={ROUTE_LOGIN} title="Go back">
-          <p>Go back</p>
-        </Link>
-      </form>
-    </>
-  );
-};
-
-export default RegisterEmail;
--- a/src/containers/login/register-verify-email.tsx
+++ b/src/containers/login/register-verify-email.tsx
@@ -1,54 +0,0 @@
-import { Button, H1, MS } from "@jambonz/ui-kit";
-import React, { useState } from "react";
-import { Link, useNavigate } from "react-router-dom";
-import { putActivationCode } from "src/api";
-import { getToken, parseJwt } from "src/router/auth";
-import {
-  ROUTE_REGISTER_EMAIL,
-  ROUTE_REGISTER_SUB_DOMAIN,
-} from "src/router/routes";
-import { toastError } from "src/store";
-import { UserData } from "src/store/types";
-
-export const EmailVerify = () => {
-  const [code, setCode] = useState("");
-  const userData: UserData = parseJwt(getToken());
-  const navigate = useNavigate();
-  const handleSubmit = (e: React.FormEvent) => {
-    e.preventDefault();
-
-    putActivationCode(code, {
-      user_sid: userData.user_sid,
-      type: "email",
-    })
-      .then(() => {
-        navigate(ROUTE_REGISTER_SUB_DOMAIN);
-      })
-      .catch((error) => {
-        toastError(error.msg);
-      });
-  };
-  return (
-    <>
-      <H1 className="h2">Register</H1>
-
-      <form className="form form--login" onSubmit={handleSubmit}>
-        <MS>Please enter the code we just sent to your email</MS>
-        <input
-          required
-          type="text"
-          name="code"
-          placeholder="Verification Code"
-          value={code}
-          onChange={(e) => setCode(e.target.value)}
-        />
-        <Button type="submit">Continue →</Button>
-        <Link to={ROUTE_REGISTER_EMAIL} title="Go back">
-          <p>Go back</p>
-        </Link>
-      </form>
-    </>
-  );
-};
-
-export default EmailVerify;
--- a/src/containers/login/register.tsx
+++ b/src/containers/login/register.tsx
@@ -1,67 +0,0 @@
-import React from "react";
-import { getGithubOauthUrl, getGoogleOauthUrl } from "./utils";
-import { v4 as uuid } from "uuid";
-import { setLocationBeforeOauth, setOauthState } from "src/store/localStore";
-import { Icons } from "src/components";
-import { Button, H1 } from "@jambonz/ui-kit";
-import { PRIVACY_POLICY, TERMS_OF_SERVICE } from "src/api/constants";
-import { Checkzone } from "src/components/forms";
-import { Link } from "react-router-dom";
-import { ROUTE_REGISTER_EMAIL } from "src/router/routes";
-
-export const Register = () => {
-  const state = uuid();
-  setOauthState(state);
-  setLocationBeforeOauth("/register");
-
-  const handleSubmit = (e: React.FormEvent) => {
-    e.preventDefault();
-  };
-  return (
-    <>
-      <H1 className="h2">Register</H1>
-
-      <form className="form form--login" onSubmit={handleSubmit}>
-        <Checkzone
-          hidden
-          name="is_accepted"
-          label=""
-          labelNode={
-            <div>
-              I accept the
-              <a href={TERMS_OF_SERVICE}>
-                <span> Terms of Service </span>
-              </a>
-              and have read the
-              <a href={PRIVACY_POLICY}>
-                <span> Privacy Policy</span>
-              </a>
-            </div>
-          }
-          initialCheck={false}
-        >
-          <Button as={Link} to={ROUTE_REGISTER_EMAIL} mainStyle="hollow">
-            <div className="mast">
-              <Icons.Mail />
-              <span>Sign Up With Email</span>
-            </div>
-          </Button>
-          <a href={getGoogleOauthUrl(state)} className="btn btn--hollow">
-            <div className="mast">
-              <Icons.Youtube />
-              <span>Sign Up With Google</span>
-            </div>
-          </a>
-          <a href={getGithubOauthUrl(state)} className="btn btn--hollow">
-            <div className="mast">
-              <Icons.GitHub />
-              <span>Sign Up With Github</span>
-            </div>
-          </a>
-        </Checkzone>
-      </form>
-    </>
-  );
-};
-
-export default Register;
--- a/src/containers/login/reset-password.tsx
+++ b/src/containers/login/reset-password.tsx
@@ -1,97 +0,0 @@
-import { Button, H1 } from "@jambonz/ui-kit";
-import React, { useEffect, useState } from "react";
-import { useNavigate, useParams } from "react-router-dom";
-import { postChangepassword, postSignIn } from "src/api";
-import { Message, Passwd } from "src/components/forms";
-import { setToken } from "src/router/auth";
-import { ROUTE_LOGIN } from "src/router/routes";
-import { toastError, toastSuccess } from "src/store";
-
-export const ResetPassword = () => {
-  const params = useParams();
-  const resetId = params.id;
-  const [newPassword, setNewPassword] = useState("");
-  const [confirmNewPassword, setConfirmNewPassword] = useState("");
-  const [isDisableSubmitButton, setIsDisableSubmitButton] = useState(false);
-  const [message, setMessage] = useState("");
-  const navigate = useNavigate();
-  const handleSubmit = (e: React.FormEvent) => {
-    e.preventDefault();
-    setMessage("");
-    if (newPassword !== confirmNewPassword) {
-      setMessage(
-        "The confirmation password does not match the new password. Please ensure both passwords are identical."
-      );
-      return;
-    }
-    if (newPassword.length < 6) {
-      setMessage("The password must be at least 7 characters long.");
-      return;
-    }
-
-    if (!/[a-zA-Z]/.test(newPassword)) {
-      setMessage("Password must contain a letter.");
-    }
-
-    setIsDisableSubmitButton(true);
-    postChangepassword({
-      old_password: resetId,
-      new_password: newPassword,
-    })
-      .then(() => {
-        toastSuccess("New password was successfully set.");
-        setToken("");
-        navigate(ROUTE_LOGIN);
-      })
-      .catch((error) => {
-        toastError(error.msg);
-      });
-  };
-
-  useEffect(() => {
-    postSignIn({
-      link: resetId,
-    })
-      .then(({ json }) => {
-        setToken(json.jwt || "");
-      })
-      .catch((error) => toastError(error.msg));
-  }, []);
-  return (
-    <>
-      <H1 className="h2">Reset Password</H1>
-      <form className="form form--login" onSubmit={handleSubmit}>
-        <label htmlFor="new_password">New password</label>
-        <Passwd
-          id="new_password"
-          name="new_password"
-          value={newPassword}
-          placeholder="New password"
-          required
-          onChange={(e) => {
-            setNewPassword(e.target.value);
-          }}
-        />
-
-        <label htmlFor="confirm_new_password">Confirm new password</label>
-        <Passwd
-          id="confirm_new_password"
-          name="confirm_new_password"
-          value={confirmNewPassword}
-          placeholder="Confirm new password"
-          required
-          onChange={(e) => {
-            setConfirmNewPassword(e.target.value);
-          }}
-        />
-
-        {message && <Message message={message} />}
-        <Button type="submit" disabled={isDisableSubmitButton}>
-          Save
-        </Button>
-      </form>
-    </>
-  );
-};
-
-export default ResetPassword;
--- a/src/containers/login/sub-domain.tsx
+++ b/src/containers/login/sub-domain.tsx
@@ -1,83 +0,0 @@
-import { Button, H1, MS } from "@jambonz/ui-kit";
-import React, { useEffect, useRef, useState } from "react";
-import { useNavigate } from "react-router-dom";
-import { getAvailability, postSipRealms } from "src/api";
-import DomainInput from "src/components/domain-input";
-import { Message } from "src/components/forms";
-import { getToken, parseJwt } from "src/router/auth";
-import { ROUTE_INTERNAL_ACCOUNTS } from "src/router/routes";
-import { getRootDomain } from "src/store/localStore";
-import { UserData } from "src/store/types";
-import { hasValue } from "src/utils";
-
-export const RegisterChooseSubdomain = () => {
-  const [name, setName] = useState("");
-  const [errorMessage, setErrorMessage] = useState("");
-  const [isValidDomain, setIsValidDomain] = useState(false);
-  const rootDomain = getRootDomain();
-  const userData: UserData = parseJwt(getToken());
-  const navigate = useNavigate();
-  const typingTimeoutRef = useRef<number | null>(null);
-  const handleSubmit = (e: React.FormEvent) => {
-    e.preventDefault();
-    setErrorMessage("");
-
-    postSipRealms(userData.account_sid || "", `${name}.${rootDomain}`)
-      .then(() => {
-        navigate(`${ROUTE_INTERNAL_ACCOUNTS}/${userData.account_sid}/edit`);
-      })
-      .catch((error) => {
-        setErrorMessage(error.msg);
-      });
-  };
-
-  useEffect(() => {
-    if (typingTimeoutRef.current) {
-      clearTimeout(typingTimeoutRef.current);
-    }
-    if (!name || name.length < 3) {
-      setIsValidDomain(false);
-      return;
-    }
-    setIsValidDomain(false);
-    typingTimeoutRef.current = setTimeout(() => {
-      getAvailability(`${name}.${rootDomain}`)
-        .then(({ json }) =>
-          setIsValidDomain(
-            Boolean(json.available) && hasValue(name) && name.length != 0
-          )
-        )
-        .catch((error) => {
-          setErrorMessage(error.msg);
-          setIsValidDomain(false);
-        });
-    }, 500);
-  }, [name]);
-  return (
-    <>
-      <H1 className="h2">Choose a subdomain</H1>
-
-      <form className="form form--login" onSubmit={handleSubmit}>
-        {errorMessage && <Message message={errorMessage} />}
-        <MS>
-          This will be the FQDN where your carrier will send calls, and where
-          you can register devices to. This can be changed at any time.
-        </MS>
-        <DomainInput
-          id="subdomain"
-          name="subdomain"
-          value={name}
-          setValue={setName}
-          placeholder="Your name here"
-          root_domain={rootDomain ? `.${rootDomain}` : ""}
-          is_valid={isValidDomain}
-        />
-        <Button type="submit" disabled={!isValidDomain}>
-          Complete Registration →
-        </Button>
-      </form>
-    </>
-  );
-};
-
-export default RegisterChooseSubdomain;
--- a/src/containers/login/utils.ts
+++ b/src/containers/login/utils.ts
@@ -1,24 +0,0 @@
-import {
-  GITHUB_CLIENT_ID,
-  GOOGLE_CLIENT_ID,
-  BASE_URL,
-} from "src/api/constants";
-
-export const getGithubOauthUrl = (state: string) => {
-  return `https://github.com/login/oauth/authorize?client_id=${GITHUB_CLIENT_ID}&state=${state}&scope=user:email&allow_signup=false`;
-};
-
-export const getGoogleOauthUrl = (state: string) => {
-  return `https://accounts.google.com/o/oauth2/v2/auth?scope=email+profile&access_type=offline&include_granted_scopes=true&response_type=code&state=${state}&redirect_uri=${BASE_URL}/oauth-callback/google&client_id=${GOOGLE_CLIENT_ID}`;
-};
-
-const length = 6;
-const digit = () => Math.floor(Math.random() * 10);
-
-export function generateActivationCode() {
-  let activationCode = "";
-  for (let i = 0; i < length; i++) {
-    activationCode += digit();
-  }
-  return activationCode;
-}
--- a/src/router/auth.tsx
+++ b/src/router/auth.tsx
@@ -4,13 +4,13 @@
 import React, { useContext } from "react";
 import { useNavigate } from "react-router-dom";

-import { getMe, postLogin, postLogout } from "src/api";
+import { postLogin, postLogout } from "src/api";
 import { StatusCodes } from "src/api/types";
 import {
  ROUTE_CREATE_PASSWORD,
  ROUTE_INTERNAL_ACCOUNTS,
+  ROUTE_INTERNAL_APPLICATIONS,
  ROUTE_LOGIN,
-  ROUTE_REGISTER_SUB_DOMAIN,
 } from "./routes";
 import {
  SESS_OLD_PASSWORD,
@@ -23,13 +23,8 @@ import {
 } from "src/constants";

 import type { UserLogin } from "src/api/types";
-import { ENABLE_HOSTED_SYSTEM, USER_ACCOUNT } from "src/api/constants";
+import { USER_ACCOUNT } from "src/api/constants";
 import type { UserData } from "src/store/types";
-import { toastError } from "src/store";
-import {
-  removeLocationBeforeOauth,
-  removeOauthState,
-} from "src/store/localStore";

 interface SignIn {
  (username: string, password: string): Promise<UserLogin>;
@@ -108,23 +103,7 @@ export const useProvideAuth = (): AuthStateContext => {
            setToken(token);
            userData = parseJwt(token);

-            if (ENABLE_HOSTED_SYSTEM) {
-              getMe()
-                .then(({ json }) => {
-                  if (!json.account?.sip_realm) {
-                    navigate(ROUTE_REGISTER_SUB_DOMAIN);
-                  } else {
-                    navigate(
-                      userData.scope !== USER_ACCOUNT
-                        ? ROUTE_INTERNAL_ACCOUNTS
-                        : `${ROUTE_INTERNAL_ACCOUNTS}/${userData.account_sid}/edit`
-                    );
-                  }
-                })
-                .catch((error) => {
-                  toastError(error.msg);
-                });
-            } else if (response.json.force_change) {
+            if (response.json.force_change) {
              sessionStorage.setItem(SESS_USER_SID, response.json.user_sid);
              sessionStorage.setItem(SESS_OLD_PASSWORD, password);
              navigate(ROUTE_CREATE_PASSWORD);
@@ -132,7 +111,7 @@ export const useProvideAuth = (): AuthStateContext => {
              navigate(
                userData.scope !== USER_ACCOUNT
                  ? ROUTE_INTERNAL_ACCOUNTS
-                  : `${ROUTE_INTERNAL_ACCOUNTS}/${userData.account_sid}/edit`
+                  : ROUTE_INTERNAL_APPLICATIONS
              );
            }

@@ -152,23 +131,19 @@ export const useProvideAuth = (): AuthStateContext => {
          }

          reject(MSG_SOMETHING_WRONG);
-        })
-        .finally(() => {
-          removeOauthState();
-          removeLocationBeforeOauth();
        });
    });
  };

  const signout = () => {
+    window.location.href = ROUTE_LOGIN;
    return new Promise((resolve, reject) => {
      postLogout()
        .then((response) => {
-          if (response.status === StatusCodes.NO_CONTENT) {
+          if (response.status === StatusCodes.OK) {
            localStorage.clear();
            sessionStorage.clear();
            sessionStorage.setItem(SESS_FLASH_MSG, MSG_LOGGED_OUT);
-            window.location.href = ROUTE_LOGIN;
            resolve(response.json);
          }
        })
@@ -176,7 +151,6 @@ export const useProvideAuth = (): AuthStateContext => {
          localStorage.clear();
          sessionStorage.clear();
          sessionStorage.setItem(SESS_FLASH_MSG, MSG_LOGGED_OUT);
-          window.location.href = ROUTE_LOGIN;
          if (error) {
            reject(error);
          }
--- a/src/router/index.tsx
+++ b/src/router/index.tsx
@@ -6,10 +6,7 @@ import { useSelectState } from "src/store";
 import { Login, Layout as LoginLayout } from "src/containers/login";
 import { Layout as InternalLayout } from "src/containers/internal";
 import { NotFound } from "src/containers/notfound";
-import {
-  ENABLE_HOSTED_SYSTEM,
-  ENABLE_FORGOT_PASSWORD,
-} from "src/api/constants";
+import { ENABLE_FORGOT_PASSWORD } from "src/api/constants";

 /** Login */
 import CreatePassword from "src/containers/login/create-password";
@@ -48,15 +45,6 @@ import LcrsEdit from "src/containers/internal/views/least-cost-routing/edit";
 import Clients from "src/containers/internal/views/clients";
 import ClientsAdd from "src/containers/internal/views/clients/add";
 import ClientsEdit from "src/containers/internal/views/clients/edit";
-import OauthCallback from "src/containers/login/oauth-callback";
-import Register from "src/containers/login/register";
-import RegisterEmail from "src/containers/login/register-email";
-import EmailVerify from "src/containers/login/register-verify-email";
-import RegisterChooseSubdomain from "src/containers/login/sub-domain";
-import Subscription from "src/containers/internal/views/accounts/subscription";
-import ManagePayment from "src/containers/internal/views/accounts/manage-payment";
-import EditSipRealm from "src/containers/internal/views/accounts/edit-sip-realm";
-import ResetPassword from "src/containers/login/reset-password";

 export const Router = () => {
  const toast = useSelectState("toast");
@@ -77,29 +65,9 @@ export const Router = () => {
            }
          />
          {ENABLE_FORGOT_PASSWORD && (
-            <>
-              <Route path="forgot-password" element={<ForgotPassword />} />
-              <Route path="reset-password/:id" element={<ResetPassword />} />
-            </>
-          )}
-          {ENABLE_HOSTED_SYSTEM && (
-            <>
-              <Route path="register" element={<Register />} />
-              <Route path="register/email" element={<RegisterEmail />} />
-              <Route
-                path="register/email/verify-your-email"
-                element={<EmailVerify />}
-              />
-              <Route
-                path="register/choose-a-subdomain"
-                element={<RegisterChooseSubdomain />}
-              />
-              <Route
-                path="oauth-callback/:provider"
-                element={<OauthCallback />}
-              />
-            </>
+            <Route path="forgot-password" element={<ForgotPassword />} />
          )}
+
          {/* 404 page not found */}
          <Route path="*" element={<NotFound />} />
        </Route>
@@ -122,26 +90,6 @@ export const Router = () => {
                    path="accounts/:account_sid/edit"
                    element={<AccountEdit />}
                  />
-                  {ENABLE_HOSTED_SYSTEM && (
-                    <>
-                      <Route
-                        path="accounts/:account_sid/subscription"
-                        element={<Subscription />}
-                      />
-                      <Route
-                        path="accounts/:account_sid/manage-payment"
-                        element={<ManagePayment />}
-                      />
-                      <Route
-                        path="accounts/:account_sid/modify-subscription"
-                        element={<Subscription />}
-                      />
-                      <Route
-                        path="accounts/:account_sid/sip-realm/edit"
-                        element={<EditSipRealm />}
-                      />
-                    </>
-                  )}
                  <Route path="applications" element={<Applications />} />
                  <Route path="applications/add" element={<ApplicationAdd />} />
                  <Route
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -1,8 +1,4 @@
 export const ROUTE_LOGIN = "/";
-export const ROUTE_REGISTER = "/register";
-export const ROUTE_REGISTER_EMAIL = "/register/email";
-export const ROUTE_REGISTER_EMAIL_VERIFY = "/register/email/verify-your-email";
-export const ROUTE_REGISTER_SUB_DOMAIN = "/register/choose-a-subdomain";
 export const ROUTE_CREATE_PASSWORD = "/create-password";
 export const ROUTE_FORGOT_PASSWORD = "/forgot-password";
 export const ROUTE_INTERNAL_USERS = "/internal/users";
--- a/src/store/localStore.ts
+++ b/src/store/localStore.ts
@@ -58,48 +58,6 @@ export const removeQueryFilter = () => {
  return localStorage.removeItem(storeQueryFilter);
 };

-/**Oauth2 */
-const oauthStateKey = "oauth-state";
-export const getOauthState = () => {
-  return localStorage.getItem(oauthStateKey) || "";
-};
-
-export const setOauthState = (token: string) => {
-  localStorage.setItem(oauthStateKey, token);
-};
-
-export const removeOauthState = () => {
-  return localStorage.removeItem(oauthStateKey);
-};
-
-const locationBeforeOauthKey = "location-before-oauth";
-
-export const getLocationBeforeOauth = () => {
-  return localStorage.getItem(locationBeforeOauthKey) || "";
-};
-
-export const setLocationBeforeOauth = (token: string) => {
-  localStorage.setItem(locationBeforeOauthKey, token);
-};
-
-export const removeLocationBeforeOauth = () => {
-  return localStorage.removeItem(locationBeforeOauthKey);
-};
-
-// Email register
-const rootDomainKey = "root-domain";
-export const setRootDomain = (domain: string) => {
-  return localStorage.setItem(rootDomainKey, domain);
-};
-
-export const getRootDomain = () => {
-  return localStorage.getItem(rootDomainKey);
-};
-
-export const removeRootDomain = () => {
-  return localStorage.removeItem(rootDomainKey);
-};
-
 /**
 * Methods to get/set the location from local storage
 */
--- a/src/styles/_forms.scss
+++ b/src/styles/_forms.scss
@@ -64,9 +64,6 @@ fieldset {
    > button {
      width: 100%;
    }
-    > a {
-      width: 100%;
-    }

    .msg {
      width: 100%;
--- a/src/styles/_grid.scss
+++ b/src/styles/_grid.scss
@@ -34,6 +34,7 @@
      padding-right: ui-vars.$px02;
    }
  }
+
  &__empty {
    display: flex;
  }
@@ -111,18 +112,4 @@
      }
    }
  }
-
-  &--col4--users {
-    .grid__row {
-      grid-template-columns: [col] 30% [col] 40% [col] 25% [col] 5%;
-      grid-template-rows: [row] auto [row] auto [row] [row] auto;
-      display: grid;
-      justify-content: space-between;
-
-      > div:last-child {
-        text-align: left;
-        padding-right: 0;
-      }
-    }
-  }
 }
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -173,13 +173,6 @@ details {
  margin-top: ui-vars.$px02;
 }

-.pre-grid-white {
-  @extend .pre-grid;
-  background-color: ui-vars.$white;
-  color: ui-vars.$dark;
-  font-size: 1.2em;
-}
-
 .pcap {
  margin-top: ui-vars.$px02;
 }
--- a/src/vendor/speech-synthesis/google-speech-synthesis-lang.ts
+++ b/src/vendor/speech-synthesis/google-speech-synthesis-lang.ts
@@ -64,10 +64,6 @@ export const languages: VoiceLanguage[] = [
      { value: "en-AU-Neural2-B", name: "Neural2-B (Male)" },
      { value: "en-AU-Neural2-C", name: "Neural2-C (Female)" },
      { value: "en-AU-Neural2-D", name: "Neural2-D (Male)" },
-      { value: "en-AU-Polyglot-1", name: "Polyglot-1 (Male)" },
-      { value: "en-AU-News-E", name: "News-E (Female)" },
-      { value: "en-AU-News-F", name: "News-F (Female)" },
-      { value: "en-AU-News-G", name: "News-G (Male)" },
    ],
  },
  {
@@ -101,13 +97,6 @@ export const languages: VoiceLanguage[] = [
      { value: "en-GB-Neural2-C", name: "Neural2-C (Female)" },
      { value: "en-GB-Neural2-D", name: "Neural2-D (Male)" },
      { value: "en-GB-Neural2-F", name: "Neural2-F (Female)" },
-      { value: "en-GB-News-G", name: "News-G (Female)" },
-      { value: "en-GB-News-H", name: "News-H (Female)" },
-      { value: "en-GB-News-I", name: "News-I (Female)" },
-      { value: "en-GB-News-J", name: "News-J (Male)" },
-      { value: "en-GB-News-K", name: "News-K (Male)" },
-      { value: "en-GB-News-L", name: "News-L (Male)" },
-      { value: "en-GB-News-M", name: "News-M (Male)" },
    ],
  },
  {
@@ -135,11 +124,6 @@ export const languages: VoiceLanguage[] = [
      { value: "en-US-Neural2-J", name: "Neural2-J (Male)" },
      { value: "en-US-Studio-M", name: "Studio-M (Male)" },
      { value: "en-US-Studio-O", name: "Studio-M (Female)" },
-      { value: "en-US-Polyglot-1", name: "Polyglot-1 (Male)" },
-      { value: "en-US-News-K", name: "News-K (Female)" },
-      { value: "en-US-News-L", name: "News-L (Female)" },
-      { value: "en-US-News-M", name: "News-M (Male)" },
-      { value: "en-US-News-N", name: "News-N (Male)" },
    ],
  },
  {
@@ -197,7 +181,6 @@ export const languages: VoiceLanguage[] = [
      { value: "fr-FR-Neural2-C", name: "Neural2-C (Female)" },
      { value: "fr-FR-Neural2-D", name: "Neural2-D (Male)" },
      { value: "fr-FR-Neural2-E", name: "Neural2-E (Female)" },
-      { value: "fr-FR-Polyglot-1", name: "Polyglot-1 (Male)" },
    ],
  },
  {
@@ -218,7 +201,6 @@ export const languages: VoiceLanguage[] = [
      { value: "de-DE-Neural2-C", name: "Neural2-C (Female)" },
      { value: "de-DE-Neural2-D", name: "Neural2-D (Male)" },
      { value: "de-DE-Neural2-F", name: "Neural2-F (Female)" },
-      { value: "de-DE-Polyglot-1", name: "Polyglot-1 (Male)" },
    ],
  },
  {
@@ -437,7 +419,6 @@ export const languages: VoiceLanguage[] = [
      { value: "es-ES-Neural2-D", name: "Neural2-D (Female)" },
      { value: "es-ES-Neural2-E", name: "Neural2-E (Female)" },
      { value: "es-ES-Neural2-F", name: "Neural2-F (Male)" },
-      { value: "es-ES-Polyglot-1", name: "Polyglot-1 (Male)" },
    ],
  },
  {
@@ -448,11 +429,6 @@ export const languages: VoiceLanguage[] = [
      { value: "es-US-Neural2-B", name: "Neural2-B (Male)" },
      { value: "es-US-Neural2-C", name: "Neural2-C (Male)" },
      { value: "es-US-Studio-B", name: "Studio-B (Male)" },
-      { value: "es-US-Polyglot-1", name: "Polyglot-1 (Male)" },
-      { value: "es-US-News-D", name: "News-D (Male)" },
-      { value: "es-US-News-E", name: "News-E (Male)" },
-      { value: "es-US-News-F", name: "News-F (Female)" },
-      { value: "es-US-News-G", name: "News-G (Female)" },
    ],
  },
  {
Author	SHA1	Message	Date
Quan HL	001ff8c7a7	improve alert view	2023-06-17 14:28:50 +07:00
Quan HL	12c2ea1f82	improve alert view	2023-06-17 14:27:13 +07:00