From 60fe8fa7b00dbb27a419e926e7d3dc4e376f92a4 Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Wed, 23 Apr 2025 14:21:45 +0200
Subject: [PATCH 1/4] Add comments to send service to make it easier to follow
 (#14389)

---
 libs/common/src/tools/send/services/send.service.ts | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/libs/common/src/tools/send/services/send.service.ts b/libs/common/src/tools/send/services/send.service.ts
index 8d6e62e3b8c..cefd9942d29 100644
--- a/libs/common/src/tools/send/services/send.service.ts
+++ b/libs/common/src/tools/send/services/send.service.ts
@@ -50,7 +50,7 @@ export class SendService implements InternalSendServiceAbstraction {
     model: SendView,
     file: File | ArrayBuffer,
     password: string,
-    key?: SymmetricCryptoKey,
+    userKey?: SymmetricCryptoKey,
   ): Promise<[Send, EncArrayBuffer]> {
     let fileData: EncArrayBuffer = null;
     const send = new Send();
@@ -62,15 +62,19 @@ export class SendService implements InternalSendServiceAbstraction {
     send.deletionDate = model.deletionDate;
     send.expirationDate = model.expirationDate;
     if (model.key == null) {
+      // Sends use a seed, stored in the URL fragment. This seed is used to derive the key that is used for encryption.
       const key = await this.keyGenerationService.createKeyWithPurpose(
         128,
         this.sendKeyPurpose,
         this.sendKeySalt,
       );
+      // key.material is the seed that can be used to re-derive the key
       model.key = key.material;
       model.cryptoKey = key.derivedKey;
     }
     if (password != null) {
+      // Note: Despite being called key, the passwordKey is not used for encryption.
+      // It is used as a static proof that the client knows the password, and has the encryption key.
       const passwordKey = await this.keyGenerationService.deriveKeyFromPassword(
         password,
         model.key,
@@ -78,11 +82,11 @@ export class SendService implements InternalSendServiceAbstraction {
       );
       send.password = passwordKey.keyB64;
     }
-    if (key == null) {
-      key = await this.keyService.getUserKey();
+    if (userKey == null) {
+      userKey = await this.keyService.getUserKey();
     }
     // Key is not a SymmetricCryptoKey, but key material used to derive the cryptoKey
-    send.key = await this.encryptService.encrypt(model.key, key);
+    send.key = await this.encryptService.encrypt(model.key, userKey);
     send.name = await this.encryptService.encrypt(model.name, model.cryptoKey);
     send.notes = await this.encryptService.encrypt(model.notes, model.cryptoKey);
     if (send.type === SendType.Text) {

From 8e1dfb7d214f3f457f688b5f693830d9355853d2 Mon Sep 17 00:00:00 2001
From: Daniel Riera <driera@livefront.com>
Date: Wed, 23 Apr 2025 09:59:05 -0400
Subject: [PATCH 2/4] PM-19281 localize relevant notification bar text (#14327)

* PM-19281 localize todo text

* update storybook
---
 .../content/components/cipher/cipher-action.ts     |  8 ++++----
 .../content/components/cipher/cipher-item.ts       |  4 +++-
 .../ciphers/cipher-action.lit-stories.ts           |  1 +
 .../lit-stories/notification/body.lit-stories.ts   |  1 +
 .../content/components/notification/body.ts        |  3 +++
 .../content/components/notification/button-row.ts  | 14 ++++++++------
 .../content/components/notification/container.ts   |  1 +
 .../content/components/notification/footer.ts      |  1 +
 apps/browser/src/autofill/notification/bar.ts      |  7 +++++--
 9 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/apps/browser/src/autofill/content/components/cipher/cipher-action.ts b/apps/browser/src/autofill/content/components/cipher/cipher-action.ts
index aaa4b11d8a2..85698c87c67 100644
--- a/apps/browser/src/autofill/content/components/cipher/cipher-action.ts
+++ b/apps/browser/src/autofill/content/components/cipher/cipher-action.ts
@@ -8,24 +8,24 @@ export function CipherAction({
   handleAction = () => {
     /* no-op */
   },
+  i18n,
   notificationType,
   theme,
 }: {
   handleAction?: (e: Event) => void;
+  i18n: { [key: string]: string };
   notificationType: typeof NotificationTypes.Change | typeof NotificationTypes.Add;
   theme: Theme;
 }) {
   return notificationType === NotificationTypes.Change
     ? BadgeButton({
         buttonAction: handleAction,
-        // @TODO localize
-        buttonText: "Update",
+        buttonText: i18n.notificationUpdate,
         theme,
       })
     : EditButton({
         buttonAction: handleAction,
-        // @TODO localize
-        buttonText: "Edit",
+        buttonText: i18n.notificationEdit,
         theme,
       });
 }
diff --git a/apps/browser/src/autofill/content/components/cipher/cipher-item.ts b/apps/browser/src/autofill/content/components/cipher/cipher-item.ts
index 96b44d2c0cc..8ab29860f3b 100644
--- a/apps/browser/src/autofill/content/components/cipher/cipher-item.ts
+++ b/apps/browser/src/autofill/content/components/cipher/cipher-item.ts
@@ -19,11 +19,13 @@ const cipherIconWidth = "24px";
 export function CipherItem({
   cipher,
   handleAction,
+  i18n,
   notificationType,
   theme = ThemeTypes.Light,
 }: {
   cipher: NotificationCipherData;
   handleAction?: (e: Event) => void;
+  i18n: { [key: string]: string };
   notificationType?: NotificationType;
   theme: Theme;
 }) {
@@ -34,7 +36,7 @@ export function CipherItem({
 
   if (notificationType === NotificationTypes.Change || notificationType === NotificationTypes.Add) {
     cipherActionButton = html`<div>
-      ${CipherAction({ handleAction, notificationType, theme })}
+      ${CipherAction({ handleAction, i18n, notificationType, theme })}
     </div>`;
   }
 
diff --git a/apps/browser/src/autofill/content/components/lit-stories/ciphers/cipher-action.lit-stories.ts b/apps/browser/src/autofill/content/components/lit-stories/ciphers/cipher-action.lit-stories.ts
index e597cddabe6..dd1ff816f06 100644
--- a/apps/browser/src/autofill/content/components/lit-stories/ciphers/cipher-action.lit-stories.ts
+++ b/apps/browser/src/autofill/content/components/lit-stories/ciphers/cipher-action.lit-stories.ts
@@ -7,6 +7,7 @@ import { CipherAction } from "../../cipher/cipher-action";
 
 type Args = {
   handleAction?: (e: Event) => void;
+  i18n: { [key: string]: string };
   notificationType: typeof NotificationTypes.Change | typeof NotificationTypes.Add;
   theme: Theme;
 };
diff --git a/apps/browser/src/autofill/content/components/lit-stories/notification/body.lit-stories.ts b/apps/browser/src/autofill/content/components/lit-stories/notification/body.lit-stories.ts
index 32b4170d1da..13e2322a9f2 100644
--- a/apps/browser/src/autofill/content/components/lit-stories/notification/body.lit-stories.ts
+++ b/apps/browser/src/autofill/content/components/lit-stories/notification/body.lit-stories.ts
@@ -10,6 +10,7 @@ import { NotificationBody } from "../../notification/body";
 
 type Args = {
   ciphers: NotificationCipherData[];
+  i18n: { [key: string]: string };
   notificationType: NotificationType;
   theme: Theme;
   handleEditOrUpdateAction: (e: Event) => void;
diff --git a/apps/browser/src/autofill/content/components/notification/body.ts b/apps/browser/src/autofill/content/components/notification/body.ts
index 66b580bde43..cc0fa359303 100644
--- a/apps/browser/src/autofill/content/components/notification/body.ts
+++ b/apps/browser/src/autofill/content/components/notification/body.ts
@@ -17,12 +17,14 @@ const { css } = createEmotion({
 
 export function NotificationBody({
   ciphers = [],
+  i18n,
   notificationType,
   theme = ThemeTypes.Light,
   handleEditOrUpdateAction,
 }: {
   ciphers?: NotificationCipherData[];
   customClasses?: string[];
+  i18n: { [key: string]: string };
   notificationType?: NotificationType;
   theme: Theme;
   handleEditOrUpdateAction: (e: Event) => void;
@@ -37,6 +39,7 @@ export function NotificationBody({
           theme,
           children: CipherItem({
             cipher,
+            i18n,
             notificationType,
             theme,
             handleAction: handleEditOrUpdateAction,
diff --git a/apps/browser/src/autofill/content/components/notification/button-row.ts b/apps/browser/src/autofill/content/components/notification/button-row.ts
index 8661f5957e1..3834da4269d 100644
--- a/apps/browser/src/autofill/content/components/notification/button-row.ts
+++ b/apps/browser/src/autofill/content/components/notification/button-row.ts
@@ -22,17 +22,19 @@ function getVaultIconByProductTier(productTierType?: ProductTierType): Option["i
 }
 
 export type NotificationButtonRowProps = {
-  theme: Theme;
+  folders?: FolderView[];
+  i18n: { [key: string]: string };
+  organizations?: OrgView[];
   primaryButton: {
     text: string;
     handlePrimaryButtonClick: (args: any) => void;
   };
-  folders?: FolderView[];
-  organizations?: OrgView[];
+  theme: Theme;
 };
 
 export function NotificationButtonRow({
   folders,
+  i18n,
   organizations,
   primaryButton,
   theme,
@@ -40,7 +42,7 @@ export function NotificationButtonRow({
   const currentUserVaultOption: Option = {
     icon: User,
     default: true,
-    text: "My vault", // @TODO localize
+    text: i18n.myVault,
     value: "0",
   };
   const organizationOptions: Option[] = organizations?.length
@@ -84,7 +86,7 @@ export function NotificationButtonRow({
           ? [
               {
                 id: "organization",
-                label: "Vault", // @TODO localize
+                label: i18n.vault,
                 options: organizationOptions,
               },
             ]
@@ -93,7 +95,7 @@ export function NotificationButtonRow({
           ? [
               {
                 id: "folder",
-                label: "Folder", // @TODO localize
+                label: i18n.folder,
                 options: folderOptions,
               },
             ]
diff --git a/apps/browser/src/autofill/content/components/notification/container.ts b/apps/browser/src/autofill/content/components/notification/container.ts
index c29f58e116b..e1d098e3b09 100644
--- a/apps/browser/src/autofill/content/components/notification/container.ts
+++ b/apps/browser/src/autofill/content/components/notification/container.ts
@@ -59,6 +59,7 @@ export function NotificationContainer({
             ciphers,
             notificationType: type,
             theme,
+            i18n,
           })
         : null}
       ${NotificationFooter({
diff --git a/apps/browser/src/autofill/content/components/notification/footer.ts b/apps/browser/src/autofill/content/components/notification/footer.ts
index 8ed69a96ad9..58a87ebc678 100644
--- a/apps/browser/src/autofill/content/components/notification/footer.ts
+++ b/apps/browser/src/autofill/content/components/notification/footer.ts
@@ -38,6 +38,7 @@ export function NotificationFooter({
         ? NotificationButtonRow({
             folders,
             organizations,
+            i18n,
             primaryButton: {
               handlePrimaryButtonClick: handleSaveAction,
               text: primaryButtonText,
diff --git a/apps/browser/src/autofill/notification/bar.ts b/apps/browser/src/autofill/notification/bar.ts
index d660790ee63..4e85d893178 100644
--- a/apps/browser/src/autofill/notification/bar.ts
+++ b/apps/browser/src/autofill/notification/bar.ts
@@ -53,6 +53,7 @@ function getI18n() {
   return {
     appName: chrome.i18n.getMessage("appName"),
     close: chrome.i18n.getMessage("close"),
+    collection: chrome.i18n.getMessage("collection"),
     folder: chrome.i18n.getMessage("folder"),
     loginSaveSuccess: chrome.i18n.getMessage("loginSaveSuccess"),
     loginSaveSuccessDetails: chrome.i18n.getMessage("loginSaveSuccessDetails"),
@@ -63,10 +64,11 @@ function getI18n() {
     nextSecurityTaskAction: chrome.i18n.getMessage("nextSecurityTaskAction"),
     newItem: chrome.i18n.getMessage("newItem"),
     never: chrome.i18n.getMessage("never"),
+    myVault: chrome.i18n.getMessage("myVault"),
     notificationAddDesc: chrome.i18n.getMessage("notificationAddDesc"),
     notificationAddSave: chrome.i18n.getMessage("notificationAddSave"),
     notificationChangeDesc: chrome.i18n.getMessage("notificationChangeDesc"),
-    notificationChangeSave: chrome.i18n.getMessage("notificationChangeSave"),
+    notificationUpdate: chrome.i18n.getMessage("notificationChangeSave"),
     notificationEdit: chrome.i18n.getMessage("edit"),
     notificationUnlock: chrome.i18n.getMessage("notificationUnlock"),
     notificationUnlockDesc: chrome.i18n.getMessage("notificationUnlockDesc"),
@@ -78,6 +80,7 @@ function getI18n() {
     typeLogin: chrome.i18n.getMessage("typeLogin"),
     updateLoginAction: chrome.i18n.getMessage("updateLoginAction"),
     updateLoginPrompt: chrome.i18n.getMessage("updateLoginPrompt"),
+    vault: chrome.i18n.getMessage("vault"),
     view: chrome.i18n.getMessage("view"),
   };
 }
@@ -200,7 +203,7 @@ async function initNotificationBar(message: NotificationBarWindowMessage) {
     const changeTemplate = document.getElementById("template-change") as HTMLTemplateElement;
 
     const changeButton = findElementById<HTMLSelectElement>(changeTemplate, "change-save");
-    changeButton.textContent = i18n.notificationChangeSave;
+    changeButton.textContent = i18n.notificationUpdate;
 
     const changeEditButton = findElementById<HTMLButtonElement>(changeTemplate, "change-edit");
     changeEditButton.textContent = i18n.notificationEdit;

From 3aa1378c992df4da6e035ca4a89931c1cf39cb87 Mon Sep 17 00:00:00 2001
From: Oscar Hinton <Hinton@users.noreply.github.com>
Date: Wed, 23 Apr 2025 16:59:14 +0200
Subject: [PATCH 3/4] Eliminate dead code from trial-initiation (#14378)

---
 .../abm-enterprise-content.component.html     |  17 ---
 .../abm-enterprise-content.component.ts       |   7 -
 .../content/abm-teams-content.component.html  |  17 ---
 .../content/abm-teams-content.component.ts    |   7 -
 .../cnet-enterprise-content.component.html    |  17 ---
 .../cnet-enterprise-content.component.ts      |   7 -
 .../cnet-individual-content.component.html    |  17 ---
 .../cnet-individual-content.component.ts      |   7 -
 .../content/cnet-teams-content.component.html |  17 ---
 .../content/cnet-teams-content.component.ts   |   7 -
 .../content/default-content.component.html    |  16 --
 .../content/default-content.component.ts      |   7 -
 .../content/enterprise-content.component.html |  44 ------
 .../content/enterprise-content.component.ts   |   7 -
 .../enterprise1-content.component.html        |  44 ------
 .../content/enterprise1-content.component.ts  |   7 -
 .../enterprise2-content.component.html        |  44 ------
 .../content/enterprise2-content.component.ts  |   7 -
 .../content/logo-badges.component.html        |  11 --
 .../content/logo-badges.component.ts          |   7 -
 .../content/logo-cnet-5-stars.component.html  |  23 ---
 .../content/logo-cnet-5-stars.component.ts    |   7 -
 .../content/logo-cnet.component.html          |  15 --
 .../content/logo-cnet.component.ts            |   7 -
 .../logo-company-testimonial.component.html   |  28 ----
 .../logo-company-testimonial.component.ts     |   7 -
 .../content/logo-forbes.component.html        |  15 --
 .../content/logo-forbes.component.ts          |   7 -
 .../content/logo-us-news.component.html       |   5 -
 .../content/logo-us-news.component.ts         |   7 -
 .../content/review-blurb.component.html       |  13 --
 .../content/review-blurb.component.ts         |  13 --
 .../content/review-logo.component.html        |  18 ---
 .../content/review-logo.component.ts          |  13 --
 .../secrets-manager-content.component.html    |  30 ----
 .../secrets-manager-content.component.ts      |  80 ----------
 .../content/teams-content.component.html      |  17 ---
 .../content/teams-content.component.ts        |   7 -
 .../content/teams1-content.component.html     |  35 -----
 .../content/teams1-content.component.ts       |   7 -
 .../content/teams2-content.component.html     |  35 -----
 .../content/teams2-content.component.ts       |   7 -
 .../content/teams3-content.component.html     |  26 ----
 .../content/teams3-content.component.ts       |   7 -
 ...-manager-trial-free-stepper.component.html |  45 ------
 ...ts-manager-trial-free-stepper.component.ts |  90 -----------
 ...-manager-trial-paid-stepper.component.html |  67 --------
 ...ts-manager-trial-paid-stepper.component.ts | 144 ------------------
 .../secrets-manager-trial.component.html      |  44 ------
 .../secrets-manager-trial.component.ts        |  32 ----
 .../trial-initiation.module.ts                |  59 +------
 51 files changed, 1 insertion(+), 1223 deletions(-)
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/abm-enterprise-content.component.html
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/abm-enterprise-content.component.ts
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/abm-teams-content.component.html
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/abm-teams-content.component.ts
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/cnet-enterprise-content.component.html
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/cnet-enterprise-content.component.ts
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/cnet-individual-content.component.html
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/cnet-individual-content.component.ts
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/cnet-teams-content.component.html
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/cnet-teams-content.component.ts
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/default-content.component.html
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/default-content.component.ts
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/enterprise-content.component.html
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/enterprise-content.component.ts
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/enterprise1-content.component.html
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/enterprise1-content.component.ts
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/enterprise2-content.component.html
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/enterprise2-content.component.ts
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/logo-badges.component.html
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/logo-badges.component.ts
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/logo-cnet-5-stars.component.html
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/logo-cnet-5-stars.component.ts
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/logo-cnet.component.html
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/logo-cnet.component.ts
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/logo-company-testimonial.component.html
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/logo-company-testimonial.component.ts
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/logo-forbes.component.html
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/logo-forbes.component.ts
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/logo-us-news.component.html
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/logo-us-news.component.ts
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/review-blurb.component.html
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/review-blurb.component.ts
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/review-logo.component.html
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/review-logo.component.ts
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/secrets-manager-content.component.html
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/secrets-manager-content.component.ts
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/teams-content.component.html
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/teams-content.component.ts
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/teams1-content.component.html
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/teams1-content.component.ts
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/teams2-content.component.html
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/teams2-content.component.ts
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/teams3-content.component.html
 delete mode 100644 apps/web/src/app/billing/trial-initiation/content/teams3-content.component.ts
 delete mode 100644 apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial-free-stepper.component.html
 delete mode 100644 apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial-free-stepper.component.ts
 delete mode 100644 apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial-paid-stepper.component.html
 delete mode 100644 apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial-paid-stepper.component.ts
 delete mode 100644 apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial.component.html
 delete mode 100644 apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial.component.ts

diff --git a/apps/web/src/app/billing/trial-initiation/content/abm-enterprise-content.component.html b/apps/web/src/app/billing/trial-initiation/content/abm-enterprise-content.component.html
deleted file mode 100644
index 46e1fae80df..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/abm-enterprise-content.component.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<h1 class="tw-text-4xl !tw-text-alt2">The Bitwarden Password Manager</h1>
-<div class="tw-pt-32">
-  <h2 class="tw-text-2xl">
-    Trusted by millions of individuals, teams, and organizations worldwide for secure password
-    storage and sharing.
-  </h2>
-</div>
-<ul class="tw-mt-12 tw-flex tw-flex-col tw-gap-10 tw-text-2xl tw-text-main">
-  <li>Store logins, secure notes, and more</li>
-  <li>Collaborate and share securely</li>
-  <li>Access anywhere on any device</li>
-  <li>Create your account to get started</li>
-</ul>
-<div class="tw-mt-28 tw-flex tw-flex-col tw-items-center tw-gap-5">
-  <app-logo-forbes></app-logo-forbes>
-  <app-logo-us-news></app-logo-us-news>
-</div>
diff --git a/apps/web/src/app/billing/trial-initiation/content/abm-enterprise-content.component.ts b/apps/web/src/app/billing/trial-initiation/content/abm-enterprise-content.component.ts
deleted file mode 100644
index 0f9db7b4405..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/abm-enterprise-content.component.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Component } from "@angular/core";
-
-@Component({
-  selector: "app-abm-enterprise-content",
-  templateUrl: "abm-enterprise-content.component.html",
-})
-export class AbmEnterpriseContentComponent {}
diff --git a/apps/web/src/app/billing/trial-initiation/content/abm-teams-content.component.html b/apps/web/src/app/billing/trial-initiation/content/abm-teams-content.component.html
deleted file mode 100644
index 46e1fae80df..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/abm-teams-content.component.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<h1 class="tw-text-4xl !tw-text-alt2">The Bitwarden Password Manager</h1>
-<div class="tw-pt-32">
-  <h2 class="tw-text-2xl">
-    Trusted by millions of individuals, teams, and organizations worldwide for secure password
-    storage and sharing.
-  </h2>
-</div>
-<ul class="tw-mt-12 tw-flex tw-flex-col tw-gap-10 tw-text-2xl tw-text-main">
-  <li>Store logins, secure notes, and more</li>
-  <li>Collaborate and share securely</li>
-  <li>Access anywhere on any device</li>
-  <li>Create your account to get started</li>
-</ul>
-<div class="tw-mt-28 tw-flex tw-flex-col tw-items-center tw-gap-5">
-  <app-logo-forbes></app-logo-forbes>
-  <app-logo-us-news></app-logo-us-news>
-</div>
diff --git a/apps/web/src/app/billing/trial-initiation/content/abm-teams-content.component.ts b/apps/web/src/app/billing/trial-initiation/content/abm-teams-content.component.ts
deleted file mode 100644
index 7765555f5cc..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/abm-teams-content.component.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Component } from "@angular/core";
-
-@Component({
-  selector: "app-abm-teams-content",
-  templateUrl: "abm-teams-content.component.html",
-})
-export class AbmTeamsContentComponent {}
diff --git a/apps/web/src/app/billing/trial-initiation/content/cnet-enterprise-content.component.html b/apps/web/src/app/billing/trial-initiation/content/cnet-enterprise-content.component.html
deleted file mode 100644
index b5c16911ab0..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/cnet-enterprise-content.component.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<h1 class="tw-text-4xl !tw-text-alt2">Start Your Enterprise Free Trial Now</h1>
-<div class="tw-pt-32">
-  <h2 class="tw-text-2xl">
-    Millions of individuals, teams, and organizations worldwide trust Bitwarden for secure password
-    storage and sharing.
-  </h2>
-</div>
-<ul class="tw-mt-12 tw-flex tw-flex-col tw-gap-10 tw-text-2xl tw-text-main">
-  <li>Collaborate and share securely</li>
-  <li>Deploy and manage quickly and easily</li>
-  <li>Access anywhere on any device</li>
-  <li>Create your account to get started</li>
-</ul>
-<div class="tw-mt-28 tw-flex tw-flex-col tw-items-center tw-gap-5">
-  <app-logo-cnet></app-logo-cnet>
-  <app-logo-us-news></app-logo-us-news>
-</div>
diff --git a/apps/web/src/app/billing/trial-initiation/content/cnet-enterprise-content.component.ts b/apps/web/src/app/billing/trial-initiation/content/cnet-enterprise-content.component.ts
deleted file mode 100644
index 4a6de8d3003..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/cnet-enterprise-content.component.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Component } from "@angular/core";
-
-@Component({
-  selector: "app-cnet-enterprise-content",
-  templateUrl: "cnet-enterprise-content.component.html",
-})
-export class CnetEnterpriseContentComponent {}
diff --git a/apps/web/src/app/billing/trial-initiation/content/cnet-individual-content.component.html b/apps/web/src/app/billing/trial-initiation/content/cnet-individual-content.component.html
deleted file mode 100644
index 6e6f545c170..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/cnet-individual-content.component.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<h1 class="tw-text-4xl !tw-text-alt2">Start Your Premium Account Now</h1>
-<div class="tw-pt-32">
-  <h2 class="tw-text-2xl">
-    Millions of individuals, teams, and organizations worldwide trust Bitwarden for secure password
-    storage and sharing.
-  </h2>
-</div>
-<ul class="tw-mt-12 tw-flex tw-flex-col tw-gap-10 tw-text-2xl tw-text-main">
-  <li>Store logins, secure notes, and more</li>
-  <li>Secure your account with advanced two-step login</li>
-  <li>Access anywhere on any device</li>
-  <li>Create your account to get started</li>
-</ul>
-<div class="tw-mt-28 tw-flex tw-flex-col tw-items-center tw-gap-5">
-  <app-logo-cnet></app-logo-cnet>
-  <app-logo-us-news></app-logo-us-news>
-</div>
diff --git a/apps/web/src/app/billing/trial-initiation/content/cnet-individual-content.component.ts b/apps/web/src/app/billing/trial-initiation/content/cnet-individual-content.component.ts
deleted file mode 100644
index 56d8b37af90..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/cnet-individual-content.component.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Component } from "@angular/core";
-
-@Component({
-  selector: "app-cnet-individual-content",
-  templateUrl: "cnet-individual-content.component.html",
-})
-export class CnetIndividualContentComponent {}
diff --git a/apps/web/src/app/billing/trial-initiation/content/cnet-teams-content.component.html b/apps/web/src/app/billing/trial-initiation/content/cnet-teams-content.component.html
deleted file mode 100644
index c719c5ac7ce..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/cnet-teams-content.component.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<h1 class="tw-text-4xl !tw-text-alt2">Start Your Teams Free Trial Now</h1>
-<div class="tw-pt-32">
-  <h2 class="tw-text-2xl">
-    Millions of individuals, teams, and organizations worldwide trust Bitwarden for secure password
-    storage and sharing.
-  </h2>
-</div>
-<ul class="tw-mt-12 tw-flex tw-flex-col tw-gap-10 tw-text-2xl tw-text-main">
-  <li>Collaborate and share securely</li>
-  <li>Deploy and manage quickly and easily</li>
-  <li>Access anywhere on any device</li>
-  <li>Create your account to get started</li>
-</ul>
-<div class="tw-mt-28 tw-flex tw-flex-col tw-items-center tw-gap-5">
-  <app-logo-cnet></app-logo-cnet>
-  <app-logo-us-news></app-logo-us-news>
-</div>
diff --git a/apps/web/src/app/billing/trial-initiation/content/cnet-teams-content.component.ts b/apps/web/src/app/billing/trial-initiation/content/cnet-teams-content.component.ts
deleted file mode 100644
index ff79a0d37cd..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/cnet-teams-content.component.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Component } from "@angular/core";
-
-@Component({
-  selector: "app-cnet-teams-content",
-  templateUrl: "cnet-teams-content.component.html",
-})
-export class CnetTeamsContentComponent {}
diff --git a/apps/web/src/app/billing/trial-initiation/content/default-content.component.html b/apps/web/src/app/billing/trial-initiation/content/default-content.component.html
deleted file mode 100644
index e1839517ff6..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/default-content.component.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<h1 class="tw-text-4xl !tw-text-alt2">The Bitwarden Password Manager</h1>
-<div class="tw-pt-32">
-  <h2 class="tw-text-2xl">
-    Trusted by millions of individuals, teams, and organizations worldwide for secure password
-    storage and sharing.
-  </h2>
-</div>
-<ul class="tw-mt-12 tw-flex tw-flex-col tw-gap-10 tw-text-2xl tw-text-main">
-  <li>Store logins, secure notes, and more</li>
-  <li>Collaborate and share securely</li>
-  <li>Access anywhere on any device</li>
-  <li>Create your account to get started</li>
-</ul>
-<div class="tw-mt-28">
-  <app-logo-company-testimonial></app-logo-company-testimonial>
-</div>
diff --git a/apps/web/src/app/billing/trial-initiation/content/default-content.component.ts b/apps/web/src/app/billing/trial-initiation/content/default-content.component.ts
deleted file mode 100644
index 7ad40b089d1..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/default-content.component.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Component } from "@angular/core";
-
-@Component({
-  selector: "app-default-content",
-  templateUrl: "default-content.component.html",
-})
-export class DefaultContentComponent {}
diff --git a/apps/web/src/app/billing/trial-initiation/content/enterprise-content.component.html b/apps/web/src/app/billing/trial-initiation/content/enterprise-content.component.html
deleted file mode 100644
index f57fb7a3510..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/enterprise-content.component.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<h1 class="tw-text-3xl !tw-text-alt2">Start your 7-day Enterprise free trial</h1>
-<div class="tw-pt-20">
-  <h2 class="tw-text-2xl">
-    Bitwarden is the most trusted password manager designed for seamless administration and employee
-    usability.
-  </h2>
-</div>
-<ul class="tw-mt-12 tw-flex tw-flex-col tw-gap-10 tw-text-2xl tw-text-main tw-list-none tw-pl-0">
-  <li class="tw-flex tw-items-center">
-    <i class="bwi bwi-lg bwi-check-circle tw-mr-4 tw-flex-none"></i
-    ><span class="tw-flex-auto"
-      >Instantly and securely share credentials with the groups and individuals who need them</span
-    >
-  </li>
-  <li class="tw-flex tw-items-center">
-    <i class="bwi bwi-lg bwi-check-circle tw-mr-4 tw-flex-none"></i
-    ><span class="tw-flex-auto"
-      >Strengthen company-wide security through centralized administrative control and
-      policies</span
-    >
-  </li>
-  <li class="tw-flex tw-items-center">
-    <i class="bwi bwi-lg bwi-check-circle tw-mr-4 tw-flex-none"></i
-    ><span class="tw-flex-auto"
-      >Streamline user onboarding and automate account provisioning with flexible SSO and SCIM
-      integrations</span
-    >
-  </li>
-  <li class="tw-flex tw-items-center">
-    <i class="bwi bwi-lg bwi-check-circle tw-mr-4 tw-flex-none"></i
-    ><span class="tw-flex-auto"
-      >Migrate to Bitwarden in minutes with comprehensive import options</span
-    >
-  </li>
-  <li class="tw-flex tw-items-center">
-    <i class="bwi bwi-lg bwi-check-circle tw-mr-4 tw-flex-none"></i
-    ><span class="tw-flex-auto"
-      >Give all Enterprise users the gift of 360º security with a free Families plan</span
-    >
-  </li>
-</ul>
-<div class="tw-mt-28 tw-flex tw-flex-col tw-items-center tw-gap-5">
-  <app-logo-badges></app-logo-badges>
-</div>
diff --git a/apps/web/src/app/billing/trial-initiation/content/enterprise-content.component.ts b/apps/web/src/app/billing/trial-initiation/content/enterprise-content.component.ts
deleted file mode 100644
index 847b3c3088a..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/enterprise-content.component.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Component } from "@angular/core";
-
-@Component({
-  selector: "app-enterprise-content",
-  templateUrl: "enterprise-content.component.html",
-})
-export class EnterpriseContentComponent {}
diff --git a/apps/web/src/app/billing/trial-initiation/content/enterprise1-content.component.html b/apps/web/src/app/billing/trial-initiation/content/enterprise1-content.component.html
deleted file mode 100644
index f57fb7a3510..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/enterprise1-content.component.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<h1 class="tw-text-3xl !tw-text-alt2">Start your 7-day Enterprise free trial</h1>
-<div class="tw-pt-20">
-  <h2 class="tw-text-2xl">
-    Bitwarden is the most trusted password manager designed for seamless administration and employee
-    usability.
-  </h2>
-</div>
-<ul class="tw-mt-12 tw-flex tw-flex-col tw-gap-10 tw-text-2xl tw-text-main tw-list-none tw-pl-0">
-  <li class="tw-flex tw-items-center">
-    <i class="bwi bwi-lg bwi-check-circle tw-mr-4 tw-flex-none"></i
-    ><span class="tw-flex-auto"
-      >Instantly and securely share credentials with the groups and individuals who need them</span
-    >
-  </li>
-  <li class="tw-flex tw-items-center">
-    <i class="bwi bwi-lg bwi-check-circle tw-mr-4 tw-flex-none"></i
-    ><span class="tw-flex-auto"
-      >Strengthen company-wide security through centralized administrative control and
-      policies</span
-    >
-  </li>
-  <li class="tw-flex tw-items-center">
-    <i class="bwi bwi-lg bwi-check-circle tw-mr-4 tw-flex-none"></i
-    ><span class="tw-flex-auto"
-      >Streamline user onboarding and automate account provisioning with flexible SSO and SCIM
-      integrations</span
-    >
-  </li>
-  <li class="tw-flex tw-items-center">
-    <i class="bwi bwi-lg bwi-check-circle tw-mr-4 tw-flex-none"></i
-    ><span class="tw-flex-auto"
-      >Migrate to Bitwarden in minutes with comprehensive import options</span
-    >
-  </li>
-  <li class="tw-flex tw-items-center">
-    <i class="bwi bwi-lg bwi-check-circle tw-mr-4 tw-flex-none"></i
-    ><span class="tw-flex-auto"
-      >Give all Enterprise users the gift of 360º security with a free Families plan</span
-    >
-  </li>
-</ul>
-<div class="tw-mt-28 tw-flex tw-flex-col tw-items-center tw-gap-5">
-  <app-logo-badges></app-logo-badges>
-</div>
diff --git a/apps/web/src/app/billing/trial-initiation/content/enterprise1-content.component.ts b/apps/web/src/app/billing/trial-initiation/content/enterprise1-content.component.ts
deleted file mode 100644
index 7b1199eb421..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/enterprise1-content.component.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Component } from "@angular/core";
-
-@Component({
-  selector: "app-enterprise1-content",
-  templateUrl: "enterprise1-content.component.html",
-})
-export class Enterprise1ContentComponent {}
diff --git a/apps/web/src/app/billing/trial-initiation/content/enterprise2-content.component.html b/apps/web/src/app/billing/trial-initiation/content/enterprise2-content.component.html
deleted file mode 100644
index f57fb7a3510..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/enterprise2-content.component.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<h1 class="tw-text-3xl !tw-text-alt2">Start your 7-day Enterprise free trial</h1>
-<div class="tw-pt-20">
-  <h2 class="tw-text-2xl">
-    Bitwarden is the most trusted password manager designed for seamless administration and employee
-    usability.
-  </h2>
-</div>
-<ul class="tw-mt-12 tw-flex tw-flex-col tw-gap-10 tw-text-2xl tw-text-main tw-list-none tw-pl-0">
-  <li class="tw-flex tw-items-center">
-    <i class="bwi bwi-lg bwi-check-circle tw-mr-4 tw-flex-none"></i
-    ><span class="tw-flex-auto"
-      >Instantly and securely share credentials with the groups and individuals who need them</span
-    >
-  </li>
-  <li class="tw-flex tw-items-center">
-    <i class="bwi bwi-lg bwi-check-circle tw-mr-4 tw-flex-none"></i
-    ><span class="tw-flex-auto"
-      >Strengthen company-wide security through centralized administrative control and
-      policies</span
-    >
-  </li>
-  <li class="tw-flex tw-items-center">
-    <i class="bwi bwi-lg bwi-check-circle tw-mr-4 tw-flex-none"></i
-    ><span class="tw-flex-auto"
-      >Streamline user onboarding and automate account provisioning with flexible SSO and SCIM
-      integrations</span
-    >
-  </li>
-  <li class="tw-flex tw-items-center">
-    <i class="bwi bwi-lg bwi-check-circle tw-mr-4 tw-flex-none"></i
-    ><span class="tw-flex-auto"
-      >Migrate to Bitwarden in minutes with comprehensive import options</span
-    >
-  </li>
-  <li class="tw-flex tw-items-center">
-    <i class="bwi bwi-lg bwi-check-circle tw-mr-4 tw-flex-none"></i
-    ><span class="tw-flex-auto"
-      >Give all Enterprise users the gift of 360º security with a free Families plan</span
-    >
-  </li>
-</ul>
-<div class="tw-mt-28 tw-flex tw-flex-col tw-items-center tw-gap-5">
-  <app-logo-badges></app-logo-badges>
-</div>
diff --git a/apps/web/src/app/billing/trial-initiation/content/enterprise2-content.component.ts b/apps/web/src/app/billing/trial-initiation/content/enterprise2-content.component.ts
deleted file mode 100644
index 08dec6190c7..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/enterprise2-content.component.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Component } from "@angular/core";
-
-@Component({
-  selector: "app-enterprise2-content",
-  templateUrl: "enterprise2-content.component.html",
-})
-export class Enterprise2ContentComponent {}
diff --git a/apps/web/src/app/billing/trial-initiation/content/logo-badges.component.html b/apps/web/src/app/billing/trial-initiation/content/logo-badges.component.html
deleted file mode 100644
index d1b33eab3a4..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/logo-badges.component.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<figure>
-  <figcaption>
-    <cite>
-      <img
-        src="../../images/register-layout/vault-signup-badges.png"
-        class="tw-mx-auto tw-block tw-w-full"
-        alt="third party awards"
-      />
-    </cite>
-  </figcaption>
-</figure>
diff --git a/apps/web/src/app/billing/trial-initiation/content/logo-badges.component.ts b/apps/web/src/app/billing/trial-initiation/content/logo-badges.component.ts
deleted file mode 100644
index c23432b67cf..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/logo-badges.component.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Component } from "@angular/core";
-
-@Component({
-  selector: "app-logo-badges",
-  templateUrl: "logo-badges.component.html",
-})
-export class LogoBadgesComponent {}
diff --git a/apps/web/src/app/billing/trial-initiation/content/logo-cnet-5-stars.component.html b/apps/web/src/app/billing/trial-initiation/content/logo-cnet-5-stars.component.html
deleted file mode 100644
index fb4537d2820..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/logo-cnet-5-stars.component.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<figure>
-  <div class="tw-flex tw-justify-center tw-gap-4 tw-text-[#eab308] tw-text-5xl">
-    <i class="bwi bwi-star-f"></i>
-    <i class="bwi bwi-star-f"></i>
-    <i class="bwi bwi-star-f"></i>
-    <i class="bwi bwi-star-f"></i>
-    <i class="bwi bwi-star-f"></i>
-  </div>
-  <blockquote class="tw-mx-auto tw-my-2 tw-max-w-xl tw-px-4 tw-text-center">
-    “Bitwarden scores points for being fully open-source, secure and audited annually by third-party
-    cybersecurity firms, giving it a level of transparency that sets it apart from its peers.”
-  </blockquote>
-  <figcaption>
-    <cite>
-      <img
-        src="../../images/register-layout/cnet-logo.svg"
-        class="tw-mx-auto tw-block tw-w-40"
-        alt="CNET Logo"
-      />
-    </cite>
-    <p class="tw-text-center tw-font-bold -tw-translate-y-4">Best Password Manager in 2024</p>
-  </figcaption>
-</figure>
diff --git a/apps/web/src/app/billing/trial-initiation/content/logo-cnet-5-stars.component.ts b/apps/web/src/app/billing/trial-initiation/content/logo-cnet-5-stars.component.ts
deleted file mode 100644
index af531829d50..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/logo-cnet-5-stars.component.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Component } from "@angular/core";
-
-@Component({
-  selector: "app-logo-cnet-5-stars",
-  templateUrl: "logo-cnet-5-stars.component.html",
-})
-export class LogoCnet5StarsComponent {}
diff --git a/apps/web/src/app/billing/trial-initiation/content/logo-cnet.component.html b/apps/web/src/app/billing/trial-initiation/content/logo-cnet.component.html
deleted file mode 100644
index 4e04cec6da4..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/logo-cnet.component.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<figure>
-  <figcaption>
-    <cite>
-      <img
-        src="../../images/register-layout/cnet-logo.svg"
-        class="tw-mx-auto tw-block tw-w-40"
-        alt="CNET Logo"
-      />
-    </cite>
-  </figcaption>
-  <blockquote class="tw-mx-auto tw-mt-2 tw-max-w-xl tw-px-4 tw-text-center">
-    "No more excuses; start using Bitwarden today. The identity you save could be your own. The
-    money definitely will be."
-  </blockquote>
-</figure>
diff --git a/apps/web/src/app/billing/trial-initiation/content/logo-cnet.component.ts b/apps/web/src/app/billing/trial-initiation/content/logo-cnet.component.ts
deleted file mode 100644
index 4f755f66a86..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/logo-cnet.component.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Component } from "@angular/core";
-
-@Component({
-  selector: "app-logo-cnet",
-  templateUrl: "logo-cnet.component.html",
-})
-export class LogoCnetComponent {}
diff --git a/apps/web/src/app/billing/trial-initiation/content/logo-company-testimonial.component.html b/apps/web/src/app/billing/trial-initiation/content/logo-company-testimonial.component.html
deleted file mode 100644
index 0b81e0bd216..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/logo-company-testimonial.component.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<figure class="tw-text-center">
-  <p class="tw-mx-auto tw-my-2 tw-max-w-xl tw-px-4 tw-text-center">
-    Recommended by industry experts
-  </p>
-  <div class="tw-flex tw-flex-wrap tw-gap-8 tw-items-center tw-justify-center tw-mb-4">
-    <div class="tw-flex tw-gap-8">
-      <img src="../../images/register-layout/cnet-logo.svg" class="tw-w-32" alt="CNET Logo" />
-      <img
-        src="../../images/register-layout/wired-logo.png"
-        class="tw-w-32 tw-object-contain"
-        alt="WIRED Logo"
-      />
-    </div>
-    <div class="tw-flex tw-gap-8">
-      <img
-        src="../../images/register-layout/new-york-times-logo.svg"
-        class="tw-w-32"
-        alt="New York Times Logo"
-      />
-      <img src="../../images/register-layout/pcmag-logo.svg" class="tw-w-32" alt="PC Mag Logo" />
-    </div>
-  </div>
-  <blockquote>
-    &ldquo;Bitwarden is currently CNET's top pick for the best password manager, thanks in part to
-    its commitment to transparency and its unbeatable free tier.&rdquo;
-  </blockquote>
-  <p class="tw-font-bold">Best Password Manager in 2024</p>
-</figure>
diff --git a/apps/web/src/app/billing/trial-initiation/content/logo-company-testimonial.component.ts b/apps/web/src/app/billing/trial-initiation/content/logo-company-testimonial.component.ts
deleted file mode 100644
index 9d9c4471820..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/logo-company-testimonial.component.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Component } from "@angular/core";
-
-@Component({
-  selector: "app-logo-company-testimonial",
-  templateUrl: "logo-company-testimonial.component.html",
-})
-export class LogoCompanyTestimonialComponent {}
diff --git a/apps/web/src/app/billing/trial-initiation/content/logo-forbes.component.html b/apps/web/src/app/billing/trial-initiation/content/logo-forbes.component.html
deleted file mode 100644
index 34426168324..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/logo-forbes.component.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<figure>
-  <figcaption>
-    <cite>
-      <img
-        src="../../images/register-layout/forbes-logo.svg"
-        class="tw-mx-auto tw-block tw-w-40"
-        alt="Forbes Logo"
-      />
-    </cite>
-  </figcaption>
-  <blockquote class="tw-mx-auto tw-mt-2 tw-max-w-xl tw-px-4 tw-text-center">
-    “Bitwarden boasts the backing of some of the world's best security experts and an attractive,
-    easy-to-use interface”
-  </blockquote>
-</figure>
diff --git a/apps/web/src/app/billing/trial-initiation/content/logo-forbes.component.ts b/apps/web/src/app/billing/trial-initiation/content/logo-forbes.component.ts
deleted file mode 100644
index 818721fd1e9..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/logo-forbes.component.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Component } from "@angular/core";
-
-@Component({
-  selector: "app-logo-forbes",
-  templateUrl: "logo-forbes.component.html",
-})
-export class LogoForbesComponent {}
diff --git a/apps/web/src/app/billing/trial-initiation/content/logo-us-news.component.html b/apps/web/src/app/billing/trial-initiation/content/logo-us-news.component.html
deleted file mode 100644
index bd44b56f090..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/logo-us-news.component.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<img
-  src="../../images/register-layout/usnews-360-badge.svg"
-  class="tw-mx-auto tw-block tw-w-48"
-  alt="US News 360 Reviews Best Password Manager"
-/>
diff --git a/apps/web/src/app/billing/trial-initiation/content/logo-us-news.component.ts b/apps/web/src/app/billing/trial-initiation/content/logo-us-news.component.ts
deleted file mode 100644
index fb0b1e0c71b..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/logo-us-news.component.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Component } from "@angular/core";
-
-@Component({
-  selector: "app-logo-us-news",
-  templateUrl: "logo-us-news.component.html",
-})
-export class LogoUSNewsComponent {}
diff --git a/apps/web/src/app/billing/trial-initiation/content/review-blurb.component.html b/apps/web/src/app/billing/trial-initiation/content/review-blurb.component.html
deleted file mode 100644
index cd719a35af8..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/review-blurb.component.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<figure>
-  <h2 class="tw-mx-auto tw-pb-2 tw-max-w-xl tw-font-semibold tw-text-center">
-    {{ header }}
-  </h2>
-  <blockquote class="tw-mx-auto tw-my-2 tw-max-w-xl tw-px-4 tw-text-center">
-    "{{ quote }}"
-  </blockquote>
-  <figcaption>
-    <cite>
-      <p class="tw-mx-auto tw-text-center tw-font-bold">{{ source }}</p>
-    </cite>
-  </figcaption>
-</figure>
diff --git a/apps/web/src/app/billing/trial-initiation/content/review-blurb.component.ts b/apps/web/src/app/billing/trial-initiation/content/review-blurb.component.ts
deleted file mode 100644
index 6419ddf1e45..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/review-blurb.component.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Component, Input } from "@angular/core";
-
-@Component({
-  selector: "app-review-blurb",
-  templateUrl: "review-blurb.component.html",
-})
-export class ReviewBlurbComponent {
-  @Input() header: string;
-  @Input() quote: string;
-  @Input() source: string;
-}
diff --git a/apps/web/src/app/billing/trial-initiation/content/review-logo.component.html b/apps/web/src/app/billing/trial-initiation/content/review-logo.component.html
deleted file mode 100644
index 77f592f1c45..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/review-logo.component.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="tw-flex tw-flex-col tw-items-center tw-justify-center">
-  <img class="tw-mb-2" [ngClass]="logoClass" [src]="logoSrc" [alt]="logoAlt" />
-  <div class="tw-flex tw-items-center">
-    <div class="tw-flex tw-items-center tw-justify-center tw-text-[#eab308] tw-text-2xl">
-      <i class="bwi bwi-star-f"></i>
-      <i class="bwi bwi-star-f"></i>
-      <i class="bwi bwi-star-f"></i>
-      <i class="bwi bwi-star-f"></i>
-      <div class="tw-relative">
-        <div class="tw-absolute tw-inset-0 tw-w-3 tw-overflow-hidden">
-          <i class="bwi bwi-star-f"></i>
-        </div>
-        <i class="bwi bwi-star-f tw-text-[#cbd5e1]"></i>
-      </div>
-    </div>
-    <span class="tw-ml-2">4.7</span>
-  </div>
-</div>
diff --git a/apps/web/src/app/billing/trial-initiation/content/review-logo.component.ts b/apps/web/src/app/billing/trial-initiation/content/review-logo.component.ts
deleted file mode 100644
index 9b104ac0bc3..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/review-logo.component.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Component, Input } from "@angular/core";
-
-@Component({
-  selector: "review-logo",
-  templateUrl: "review-logo.component.html",
-})
-export class ReviewLogoComponent {
-  @Input() logoClass: string;
-  @Input() logoSrc: string;
-  @Input() logoAlt: string;
-}
diff --git a/apps/web/src/app/billing/trial-initiation/content/secrets-manager-content.component.html b/apps/web/src/app/billing/trial-initiation/content/secrets-manager-content.component.html
deleted file mode 100644
index 569ff91f625..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/secrets-manager-content.component.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<h1 class="tw-text-4xl !tw-text-alt2">{{ header }}</h1>
-<div class="tw-pt-16">
-  <h2 class="tw-text-2xl tw-font-semibold">
-    {{ headline }}
-  </h2>
-</div>
-<ul class="tw-mt-12 tw-flex tw-flex-col tw-gap-10 tw-text-2xl tw-text-main">
-  <li *ngFor="let primaryPoint of primaryPoints">
-    {{ primaryPoint }}
-  </li>
-</ul>
-<div class="tw-mt-12 tw-flex tw-flex-col">
-  <div class="tw-rounded-[32px] tw-bg-background">
-    <div class="tw-my-8 tw-mx-6">
-      <h2 class="tw-pl-5 tw-font-semibold">{{ calloutHeadline }}</h2>
-      <ul class="tw-space-y-4 tw-mt-4 tw-pl-10">
-        <li *ngFor="let callout of callouts">
-          {{ callout }}
-        </li>
-      </ul>
-    </div>
-  </div>
-</div>
-<div class="tw-mt-12 tw-flex tw-flex-col tw-items-center tw-gap-5">
-  <app-review-blurb
-    header="Businesses trust Bitwarden to secure their infrastructure"
-    quote="At this point, it would be almost impossible to leak our secrets. It's just one less thing we have to worry about."
-    source="Titanom Technologies"
-  ></app-review-blurb>
-</div>
diff --git a/apps/web/src/app/billing/trial-initiation/content/secrets-manager-content.component.ts b/apps/web/src/app/billing/trial-initiation/content/secrets-manager-content.component.ts
deleted file mode 100644
index 955c18fddf2..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/secrets-manager-content.component.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Component, OnDestroy, OnInit } from "@angular/core";
-import { ActivatedRoute } from "@angular/router";
-import { Subject, takeUntil } from "rxjs";
-
-@Component({
-  selector: "app-secrets-manager-content",
-  templateUrl: "secrets-manager-content.component.html",
-})
-export class SecretsManagerContentComponent implements OnInit, OnDestroy {
-  header: string;
-  headline =
-    "A simpler, faster way to secure and automate secrets across code and infrastructure deployments";
-  primaryPoints: string[];
-  calloutHeadline: string;
-  callouts: string[];
-
-  private paidPrimaryPoints = [
-    "Unlimited secrets, users, and projects",
-    "Simple and transparent pricing",
-    "Zero-knowledge, end-to-end encryption",
-  ];
-
-  private paidCalloutHeadline = "Limited time offer";
-
-  private paidCallouts = [
-    "Sign up today and receive a complimentary 12-month subscription to Bitwarden Password Manager",
-    "Experience complete security across your organization",
-    "Secure all your sensitive credentials, from user applications to machine secrets",
-  ];
-
-  private freePrimaryPoints = [
-    "Unlimited secrets",
-    "Simple and transparent pricing",
-    "Zero-knowledge, end-to-end encryption",
-  ];
-
-  private freeCalloutHeadline = "Go beyond developer security!";
-
-  private freeCallouts = [
-    "Your Bitwarden account will also grant complimentary access to Bitwarden Password Manager",
-    "Extend end-to-end encryption to your personal passwords, addresses, credit cards and notes",
-  ];
-
-  private destroy$ = new Subject<void>();
-
-  constructor(private activatedRoute: ActivatedRoute) {}
-
-  ngOnDestroy() {
-    this.destroy$.next();
-    this.destroy$.complete();
-  }
-
-  ngOnInit(): void {
-    this.activatedRoute.queryParams.pipe(takeUntil(this.destroy$)).subscribe((queryParameters) => {
-      switch (queryParameters.org) {
-        case "enterprise":
-          this.header = "Secrets Manager for Enterprise";
-          this.primaryPoints = this.paidPrimaryPoints;
-          this.calloutHeadline = this.paidCalloutHeadline;
-          this.callouts = this.paidCallouts;
-          break;
-        case "free":
-          this.header = "Bitwarden Secrets Manager";
-          this.primaryPoints = this.freePrimaryPoints;
-          this.calloutHeadline = this.freeCalloutHeadline;
-          this.callouts = this.freeCallouts;
-          break;
-        case "teams":
-        case "teamsStarter":
-          this.header = "Secrets Manager for Teams";
-          this.primaryPoints = this.paidPrimaryPoints;
-          this.calloutHeadline = this.paidCalloutHeadline;
-          this.callouts = this.paidCallouts;
-          break;
-      }
-    });
-  }
-}
diff --git a/apps/web/src/app/billing/trial-initiation/content/teams-content.component.html b/apps/web/src/app/billing/trial-initiation/content/teams-content.component.html
deleted file mode 100644
index 46e1fae80df..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/teams-content.component.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<h1 class="tw-text-4xl !tw-text-alt2">The Bitwarden Password Manager</h1>
-<div class="tw-pt-32">
-  <h2 class="tw-text-2xl">
-    Trusted by millions of individuals, teams, and organizations worldwide for secure password
-    storage and sharing.
-  </h2>
-</div>
-<ul class="tw-mt-12 tw-flex tw-flex-col tw-gap-10 tw-text-2xl tw-text-main">
-  <li>Store logins, secure notes, and more</li>
-  <li>Collaborate and share securely</li>
-  <li>Access anywhere on any device</li>
-  <li>Create your account to get started</li>
-</ul>
-<div class="tw-mt-28 tw-flex tw-flex-col tw-items-center tw-gap-5">
-  <app-logo-forbes></app-logo-forbes>
-  <app-logo-us-news></app-logo-us-news>
-</div>
diff --git a/apps/web/src/app/billing/trial-initiation/content/teams-content.component.ts b/apps/web/src/app/billing/trial-initiation/content/teams-content.component.ts
deleted file mode 100644
index 5c97695deff..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/teams-content.component.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Component } from "@angular/core";
-
-@Component({
-  selector: "app-teams-content",
-  templateUrl: "teams-content.component.html",
-})
-export class TeamsContentComponent {}
diff --git a/apps/web/src/app/billing/trial-initiation/content/teams1-content.component.html b/apps/web/src/app/billing/trial-initiation/content/teams1-content.component.html
deleted file mode 100644
index f51c370bebd..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/teams1-content.component.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<h1 class="tw-text-3xl !tw-text-alt2">Start your 7-day free trial for Teams</h1>
-<div class="tw-pt-20">
-  <h2 class="tw-text-2xl">
-    Strengthen business security with an easy-to-use password manager your team will love.
-  </h2>
-</div>
-<ul class="tw-mt-12 tw-flex tw-flex-col tw-gap-10 tw-text-2xl tw-text-main tw-list-none tw-pl-0">
-  <li class="tw-flex tw-items-center">
-    <i class="bwi bwi-lg bwi-check-circle tw-mr-4 tw-flex-none"></i
-    ><span class="tw-flex-auto"
-      >Instantly and securely share credentials with the groups and individuals who need them</span
-    >
-  </li>
-  <li class="tw-flex tw-items-center">
-    <i class="bwi bwi-lg bwi-check-circle tw-mr-4 tw-flex-none"></i
-    ><span class="tw-flex-auto"
-      >Migrate to Bitwarden in minutes with comprehensive import options</span
-    >
-  </li>
-  <li class="tw-flex tw-items-center">
-    <i class="bwi bwi-lg bwi-check-circle tw-mr-4 tw-flex-none"></i
-    ><span class="tw-flex-auto"
-      >Save time and increase productivity with autofill and instant device syncing</span
-    >
-  </li>
-  <li class="tw-flex tw-items-center">
-    <i class="bwi bwi-lg bwi-check-circle tw-mr-4 tw-flex-none"></i
-    ><span class="tw-flex-auto"
-      >Enhance security practices across your team with easy user management</span
-    >
-  </li>
-</ul>
-<div class="tw-mt-28 tw-flex tw-flex-col tw-items-center tw-gap-5">
-  <app-logo-badges></app-logo-badges>
-</div>
diff --git a/apps/web/src/app/billing/trial-initiation/content/teams1-content.component.ts b/apps/web/src/app/billing/trial-initiation/content/teams1-content.component.ts
deleted file mode 100644
index 055ec7fda10..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/teams1-content.component.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Component } from "@angular/core";
-
-@Component({
-  selector: "app-teams1-content",
-  templateUrl: "teams1-content.component.html",
-})
-export class Teams1ContentComponent {}
diff --git a/apps/web/src/app/billing/trial-initiation/content/teams2-content.component.html b/apps/web/src/app/billing/trial-initiation/content/teams2-content.component.html
deleted file mode 100644
index f51c370bebd..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/teams2-content.component.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<h1 class="tw-text-3xl !tw-text-alt2">Start your 7-day free trial for Teams</h1>
-<div class="tw-pt-20">
-  <h2 class="tw-text-2xl">
-    Strengthen business security with an easy-to-use password manager your team will love.
-  </h2>
-</div>
-<ul class="tw-mt-12 tw-flex tw-flex-col tw-gap-10 tw-text-2xl tw-text-main tw-list-none tw-pl-0">
-  <li class="tw-flex tw-items-center">
-    <i class="bwi bwi-lg bwi-check-circle tw-mr-4 tw-flex-none"></i
-    ><span class="tw-flex-auto"
-      >Instantly and securely share credentials with the groups and individuals who need them</span
-    >
-  </li>
-  <li class="tw-flex tw-items-center">
-    <i class="bwi bwi-lg bwi-check-circle tw-mr-4 tw-flex-none"></i
-    ><span class="tw-flex-auto"
-      >Migrate to Bitwarden in minutes with comprehensive import options</span
-    >
-  </li>
-  <li class="tw-flex tw-items-center">
-    <i class="bwi bwi-lg bwi-check-circle tw-mr-4 tw-flex-none"></i
-    ><span class="tw-flex-auto"
-      >Save time and increase productivity with autofill and instant device syncing</span
-    >
-  </li>
-  <li class="tw-flex tw-items-center">
-    <i class="bwi bwi-lg bwi-check-circle tw-mr-4 tw-flex-none"></i
-    ><span class="tw-flex-auto"
-      >Enhance security practices across your team with easy user management</span
-    >
-  </li>
-</ul>
-<div class="tw-mt-28 tw-flex tw-flex-col tw-items-center tw-gap-5">
-  <app-logo-badges></app-logo-badges>
-</div>
diff --git a/apps/web/src/app/billing/trial-initiation/content/teams2-content.component.ts b/apps/web/src/app/billing/trial-initiation/content/teams2-content.component.ts
deleted file mode 100644
index 394ba90b491..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/teams2-content.component.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Component } from "@angular/core";
-
-@Component({
-  selector: "app-teams2-content",
-  templateUrl: "teams2-content.component.html",
-})
-export class Teams2ContentComponent {}
diff --git a/apps/web/src/app/billing/trial-initiation/content/teams3-content.component.html b/apps/web/src/app/billing/trial-initiation/content/teams3-content.component.html
deleted file mode 100644
index c6f1ae697ae..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/teams3-content.component.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<h1 class="tw-text-4xl !tw-text-alt2">Begin Teams Starter Free Trial Now</h1>
-<div class="tw-pt-32">
-  <h2 class="tw-text-2xl">
-    Millions of individuals, teams, and organizations worldwide trust Bitwarden for secure password
-    storage and sharing.
-  </h2>
-</div>
-<ul class="tw-mt-12 tw-flex tw-flex-col tw-gap-10 tw-text-2xl tw-text-main">
-  <li>
-    Powerful security for up to 10 users
-    <div class="tw-mt-2 tw-text-base">
-      Have more than 10 users?
-      <a routerLink="/register" [queryParams]="{ org: 'teams', layout: 'teams1' }"
-        >Start a Teams trial</a
-      >
-    </div>
-  </li>
-  <li>Collaborate and share securely</li>
-  <li>Deploy and manage quickly and easily</li>
-  <li>Access anywhere on any device</li>
-  <li>Create your account to get started</li>
-</ul>
-<div class="tw-mt-28 tw-flex tw-flex-col tw-items-center tw-gap-5">
-  <app-logo-forbes></app-logo-forbes>
-  <app-logo-us-news></app-logo-us-news>
-</div>
diff --git a/apps/web/src/app/billing/trial-initiation/content/teams3-content.component.ts b/apps/web/src/app/billing/trial-initiation/content/teams3-content.component.ts
deleted file mode 100644
index df91268ab26..00000000000
--- a/apps/web/src/app/billing/trial-initiation/content/teams3-content.component.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Component } from "@angular/core";
-
-@Component({
-  selector: "app-teams3-content",
-  templateUrl: "teams3-content.component.html",
-})
-export class Teams3ContentComponent {}
diff --git a/apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial-free-stepper.component.html b/apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial-free-stepper.component.html
deleted file mode 100644
index dddac598a46..00000000000
--- a/apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial-free-stepper.component.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<app-vertical-stepper #stepper linear>
-  <app-vertical-step
-    label="{{ 'organizationInformation' | i18n | titlecase }}"
-    [subLabel]="subLabels.organizationInfo"
-  >
-    <app-org-info [nameOnly]="true" [formGroup]="formGroup"> </app-org-info>
-    <button
-      type="button"
-      bitButton
-      buttonType="primary"
-      [disabled]="formGroup.get('name').invalid"
-      (click)="createOrganization()"
-    >
-      {{ "next" | i18n }}
-    </button>
-  </app-vertical-step>
-  <app-vertical-step label="{{ 'confirmationDetails' | i18n | titlecase }}">
-    <div class="tw-pb-6 tw-pl-6">
-      <p class="tw-text-xl">{{ "smFreeTrialThankYou" | i18n }}</p>
-      <ul class="tw-list-disc">
-        <li>
-          <p>
-            {{ "smFreeTrialConfirmationEmail" | i18n }}
-            <span class="tw-font-bold">{{ formGroup.get("email").value }}</span
-            >.
-          </p>
-        </li>
-      </ul>
-    </div>
-    <div class="tw-mb-3 tw-flex">
-      <button type="button" bitButton buttonType="primary" (click)="navigateToSecretsManager()">
-        {{ "getStarted" | i18n | titlecase }}
-      </button>
-      <button
-        type="button"
-        bitButton
-        buttonType="secondary"
-        (click)="navigateToMembers()"
-        class="tw-ml-3 tw-inline-flex tw-items-center tw-px-3"
-      >
-        {{ "inviteUsers" | i18n }}
-      </button>
-    </div>
-  </app-vertical-step>
-</app-vertical-stepper>
diff --git a/apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial-free-stepper.component.ts b/apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial-free-stepper.component.ts
deleted file mode 100644
index f7c5a9b2b98..00000000000
--- a/apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial-free-stepper.component.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Component, OnInit, ViewChild } from "@angular/core";
-import { UntypedFormBuilder, Validators } from "@angular/forms";
-import { Router } from "@angular/router";
-
-import { OrganizationBillingServiceAbstraction as OrganizationBillingService } from "@bitwarden/common/billing/abstractions/organization-billing.service";
-import { PlanType } from "@bitwarden/common/billing/enums";
-import { ReferenceEventRequest } from "@bitwarden/common/models/request/reference-event.request";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-
-import { VerticalStepperComponent } from "../../trial-initiation/vertical-stepper/vertical-stepper.component";
-
-@Component({
-  selector: "app-secrets-manager-trial-free-stepper",
-  templateUrl: "secrets-manager-trial-free-stepper.component.html",
-})
-export class SecretsManagerTrialFreeStepperComponent implements OnInit {
-  @ViewChild("stepper", { static: false }) verticalStepper: VerticalStepperComponent;
-
-  formGroup = this.formBuilder.group({
-    name: [
-      "",
-      {
-        validators: [Validators.required, Validators.maxLength(50)],
-        updateOn: "change",
-      },
-    ],
-    email: [
-      "",
-      {
-        validators: [Validators.email],
-      },
-    ],
-  });
-
-  subLabels = {
-    createAccount:
-      "Before creating your free organization, you first need to log in or create a personal account.",
-    organizationInfo: "Enter your organization information",
-  };
-
-  organizationId: string;
-
-  referenceEventRequest: ReferenceEventRequest;
-
-  constructor(
-    protected formBuilder: UntypedFormBuilder,
-    protected i18nService: I18nService,
-    protected organizationBillingService: OrganizationBillingService,
-    protected router: Router,
-  ) {}
-
-  ngOnInit(): void {
-    this.referenceEventRequest = new ReferenceEventRequest();
-    this.referenceEventRequest.initiationPath = "Secrets Manager trial from marketing website";
-  }
-
-  accountCreated(email: string): void {
-    this.formGroup.get("email")?.setValue(email);
-    this.subLabels.createAccount = email;
-    this.verticalStepper.next();
-  }
-
-  async createOrganization(): Promise<void> {
-    const response = await this.organizationBillingService.startFree({
-      organization: {
-        name: this.formGroup.get("name").value,
-        billingEmail: this.formGroup.get("email").value,
-      },
-      plan: {
-        type: PlanType.Free,
-        subscribeToSecretsManager: true,
-        isFromSecretsManagerTrial: true,
-      },
-    });
-
-    this.organizationId = response.id;
-    this.subLabels.organizationInfo = response.name;
-    this.verticalStepper.next();
-  }
-
-  async navigateToMembers(): Promise<void> {
-    await this.router.navigate(["organizations", this.organizationId, "members"]);
-  }
-
-  async navigateToSecretsManager(): Promise<void> {
-    await this.router.navigate(["sm", this.organizationId]);
-  }
-}
diff --git a/apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial-paid-stepper.component.html b/apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial-paid-stepper.component.html
deleted file mode 100644
index 99e2706d713..00000000000
--- a/apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial-paid-stepper.component.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<app-vertical-stepper #stepper linear>
-  <app-vertical-step
-    label="{{ 'organizationInformation' | i18n | titlecase }}"
-    [subLabel]="subLabels.organizationInfo"
-  >
-    <app-org-info [nameOnly]="true" [formGroup]="formGroup"></app-org-info>
-    <button
-      type="button"
-      bitButton
-      buttonType="primary"
-      [disabled]="formGroup.get('name').invalid"
-      [loading]="createOrganizationLoading"
-      (click)="createOrganizationOnTrial()"
-      *ngIf="enableTrialPayment$ | async"
-    >
-      {{ "startTrial" | i18n }}
-    </button>
-    <button
-      type="button"
-      bitButton
-      buttonType="primary"
-      [disabled]="formGroup.get('name').invalid"
-      [loading]="createOrganizationLoading"
-      cdkStepperNext
-      *ngIf="!(enableTrialPayment$ | async)"
-    >
-      {{ "next" | i18n }}
-    </button>
-  </app-vertical-step>
-  <app-vertical-step
-    label="{{ 'billing' | i18n | titlecase }}"
-    [subLabel]="billingSubLabel"
-    *ngIf="!(enableTrialPayment$ | async)"
-  >
-    <app-trial-billing-step
-      *ngIf="stepper.selectedIndex === 2"
-      [organizationInfo]="{
-        name: formGroup.get('name').value,
-        email: formGroup.get('email').value,
-        type: productType,
-      }"
-      [subscriptionProduct]="SubscriptionProduct.SecretsManager"
-      (steppedBack)="steppedBack()"
-      (organizationCreated)="organizationCreated($event)"
-    ></app-trial-billing-step>
-  </app-vertical-step>
-  <app-vertical-step label="{{ 'confirmationDetails' | i18n | titlecase }}">
-    <app-trial-confirmation-details
-      [email]="formGroup.get('email').value"
-      [orgLabel]="organizationTypeQueryParameter"
-    ></app-trial-confirmation-details>
-    <div class="tw-mb-3 tw-flex">
-      <button type="button" bitButton buttonType="primary" (click)="navigateToSecretsManager()">
-        {{ "getStarted" | i18n | titlecase }}
-      </button>
-      <button
-        type="button"
-        bitButton
-        buttonType="secondary"
-        (click)="navigateToMembers()"
-        class="tw-ml-3 tw-inline-flex tw-items-center tw-px-3"
-      >
-        {{ "inviteUsers" | i18n }}
-      </button>
-    </div>
-  </app-vertical-step>
-</app-vertical-stepper>
diff --git a/apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial-paid-stepper.component.ts b/apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial-paid-stepper.component.ts
deleted file mode 100644
index 650c1d8e69e..00000000000
--- a/apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial-paid-stepper.component.ts
+++ /dev/null
@@ -1,144 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Component, Input, OnInit, ViewChild } from "@angular/core";
-import { UntypedFormBuilder } from "@angular/forms";
-import { ActivatedRoute, Router } from "@angular/router";
-import { Subject, takeUntil } from "rxjs";
-
-import { OrganizationBillingServiceAbstraction as OrganizationBillingService } from "@bitwarden/common/billing/abstractions/organization-billing.service";
-import { PlanType, ProductTierType } from "@bitwarden/common/billing/enums";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ReferenceEventRequest } from "@bitwarden/common/models/request/reference-event.request";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-
-import {
-  OrganizationCreatedEvent,
-  SubscriptionProduct,
-  TrialOrganizationType,
-} from "../../../billing/accounts/trial-initiation/trial-billing-step.component";
-import { VerticalStepperComponent } from "../../trial-initiation/vertical-stepper/vertical-stepper.component";
-import { SecretsManagerTrialFreeStepperComponent } from "../secrets-manager/secrets-manager-trial-free-stepper.component";
-
-export enum ValidOrgParams {
-  families = "families",
-  enterprise = "enterprise",
-  teams = "teams",
-  teamsStarter = "teamsStarter",
-  individual = "individual",
-  premium = "premium",
-  free = "free",
-}
-
-const trialFlowOrgs = [
-  ValidOrgParams.teams,
-  ValidOrgParams.teamsStarter,
-  ValidOrgParams.enterprise,
-  ValidOrgParams.families,
-];
-
-@Component({
-  selector: "app-secrets-manager-trial-paid-stepper",
-  templateUrl: "secrets-manager-trial-paid-stepper.component.html",
-})
-export class SecretsManagerTrialPaidStepperComponent
-  extends SecretsManagerTrialFreeStepperComponent
-  implements OnInit
-{
-  @ViewChild("stepper", { static: false }) verticalStepper: VerticalStepperComponent;
-  @Input() organizationTypeQueryParameter: string;
-
-  plan: PlanType;
-  createOrganizationLoading = false;
-  billingSubLabel = this.i18nService.t("billingTrialSubLabel");
-  organizationId: string;
-
-  private destroy$ = new Subject<void>();
-  protected enableTrialPayment$ = this.configService.getFeatureFlag$(
-    FeatureFlag.TrialPaymentOptional,
-  );
-
-  constructor(
-    private route: ActivatedRoute,
-    private configService: ConfigService,
-    protected formBuilder: UntypedFormBuilder,
-    protected i18nService: I18nService,
-    protected organizationBillingService: OrganizationBillingService,
-    protected router: Router,
-  ) {
-    super(formBuilder, i18nService, organizationBillingService, router);
-  }
-
-  async ngOnInit(): Promise<void> {
-    this.referenceEventRequest = new ReferenceEventRequest();
-    this.referenceEventRequest.initiationPath = "Secrets Manager trial from marketing website";
-
-    this.route.queryParams.pipe(takeUntil(this.destroy$)).subscribe((qParams) => {
-      if (trialFlowOrgs.includes(qParams.org)) {
-        if (qParams.org === ValidOrgParams.teamsStarter) {
-          this.plan = PlanType.TeamsStarter;
-        } else if (qParams.org === ValidOrgParams.teams) {
-          this.plan = PlanType.TeamsAnnually;
-        } else if (qParams.org === ValidOrgParams.enterprise) {
-          this.plan = PlanType.EnterpriseAnnually;
-        }
-      }
-    });
-  }
-
-  organizationCreated(event: OrganizationCreatedEvent) {
-    this.organizationId = event.organizationId;
-    this.billingSubLabel = event.planDescription;
-    this.verticalStepper.next();
-  }
-
-  steppedBack() {
-    this.verticalStepper.previous();
-  }
-
-  async createOrganizationOnTrial(): Promise<void> {
-    this.createOrganizationLoading = true;
-    const response = await this.organizationBillingService.purchaseSubscriptionNoPaymentMethod({
-      organization: {
-        name: this.formGroup.get("name").value,
-        billingEmail: this.formGroup.get("email").value,
-        initiationPath: "Secrets Manager trial from marketing website",
-      },
-      plan: {
-        type: this.plan,
-        subscribeToSecretsManager: true,
-        isFromSecretsManagerTrial: true,
-        passwordManagerSeats: 1,
-        secretsManagerSeats: 1,
-      },
-    });
-
-    this.organizationId = response?.id;
-    this.subLabels.organizationInfo = response?.name;
-    this.createOrganizationLoading = false;
-    this.verticalStepper.next();
-  }
-
-  get createAccountLabel() {
-    const organizationType =
-      this.productType === ProductTierType.TeamsStarter
-        ? "Teams Starter"
-        : ProductTierType[this.productType];
-    return `Before creating your ${organizationType} organization, you first need to log in or create a personal account.`;
-  }
-
-  get productType(): TrialOrganizationType {
-    switch (this.organizationTypeQueryParameter) {
-      case "enterprise":
-        return ProductTierType.Enterprise;
-      case "families":
-        return ProductTierType.Families;
-      case "teams":
-        return ProductTierType.Teams;
-      case "teamsStarter":
-        return ProductTierType.TeamsStarter;
-    }
-  }
-
-  protected readonly SubscriptionProduct = SubscriptionProduct;
-}
diff --git a/apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial.component.html b/apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial.component.html
deleted file mode 100644
index 88251136dbe..00000000000
--- a/apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial.component.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!-- eslint-disable tailwindcss/no-custom-classname -->
-<ng-container>
-  <div class="tw-absolute tw--z-10 tw--mt-48 tw-h-[28rem] tw-w-full tw-bg-background-alt2"></div>
-  <div class="tw-min-w-4xl tw-mx-auto tw-flex tw-max-w-screen-xl tw-gap-12 tw-px-4">
-    <div class="tw-w-1/2">
-      <img
-        alt="Bitwarden"
-        style="height: 50px; width: 335px"
-        class="tw-mt-6"
-        src="../../../../images/register-layout/logo-horizontal-white.svg"
-      />
-      <div class="tw-pt-12">
-        <app-secrets-manager-content></app-secrets-manager-content>
-      </div>
-    </div>
-    <div class="tw-w-1/2">
-      <div class="tw-pt-44">
-        <div class="tw-rounded tw-border tw-border-solid tw-border-secondary-300 tw-bg-background">
-          <div
-            *ngIf="!freeOrganization"
-            class="tw-flex tw-h-auto tw-w-full tw-gap-5 tw-rounded-t tw-bg-secondary-100"
-          >
-            <h2 class="tw-pb-4 tw-pl-4 tw-pt-5 tw-text-base tw-font-bold tw-uppercase">
-              {{
-                "startYour7DayFreeTrialOfBitwardenSecretsManagerFor"
-                  | i18n: organizationTypeQueryParameter
-              }}
-            </h2>
-            <environment-selector
-              class="tw-mr-4 tw-mt-6 tw-flex-shrink-0 tw-text-end"
-            ></environment-selector>
-          </div>
-          <app-secrets-manager-trial-free-stepper
-            *ngIf="freeOrganization"
-          ></app-secrets-manager-trial-free-stepper>
-          <app-secrets-manager-trial-paid-stepper
-            *ngIf="!freeOrganization"
-            [organizationTypeQueryParameter]="organizationTypeQueryParameter"
-          ></app-secrets-manager-trial-paid-stepper>
-        </div>
-      </div>
-    </div>
-  </div>
-</ng-container>
diff --git a/apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial.component.ts b/apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial.component.ts
deleted file mode 100644
index 678514532ca..00000000000
--- a/apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial.component.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Component, OnDestroy, OnInit } from "@angular/core";
-import { ActivatedRoute } from "@angular/router";
-import { Subject, takeUntil } from "rxjs";
-
-@Component({
-  selector: "app-secrets-manager-trial",
-  templateUrl: "secrets-manager-trial.component.html",
-})
-export class SecretsManagerTrialComponent implements OnInit, OnDestroy {
-  organizationTypeQueryParameter: string;
-
-  private destroy$ = new Subject<void>();
-
-  constructor(private route: ActivatedRoute) {}
-
-  ngOnInit(): void {
-    this.route.queryParams.pipe(takeUntil(this.destroy$)).subscribe((queryParameters) => {
-      this.organizationTypeQueryParameter = queryParameters.org;
-    });
-  }
-
-  ngOnDestroy(): void {
-    this.destroy$.next();
-    this.destroy$.complete();
-  }
-
-  get freeOrganization() {
-    return this.organizationTypeQueryParameter === "free";
-  }
-}
diff --git a/apps/web/src/app/billing/trial-initiation/trial-initiation.module.ts b/apps/web/src/app/billing/trial-initiation/trial-initiation.module.ts
index 3e6bfdc4e6c..06e1cce7f23 100644
--- a/apps/web/src/app/billing/trial-initiation/trial-initiation.module.ts
+++ b/apps/web/src/app/billing/trial-initiation/trial-initiation.module.ts
@@ -7,36 +7,10 @@ import { FormFieldModule } from "@bitwarden/components";
 
 import { OrganizationCreateModule } from "../../admin-console/organizations/create/organization-create.module";
 import { TrialBillingStepComponent } from "../../billing/accounts/trial-initiation/trial-billing-step.component";
-import { SecretsManagerTrialFreeStepperComponent } from "../../billing/trial-initiation/secrets-manager/secrets-manager-trial-free-stepper.component";
-import { SecretsManagerTrialPaidStepperComponent } from "../../billing/trial-initiation/secrets-manager/secrets-manager-trial-paid-stepper.component";
-import { SecretsManagerTrialComponent } from "../../billing/trial-initiation/secrets-manager/secrets-manager-trial.component";
-import { EnvironmentSelectorModule } from "../../components/environment-selector/environment-selector.module";
 import { SharedModule } from "../../shared";
 
 import { CompleteTrialInitiationComponent } from "./complete-trial-initiation/complete-trial-initiation.component";
 import { ConfirmationDetailsComponent } from "./confirmation-details.component";
-import { AbmEnterpriseContentComponent } from "./content/abm-enterprise-content.component";
-import { AbmTeamsContentComponent } from "./content/abm-teams-content.component";
-import { CnetEnterpriseContentComponent } from "./content/cnet-enterprise-content.component";
-import { CnetIndividualContentComponent } from "./content/cnet-individual-content.component";
-import { CnetTeamsContentComponent } from "./content/cnet-teams-content.component";
-import { DefaultContentComponent } from "./content/default-content.component";
-import { EnterpriseContentComponent } from "./content/enterprise-content.component";
-import { Enterprise1ContentComponent } from "./content/enterprise1-content.component";
-import { Enterprise2ContentComponent } from "./content/enterprise2-content.component";
-import { LogoBadgesComponent } from "./content/logo-badges.component";
-import { LogoCnet5StarsComponent } from "./content/logo-cnet-5-stars.component";
-import { LogoCnetComponent } from "./content/logo-cnet.component";
-import { LogoCompanyTestimonialComponent } from "./content/logo-company-testimonial.component";
-import { LogoForbesComponent } from "./content/logo-forbes.component";
-import { LogoUSNewsComponent } from "./content/logo-us-news.component";
-import { ReviewBlurbComponent } from "./content/review-blurb.component";
-import { ReviewLogoComponent } from "./content/review-logo.component";
-import { SecretsManagerContentComponent } from "./content/secrets-manager-content.component";
-import { TeamsContentComponent } from "./content/teams-content.component";
-import { Teams1ContentComponent } from "./content/teams1-content.component";
-import { Teams2ContentComponent } from "./content/teams2-content.component";
-import { Teams3ContentComponent } from "./content/teams3-content.component";
 import { VerticalStepperModule } from "./vertical-stepper/vertical-stepper.module";
 
 @NgModule({
@@ -46,41 +20,10 @@ import { VerticalStepperModule } from "./vertical-stepper/vertical-stepper.modul
     VerticalStepperModule,
     FormFieldModule,
     OrganizationCreateModule,
-    EnvironmentSelectorModule,
     TrialBillingStepComponent,
     InputPasswordComponent,
   ],
-  declarations: [
-    CompleteTrialInitiationComponent,
-    EnterpriseContentComponent,
-    TeamsContentComponent,
-    ConfirmationDetailsComponent,
-    DefaultContentComponent,
-    EnterpriseContentComponent,
-    Enterprise1ContentComponent,
-    Enterprise2ContentComponent,
-    TeamsContentComponent,
-    Teams1ContentComponent,
-    Teams2ContentComponent,
-    Teams3ContentComponent,
-    CnetEnterpriseContentComponent,
-    CnetIndividualContentComponent,
-    CnetTeamsContentComponent,
-    AbmEnterpriseContentComponent,
-    AbmTeamsContentComponent,
-    LogoBadgesComponent,
-    LogoCnet5StarsComponent,
-    LogoCompanyTestimonialComponent,
-    LogoCnetComponent,
-    LogoForbesComponent,
-    LogoUSNewsComponent,
-    ReviewLogoComponent,
-    SecretsManagerContentComponent,
-    ReviewBlurbComponent,
-    SecretsManagerTrialComponent,
-    SecretsManagerTrialFreeStepperComponent,
-    SecretsManagerTrialPaidStepperComponent,
-  ],
+  declarations: [CompleteTrialInitiationComponent, ConfirmationDetailsComponent],
   exports: [CompleteTrialInitiationComponent],
   providers: [TitleCasePipe],
 })

From ef80c2370700c79a095d562bbc4cb1ab03d49a8f Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Wed, 23 Apr 2025 18:45:29 +0200
Subject: [PATCH 4/4] Fix type 0 not being blocked on key wrapping (#14388)

* Fix type 0 not being blocked on key wrapping

* Move block type0 below key null check
---
 .../encrypt.service.implementation.ts         |  6 +++
 .../crypto/services/encrypt.service.spec.ts   | 39 +++++++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/libs/common/src/key-management/crypto/services/encrypt.service.implementation.ts b/libs/common/src/key-management/crypto/services/encrypt.service.implementation.ts
index f4318840515..fceef34421c 100644
--- a/libs/common/src/key-management/crypto/services/encrypt.service.implementation.ts
+++ b/libs/common/src/key-management/crypto/services/encrypt.service.implementation.ts
@@ -116,6 +116,12 @@ export class EncryptServiceImplementation implements EncryptService {
       throw new Error("No encryption key provided.");
     }
 
+    if (this.blockType0) {
+      if (key.inner().type === EncryptionType.AesCbc256_B64 || key.key.byteLength < 64) {
+        throw new Error("Type 0 encryption is not supported.");
+      }
+    }
+
     if (plainValue == null) {
       return Promise.resolve(null);
     }
diff --git a/libs/common/src/key-management/crypto/services/encrypt.service.spec.ts b/libs/common/src/key-management/crypto/services/encrypt.service.spec.ts
index 6b2851ad116..bc945a5eff7 100644
--- a/libs/common/src/key-management/crypto/services/encrypt.service.spec.ts
+++ b/libs/common/src/key-management/crypto/services/encrypt.service.spec.ts
@@ -55,6 +55,19 @@ describe("EncryptService", () => {
         "No wrappingKey provided for wrapping.",
       );
     });
+    it("fails if type 0 key is provided with flag turned on", async () => {
+      (encryptService as any).blockType0 = true;
+      const mock32Key = mock<SymmetricCryptoKey>();
+      mock32Key.key = makeStaticByteArray(32);
+      mock32Key.inner.mockReturnValue({
+        type: 0,
+        encryptionKey: mock32Key.key,
+      });
+
+      await expect(encryptService.wrapSymmetricKey(mock32Key, mock32Key)).rejects.toThrow(
+        "Type 0 encryption is not supported.",
+      );
+    });
   });
 
   describe("wrapDecapsulationKey", () => {
@@ -83,6 +96,19 @@ describe("EncryptService", () => {
         "No wrappingKey provided for wrapping.",
       );
     });
+    it("throws if type 0 key is provided with flag turned on", async () => {
+      (encryptService as any).blockType0 = true;
+      const mock32Key = mock<SymmetricCryptoKey>();
+      mock32Key.key = makeStaticByteArray(32);
+      mock32Key.inner.mockReturnValue({
+        type: 0,
+        encryptionKey: mock32Key.key,
+      });
+
+      await expect(
+        encryptService.wrapDecapsulationKey(new Uint8Array(200), mock32Key),
+      ).rejects.toThrow("Type 0 encryption is not supported.");
+    });
   });
 
   describe("wrapEncapsulationKey", () => {
@@ -111,6 +137,19 @@ describe("EncryptService", () => {
         "No wrappingKey provided for wrapping.",
       );
     });
+    it("throws if type 0 key is provided with flag turned on", async () => {
+      (encryptService as any).blockType0 = true;
+      const mock32Key = mock<SymmetricCryptoKey>();
+      mock32Key.key = makeStaticByteArray(32);
+      mock32Key.inner.mockReturnValue({
+        type: 0,
+        encryptionKey: mock32Key.key,
+      });
+
+      await expect(
+        encryptService.wrapEncapsulationKey(new Uint8Array(200), mock32Key),
+      ).rejects.toThrow("Type 0 encryption is not supported.");
+    });
   });
 
   describe("onServerConfigChange", () => {