diff --git a/client/blocks/login/index.jsx b/client/blocks/login/index.jsx
index ebcf8bbb3384b..a6ca15f2b1847 100644
--- a/client/blocks/login/index.jsx
+++ b/client/blocks/login/index.jsx
@@ -72,7 +72,6 @@ class Login extends Component {
 		isLinking: PropTypes.bool,
 		isJetpack: PropTypes.bool.isRequired,
 		isWhiteLogin: PropTypes.bool.isRequired,
-		isJetpackWooCommerceFlow: PropTypes.bool.isRequired,
 		isFromAkismet: PropTypes.bool,
 		isFromMigrationPlugin: PropTypes.bool,
 		isFromAutomatticForAgenciesPlugin: PropTypes.bool,
@@ -115,7 +114,6 @@ class Login extends Component {
 	static defaultProps = {
 		isJetpack: false,
 		isWhiteLogin: false,
-		isJetpackWooCommerceFlow: false,
 	};
 
 	componentDidMount() {
@@ -191,7 +189,6 @@ class Login extends Component {
 	showContinueAsUser = () => {
 		const {
 			isJetpack,
-			isJetpackWooCommerceFlow,
 			oauth2Client,
 			privateSite,
 			socialConnect,
@@ -210,7 +207,6 @@ class Login extends Component {
 			! privateSite &&
 			// Show the continue as user flow WooCommerce and Blaze Pro but not for other OAuth2 clients
 			! ( oauth2Client && ! isWCCOM && ! isBlazePro ) &&
-			! isJetpackWooCommerceFlow &&
 			! isJetpack &&
 			! fromSite &&
 			! twoFactorEnabled &&
@@ -352,7 +348,6 @@ class Login extends Component {
 			isGravPoweredClient,
 			isGravPoweredLoginPage,
 			isJetpack,
-			isJetpackWooCommerceFlow,
 			isManualRenewalImmediateLoginAttempt,
 			isP2Login,
 			isSignupExistingAccount,
@@ -617,26 +612,6 @@ class Login extends Component {
 			}
 			preHeader = null;
 			postHeader = <p className="login__header-subtitle">{ subtitle }</p>;
-		} else if ( isJetpackWooCommerceFlow ) {
-			headerText = translate( 'Log in to your WordPress.com account' );
-			preHeader = (
-				<div className="login__jetpack-logo">
-					<AsyncLoad
-						require="calypso/components/jetpack-header"
-						placeholder={ null }
-						partnerSlug={ this.props.partnerSlug }
-						isWooOnboarding
-						width={ 200 }
-					/>
-				</div>
-			);
-			postHeader = (
-				<p className="login__header-subtitle">
-					{ translate(
-						'Your account will enable you to start using the features and benefits offered by Jetpack & WooCommerce Services.'
-					) }
-				</p>
-			);
 		} else if ( isFromMigrationPlugin ) {
 			headerText = translate( 'Log in to your account' );
 		} else if ( isJetpack ) {
@@ -1059,8 +1034,6 @@ export default connect(
 			'automattic-for-agencies-client' ===
 				new URLSearchParams( getRedirectToOriginal( state )?.split( '?' )[ 1 ] ).get( 'from' ),
 		isJetpackWooDnaFlow: wooDnaConfig( getCurrentQueryArguments( state ) ).isWooDnaFlow(),
-		isJetpackWooCommerceFlow:
-			'woocommerce-onboarding' === get( getCurrentQueryArguments( state ), 'from' ),
 		isWooJPC: isWooJPCFlow( state ),
 		isWCCOM: getIsWCCOM( state ),
 		isWoo: getIsWoo( state ),
diff --git a/client/blocks/login/login-form.jsx b/client/blocks/login/login-form.jsx
index 5d084bb45297c..abd7b6ff14791 100644
--- a/client/blocks/login/login-form.jsx
+++ b/client/blocks/login/login-form.jsx
@@ -383,12 +383,8 @@ export class LoginForm extends Component {
 	};
 
 	recordWooCommerceLoginTracks( method ) {
-		const { isJetpackWooCommerceFlow, isWoo, wccomFrom } = this.props;
-		if ( isJetpackWooCommerceFlow ) {
-			this.props.recordTracksEvent( 'wcadmin_storeprofiler_login_jetpack_account', {
-				login_method: method,
-			} );
-		} else if ( isWoo && 'cart' === wccomFrom ) {
+		const { isWoo, wccomFrom } = this.props;
+		if ( isWoo && 'cart' === wccomFrom ) {
 			this.props.recordTracksEvent( 'wcadmin_storeprofiler_payment_login', {
 				login_method: method,
 			} );
@@ -644,13 +640,7 @@ export class LoginForm extends Component {
 	};
 
 	getMagicLoginPageLink() {
-		if (
-			! canDoMagicLogin(
-				this.props.twoFactorAuthType,
-				this.props.oauth2Client,
-				this.props.isJetpackWooCommerceFlow
-			)
-		) {
+		if ( ! canDoMagicLogin( this.props.twoFactorAuthType, this.props.oauth2Client ) ) {
 			return null;
 		}
 
@@ -667,13 +657,7 @@ export class LoginForm extends Component {
 	}
 
 	getQrLoginLink() {
-		if (
-			! canDoMagicLogin(
-				this.props.twoFactorAuthType,
-				this.props.oauth2Client,
-				this.props.isJetpackWooCommerceFlow
-			)
-		) {
+		if ( ! canDoMagicLogin( this.props.twoFactorAuthType, this.props.oauth2Client ) ) {
 			return null;
 		}
 
@@ -792,7 +776,6 @@ export class LoginForm extends Component {
 			oauth2Client,
 			requestError,
 			socialAccountIsLinking: linkingSocialUser,
-			isJetpackWooCommerceFlow,
 			isP2Login,
 			isJetpack,
 			isJetpackWooDnaFlow,
@@ -878,10 +861,6 @@ export class LoginForm extends Component {
 			) : null;
 		}
 
-		if ( isJetpackWooCommerceFlow ) {
-			return this.renderWooCommerce( { socialToS } );
-		}
-
 		if ( isJetpackWooDnaFlow ) {
 			return this.renderWooCommerce( {
 				showSocialLogin: !! accountType, // Only show the social buttons after the user entered an email.
@@ -1176,8 +1155,6 @@ export default connect(
 			oauth2Client: getCurrentOAuth2Client( state ),
 			isFromAutomatticForAgenciesPlugin:
 				'automattic-for-agencies-client' === get( getCurrentQueryArguments( state ), 'from' ),
-			isJetpackWooCommerceFlow:
-				'woocommerce-onboarding' === get( getCurrentQueryArguments( state ), 'from' ),
 			isJetpackWooDnaFlow: wooDnaConfig( getCurrentQueryArguments( state ) ).isWooDnaFlow(),
 			isWooJPC: isWooJPCFlow( state ),
 			isWoo: getIsWoo( state ),
diff --git a/client/blocks/login/style.scss b/client/blocks/login/style.scss
index 883433ed5dad5..c1256ff0f0451 100644
--- a/client/blocks/login/style.scss
+++ b/client/blocks/login/style.scss
@@ -6,7 +6,7 @@
 
 $breakpoint-mobile: 782px; //Mobile size.
 
-.layout:not(.is-jetpack-woocommerce-flow):not(.is-jetpack-woo-dna-flow):not(.is-wccom-oauth-flow):not(.is-woocommerce-core-profiler-flow) {
+.layout:not(.is-jetpack-woo-dna-flow):not(.is-wccom-oauth-flow):not(.is-woocommerce-core-profiler-flow) {
 	.login.is-jetpack:not(.is-automattic-for-agencies-flow) {
 		.button.is-primary {
 			background-color: var(--studio-jetpack-green-50);
@@ -56,7 +56,6 @@ $breakpoint-mobile: 782px; //Mobile size.
 	}
 }
 
-.layout.is-jetpack-woocommerce-flow,
 .layout.is-jetpack-woo-dna-flow,
 .layout.is-wccom-oauth-flow {
 	.login__jetpack-logo,
diff --git a/client/blocks/signup-form/index.jsx b/client/blocks/signup-form/index.jsx
index e7884800f3279..6ff4fbc83b146 100644
--- a/client/blocks/signup-form/index.jsx
+++ b/client/blocks/signup-form/index.jsx
@@ -765,12 +765,8 @@ class SignupForm extends Component {
 	}
 
 	recordWooCommerceSignupTracks( method ) {
-		const { isJetpackWooCommerceFlow, isWoo, wccomFrom } = this.props;
-		if ( isJetpackWooCommerceFlow ) {
-			recordTracksEvent( 'wcadmin_storeprofiler_create_jetpack_account', {
-				signup_method: method,
-			} );
-		} else if ( isWoo && 'cart' === wccomFrom ) {
+		const { isWoo, wccomFrom } = this.props;
+		if ( isWoo && 'cart' === wccomFrom ) {
 			recordTracksEvent( 'wcadmin_storeprofiler_payment_create_account', {
 				signup_method: method,
 			} );
@@ -1191,7 +1187,7 @@ class SignupForm extends Component {
 			);
 		}
 
-		if ( this.props.isJetpackWooCommerceFlow || this.props.isJetpackWooDnaFlow ) {
+		if ( this.props.isJetpackWooDnaFlow ) {
 			return (
 				<div className={ clsx( 'signup-form__woocommerce', this.props.className ) }>
 					<LoggedOutForm onSubmit={ this.handleWooCommerceSubmit } noValidate>
@@ -1386,8 +1382,6 @@ export default connect(
 			currentUser: getCurrentUser( state ),
 			oauth2Client,
 			sectionName: getSectionName( state ),
-			isJetpackWooCommerceFlow:
-				'woocommerce-onboarding' === get( getCurrentQueryArguments( state ), 'from' ),
 			isJetpackWooDnaFlow: wooDnaConfig( getCurrentQueryArguments( state ) ).isWooDnaFlow(),
 			from: get( getCurrentQueryArguments( state ), 'from' ),
 			wccomFrom: getWccomFrom( state ),
diff --git a/client/components/jetpack-header/index.jsx b/client/components/jetpack-header/index.jsx
index 50ca774b1a03b..164432f1143c9 100644
--- a/client/components/jetpack-header/index.jsx
+++ b/client/components/jetpack-header/index.jsx
@@ -14,7 +14,6 @@ export class JetpackHeader extends PureComponent {
 		darkColorScheme: PropTypes.bool,
 		partnerSlug: PropTypes.string,
 		isFromAutomatticForAgenciesPlugin: PropTypes.bool,
-		isWooOnboarding: PropTypes.bool,
 		isWooJPC: PropTypes.bool,
 		isWooDna: PropTypes.bool,
 		width: PropTypes.number,
@@ -26,7 +25,6 @@ export class JetpackHeader extends PureComponent {
 			partnerSlug,
 			width,
 			isFromAutomatticForAgenciesPlugin,
-			isWooOnboarding,
 			isWooJPC,
 			isWooDna,
 			translate,
@@ -36,25 +34,6 @@ export class JetpackHeader extends PureComponent {
 			return null;
 		}
 
-		if ( isWooOnboarding ) {
-			// @todo Implement WooCommerce + partner co-branding in the future.
-			return (
-				<JetpackPartnerLogoGroup
-					width={ width || 662.5 }
-					viewBox="0 0 1270 170"
-					partnerName="WooCommerce"
-				>
-					<g transform="translate(360 25)">
-						<AsyncLoad
-							require="calypso/components/jetpack-header/woocommerce"
-							darkColorScheme={ darkColorScheme }
-							placeholder={ null }
-						/>
-					</g>
-				</JetpackPartnerLogoGroup>
-			);
-		}
-
 		if ( isWooDna ) {
 			return (
 				<svg width={ width } viewBox="0 0 1270 170">
diff --git a/client/components/social-buttons/qr-code.tsx b/client/components/social-buttons/qr-code.tsx
index 0e246ba9cc46c..25256422c9c0a 100644
--- a/client/components/social-buttons/qr-code.tsx
+++ b/client/components/social-buttons/qr-code.tsx
@@ -8,7 +8,6 @@ import { resetMagicLoginRequestForm } from 'calypso/state/login/magic-login/acti
 import { isFormDisabled } from 'calypso/state/login/selectors';
 import { getCurrentOAuth2Client } from 'calypso/state/oauth2-clients/ui/selectors';
 import getCurrentLocaleSlug from 'calypso/state/selectors/get-current-locale-slug';
-import getCurrentQueryArguments from 'calypso/state/selectors/get-current-query-arguments';
 import getIsWoo from 'calypso/state/selectors/get-is-woo';
 
 type QrCodeLoginButtonProps = {
@@ -18,10 +17,8 @@ type QrCodeLoginButtonProps = {
 const QrCodeLoginButton = ( { loginUrl }: QrCodeLoginButtonProps ) => {
 	const dispatch = useDispatch();
 	const translate = useTranslate();
-	const { isDisabled, isJetpackWooCommerceFlow, oauth2Client, isWoo } = useSelector( ( select ) => {
+	const { isDisabled, oauth2Client, isWoo } = useSelector( ( select ) => {
 		return {
-			isJetpackWooCommerceFlow:
-				'woocommerce-onboarding' === getCurrentQueryArguments( select )?.from,
 			oauth2Client: getCurrentOAuth2Client( select ) as { id: string },
 			locale: getCurrentLocaleSlug( select ),
 			isWoo: getIsWoo( select ),
@@ -35,10 +32,6 @@ const QrCodeLoginButton = ( { loginUrl }: QrCodeLoginButtonProps ) => {
 		return null;
 	}
 
-	if ( isJetpackWooCommerceFlow ) {
-		return null;
-	}
-
 	const handleClick = () => {
 		recordTracksEvent( 'calypso_login_magic_login_request_click', {
 			origin: 'login-links',
diff --git a/client/document/index.jsx b/client/document/index.jsx
index 642e249e826ce..6e0e30c83daeb 100644
--- a/client/document/index.jsx
+++ b/client/document/index.jsx
@@ -60,7 +60,6 @@ class Document extends Component {
 			query,
 			reactQueryDevtoolsHelper,
 			renderedLayout,
-			requestFrom,
 			sectionGroup,
 			sectionName,
 			storeSandboxHelper,
@@ -96,9 +95,6 @@ class Document extends Component {
 				? `var localeFromRoute = ${ jsonStringifyForHtml( params.lang ?? '' ) };\n`
 				: '' );
 
-		const isJetpackWooCommerceFlow =
-			'jetpack-connect' === sectionName && 'woocommerce-onboarding' === requestFrom;
-
 		const isJetpackWooDnaFlow = 'jetpack-connect' === sectionName && isWooDna;
 
 		const theme = config( 'theme' );
@@ -177,7 +173,6 @@ class Document extends Component {
 								className={ clsx( 'layout', {
 									[ 'is-group-' + sectionGroup ]: sectionGroup,
 									[ 'is-section-' + sectionName ]: sectionName,
-									'is-jetpack-woocommerce-flow': isJetpackWooCommerceFlow,
 									'is-jetpack-woo-dna-flow': isJetpackWooDnaFlow,
 								} ) }
 							>
diff --git a/client/jetpack-connect/auth-form-header.jsx b/client/jetpack-connect/auth-form-header.jsx
index bfa1b7286e9b7..b89c361b3424b 100644
--- a/client/jetpack-connect/auth-form-header.jsx
+++ b/client/jetpack-connect/auth-form-header.jsx
@@ -19,7 +19,6 @@ import { authQueryPropTypes } from './utils';
 export class AuthFormHeader extends Component {
 	static propTypes = {
 		authQuery: authQueryPropTypes.isRequired,
-		isWooOnboarding: PropTypes.bool,
 		isWooJPC: PropTypes.bool,
 		isWpcomMigration: PropTypes.bool,
 		wooDnaConfig: PropTypes.object,
@@ -57,7 +56,6 @@ export class AuthFormHeader extends Component {
 		const {
 			translate,
 			partnerSlug,
-			isWooOnboarding,
 			isWooJPC,
 			wooDnaConfig,
 			isWpcomMigration,
@@ -96,15 +94,6 @@ export class AuthFormHeader extends Component {
 
 		const currentState = this.getState();
 
-		if ( isWooOnboarding ) {
-			switch ( currentState ) {
-				case 'logged-out':
-					return translate( 'Create a Jetpack account' );
-				default:
-					return translate( 'Connecting your store' );
-			}
-		}
-
 		if ( isWooJPC ) {
 			switch ( currentState ) {
 				case 'logged-out':
@@ -150,7 +139,6 @@ export class AuthFormHeader extends Component {
 	getSubHeaderText() {
 		const {
 			translate,
-			isWooOnboarding,
 			isWooJPC,
 			wooDnaConfig,
 			isWpcomMigration,
@@ -158,17 +146,6 @@ export class AuthFormHeader extends Component {
 		} = this.props;
 		const currentState = this.getState();
 
-		if ( isWooOnboarding ) {
-			switch ( currentState ) {
-				case 'logged-out':
-					return translate(
-						'Your account will enable you to start using the features and benefits offered by Jetpack & WooCommerce Services.'
-					);
-				default:
-					return translate( "Once connected we'll continue setting up your store" );
-			}
-		}
-
 		if ( isWooJPC ) {
 			const pluginName = getPluginTitle( this.props.authQuery?.plugin_name, translate );
 			const reviewDocLink = (
diff --git a/client/jetpack-connect/authorize.js b/client/jetpack-connect/authorize.js
index dbd884ff4fe76..21ec9f4efec19 100644
--- a/client/jetpack-connect/authorize.js
+++ b/client/jetpack-connect/authorize.js
@@ -443,20 +443,24 @@ export class JetpackAuthorize extends Component {
 			[
 				'woocommerce-services-auto-authorize',
 				'woocommerce-setup-wizard',
+				// Legacy flow not in use anymore. Keeping around just to
+				// support redirects correctly.
 				'woocommerce-onboarding',
 				'woocommerce-core-profiler',
 			].includes( from ) || this.getWooDnaConfig( props ).isWooDnaFlow()
 		);
 	};
 
-	isWooOnboarding( props = this.props ) {
-		const { from } = props.authQuery;
-		return 'woocommerce-onboarding' === from;
-	}
-
 	isWooJPC( props = this.props ) {
 		const { from } = props.authQuery;
-		return 'woocommerce-core-profiler' === from || this.props.isWooJPC;
+		return (
+			// TODO: the two extra `from` checks shouldn't be necessary,
+			// as they are part of the isWooJPCFlow check. But the unit tests
+			// don't use the connected component and would otherwise fail.
+			'woocommerce-core-profiler' === from ||
+			'woocommerce-onboarding' === from ||
+			this.props.isWooJPC
+		);
 	}
 
 	getWooDnaConfig( props = this.props ) {
@@ -503,10 +507,6 @@ export class JetpackAuthorize extends Component {
 
 		const { recordTracksEvent } = this.props;
 		switch ( true ) {
-			case this.isWooOnboarding():
-				recordTracksEvent( 'wcadmin_storeprofiler_connect_store', { use_account: true } );
-				window.location.href = e.target.href;
-				break;
 			case this.isWooJPC():
 				// Logout user before redirecting to login page.
 				try {
@@ -537,13 +537,8 @@ export class JetpackAuthorize extends Component {
 
 	handleSignOut = () => {
 		const { recordTracksEvent } = this.props;
-		const { from } = this.props.authQuery;
 		recordTracksEvent( 'calypso_jpc_signout_click' );
 
-		if ( 'woocommerce-onboarding' === from ) {
-			recordTracksEvent( 'wcadmin_storeprofiler_connect_store', { create_jetpack: true } );
-		}
-
 		this.props.redirectToLogout( window.location.href );
 	};
 
@@ -594,10 +589,6 @@ export class JetpackAuthorize extends Component {
 
 		recordTracksEvent( 'calypso_jpc_approve_click' );
 
-		if ( 'woocommerce-onboarding' === from ) {
-			recordTracksEvent( 'wcadmin_storeprofiler_connect_store', { use_account: true } );
-		}
-
 		if ( 'woocommerce-core-profiler' === from ) {
 			recordTracksEvent( 'calypso_jpc_wc_coreprofiler_connect', { use_account: true } );
 		}
@@ -1031,7 +1022,7 @@ export class JetpackAuthorize extends Component {
 								siteName={ decodeEntities( authQuery.blogname ) }
 								companyName={ this.getCompanyName() }
 								from={ authQuery.from }
-								isWooJPC={ this.props.isWooJPC }
+								isWooJPC={ this.isWooJPC() }
 							/>
 							{ this.renderStateAction() }
 						</div>
@@ -1224,7 +1215,6 @@ export class JetpackAuthorize extends Component {
 
 		return (
 			<MainWrapper
-				isWooOnboarding={ this.isWooOnboarding() }
 				isWooJPC={ this.isWooJPC() }
 				isWpcomMigration={ this.isFromMigrationPlugin() }
 				isFromAutomatticForAgenciesPlugin={ this.isFromAutomatticForAgenciesPlugin() }
@@ -1247,7 +1237,6 @@ export class JetpackAuthorize extends Component {
 						/>
 						<AuthFormHeader
 							authQuery={ this.props.authQuery }
-							isWooOnboarding={ this.isWooOnboarding() }
 							isWooJPC={ this.isWooJPC() }
 							isWpcomMigration={ this.isFromMigrationPlugin() }
 							isFromAutomatticForAgenciesPlugin={ this.isFromAutomatticForAgenciesPlugin() }
diff --git a/client/jetpack-connect/main-wrapper.jsx b/client/jetpack-connect/main-wrapper.jsx
index 60ddd427f5d7d..c29b38a07dc39 100644
--- a/client/jetpack-connect/main-wrapper.jsx
+++ b/client/jetpack-connect/main-wrapper.jsx
@@ -12,7 +12,6 @@ import { retrieveMobileRedirect } from './persistence-utils';
 export class JetpackConnectMainWrapper extends PureComponent {
 	static propTypes = {
 		isWide: PropTypes.bool,
-		isWooOnboarding: PropTypes.bool,
 		isWooJPC: PropTypes.bool,
 		isWpcomMigration: PropTypes.bool,
 		wooDnaConfig: PropTypes.object,
@@ -23,7 +22,6 @@ export class JetpackConnectMainWrapper extends PureComponent {
 
 	static defaultProps = {
 		isWide: false,
-		isWooOnboarding: false,
 		isWooJPC: false,
 		wooDnaConfig: null,
 	};
@@ -31,7 +29,6 @@ export class JetpackConnectMainWrapper extends PureComponent {
 	render() {
 		const {
 			isWide,
-			isWooOnboarding,
 			isWooJPC,
 			isWpcomMigration,
 			isFromAutomatticForAgenciesPlugin,
@@ -47,14 +44,15 @@ export class JetpackConnectMainWrapper extends PureComponent {
 
 		const wrapperClassName = clsx( 'jetpack-connect__main', {
 			'is-wide': isWide,
-			'is-woocommerce': isWooOnboarding || isWooDna || isWooJPC,
+			'is-woocommerce': isWooDna || isWooJPC,
 			'is-woocommerce-core-profiler-flow': isWooJPC,
 			'is-mobile-app-flow': !! retrieveMobileRedirect(),
 			'is-wpcom-migration': isWpcomMigration,
 			'is-automattic-for-agencies-flow': isFromAutomatticForAgenciesPlugin,
 		} );
 
-		const width = isWooOnboarding || isWooDna ? 200 : undefined;
+		// Note: legacy flow here was "merged" with DNA
+		const width = isWooDna ? 200 : undefined;
 		const darkColorScheme = false;
 
 		return (
@@ -68,7 +66,6 @@ export class JetpackConnectMainWrapper extends PureComponent {
 						<JetpackHeader
 							partnerSlug={ partnerSlug }
 							isFromAutomatticForAgenciesPlugin={ isFromAutomatticForAgenciesPlugin }
-							isWooOnboarding={ isWooOnboarding }
 							isWooJPC={ isWooJPC }
 							isWooDna={ isWooDna }
 							width={ width }
diff --git a/client/jetpack-connect/signup.js b/client/jetpack-connect/signup.js
index 8f809f594f0d8..7fbc503f62962 100644
--- a/client/jetpack-connect/signup.js
+++ b/client/jetpack-connect/signup.js
@@ -124,11 +124,6 @@ export class JetpackSignup extends Component {
 		this.props.resetAuthAccountType();
 	};
 
-	isWooOnboarding() {
-		const { authQuery } = this.props;
-		return 'woocommerce-onboarding' === authQuery.from;
-	}
-
 	isWooJPC( props = this.props ) {
 		const { from } = props.authQuery;
 		return 'woocommerce-core-profiler' === from || this.props.isWooJPC;
@@ -171,9 +166,7 @@ export class JetpackSignup extends Component {
 					extra: {
 						...userData.extra,
 						jpc: true,
-						source: this.props.isWooJPC
-							? 'woo-passwordless-jpc' + '-' + this.props.authQuery.from
-							: '',
+						source: this.isWooJPC() ? 'woo-passwordless-jpc' + '-' + this.props.authQuery.from : '',
 					},
 				} )
 				.then( this.handleUserCreationSuccess, this.handleUserCreationError )
@@ -504,16 +497,14 @@ export class JetpackSignup extends Component {
 
 		return (
 			<MainWrapper
-				isWooOnboarding={ this.isWooOnboarding() }
-				isWooJPC={ this.isWooJPC() }
+				isWooJPC={ isWooJPC }
 				isFromAutomatticForAgenciesPlugin={ this.isFromAutomatticForAgenciesPlugin() }
 			>
 				<div className="jetpack-connect__authorize-form">
 					{ this.renderLocaleSuggestions() }
 					<AuthFormHeader
 						authQuery={ this.props.authQuery }
-						isWooOnboarding={ this.isWooOnboarding() }
-						isWooJPC={ this.isWooJPC() }
+						isWooJPC={ isWooJPC }
 						isFromAutomatticForAgenciesPlugin={ this.isFromAutomatticForAgenciesPlugin() }
 						disableSiteCard={ isWooJPC }
 					/>
diff --git a/client/jetpack-connect/store-header.tsx b/client/jetpack-connect/store-header.tsx
index 75410315da8f1..4af98b4f26918 100644
--- a/client/jetpack-connect/store-header.tsx
+++ b/client/jetpack-connect/store-header.tsx
@@ -28,7 +28,6 @@ export default function StoreHeader() {
 			<div className={ headerClass }>
 				<JetpackHeader
 					partnerSlug={ partnerSlug }
-					isWooOnboarding={ false }
 					isWooDna={ false }
 					isWooJPC={ false }
 					darkColorScheme
diff --git a/client/jetpack-connect/style.scss b/client/jetpack-connect/style.scss
index 670ed2e56b8ff..accf61928f084 100644
--- a/client/jetpack-connect/style.scss
+++ b/client/jetpack-connect/style.scss
@@ -5,11 +5,10 @@
 $colophon-height: 50px;
 
 .jetpack-connect__main:not(.is-woocommerce):not(.is-wpcom-migration):not(.is-automattic-for-agencies-flow),
-.layout.is-section-jetpack-connect:not(.is-jetpack-mobile-flow):not(.is-jetpack-woocommerce-flow):not(.is-jetpack-woo-dna-flow):not(.is-wpcom-migration):not(.is-woocommerce-core-profiler-flow):not(.is-automattic-for-agencies-flow) {
+.layout.is-section-jetpack-connect:not(.is-jetpack-mobile-flow):not(.is-jetpack-woo-dna-flow):not(.is-wpcom-migration):not(.is-woocommerce-core-profiler-flow):not(.is-automattic-for-agencies-flow) {
 	@include jetpack-connect-colors();
 }
 
-.layout.is-jetpack-woocommerce-flow,
 .layout.is-jetpack-woo-dna-flow {
 	@include woocommerce-colors();
 }
@@ -850,7 +849,6 @@ $colophon-height: 50px;
 	}
 
 	/** WooCommerce Onboarding Styles **/
-	&.is-jetpack-woocommerce-flow,
 	&.is-jetpack-woo-dna-flow {
 		background-color: var(--color-woocommerce-onboarding-background);
 
@@ -1430,12 +1428,10 @@ $colophon-height: 50px;
 
 body.is-section-jetpack-connect {
 	background-color: var(--color-surface);
-	.layout {
-		&.is-jetpack-woocommerce-flow,
-		&.is-jetpack-woo-dna-flow {
-			.wpcom-site__logo {
-				display: none;
-			}
+
+	.layout.is-jetpack-woo-dna-flow {
+		.wpcom-site__logo {
+			display: none;
 		}
 	}
 }
diff --git a/client/jetpack-connect/test/authorize.js b/client/jetpack-connect/test/authorize.js
index f7da5b2cb512e..e25058ec2c308 100644
--- a/client/jetpack-connect/test/authorize.js
+++ b/client/jetpack-connect/test/authorize.js
@@ -178,7 +178,7 @@ describe( 'JetpackAuthorize', () => {
 			expect( isWooRedirect( props ) ).toBe( true );
 		} );
 
-		test( 'should return true for new woo onboarding', () => {
+		test( 'should return true for legacy woo onboarding', () => {
 			const props = { authQuery: { from: 'woocommerce-onboarding' } };
 			expect( isWooRedirect( props ) ).toBe( true );
 		} );
diff --git a/client/layout/index.jsx b/client/layout/index.jsx
index df48cc7ea29c3..a5ee252de8548 100644
--- a/client/layout/index.jsx
+++ b/client/layout/index.jsx
@@ -297,7 +297,6 @@ class Layout extends Component {
 			'is-jetpack-login': this.props.isJetpackLogin,
 			'is-jetpack-site': this.props.isJetpack,
 			'is-jetpack-mobile-flow': this.props.isJetpackMobileFlow,
-			'is-jetpack-woocommerce-flow': this.props.isJetpackWooCommerceFlow,
 			'is-jetpack-woo-dna-flow': this.props.isJetpackWooDnaFlow,
 			'is-woocommerce-core-profiler-flow': this.props.isWooJPC,
 			'is-automattic-for-agencies-flow': this.props.isFromAutomatticForAgenciesPlugin,
@@ -480,9 +479,6 @@ export default withCurrentRoute(
 			isJetpackCloud() ||
 			isA8CForAgencies();
 		const isJetpackMobileFlow = 'jetpack-connect' === sectionName && !! retrieveMobileRedirect();
-		const isJetpackWooCommerceFlow =
-			[ 'jetpack-connect', 'login' ].includes( sectionName ) &&
-			'woocommerce-onboarding' === currentQuery?.from;
 		const isJetpackWooDnaFlow =
 			[ 'jetpack-connect', 'login' ].includes( sectionName ) &&
 			wooDnaConfig( currentQuery ).isWooDnaFlow();
@@ -507,7 +503,6 @@ export default withCurrentRoute(
 			sidebarIsHidden,
 			isJetpack,
 			isJetpackLogin,
-			isJetpackWooCommerceFlow,
 			isJetpackWooDnaFlow,
 			isJetpackMobileFlow,
 			isWooJPC,
diff --git a/client/layout/logged-out.jsx b/client/layout/logged-out.jsx
index aee8202c3f104..323a7953b8b2f 100644
--- a/client/layout/logged-out.jsx
+++ b/client/layout/logged-out.jsx
@@ -55,7 +55,6 @@ const LayoutLoggedOut = ( {
 	isJetpackLogin,
 	isWhiteLogin,
 	isPopup,
-	isJetpackWooCommerceFlow,
 	isJetpackWooDnaFlow,
 	isP2Login,
 	isGravatar,
@@ -132,7 +131,6 @@ const LayoutLoggedOut = ( {
 		'is-jetpack-site': isJetpackCheckout,
 		'is-white-login': isWhiteLogin,
 		'is-popup': isPopup,
-		'is-jetpack-woocommerce-flow': isJetpackWooCommerceFlow,
 		'is-jetpack-woo-dna-flow': isJetpackWooDnaFlow,
 		'is-p2-login': isP2Login,
 		'is-gravatar': isGravatar,
@@ -344,7 +342,6 @@ export default withCurrentRoute(
 				! isWooOAuth2Client( oauth2Client ) &&
 				! isBlazeProOAuth2Client( oauth2Client ) &&
 				[ 'signup', 'jetpack-connect' ].includes( sectionName );
-			const isJetpackWooCommerceFlow = 'woocommerce-onboarding' === currentQuery?.from;
 			const isWooJPC = isWooJPCFlow( state );
 			const wccomFrom = getWccomFrom( state );
 			const masterbarIsHidden =
@@ -360,7 +357,6 @@ export default withCurrentRoute(
 				isJetpackLogin,
 				isWhiteLogin,
 				isPopup,
-				isJetpackWooCommerceFlow,
 				isJetpackWooDnaFlow,
 				isP2Login,
 				isGravatar,
diff --git a/client/lib/login/index.js b/client/lib/login/index.js
index 91fb5320a59ab..464096d9adac5 100644
--- a/client/lib/login/index.js
+++ b/client/lib/login/index.js
@@ -188,7 +188,7 @@ export function getSignupUrl( currentQuery, currentRoute, oauth2Client, locale,
 	return signupUrl;
 }
 
-export const canDoMagicLogin = ( twoFactorAuthType, oauth2Client, isJetpackWooCommerceFlow ) => {
+export const canDoMagicLogin = ( twoFactorAuthType, oauth2Client ) => {
 	if ( ! config.isEnabled( `login/magic-login` ) || twoFactorAuthType ) {
 		return false;
 	}
@@ -203,10 +203,6 @@ export const canDoMagicLogin = ( twoFactorAuthType, oauth2Client, isJetpackWooCo
 		return false;
 	}
 
-	if ( isJetpackWooCommerceFlow ) {
-		return false;
-	}
-
 	return true;
 };
 
diff --git a/client/login/wp-login/login-links.jsx b/client/login/wp-login/login-links.jsx
index a2d4d146e1345..f2af8090bd746 100644
--- a/client/login/wp-login/login-links.jsx
+++ b/client/login/wp-login/login-links.jsx
@@ -25,7 +25,6 @@ import { getCurrentUserId } from 'calypso/state/current-user/selectors';
 import { resetMagicLoginRequestForm } from 'calypso/state/login/magic-login/actions';
 import getCurrentQueryArguments from 'calypso/state/selectors/get-current-query-arguments';
 import getCurrentRoute from 'calypso/state/selectors/get-current-route';
-import getWccomFrom from 'calypso/state/selectors/get-wccom-from';
 
 export class LoginLinks extends Component {
 	static propTypes = {
@@ -208,14 +207,7 @@ export class LoginLinks extends Component {
 	}
 
 	renderMagicLoginLink() {
-		if (
-			! canDoMagicLogin(
-				this.props.twoFactorAuthType,
-				this.props.oauth2Client,
-				this.props.wccomFrom,
-				this.props.isJetpackWooCommerceFlow
-			)
-		) {
+		if ( ! canDoMagicLogin( this.props.twoFactorAuthType, this.props.oauth2Client ) ) {
 			return null;
 		}
 
@@ -261,10 +253,6 @@ export class LoginLinks extends Component {
 			return null;
 		}
 
-		if ( this.props.isJetpackWooCommerceFlow ) {
-			return null;
-		}
-
 		const loginUrl = login( {
 			locale: this.props.locale,
 			twoFactorAuthType: 'qr',
@@ -298,8 +286,6 @@ export default connect(
 		currentRoute: getCurrentRoute( state ),
 		isLoggedIn: Boolean( getCurrentUserId( state ) ),
 		query: getCurrentQueryArguments( state ),
-		isJetpackWooCommerceFlow: 'woocommerce-onboarding' === getCurrentQueryArguments( state ).from,
-		wccomFrom: getWccomFrom( state ),
 	} ),
 	{
 		recordTracksEvent,
diff --git a/client/login/wp-login/style.scss b/client/login/wp-login/style.scss
index 3d405d8c1ef4a..0bffc0641ab9d 100644
--- a/client/login/wp-login/style.scss
+++ b/client/login/wp-login/style.scss
@@ -153,11 +153,10 @@ $image-height: 47px;
 	}
 }
 
-.layout.is-jetpack-login:not(.is-jetpack-woocommerce-flow):not(.is-wccom-oauth-flow):not(.is-woocommerce-core-profiler-flow) {
+.layout.is-jetpack-login:not(.is-wccom-oauth-flow):not(.is-woocommerce-core-profiler-flow) {
 	@include jetpack-connect-colors();
 }
 
-.layout.is-jetpack-woocommerce-flow,
 .layout.is-wccom-oauth-flow,
 .layout.is-jetpack-woo-dna-flow {
 	@include woocommerce-colors();
@@ -196,7 +195,6 @@ $image-height: 47px;
 	}
 }
 
-.layout.is-jetpack-woocommerce-flow,
 .layout.is-wccom-oauth-flow {
 	background-color: var(--color-woocommerce-onboarding-background);
 
diff --git a/client/server/pages/index.js b/client/server/pages/index.js
index dac1bb6161ea3..75ceb64541fa4 100644
--- a/client/server/pages/index.js
+++ b/client/server/pages/index.js
@@ -176,7 +176,6 @@ function getDefaultContext( request, response, entrypoint = 'entry-main' ) {
 		user: false,
 		env: calypsoEnv,
 		sanitize: sanitize,
-		requestFrom: request.query.from,
 		isWooDna: wooDnaConfig( request.query ).isWooDnaFlow(),
 		badge: false,
 		lang: config( 'i18n_default_locale_slug' ),
diff --git a/client/server/pages/test/index.js b/client/server/pages/test/index.js
index df695691bab88..16532df210889 100644
--- a/client/server/pages/test/index.js
+++ b/client/server/pages/test/index.js
@@ -406,11 +406,6 @@ const assertDefaultContext = ( { url, entry } ) => {
 		expect( request.context.sanitize ).toEqual( app.getMocks().sanitize );
 	} );
 
-	it( 'sets requestFrom', async () => {
-		const { request } = await app.run( { request: { query: { from: 'from' } } } );
-		expect( request.context.requestFrom ).toEqual( 'from' );
-	} );
-
 	it( 'sets lang to the default', async () => {
 		const { request } = await app.run();
 		expect( request.context.lang ).toEqual( 'en' );
diff --git a/client/state/selectors/is-woo-jpc-flow.ts b/client/state/selectors/is-woo-jpc-flow.ts
index cec60a6002f44..e0ce04da9e6aa 100644
--- a/client/state/selectors/is-woo-jpc-flow.ts
+++ b/client/state/selectors/is-woo-jpc-flow.ts
@@ -4,7 +4,14 @@ import getInitialQueryArguments from 'calypso/state/selectors/get-initial-query-
 import { isWooCommerceCoreProfilerFlow } from './is-woocommerce-core-profiler-flow';
 import type { AppState } from 'calypso/types';
 
-const isWooCommercePaymentsOnboardingFlow = ( state: AppState ): boolean => {
+// The legacy Jetpack Woo Onboarding flow is not in use anymore,
+// and is now absorbed into the Woo JPC Onboarding flow.
+// See https://github.com/Automattic/wp-calypso/pull/99558 for more details.
+const isLegacyJetpackWooOnboardingFlow = ( state: AppState ) => {
+	return 'woocommerce-onboarding' === get( getCurrentQueryArguments( state ), 'from' );
+};
+
+const isWooCommercePaymentsOnboardingFlow = ( state: AppState ) => {
 	const from =
 		get( getInitialQueryArguments( state ), 'from' ) === 'woocommerce-payments' ||
 		get( getCurrentQueryArguments( state ), 'from' ) === 'woocommerce-payments';
@@ -42,7 +49,11 @@ const isWooCommercePaymentsOnboardingFlow = ( state: AppState ): boolean => {
  * @returns {?boolean}        Whether the user should see the new passwordless Jetpack connection or not
  */
 export const isWooJPCFlow = ( state: AppState ): boolean => {
-	return isWooCommerceCoreProfilerFlow( state ) || isWooCommercePaymentsOnboardingFlow( state );
+	return (
+		isLegacyJetpackWooOnboardingFlow( state ) ||
+		isWooCommerceCoreProfilerFlow( state ) ||
+		isWooCommercePaymentsOnboardingFlow( state )
+	);
 };
 
 export default isWooJPCFlow;
diff --git a/packages/calypso-analytics/src/tracks.ts b/packages/calypso-analytics/src/tracks.ts
index a7d6f62199f51..f932331705bc3 100644
--- a/packages/calypso-analytics/src/tracks.ts
+++ b/packages/calypso-analytics/src/tracks.ts
@@ -27,9 +27,6 @@ const EVENT_NAME_EXCEPTIONS = [
 	'a8c_cookie_banner_view',
 	'a8c_ccpa_optout',
 	// WooCommerce Onboarding / Connection Flow.
-	'wcadmin_storeprofiler_create_jetpack_account',
-	'wcadmin_storeprofiler_connect_store',
-	'wcadmin_storeprofiler_login_jetpack_account',
 	'wcadmin_storeprofiler_payment_login',
 	'wcadmin_storeprofiler_payment_create_account',
 	// Checkout