diff --git a/src/components/auth/Oauth/AuthorizationCode/OauthFlow2/OauthFlow2.tsx b/src/components/auth/Oauth/AuthorizationCode/OauthFlow2/OauthFlow2.tsx
index 4d370ac99..26e758829 100644
--- a/src/components/auth/Oauth/AuthorizationCode/OauthFlow2/OauthFlow2.tsx
+++ b/src/components/auth/Oauth/AuthorizationCode/OauthFlow2/OauthFlow2.tsx
@@ -16,12 +16,10 @@ import { useConnectionsListQuery } from "src/hooks/query/useConnectionsListQuery
 import { AMP_SERVER } from "src/services/api";
 
 import { NoWorkspaceEntryContent } from "../NoWorkspaceEntry/NoWorkspaceEntryContent";
-import { SalesforceSubdomainEntry } from "../WorkspaceEntry/Salesforce/SalesforceSubdomainEntry";
 import { WorkspaceEntryContent } from "../WorkspaceEntry/WorkspaceEntryContent";
 
 const DEFAULT_WIDTH = 600; // px
 const DEFAULT_HEIGHT = 600; // px
-const PROVIDER_SALESFORCE = "salesforce";
 
 /** Payload shape we expect from the popup */
 type AuthEvent =
@@ -68,7 +66,6 @@ export function OauthFlow2({
   const [error, setError] = useState<string | null>(moduleError || null);
 
   // workspace and metadata states
-  const [workspace, setWorkspace] = useState<string>("");
   const [formData, setFormData] = useState<Record<string, string>>({});
   const [metadata, setMetadata] = useState<ProviderMetadata>({});
 
@@ -106,16 +103,6 @@ export function OauthFlow2({
     return () => window.removeEventListener("message", onMessage);
   }, [queryClient]);
 
-  // Salesforce specific (separate case that can be refactored)
-  const setSalesforceWorkspace = (workspace: string) => {
-    setWorkspace(workspace);
-    setFormData((prev) => ({ ...prev, workspace: workspace }));
-    setMetadata((prev) => ({
-      ...prev,
-      workspace: { value: workspace, source: "input" },
-    }));
-  };
-
   const handleFormDataChange = (key: string, value: string) => {
     setFormData((prev) => ({ ...prev, [key]: value }));
     setMetadata((prev) => ({ ...prev, [key]: { value, source: "input" } }));
@@ -153,10 +140,7 @@ export function OauthFlow2({
           projectId: projectId || "", // todo - update to use projectIdOrName
           consumerName,
           groupName,
-          providerWorkspaceRef:
-            provider === PROVIDER_SALESFORCE
-              ? workspace
-              : metadata?.workspace?.value,
+          providerWorkspaceRef: metadata?.workspace?.value,
           providerMetadata: metadata,
         },
       });
@@ -180,23 +164,6 @@ export function OauthFlow2({
 
   // Determine which entry component to show based on provider and metadata
   const entryComponent = (() => {
-    // Salesforce has a special entry component
-    if (provider === PROVIDER_SALESFORCE) {
-      return (
-        <SalesforceSubdomainEntry
-          handleSubmit={handleSubmit}
-          setWorkspace={setSalesforceWorkspace}
-          error={error}
-          isButtonDisabled={
-            workspace.length === 0 ||
-            isCreatingOauthConnection ||
-            isConnectionsFetching ||
-            !!error
-          }
-        />
-      );
-    }
-
     // If there are metadata fields, show the workspace entry form
     if (metadataInputs.length > 0) {
       return (
diff --git a/src/components/auth/Oauth/AuthorizationCode/WorkspaceEntry/Salesforce/SalesforceSubdomainEntry.tsx b/src/components/auth/Oauth/AuthorizationCode/WorkspaceEntry/Salesforce/SalesforceSubdomainEntry.tsx
deleted file mode 100644
index 976eb2e51..000000000
--- a/src/components/auth/Oauth/AuthorizationCode/WorkspaceEntry/Salesforce/SalesforceSubdomainEntry.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import {
-  AuthCardLayout,
-  AuthTitle,
-} from "src/layout/AuthCardLayout/AuthCardLayout";
-
-import { AuthErrorAlert } from "components/auth/AuthErrorAlert/AuthErrorAlert";
-import { FormComponent } from "components/form";
-import { AccessibleLink } from "components/ui-base/AccessibleLink";
-import { Button } from "components/ui-base/Button";
-
-import {
-  SALESFORCE_HELP_URL,
-  SubdomainEntryProps,
-} from "./SubdomainEntryProps";
-
-export function SalesforceSubdomainEntry({
-  handleSubmit,
-  setWorkspace,
-  error,
-  isButtonDisabled,
-}: SubdomainEntryProps) {
-  return (
-    <AuthCardLayout>
-      <AuthTitle>Enter your Salesforce subdomain</AuthTitle>
-      <AccessibleLink href={SALESFORCE_HELP_URL} newTab>
-        What is my Salesforce subdomain?
-      </AccessibleLink>
-      <AuthErrorAlert error={error} />
-      <div style={{ display: "flex", marginTop: "1em", alignItems: "center" }}>
-        <FormComponent.Input
-          id="salesforce-subdomain"
-          type="text"
-          placeholder="my-domain"
-          onChange={(event) => setWorkspace(event.currentTarget.value)}
-        />
-        <p style={{ lineHeight: "2.2em", marginLeft: "0.4em" }}>
-          .my.salesforce.com
-        </p>
-      </div>
-      <Button
-        style={{ marginTop: "1em", width: "100%" }}
-        disabled={isButtonDisabled}
-        type="submit"
-        onClick={handleSubmit}
-      >
-        Next
-      </Button>
-    </AuthCardLayout>
-  );
-}
diff --git a/src/components/auth/Oauth/AuthorizationCode/WorkspaceEntry/Salesforce/SubdomainEntryProps.tsx b/src/components/auth/Oauth/AuthorizationCode/WorkspaceEntry/Salesforce/SubdomainEntryProps.tsx
deleted file mode 100644
index db7fe8f7a..000000000
--- a/src/components/auth/Oauth/AuthorizationCode/WorkspaceEntry/Salesforce/SubdomainEntryProps.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-export const SALESFORCE_HELP_URL =
-  "https://help.salesforce.com/s/articleView?id=sf.faq_domain_name_what.htm&type=5";
-
-export type SubdomainEntryProps = {
-  handleSubmit: () => void;
-  setWorkspace: (workspace: string) => void;
-  error: string | null;
-  isButtonDisabled?: boolean;
-};
diff --git a/src/components/auth/Oauth/AuthorizationCode/WorkspaceEntry/WorkspaceOauthFlow.tsx b/src/components/auth/Oauth/AuthorizationCode/WorkspaceEntry/WorkspaceOauthFlow.tsx
index a2a4e79df..5029ff5b6 100644
--- a/src/components/auth/Oauth/AuthorizationCode/WorkspaceEntry/WorkspaceOauthFlow.tsx
+++ b/src/components/auth/Oauth/AuthorizationCode/WorkspaceEntry/WorkspaceOauthFlow.tsx
@@ -8,11 +8,8 @@ import { useProviderInfoQuery } from "src/hooks/useProvider";
 import { OAuthWindow } from "../OAuthWindow/OAuthWindow";
 import { useOAuthPopupURL } from "../useOAuthPopupURL";
 
-import { SalesforceSubdomainEntry } from "./Salesforce/SalesforceSubdomainEntry";
 import { WorkspaceEntryContent } from "./WorkspaceEntryContent";
 
-const PROVIDER_SALESFORCE = "salesforce";
-
 interface WorkspaceOauthFlowProps {
   provider: string;
   consumerRef: string;
@@ -36,7 +33,6 @@ export function WorkspaceOauthFlow({
   groupName,
   providerName,
 }: WorkspaceOauthFlowProps) {
-  const [workspace, setWorkspace] = useState<string>("");
   const [formData, setFormData] = useState<Record<string, string>>({});
   const [localError, setLocalError] = useState<string | null>(null);
   // keeps track of whether the OAuth popup URL should be passed to the OAuthWindow
@@ -58,7 +54,7 @@ export function WorkspaceOauthFlow({
     provider,
     consumerName,
     groupName,
-    provider === PROVIDER_SALESFORCE ? workspace : metadata?.workspace?.value,
+    metadata?.workspace?.value,
     metadata,
   );
 
@@ -77,15 +73,6 @@ export function WorkspaceOauthFlow({
     setShowURL(false);
   }, [setShowURL]);
 
-  const setSalesforceWorkspace = (workspace: string) => {
-    setWorkspace(workspace);
-    setFormData((prev) => ({ ...prev, workspace: workspace }));
-    setMetadata((prev) => ({
-      ...prev,
-      workspace: { value: workspace, source: "input" },
-    }));
-  };
-
   const handleFormDataChange = (key: string, value: string) => {
     setFormData((prev) => ({ ...prev, [key]: value }));
     setMetadata((prev) => ({ ...prev, [key]: { value, source: "input" } }));
@@ -106,28 +93,19 @@ export function WorkspaceOauthFlow({
     }
   };
 
-  // custom entry component for Salesforce provider
-  const workspaceEntryComponent =
-    provider === PROVIDER_SALESFORCE ? (
-      <SalesforceSubdomainEntry
-        handleSubmit={providerHandleSubmit}
-        setWorkspace={setSalesforceWorkspace}
-        error={errorMessage}
-        isButtonDisabled={workspace.length === 0}
-      />
-    ) : (
-      // general workspace entry component
-      <WorkspaceEntryContent
-        handleSubmit={providerHandleSubmit}
-        setFormData={handleFormDataChange}
-        error={errorMessage}
-        isButtonDisabled={
-          !isProviderMetadataValid(metadataInputs, formData) || isLoading
-        }
-        providerName={providerName}
-        metadataInputs={metadataInputs}
-      />
-    );
+  // general workspace entry component
+  const workspaceEntryComponent = (
+    <WorkspaceEntryContent
+      handleSubmit={providerHandleSubmit}
+      setFormData={handleFormDataChange}
+      error={errorMessage}
+      isButtonDisabled={
+        !isProviderMetadataValid(metadataInputs, formData) || isLoading
+      }
+      providerName={providerName}
+      metadataInputs={metadataInputs}
+    />
+  );
 
   return (
     <OAuthWindow