diff --git a/src/OnboardingSPA/components/NewfoldInterfaceSkeleton/SiteGen/index.js b/src/OnboardingSPA/components/NewfoldInterfaceSkeleton/SiteGen/index.js
index 6905a0cf5..2bde8c721 100644
--- a/src/OnboardingSPA/components/NewfoldInterfaceSkeleton/SiteGen/index.js
+++ b/src/OnboardingSPA/components/NewfoldInterfaceSkeleton/SiteGen/index.js
@@ -45,10 +45,6 @@ const ThemedNewfoldInterfaceSkeleton = themeToggleHOC(
 
 const SiteGen = () => {
 	const [ failedApi, setFailedApi ] = useState( [] );
-
-	useEffect( () => {
-		document.body.classList.add( `nfd-brand-${ newfoldBrand }` );
-	}, [ newfoldBrand ] );
 	const location = useLocation();
 
 	const {
diff --git a/src/OnboardingSPA/steps/SiteGen/SiteLogo/index.js b/src/OnboardingSPA/steps/SiteGen/SiteLogo/index.js
index 8a72a5524..ae14bdffd 100644
--- a/src/OnboardingSPA/steps/SiteGen/SiteLogo/index.js
+++ b/src/OnboardingSPA/steps/SiteGen/SiteLogo/index.js
@@ -62,7 +62,7 @@ const SiteGenSiteLogo = () => {
 		setSiteLogo( undefined );
 		setIsFooterNavAllowed( false );
 		trackOnboardingEvent(
-			new OnboardingEvent( ACTION_SITEGEN_LOGO_SKIPPED, {
+			new OnboardingEvent( ACTION_SITEGEN_LOGO_SKIPPED, undefined, {
 				source: SITEGEN_FLOW,
 			} )
 		);
diff --git a/src/OnboardingSPA/steps/SiteGen/SocialMedia/index.js b/src/OnboardingSPA/steps/SiteGen/SocialMedia/index.js
index 57b8a547d..3d0fb7dff 100644
--- a/src/OnboardingSPA/steps/SiteGen/SocialMedia/index.js
+++ b/src/OnboardingSPA/steps/SiteGen/SocialMedia/index.js
@@ -68,9 +68,13 @@ const SiteGenSiteSocialMedia = () => {
 
 	const trackSkipEvent = () => {
 		trackOnboardingEvent(
-			new OnboardingEvent( ACTION_SITEGEN_SOCIAL_CONNECT_SKIPPED, {
-				source: SITEGEN_FLOW,
-			} )
+			new OnboardingEvent(
+				ACTION_SITEGEN_SOCIAL_CONNECT_SKIPPED,
+				undefined,
+				{
+					source: SITEGEN_FLOW,
+				}
+			)
 		);
 	};