diff --git a/modules/apps/frontend-js/frontend-js-test/FrontendJSCustomDialog.testcase b/modules/apps/frontend-js/frontend-js-test/FrontendJSCustomDialog.testcase
deleted file mode 100644
index 6c3696bc4a64e4..00000000000000
--- a/modules/apps/frontend-js/frontend-js-test/FrontendJSCustomDialog.testcase
+++ /dev/null
@@ -1,55 +0,0 @@
-@component-name = "portal-frontend-infrastructure"
-definition {
-
-	property portal.acceptance = "true";
-	property portal.release = "true";
-	property portal.upstream = "true";
-	property testray.main.component.name = "Frontend JS";
-
-	setUp {
-		TestCase.setUpPortalInstance();
-
-		User.firstLoginPG();
-
-		task ("Given: Enabled Custom Dialog") {
-			PortalSettings.openInstanceSettingsAdmin();
-
-			SystemSettings.gotoConfiguration(
-				configurationCategory = "Custom Dialogs",
-				configurationName = "Custom Dialogs",
-				configurationScope = "Virtual Instance Scope");
-
-			SystemSettings.configureSystemSetting(
-				enableSetting = "true",
-				settingFieldName = "Enabled");
-		}
-	}
-
-	tearDown {
-		var testLiferayVirtualInstance = PropsUtil.get("test.liferay.virtual.instance");
-
-		if (${testLiferayVirtualInstance} == "true") {
-			PortalInstances.tearDownCP();
-		}
-		else {
-			SystemSettings.configureSystemSetting(
-				enableSetting = "false",
-				settingFieldName = "Enabled");
-		}
-	}
-
-	@description = "LPS-165263: This test validates that the liferay custom alert modal dialog can render."
-	@priority = 3
-	test CanRenderOpenAlertModal {
-		task ("When: run JS code: Liferay.Util.openAlertModal({message: 'Test Alert Modal', onConfirm: ()=>{}})") {
-			ExecuteJavaScript(value1 = "Liferay.Util.openAlertModal({message: 'Test Alert Modal', onConfirm: ()=>{}})");
-		}
-
-		task ("Then: text 'Test Alert Modal' is present in the modal") {
-			AssertTextEquals(
-				locator1 = "Modal#BODY",
-				value1 = "Test Alert Modal");
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/modules/apps/frontend-js/frontend-js-test/src/testFunctional/tests/WalkthroughHotspot.testcase b/modules/apps/frontend-js/frontend-js-test/src/testFunctional/tests/WalkthroughHotspot.testcase
deleted file mode 100644
index e4c35b29d86c28..00000000000000
--- a/modules/apps/frontend-js/frontend-js-test/src/testFunctional/tests/WalkthroughHotspot.testcase
+++ /dev/null
@@ -1,81 +0,0 @@
-@component-name = "portal-frontend-infrastructure"
-definition {
-
-	property osgi.modules.includes = "frontend-js-components-sample-web";
-	property portal.acceptance = "true";
-	property portal.release = "true";
-	property portal.upstream = "true";
-	property testray.main.component.name = "Frontend JS";
-
-	setUp {
-		TestCase.setUpPortalInstance();
-
-		User.firstLoginPG();
-
-		task ("Given walkthrough component sample portlet") {
-			JSONLayout.addPublicLayout(
-				groupName = "Guest",
-				layoutName = "JS Components Sample Page");
-
-			JSONLayout.addWidgetToPublicLayout(
-				groupName = "Guest",
-				layoutName = "JS Components Sample Page",
-				widgetName = "JS Components Sample");
-
-			JSONLayout.updateLayoutTemplateOfPublicLayout(
-				groupName = "Guest",
-				layoutName = "JS Components Sample Page",
-				layoutTemplate = "1 Column");
-
-			Navigator.gotoPage(pageName = "JS Components Sample Page");
-
-			Navigator.gotoNavTab(navTab = "Walkable");
-		}
-	}
-
-	tearDown {
-		var testLiferayVirtualInstance = PropsUtil.get("test.liferay.virtual.instance");
-
-		if (${testLiferayVirtualInstance} == "true") {
-			PortalInstances.tearDownCP();
-		}
-		else {
-			JSONLayout.deletePublicLayout(
-				groupName = "Guest",
-				layoutName = "JS Components Sample Page");
-		}
-	}
-
-	@description = "LPS-150906. Assert a hotspot element will switch to popover mode after clicking."
-	@priority = 5
-	test WillDisplayPopoverWhenClicked {
-		property custom.properties = "feature.flag.LPD-44091=true";
-
-		task ("When click hospot element") {
-			Click(locator1 = "Walkthrough#SAMPLE_PORTLET_HOTSPOT");
-		}
-
-		task ("Then popover is present") {
-			AssertElementPresent(locator1 = "Walkthrough#POPOVER");
-		}
-
-		task ("And then hotspot element is not present") {
-			AssertElementNotPresent(locator1 = "Walkthrough#SAMPLE_PORTLET_HOTSPOT");
-		}
-	}
-
-	@description = "LPS-150047. Assert walkthrough component renders a hotspot element as initial state."
-	@priority = 5
-	test WillRenderAsInitialState {
-		property custom.properties = "feature.flag.LPD-44091=true";
-
-		task ("Then Hotspot element is present") {
-			AssertElementPresent(locator1 = "Walkthrough#SAMPLE_PORTLET_HOTSPOT");
-		}
-
-		task ("And then popover element is not present") {
-			AssertElementNotPresent(locator1 = "Walkthrough#POPOVER");
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/modules/apps/frontend-js/frontend-js-test/src/testFunctional/tests/WalkthroughMultiplePages.testcase b/modules/apps/frontend-js/frontend-js-test/src/testFunctional/tests/WalkthroughMultiplePages.testcase
deleted file mode 100644
index ab66675bdce2eb..00000000000000
--- a/modules/apps/frontend-js/frontend-js-test/src/testFunctional/tests/WalkthroughMultiplePages.testcase
+++ /dev/null
@@ -1,188 +0,0 @@
-@component-name = "portal-frontend-infrastructure"
-definition {
-
-	property osgi.modules.includes = "frontend-js-walkthrough-sample-web";
-	property portal.release = "true";
-	property portal.upstream = "true";
-	property testray.main.component.name = "Frontend JS";
-
-	setUp {
-		TestCase.setUpPortalInstance();
-
-		User.firstLoginPG();
-
-		task ("Given walkthrough enabled site-level") {
-			HeadlessSite.addSite(siteName = "Site Name");
-
-			Walkthrough.enableWalkthroughFF();
-
-			ApplicationsMenu.gotoSite(site = "Site Name");
-
-			Walkthrough.addWalkthrough(fileName = "walkthrough_configuration_multiple_page.json");
-		}
-
-		task ("And Given mutiple pages defined") {
-			JSONLayout.addPublicLayout(
-				groupName = "Site Name",
-				layoutName = "Walkthrough Page 1");
-
-			JSONLayout.addPublicLayout(
-				groupName = "Site Name",
-				layoutName = "Walkthrough Page 2");
-
-			JSONLayout.addWidgetToPublicLayout(
-				groupName = "Site Name",
-				layoutName = "Walkthrough Page 1",
-				widgetName = "JS Walkthrough Sample");
-
-			JSONLayout.addWidgetToPublicLayout(
-				groupName = "Site Name",
-				layoutName = "Walkthrough Page 2",
-				widgetName = "JS Walkthrough Sample");
-
-			Navigator.openSitePage(
-				pageName = "Walkthrough Page 1",
-				siteName = "Site Name");
-		}
-	}
-
-	tearDown {
-		var testLiferayVirtualInstance = PropsUtil.get("test.liferay.virtual.instance");
-
-		if (${testLiferayVirtualInstance} == "true") {
-			PortalInstances.tearDownCP();
-		}
-		else {
-			JSONGroup.deleteGroupByName(groupName = "Site Name");
-		}
-	}
-
-	@description = "LPS-150895. Assert walkthrough can navigate to the next page."
-	@priority = 5
-	test CanNavigateToNextPage {
-		property portal.acceptance = "true";
-
-		var portalURL = PropsUtil.get("portal.url");
-
-		task ("When on step 1") {
-			Walkthrough.enablePopoverMode();
-
-			VerifyElementPresent(
-				key_title = "Step 1 of 2: Click the Button",
-				locator1 = "Walkthrough#POPOVER_TITLE");
-		}
-
-		task ("And When navigate to next step") {
-			Walkthrough.goToNextStep(key_step = 2);
-		}
-
-		task ("Then browser URL ends with /walkthrough-page-2") {
-			AssertLocation(value1 = "${portalURL}/web/site-name/walkthrough-page-2");
-		}
-
-		task ("And Then popover is in step 2") {
-			AssertElementPresent(
-				key_title = "Step 2 of 2: Enter Your Name",
-				locator1 = "Walkthrough#POPOVER_TITLE");
-		}
-	}
-
-	@description = "LPS-150895. Assert walkthrough can navigate back to the previous page."
-	@priority = 5
-	test CanNavigateToPreviousPage {
-		property portal.acceptance = "true";
-
-		var portalURL = PropsUtil.get("portal.url");
-
-		task ("When on step 2") {
-			Walkthrough.enablePopoverMode();
-
-			Walkthrough.goToSpecificStep(key_step = 2);
-
-			VerifyElementPresent(
-				key_title = "Step 2 of 2: Enter Your Name",
-				locator1 = "Walkthrough#POPOVER_TITLE");
-		}
-
-		task ("And When navigate to previous step") {
-			Walkthrough.goToPreviousStep(key_step = 1);
-		}
-
-		task ("Then browser URL ends with /walkthrough-page-1") {
-			AssertLocation(value1 = "${portalURL}/web/site-name/walkthrough-page-1");
-		}
-
-		task ("And Then popover is in step 1") {
-			AssertElementPresent(
-				key_title = "Step 1 of 2: Click the Button",
-				locator1 = "Walkthrough#POPOVER_TITLE");
-		}
-	}
-
-	@description = "LPS-150895. Assert walkthrough can save current step when navigating through different pages."
-	@priority = 4
-	test CurrentStepIsSavedWhenNavigatingPages {
-		var portalURL = PropsUtil.get("portal.url");
-
-		task ("When on step 2") {
-			Walkthrough.enablePopoverMode();
-
-			Walkthrough.goToSpecificStep(key_step = 2);
-
-			VerifyElementPresent(
-				key_title = "Step 2 of 2: Enter Your Name",
-				locator1 = "Walkthrough#POPOVER_TITLE");
-		}
-
-		task ("And When navigate to previous step through url") {
-			Navigator.openSpecificURL(url = "${portalURL}/web/site-name/walkthrough-page-1");
-		}
-
-		task ("Then popover mode is not present") {
-			AssertElementNotPresent(
-				key_title = "",
-				locator1 = "Walkthrough#POPOVER_TITLE");
-		}
-
-		task ("When navigate back to next step through url") {
-			Navigator.openSpecificURL(url = "${portalURL}/web/site-name/walkthrough-page-2");
-		}
-
-		task ("Then popover mode element is present on step 2") {
-			AssertElementPresent(
-				key_title = "Step 2 of 2: Enter Your Name",
-				locator1 = "Walkthrough#POPOVER_TITLE");
-		}
-	}
-
-	@description = "LPS-150895. Assert walkthrough can save current step when user signs in and out."
-	@priority = 3
-	test CurrentStepIsSavedWhenUserSignsInAndOut {
-		var portalURL = PropsUtil.get("portal.url");
-
-		task ("When on step 2") {
-			Walkthrough.enablePopoverMode();
-
-			Walkthrough.goToSpecificStep(key_step = 2);
-
-			VerifyElementPresent(
-				key_title = "Step 2 of 2: Enter Your Name",
-				locator1 = "Walkthrough#POPOVER_TITLE");
-		}
-
-		task ("And When user signs out and in") {
-			User.logoutAndLoginPG(
-				userLoginEmailAddress = "test@liferay.com",
-				userLoginFullName = "Test Test");
-		}
-
-		task ("Then popover mode element is present on step 2") {
-			Navigator.openSpecificURL(url = "${portalURL}/web/site-name/walkthrough-page-2");
-
-			AssertElementPresent(
-				key_title = "Step 2 of 2: Enter Your Name",
-				locator1 = "Walkthrough#POPOVER_TITLE");
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/modules/apps/frontend-js/frontend-js-test/src/testFunctional/tests/WalkthroughPopover.testcase b/modules/apps/frontend-js/frontend-js-test/src/testFunctional/tests/WalkthroughPopover.testcase
deleted file mode 100644
index d8099e2c6ac710..00000000000000
--- a/modules/apps/frontend-js/frontend-js-test/src/testFunctional/tests/WalkthroughPopover.testcase
+++ /dev/null
@@ -1,363 +0,0 @@
-@component-name = "portal-frontend-infrastructure"
-definition {
-
-	property osgi.modules.includes = "frontend-js-components-sample-web";
-	property portal.acceptance = "true";
-	property portal.release = "true";
-	property portal.upstream = "true";
-	property testray.main.component.name = "Frontend JS";
-
-	setUp {
-		TestCase.setUpPortalInstance();
-
-		User.firstLoginPG();
-
-		task ("Given walkthrough component sample portlet") {
-			JSONLayout.addPublicLayout(
-				groupName = "Guest",
-				layoutName = "JS Components Sample Page");
-
-			JSONLayout.addWidgetToPublicLayout(
-				groupName = "Guest",
-				layoutName = "JS Components Sample Page",
-				widgetName = "JS Components Sample");
-
-			JSONLayout.updateLayoutTemplateOfPublicLayout(
-				groupName = "Guest",
-				layoutName = "JS Components Sample Page",
-				layoutTemplate = "1 Column");
-
-			Navigator.gotoPage(pageName = "JS Components Sample Page");
-
-			Navigator.gotoNavTab(navTab = "Walkable");
-		}
-	}
-
-	tearDown {
-		var testLiferayVirtualInstance = PropsUtil.get("test.liferay.virtual.instance");
-
-		if (${testLiferayVirtualInstance} == "true") {
-			PortalInstances.tearDownCP();
-		}
-		else {
-			JSONLayout.deletePublicLayout(
-				groupName = "Guest",
-				layoutName = "JS Components Sample Page");
-		}
-	}
-
-	@description = "LPS-150906. Assert component will switch to hotspot mode in the current step when closing popover."
-	@priority = 5
-	test CanBeClosed {
-		property custom.properties = "feature.flag.LPD-44091=true";
-
-		task ("Given click hotspot element") {
-			Click(locator1 = "Walkthrough#SAMPLE_PORTLET_HOTSPOT");
-		}
-
-		task ("When Click close icon") {
-			Click(locator1 = "Walkthrough#CLOSE_POPOVER");
-		}
-
-		task ("Then hotspot element is present") {
-			AssertElementPresent(locator1 = "Walkthrough#SAMPLE_PORTLET_HOTSPOT");
-		}
-	}
-
-	@description = "LPS-150906. Assert popover mode contains content."
-	@priority = 5
-	test CanDisplayContent {
-		property custom.properties = "feature.flag.LPD-44091=true";
-
-		task ("When click hotspot element") {
-			Click(locator1 = "Walkthrough#SAMPLE_PORTLET_HOTSPOT");
-		}
-
-		task ("Then content text is present on popover") {
-			AssertElementPresent(
-				key_index = 1,
-				locator1 = "Walkthrough#POPOVER_SAMPLE_CONTENT");
-		}
-	}
-
-	@description = "LPS-150906. Assert popover contains a button to transition to previous step."
-	@priority = 5
-	test CanDisplayPreviousButtonOnIntermediateStep {
-		property custom.properties = "feature.flag.LPD-44091=true";
-
-		task ("And Given popover mode") {
-			Walkthrough.enablePopoverMode();
-		}
-
-		task ("When navigate to 2nd step popover") {
-			Walkthrough.goToNextStep(key_step = 2);
-		}
-
-		task ("Then previous step button is present") {
-			AssertElementPresent(locator1 = "Button#PREVIOUS");
-		}
-
-		task ("And When click on previous step button") {
-			Click(locator1 = "Button#PREVIOUS");
-		}
-
-		task ("Then 1st step popover is present") {
-			AssertElementPresent(
-				key_title = "Step 1 of 5: Title 1",
-				locator1 = "Walkthrough#POPOVER_TITLE");
-		}
-
-		task ("And Then 2nd step popover is not present") {
-			AssertElementNotPresent(
-				key_title = "Step 2 of 5: Title 2",
-				locator1 = "Walkthrough#POPOVER_TITLE");
-		}
-	}
-
-	@description = "LPS-150906. Assert popover mode can display step number."
-	@priority = 4
-	test CanDisplayStepNumber {
-		property custom.properties = "feature.flag.LPD-44091=true";
-
-		task ("And given click hotspot element") {
-			Click(locator1 = "Walkthrough#SAMPLE_PORTLET_HOTSPOT");
-		}
-
-		task ("When click through all primary step buttons") {
-			for (var number : list "2,3,4,5") {
-				Click(locator1 = "Button#OK");
-
-				task ("Then step number is displayed consecutively") {
-					AssertElementPresent(
-						key_title = "Step ${number} of 5: Title ${number}",
-						locator1 = "Walkthrough#POPOVER_TITLE");
-				}
-			}
-		}
-	}
-
-	@description = "LPS-150906. Assert popover mode contains a title."
-	@priority = 5
-	test CanDisplayTitle {
-		property custom.properties = "feature.flag.LPD-44091=true";
-
-		task ("When click hotspot element") {
-			Click(locator1 = "Walkthrough#SAMPLE_PORTLET_HOTSPOT");
-		}
-
-		task ("Then title text is present on popover") {
-			AssertElementPresent(
-				key_title = "Step 1 of 5: Title 1",
-				locator1 = "Walkthrough#POPOVER_TITLE");
-		}
-	}
-
-	@description = "LPS-150906. Assert a dark background overlay can be toggled."
-	@priority = 3
-	test CanHaveADarkBackgroundOverlay {
-		property custom.properties = "feature.flag.LPD-44091=true";
-		property portal.acceptance = "false";
-
-		task ("When click hotspot element") {
-			Click(locator1 = "Walkthrough#SAMPLE_PORTLET_HOTSPOT");
-		}
-
-		task ("Then outside the element has a dark background overlay") {
-			AssertElementPresent(locator1 = "Walkthrough#POPOVER_OVERLAY");
-
-			AssertAttributeValue(
-				locator1 = "Walkthrough#POPOVER_OVERLAY",
-				value1 = "fill",
-				value2 = "#393a4a");
-		}
-	}
-
-	@description = "LPS-150906. Assert popover mode can have a shadow around element."
-	@priority = 2
-	test CanHaveAShadowAroundElement {
-		property custom.properties = "feature.flag.LPD-44091=true";
-		property portal.acceptance = "false";
-
-		task ("When click hotspot element until Step 4") {
-			Click(locator1 = "Walkthrough#SAMPLE_PORTLET_HOTSPOT");
-
-			Click(locator1 = "Button#OK");
-
-			Click(locator1 = "Button#OK");
-
-			Click(locator1 = "Button#OK");
-		}
-
-		task ("Then element is outlined with a shadow") {
-			AssertCssValue(
-				id = "step4",
-				locator1 = "Walkthrough#ALERT",
-				locator2 = "box-shadow",
-				value1 = "rgba(11, 95, 255, 0.16) 0px 8px 16px 0px");
-		}
-	}
-
-	@description = "LPS-150906. Assert hotspot can transition back to previous step if next element doesn't exist on the page."
-	@priority = 3
-	test CanReturnToPreviousStepIfElementDoesNotExist {
-		property custom.properties = "feature.flag.LPD-44091=true";
-		property portal.acceptance = "false";
-
-		task ("Given JSON file includes an element that does not exist on the page/sample portlet") {
-			Navigator.gotoNavTab(navTab = "Test Walkable");
-		}
-
-		task ("When popover mode transistions to the step that has no element") {
-			Walkthrough.enablePopoverMode();
-
-			Click(locator1 = "Button#OK");
-		}
-
-		task ("Then hotspot returns to last element") {
-			WalkthroughPopover.viewCoordinatePositionMatchesElementStep(
-				hotspotElementClass = "lfr-walkthrough-hotspot-inner",
-				stepElementId = "teststep1");
-		}
-	}
-
-	@description = "LPS-150906. Assert close button on final step can reset walkthrough process."
-	@priority = 5
-	test CloseButtonOnFinalStepCanResetTheProcess {
-		property custom.properties = "feature.flag.LPD-44091=true";
-
-		task ("And popover mode") {
-			Walkthrough.enablePopoverMode();
-		}
-
-		task ("When on 1st step popover") {
-			VerifyElementPresent(
-				key_title = "Step 1 of 5: Title 1",
-				locator1 = "Walkthrough#POPOVER_TITLE");
-		}
-
-		task ("And click on all next steps") {
-			Walkthrough.goToSpecificStep(key_step = 5);
-		}
-
-		task ("Then last step contains close button") {
-			AssertElementPresent(locator1 = "Button#CLOSE");
-		}
-
-		task ("When click on close button") {
-			Click(locator1 = "Button#CLOSE");
-		}
-
-		task ("Then popover is not present") {
-			AssertElementNotPresent(locator1 = "Walkthrough#POPOVER");
-		}
-
-		task ("Then hotspot element is present on 1st element") {
-			AssertElementPresent(locator1 = "Walkthrough#SAMPLE_PORTLET_HOTSPOT");
-
-			WalkthroughPopover.viewCoordinatePositionMatchesElementStep(
-				hotspotElementClass = "lfr-walkthrough-hotspot-inner",
-				stepElementId = "step1");
-		}
-	}
-
-	@description = "LPS-150906. Assert 1st step popover does not contain a button to transition to previous step."
-	@priority = 5
-	test FirstStepDoesNotHavePreviousStepButton {
-		property custom.properties = "feature.flag.LPD-44091=true";
-
-		task ("And Given popover mode") {
-			Walkthrough.enablePopoverMode();
-		}
-
-		task ("When on 1st step popover") {
-			VerifyElementPresent(
-				key_title = "Step 1 of 5: Title 1",
-				locator1 = "Walkthrough#POPOVER_TITLE");
-		}
-
-		task ("Then previous step button is not present") {
-			AssertElementNotPresent(locator1 = "Button#PREVIOUS");
-		}
-
-		task ("And Then the primary button next step is present") {
-			AssertElementPresent(locator1 = "Button#OK");
-		}
-
-		task ("And When click on next step button") {
-			Click(locator1 = "Button#OK");
-		}
-
-		task ("Then 2nd step popover is present") {
-			AssertElementPresent(
-				key_title = "Step 2 of 5: Title 2",
-				locator1 = "Walkthrough#POPOVER_TITLE");
-		}
-
-		task ("And Then 1st step popover is not present") {
-			AssertElementNotPresent(
-				key_title = "Step 1 of 5: Title 1",
-				locator1 = "Walkthrough#POPOVER_TITLE");
-		}
-	}
-
-	@description = "LPS-150906. Assert intermediate step displays previous and next step button."
-	@priority = 5
-	test IntermediateStepHasPreviousAndNextStepPresent {
-		property custom.properties = "feature.flag.LPD-44091=true";
-
-		task ("And popover mode") {
-			Walkthrough.enablePopoverMode();
-		}
-
-		task ("When on 1st step popover") {
-			VerifyElementPresent(
-				key_title = "Step 1 of 5: Title 1",
-				locator1 = "Walkthrough#POPOVER_TITLE");
-		}
-
-		task ("And click on next steps until second to last step") {
-			Walkthrough.goToSpecificStep(key_step = 4);
-		}
-
-		task ("Then able to reach second to final step") {
-			AssertElementPresent(
-				key_title = "Step 4",
-				locator1 = "Walkthrough#POPOVER_TITLE");
-		}
-
-		task ("And primary button is present") {
-			AssertElementPresent(locator1 = "Button#OK");
-		}
-
-		task ("Then secondary button previous step is present") {
-			AssertElementPresent(locator1 = "Button#PREVIOUS");
-		}
-	}
-
-	@description = "LPS-150906. Assert component will switch to hotspot mode in the 2nd step when closing 2nd popover."
-	@priority = 5
-	test WhenClosedCanTransitionToHotSpotModeOnCurrentStepElement {
-		property custom.properties = "feature.flag.LPD-44091=true";
-
-		task ("Given click hotspot element") {
-			Click(locator1 = "Walkthrough#SAMPLE_PORTLET_HOTSPOT");
-		}
-
-		task ("Click on next step") {
-			Click(locator1 = "Button#OK");
-		}
-
-		task ("When Click close icon") {
-			Click(locator1 = "Walkthrough#CLOSE_POPOVER");
-		}
-
-		task ("Then hotspot element is present on the 2nd element") {
-			AssertElementPresent(locator1 = "Walkthrough#SAMPLE_PORTLET_HOTSPOT");
-
-			WalkthroughPopover.viewCoordinatePositionMatchesElementStep(
-				hotspotElementClass = "lfr-walkthrough-hotspot-inner",
-				stepElementId = "step2");
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/modules/apps/frontend-js/frontend-js-test/src/testFunctional/tests/WalkthroughSiteLevel.testcase b/modules/apps/frontend-js/frontend-js-test/src/testFunctional/tests/WalkthroughSiteLevel.testcase
deleted file mode 100644
index aa9c9bb90e2bf1..00000000000000
--- a/modules/apps/frontend-js/frontend-js-test/src/testFunctional/tests/WalkthroughSiteLevel.testcase
+++ /dev/null
@@ -1,197 +0,0 @@
-@component-name = "portal-frontend-infrastructure"
-definition {
-
-	property osgi.modules.includes = "frontend-js-walkthrough-sample-web";
-	property portal.release = "false";
-	property portal.upstream = "true";
-	property testray.main.component.name = "Frontend JS";
-
-	setUp {
-		TestCase.setUpPortalInstance();
-
-		User.firstLoginPG();
-
-		HeadlessSite.addSite(siteName = "Site Name");
-
-		Walkthrough.enableWalkthroughFF();
-
-		ApplicationsMenu.gotoSite(site = "Site Name");
-	}
-
-	tearDown {
-		var testLiferayVirtualInstance = PropsUtil.get("test.liferay.virtual.instance");
-
-		if (${testLiferayVirtualInstance} == "true") {
-			PortalInstances.tearDownCP();
-		}
-		else {
-			JSONGroup.deleteGroupByName(groupName = "Site Name");
-		}
-	}
-
-	@description = "LPS-150895. When skippable is set to true, checked and ends all steps the hotspot element is not present."
-	@priority = 3
-	test CanEnableSkippable {
-		property portal.acceptance = "false";
-
-		task ("Given walkthrough enabled site-level") {
-			Walkthrough.setupWalkthroughPage(
-				filename = "walkthrough_configuration_single_page.json",
-				siteName = "Site Name");
-		}
-
-		task ("And When navigate to second step") {
-			Walkthrough.goToSpecificStep(key_step = 2);
-		}
-
-		task ("And When enable Do not show me this again") {
-			Check.checkNotVisible(
-				checkboxName = "Do not show me this again.",
-				locator1 = "Checkbox#ANY_CHECKBOX");
-		}
-
-		task ("And When navigate to next step") {
-			Walkthrough.goToNextStep(key_step = 3);
-		}
-
-		task ("And When click ok to finish the steps") {
-			Click(
-				key_text = "Close",
-				locator1 = "Button#ANY");
-		}
-
-		task ("Then popover mode is not present") {
-			AssertElementNotPresent(
-				key_title = "",
-				locator1 = "Walkthrough#HOTSPOT");
-		}
-	}
-
-	@description = "LPS-150895. When a walkthrough step is defined and a step is below the fold, user can see popover is."
-	@priority = 3
-	test CanRenderWhenStepIsBelowFold {
-		property portal.acceptance = "false";
-
-		task ("Given walkthrough enabled site-level") {
-			Walkthrough.addWalkthrough(fileName = "walkthrough_configuration_multiple_page.json");
-
-			JSONLayout.addPublicLayout(
-				groupName = "Site Name",
-				layoutName = "Walkthrough Page 1");
-
-			JSONLayout.addWidgetToPublicLayout(
-				groupName = "Site Name",
-				layoutName = "Walkthrough Page 1",
-				widgetName = "JS Walkthrough Sample");
-		}
-
-		task ("Given a page width larger than the preview window.") {
-			JSONLayout.addPublicLayout(
-				groupName = "Site Name",
-				layoutName = "Walkthrough Page 2");
-
-			JSONLayout.addWidgetToPublicLayout(
-				groupName = "Site Name",
-				layoutName = "Walkthrough Page 2",
-				widgetName = "Clay Sample");
-
-			JSONLayout.addWidgetToPublicLayout(
-				groupName = "Site Name",
-				layoutName = "Walkthrough Page 2",
-				widgetName = "JS Walkthrough Sample");
-		}
-
-		task ("When enable popover mode") {
-			Navigator.openSitePage(
-				pageName = "Walkthrough Page 1",
-				siteName = "Site Name");
-
-			Walkthrough.enablePopoverMode();
-		}
-
-		task ("And When navigate to step that is below the fold") {
-			Walkthrough.goToNextStep(key_step = 2);
-		}
-
-		task ("Then popover element is visible when rendered") {
-			AssertVisible(
-				key_title = "Step 2 of 2: Enter Your Name",
-				locator1 = "Walkthrough#POPOVER_TITLE");
-		}
-	}
-
-	@description = "LPS-150895. It is possible use same JSON on different sites as long as the pages have same name. "
-	@priority = 4
-	test SameJSONCanBeEnabledOnMultipleSites {
-		property portal.acceptance = "false";
-
-		task ("When site 1 has walkthrough enabled site-level with JSON") {
-			Walkthrough.setupWalkthroughPage(
-				filename = "walkthrough_configuration_single_page.json",
-				siteName = "Site Name");
-		}
-
-		task ("And When site 2 has walkthrough enabled site-level with JSON") {
-			task ("Create site 2") {
-				HeadlessSite.addSite(siteName = "Test Site Name");
-
-				ApplicationsMenu.gotoSite(site = "Test Site Name");
-			}
-
-			Walkthrough.setupWalkthroughPage(
-				filename = "walkthrough_configuration_single_page.json",
-				siteName = "Test Site Name");
-		}
-
-		task ("Then hotspot element is present on first site") {
-			Navigator.openSitePage(
-				pageName = "Walkthrough Page 1",
-				siteName = "Site Name");
-
-			AssertElementPresent(
-				key_title = "",
-				locator1 = "Walkthrough#POPOVER_TITLE");
-		}
-
-		task ("And Then hotspot element is present on second site") {
-			Navigator.openSitePage(
-				pageName = "Walkthrough Page 1",
-				siteName = "Test Site Name");
-
-			AssertElementPresent(
-				key_title = "",
-				locator1 = "Walkthrough#POPOVER_TITLE");
-		}
-	}
-
-	@description = "LPS-150895. Checked that each step corresponds to the expected Step Id."
-	@priority = 5
-	test StepCanCorrespondToCorrectStepId {
-		property portal.acceptance = "false";
-
-		var portalURL = PropsUtil.get("portal.url");
-
-		task ("Given walkthrough enabled site-level") {
-			Walkthrough.setupWalkthroughPage(
-				filename = "walkthrough_configuration_multiple_page.json",
-				siteName = "Site Name");
-		}
-
-		task ("When on step 1") {
-			AssertLocation(value1 = "${portalURL}/web/site-name/walkthrough-page-1");
-		}
-
-		task ("Then correspond to the correct step ID on correct page") {
-			Walkthrough.assertHighlightedSpecificObject(key_stepId = "step-1");
-		}
-
-		task ("When on step 2 correspond to the correct step ID on correct page") {
-			Walkthrough.goToNextStep(key_step = 2);
-
-			AssertLocation(value1 = "${portalURL}/web/site-name/walkthrough-page-2");
-
-			Walkthrough.assertHighlightedSpecificObject(key_stepId = "step-2");
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/portal-web/test/functional/com/liferay/portalweb/tests/enduser/frontendinfrastructure/uiinfrastructure/AMDLoader.testcase b/portal-web/test/functional/com/liferay/portalweb/tests/enduser/frontendinfrastructure/uiinfrastructure/AMDLoader.testcase
deleted file mode 100644
index 772a2483053799..00000000000000
--- a/portal-web/test/functional/com/liferay/portalweb/tests/enduser/frontendinfrastructure/uiinfrastructure/AMDLoader.testcase
+++ /dev/null
@@ -1,71 +0,0 @@
-@component-name = "portal-frontend-infrastructure"
-definition {
-
-	property portal.release = "true";
-	property portal.upstream = "true";
-	property testray.main.component.name = "Frontend JS";
-
-	setUp {
-		task ("Given Liferay portal") {
-			TestCase.setUpPortalInstance();
-
-			User.firstLoginPG();
-		}
-	}
-
-	tearDown {
-		var testLiferayVirtualInstance = PropsUtil.get("test.liferay.virtual.instance");
-
-		if (${testLiferayVirtualInstance} == "true") {
-			PortalInstances.tearDownCP();
-		}
-	}
-
-	@description = "LPS-144267. I'm able to see references to import map by default on DOM"
-	@priority = 5
-	test CanGenerateTheAMDToESMBridge {
-		property portal.acceptance = "true";
-
-		task ("When navigate to home page") {
-			Navigator.gotoPage(pageName = "Home");
-		}
-
-		task ("Then import maps is referenced in the HTML of the page.") {
-			AssertElementPresent(locator1 = "//script[@type='importmap' and contains(.,'react-dom')]");
-
-			AssertElementPresent(locator1 = "//script[@type='importmap' and contains(.,'react')]");
-		}
-	}
-
-	@description = "IFI-847. Verify user can configure AMD loader log level"
-	@priority = 5
-	@refactordone
-	test LogLevelCanBeConfigured {
-		property portal.acceptance = "true";
-		property test.liferay.virtual.instance = "false";
-		property test.run.type = "single";
-
-		ApplicationsMenu.gotoPortlet(
-			category = "Configuration",
-			panel = "Control Panel",
-			portlet = "System Settings");
-
-		SystemSettings.gotoConfiguration(
-			configurationCategory = "Infrastructure",
-			configurationName = "JavaScript Loader",
-			configurationScope = "System Scope");
-
-		FormFields.viewSelectOption(
-			fieldName = "Log Level",
-			selectOption = "Warn");
-
-		for (var logLevelOptionName : list "Off,Error,Info,Debug,Warn") {
-			var logLevelOption = ${logLevelOptionName};
-
-			AMDLoader.setLogLevelOption(selectOption = ${logLevelOption});
-
-			AMDLoader.confirmLogLevelOptionSetCorrectly(selectOption = ${logLevelOption});
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/portal-web/test/functional/com/liferay/portalweb/tests/enduser/frontendinfrastructure/uiinfrastructure/remotewebapps/ClientExtension.testcase b/portal-web/test/functional/com/liferay/portalweb/tests/enduser/frontendinfrastructure/uiinfrastructure/remotewebapps/ClientExtension.testcase
index 0df6b1349ce1b4..52a48db8905058 100644
--- a/portal-web/test/functional/com/liferay/portalweb/tests/enduser/frontendinfrastructure/uiinfrastructure/remotewebapps/ClientExtension.testcase
+++ b/portal-web/test/functional/com/liferay/portalweb/tests/enduser/frontendinfrastructure/uiinfrastructure/remotewebapps/ClientExtension.testcase
@@ -37,100 +37,6 @@ definition {
 		}
 	}
 
-	@description = "LPS-182184. Verify the option to export a client extension is displayed."
-	@priority = 4
-	test AssertExportOptionIsDisplayed {
-		task ("Given the admin page of client extensions") {
-			ClientExtensionGeneral.goToRemoteAppsPortlet();
-		}
-
-		task ("And Create a Custom Element") {
-			ClientExtensionGeneral.addCustomElement(
-				entryHtmlName = "vanilla-counter",
-				entryName = "Vanilla Counter",
-				entryURL = " http://remote-component-test.wincent.com/packages/vanilla-counter/index.js");
-		}
-
-		task ("When the user clicks the ellipsis button of the client extension created") {
-			Click(
-				key_entryName = "Vanilla Counter",
-				locator1 = "ClientExtension#ENTRY_ELLIPSIS_BUTTON");
-		}
-
-		task ("Then the export option is displayed") {
-			AssertVisible(
-				key_menuItem = "Export as JSON",
-				locator1 = "MenuItem#DROPDOWN_MENU_ITEM");
-		}
-	}
-
-	@description = "LPS-182184. Verify the JSON field contains the name of the file selected to be imported"
-	@priority = 5
-	test AssertFileNameInJSONField {
-		property portal.acceptance = "true";
-
-		task ("Given the admin page of client extensions") {
-			ClientExtensionGeneral.goToRemoteAppsPortlet();
-
-			ClientExtensionGeneral.addCustomElement(
-				entryHtmlName = "vanilla-counter",
-				entryName = "Vanilla Counter",
-				entryURL = "http://remote-component-test.wincent.com/packages/vanilla-counter/index.js");
-
-			Click(
-				key_entryName = "Vanilla Counter",
-				locator1 = "ClientExtension#ENTRY_ELLIPSIS_BUTTON");
-
-			Click(
-				key_menuItem = "Export as JSON",
-				locator1 = "MenuItem#DROPDOWN_MENU_ITEM");
-
-			ClientExtensionGeneral.deleteRemoteApp(tableEntry = "Vanilla Counter");
-		}
-
-		task ("When the import option is selected") {
-			Click(locator1 = "Icon#SVG_ELLIPSIS");
-
-			DropdownMenuItem.click(menuItem = "Import");
-		}
-
-		task ("And the client-extension json file is selected") {
-			var sampleFileName = TestCase.getDownloadedTempFileName(fileNamePattern = "client-extension-*.json");
-			var tempFileDirectory = selenium.getOutputDirName();
-
-			var filePath = "${tempFileDirectory}/${sampleFileName}";
-
-			UploadFile(
-				locator1 = "TextInput#FILE",
-				value1 = ${filePath});
-		}
-
-		task ("Then the file name is shown in the JSON File field") {
-			AssertVisible(
-				key_fieldValue = ${sampleFileName},
-				locator1 = "FormFields#TEXT_FIELD_3");
-		}
-	}
-
-	@description = "LPS-114812. Verify Client Extension can be deleted"
-	@priority = 5
-	@refactordone
-	test CanBeDeleted {
-		property portal.acceptance = "true";
-
-		var remoteAppName = "My New Remote App To Delete";
-
-		JSONClientExtension.addIFrameRemoteAppEntry(
-			iFrameURL = "http://www.liferay.com/my_new_remote_app",
-			name = ${remoteAppName});
-
-		ClientExtensionGeneral.goToRemoteAppsPortlet();
-
-		ClientExtensionGeneral.deleteRemoteApp(tableEntry = ${remoteAppName});
-
-		ClientExtensionGeneral.viewEmptyRemoteTable();
-	}
-
 	@description = "LPS-153716. Add Client Extension with DB Partitioning enabled."
 	@priority = 5
 	test CanBeDisplayedWithDBPartitioning {
@@ -156,58 +62,6 @@ definition {
 		}
 	}
 
-	@description = "LPS-182184. Verify it's possible to cancel an import."
-	@priority = 4
-	test CanCancelImport {
-		task ("Given the admin page of client extensions") {
-			ClientExtensionGeneral.goToRemoteAppsPortlet();
-
-			ClientExtensionGeneral.addCustomElement(
-				entryHtmlName = "vanilla-counter",
-				entryName = "Vanilla Counter",
-				entryURL = "http://remote-component-test.wincent.com/packages/vanilla-counter/index.js");
-
-			Click(
-				key_entryName = "Vanilla Counter",
-				locator1 = "ClientExtension#ENTRY_ELLIPSIS_BUTTON");
-
-			Click(
-				key_menuItem = "Export as JSON",
-				locator1 = "MenuItem#DROPDOWN_MENU_ITEM");
-
-			ClientExtensionGeneral.deleteRemoteApp(tableEntry = "Vanilla Counter");
-		}
-
-		task ("When the import option is selected") {
-			Click(locator1 = "Icon#SVG_ELLIPSIS");
-
-			DropdownMenuItem.click(menuItem = "Import");
-		}
-
-		task ("And the client-extension json file is selected") {
-			var sampleFileName = TestCase.getDownloadedTempFileName(fileNamePattern = "client-extension-*.json");
-			var tempFileDirectory = selenium.getOutputDirName();
-
-			var filePath = "${tempFileDirectory}/${sampleFileName}";
-
-			UploadFile(
-				locator1 = "TextInput#FILE",
-				value1 = ${filePath});
-		}
-
-		task ("And click the cancel button") {
-			Click(
-				key_text = "Cancel",
-				locator1 = "Button#ANY");
-		}
-
-		task ("Then confirm that there is no Client Extension entry") {
-			AssertElementNotPresent(
-				key_tableEntryName = "Vanilla Counter",
-				locator1 = "ClientExtension#TABLE_ENTRY_NAME_REMOTE_TABLE");
-		}
-	}
-
 	@description = "LPS-182184. Verify it's possible to cancel the updating of an existing client extension. Blocked by LPS-189916"
 	@ignore = "true"
 	@priority = 3
@@ -418,115 +272,6 @@ definition {
 	test CanUpdateExistingClientExtension {
 	}
 
-	@description = "LPS-182184. Verify the JSON field is present when the user clicks on Import button. Blocked by LPS-189881."
-	@ignore = "true"
-	@priority = 4
-	test CanViewImportField {
-		task ("Given the admin page of Client Extension") {
-			ClientExtensionGeneral.goToRemoteAppsPortlet();
-		}
-
-		task ("When you click the ellipsis button in the upper right corner") {
-			Click(locator1 = "Icon#SVG_ELLIPSIS");
-		}
-
-		task ("And you click the import option") {
-			DropdownMenuItem.click(menuItem = "Import");
-		}
-
-		task ("Then “JSON file” field is present") {
-			AssertVisible(
-				key_fieldLabel = "JSON File",
-				locator1 = "FormFields#FIELD_DISABLED");
-		}
-
-		task ("And The text "The file containing the code with the client extension." is displayed under the field ") {
-			AssertVisible(
-				key_message = "The file containing the code with the client extension.",
-				locator1 = "DataSet#MODAL_MESSAGE");
-		}
-
-		task ("And the button Clear is not present") {
-			AssertElementNotPresent(
-				key_text = "Clear",
-				locator1 = "Button#ANY");
-		}
-	}
-
-	@description = "LPS-162031. The site administrator could add a CSS remote app."
-	@priority = 3
-	test CSSCanBeCreated {
-		task ("Given a site administrator accesses to the Client Extensions admin") {
-			HeadlessSite.addSite(siteName = "Test Site Name");
-
-			JSONDocument.addFileWithUploadedFile(
-				dmDocumentTitle = "Font Family",
-				groupName = "Test Site Name",
-				mimeType = "text/css",
-				sourceFileName = "font_family.css");
-
-			var url = JSONDocument.getLatestVersionURL(
-				dmDocumentTitle = "Font Family",
-				groupName = "Test Site Name");
-
-			ClientExtensionGeneral.goToRemoteAppsPortlet();
-		}
-
-		task ("When the site administrator creates a CSS remote app") {
-			ClientExtensionGeneral.addType(type = "Add CSS");
-
-			ClientExtensionGeneral.addApp(
-				entryName = "Font Family",
-				entryURL = ${url});
-		}
-
-		task ("Then the site administrator sees the created CSS remote app") {
-			ClientExtensionGeneral.viewTableEntryName(entryName = "Font Family");
-
-			JSONGroup.deleteGroupByName(groupName = "Test Site Name");
-		}
-	}
-
-	@description = "Verify that client extension of type Custom Element can be created"
-	@priority = 5
-	test CustomElementCanBeCreated {
-		property app.server.types = "tomcat";
-		property database.types = "mysql";
-		property environment.acceptance = "false";
-		property operating.system.types = "alpine,amazonlinux,centos,debian,fedora,orcllinux,osx,redhat,rockylinux,solaris,suse,ubuntu,windows";
-		property portal.acceptance = "true";
-
-		task ("Create Vanilla Counter as a Custom Element") {
-			ClientExtensionGeneral.goToRemoteAppsPortlet();
-
-			ClientExtensionGeneral.addCustomElementAllFields(
-				entryCssurl = "https://liferay.github.io/liferay-frontend-projects/index.css",
-				entryHtmlName = "vanilla-counter",
-				entryName = "Vanilla Counter",
-				entryProperties = "test-data-user=QAuser",
-				entryURL = "https://liferay.github.io/liferay-frontend-projects/vanilla-counter/index.js");
-		}
-
-		task ("Assert that the Vanilla Counter is listed") {
-			ClientExtensionGeneral.viewTableEntries(
-				entryName = "Vanilla Counter",
-				entryType = "Custom Element");
-		}
-
-		task ("Assert that the Vanilla Counter fields have been saved correctly") {
-			Click(
-				key_tableEntryName = "Vanilla Counter",
-				locator1 = "ClientExtension#TABLE_ENTRY_NAME_REMOTE_TABLE");
-
-			ClientExtensionGeneral.assertCustomElementFields(
-				entryCssurl = "https://liferay.github.io/liferay-frontend-projects/index.css",
-				entryHtmlName = "vanilla-counter",
-				entryName = "Vanilla Counter",
-				entryProperties = "test-data-user=QAuser",
-				entryURL = "https://liferay.github.io/liferay-frontend-projects/vanilla-counter/index.js");
-		}
-	}
-
 	@description = "LPS-158083. Client Extension using non-root portal context"
 	@priority = 4
 	test CustomElementCanBeCreatedInNonRootContext {
@@ -597,27 +342,6 @@ definition {
 		}
 	}
 
-	@description = "LPS-139377. Verify that remote app of type Custom Element can be deleted"
-	@priority = 4
-	test CustomElementCanBeDeleted {
-		task ("Create Vanilla Counter as a Custom Element") {
-			JSONClientExtension.addCustomElementRemoteAppEntry(
-				customElementHtmlName = "vanilla-counter",
-				customElementName = "Vanilla Counter",
-				customElementURL = "https://liferay.github.io/liferay-frontend-projects/vanilla-counter/index.js");
-		}
-
-		task ("Delete Vanilla Counter") {
-			ClientExtensionGeneral.goToRemoteAppsPortlet();
-
-			ClientExtensionGeneral.deleteRemoteApp(tableEntry = "Vanilla Counter");
-		}
-
-		task ("Assert that Vanilla Counter has been deleted") {
-			ClientExtensionGeneral.assertTableEntryNameNotPresent(entryName = "Vanilla Counter");
-		}
-	}
-
 	@description = "LPS-139377. Verify that remote app of type Custom Element can be displayed by portlet"
 	@priority = 5
 	test CustomElementCanBeDisplayedByPortlet {
@@ -660,50 +384,6 @@ definition {
 		}
 	}
 
-	@description = "LPS-139377. Verify that remote app of type Custom Element can be edited"
-	@priority = 4
-	test CustomElementCanBeEdited {
-		var remoteAppName = "New Counter";
-
-		task ("Create a Custom Element") {
-			JSONClientExtension.addCustomElementRemoteAppEntry(
-				customElementHtmlName = "new-counter",
-				customElementName = "New Counter",
-				customElementURL = "https://liferay.github.io/liferay-frontend-projects/vanilla-counter/index.js");
-		}
-
-		task ("Edit the fields of the Custom Element") {
-			ClientExtensionGeneral.goToRemoteAppsPortlet();
-
-			Click(
-				key_tableEntryName = ${remoteAppName},
-				locator1 = "ClientExtension#TABLE_ENTRY_NAME_REMOTE_TABLE");
-
-			ClientExtensionGeneral.editCustomElement(
-				entryCssurl = "https://liferay.github.io/liferay-frontend-projects/index.css",
-				entryHtmlName = "vanilla-counter-edited",
-				entryName = "Vanilla Counter Edited",
-				entryProperties = "test-data-user=QAuser");
-		}
-
-		task ("Assert that the Custom Element is listed") {
-			ClientExtensionGeneral.viewTableEntryName(entryName = "Vanilla Counter Edited");
-		}
-
-		task ("Assert that the fields have been updated") {
-			Click(
-				key_tableEntryName = "Vanilla Counter Edited",
-				locator1 = "ClientExtension#TABLE_ENTRY_NAME_REMOTE_TABLE");
-
-			ClientExtensionGeneral.assertCustomElementFields(
-				entryCssurl = "https://liferay.github.io/liferay-frontend-projects/index.css",
-				entryHtmlName = "vanilla-counter-edited",
-				entryName = "Vanilla Counter Edited",
-				entryProperties = "test-data-user=QAuser",
-				entryURL = "https://liferay.github.io/liferay-frontend-projects/vanilla-counter/index.js");
-		}
-	}
-
 	@description = "LPS-139377. Verify that remote app of type Custom Element can be instanceable in a Content Page"
 	@priority = 3
 	test CustomElementCanBeInstanceable {
@@ -763,64 +443,6 @@ definition {
 		}
 	}
 
-	@description = "LPS-158832. Verify remote app can be configured one its portlet name has been changed"
-	@priority = 3
-	test CustomElementCanConfigurePortletName {
-		task ("Given Create Vanilla Counter as a Custom Element") {
-			JSONClientExtension.addCustomElementRemoteAppEntry(
-				customElementHtmlName = "vanilla-counter",
-				customElementName = "Vanilla Counter",
-				customElementURL = "https://liferay.github.io/liferay-frontend-projects/vanilla-counter/index.js");
-		}
-
-		task ("When adding created portlet to a widget page") {
-			ClientExtension.addPortletToWidgetPage(
-				portletName = "Vanilla Counter",
-				widgetPageName = "Test Page");
-		}
-
-		task ("And change Vanilla Counter portlet name") {
-			ClientExtensionGeneral.goToRemoteAppsPortlet();
-
-			Click(
-				key_tableEntryName = "Vanilla Counter",
-				locator1 = "ClientExtension#TABLE_ENTRY_NAME_REMOTE_TABLE");
-
-			Type(
-				key_text = "Name",
-				locator1 = "TextInput#ANY",
-				value1 = "Vanilla Counter Modified");
-
-			PortletEntry.publish();
-		}
-
-		task ("Then assert that Vanilla Counter name has been changed in Widget Page Editor") {
-			Navigator.gotoPage(pageName = "Test Page");
-
-			Click(locator1 = "ControlMenu#ADD");
-
-			AssertElementPresent(locator1 = "ControlMenuAddPanel#SIDEBAR_HEADER");
-
-			Navigator.gotoNavTab(navTab = "Widgets");
-
-			WaitForElementPresent(locator1 = "NavBar#APPLICATION_SEARCH_FIELD");
-
-			Type(
-				locator1 = "NavBar#APPLICATION_SEARCH_FIELD",
-				value1 = "Vanilla Counter Modified");
-
-			AssertElementPresent(
-				key_remoteAppName = "Vanilla Counter Modified",
-				locator1 = "ClientExtension#APPLICATION_SEARCH_FIELD_WIDGET_SEARCH_REMOTE_APP");
-		}
-
-		task ("Then assert Vanilla Counter continues displayed") {
-			Navigator.gotoPage(pageName = "Test Page");
-
-			AssertElementPresent(locator1 = "ClientExtension#VANILLA_COUNTER_REMOTE_APP");
-		}
-	}
-
 	@description = "LPS-139377. Verify that remote app of type Custom Element can displayed properties in HTML"
 	@priority = 3
 	test CustomElementCanInjectHTMLProperties {
@@ -849,26 +471,6 @@ definition {
 		}
 	}
 
-	@description = "LPS-139377. Verify that remote app of type Custom Element can save multiple URLs"
-	@priority = 4
-	test CustomElementCanSaveMultipleURLs {
-		task ("Create Vanilla Counter as a Custom Element") {
-			ClientExtensionGeneral.goToRemoteAppsPortlet();
-
-			ClientExtensionGeneral.addCustomElementMultipleURLs();
-		}
-
-		task ("Go to edit entry") {
-			Click(
-				key_tableEntryName = "Vanilla Counter",
-				locator1 = "ClientExtension#TABLE_ENTRY_NAME_REMOTE_TABLE");
-		}
-
-		task ("Assert multiple URL fields are saved") {
-			ClientExtensionGeneral.assertCustomElementMultipleURLFields();
-		}
-	}
-
 	@description = "LPS-159013. ES module custom element portlets render incorrect script node when dragged in the UI"
 	@priority = 4
 	test CustomElementRendersCorrectlyWhenPlacedOnWidgetPage {
@@ -940,35 +542,6 @@ definition {
 		}
 	}
 
-	@description = "LPS-154718. Validate Client Extensions UI has an understandable error message when user inputs an invalid URL."
-	@priority = 4
-	test HasAnUnderstandableErrorMessageWhenURLInvalid {
-		task ("Given Add IFrame Client Extensions") {
-			ApplicationsMenu.gotoPortlet(
-				category = "Custom Apps",
-				panel = "Applications",
-				portlet = "Client Extensions");
-
-			ClientExtensionGeneral.addType(type = "IFrame");
-		}
-
-		task ("When type testurl in URL field and a valid name is entered") {
-			ClientExtensionGeneral.addApp(
-				entryName = "Test Name",
-				entryURL = ${testURL});
-		}
-
-		task ("And When attempt to save the remote app") {
-			Button.clickPublish();
-		}
-
-		task ("Then error message 'Please enter a valid URL' appears") {
-			AssertTextEquals.assertPartialText(
-				locator1 = "Message#ERROR_ENTER_A_VALID_URL",
-				value1 = "Please enter a valid URL.");
-		}
-	}
-
 	@description = "LPS-154718. Validate Client Extensions UI has a clear error message when all the mandatory fields are empty."
 	@priority = 4
 	test HasMandatoryFieldErrorMessagesWhenEmpty {
@@ -1086,60 +659,6 @@ definition {
 		ClientExtensionGeneral.viewTableEntryName(entryName = "Test Remote App");
 	}
 
-	@description = "LPS-139377. Verify that remote app type IFrame can display property fields"
-	@priority = 4
-	test IframeTypeCanDisplayProperFields {
-		property portal.acceptance = "true";
-
-		ClientExtensionGeneral.goToRemoteAppsPortlet();
-
-		ClientExtensionGeneral.addType(type = "Custom Element");
-
-		AssertVisible(
-			key_text = "HTML Element Name",
-			locator1 = "TextInput#ANY");
-
-		AssertVisible(
-			key_text = "CSS URL",
-			locator1 = "TextInput#ANY");
-
-		Click(locator1 = "Button#BACK");
-
-		ClientExtensionGeneral.addType(type = "IFrame");
-
-		AssertElementNotPresent(
-			key_text = "HTML Element Name",
-			locator1 = "TextInput#ANY");
-
-		AssertElementNotPresent(
-			key_text = "CSS URL",
-			locator1 = "TextInput#ANY");
-	}
-
-	@description = "LPS-166479. Created (theme SVG extensions), the theme SVG extensions admin page lists the name and type"
-	@priority = 4
-	test ThemeSvgTypeCanBeCreated {
-		task ("Given a created Client Extension") {
-			ClientExtensionGeneral.goToRemoteAppsPortlet();
-		}
-
-		task ("When type is Theme svg extensions") {
-			ClientExtensionGeneral.addType(type = "Theme SVG Spritemap");
-		}
-
-		task ("And when adding requirements,and click in publish") {
-			ClientExtensionGeneral.addApp(
-				entryName = "speitemap_example.svg",
-				entryURL = "https://liferay.github.io/liferay-frontend-projects/spritemap-svg/spritemap-pencil-swapped- with-cog.svg");
-		}
-
-		task ("Then theme svg extensions admin page lists the Name and Type") {
-			ClientExtensionGeneral.viewTableEntryName(entryName = "speitemap_example.svg");
-
-			ClientExtensionGeneral.viewTableEntryType(entryType = "Theme SVG Spritemap");
-		}
-	}
-
 	@description = "LPS-154725. Verify that the UI label is present when a client extension is not created through osgi"
 	@priority = 3
 	test UILabelIsPresent {
diff --git a/portal-web/test/functional/com/liferay/portalweb/tests/enduser/frontendinfrastructure/uiinfrastructure/remotewebapps/ClientExtensionJSImportMap.testcase b/portal-web/test/functional/com/liferay/portalweb/tests/enduser/frontendinfrastructure/uiinfrastructure/remotewebapps/ClientExtensionJSImportMap.testcase
index c54783526b8bc4..244b2815d2ce35 100644
--- a/portal-web/test/functional/com/liferay/portalweb/tests/enduser/frontendinfrastructure/uiinfrastructure/remotewebapps/ClientExtensionJSImportMap.testcase
+++ b/portal-web/test/functional/com/liferay/portalweb/tests/enduser/frontendinfrastructure/uiinfrastructure/remotewebapps/ClientExtensionJSImportMap.testcase
@@ -77,46 +77,6 @@ definition {
 		}
 	}
 
-	@description = "LPS-180167. Verify if has possible change the language on language icon"
-	@priority = 3
-	test CanChangeLanguage {
-		task ("And changes the language flag icon to Spanish flag") {
-			Click(
-				key_locale = "en-US",
-				locator1 = "Translation#CURRENT_LOCALE_NAME");
-
-			DropdownMenuItem.click(menuItem = "es-ES");
-		}
-
-		task ("And types “Cambiar formato de fecha” on Name field") {
-			Type(
-				key_text = "Name",
-				locator1 = "TextInput#ANY",
-				value1 = "Cambiar formato de fecha");
-		}
-
-		task ("And changes the language icon to English and Spanish again") {
-			Click(
-				key_locale = "es-ES",
-				locator1 = "Translation#CURRENT_LOCALE_NAME");
-
-			DropdownMenuItem.click(menuItem = "en-US");
-
-			Click(
-				key_locale = "en-US",
-				locator1 = "Translation#CURRENT_LOCALE_NAME");
-
-			DropdownMenuItem.click(menuItem = "es-ES");
-		}
-
-		task ("Then the title and information about the fields are displayed in Spanish") {
-			AssertTextEquals(
-				key_text = "Name",
-				locator1 = "TextInput#ANY",
-				value1 = "Cambiar formato de fecha");
-		}
-	}
-
 	@description = "LPS-180167. Verify if is possible publish with only requireds fields"
 	@priority = 5
 	test CanCreateWithOnlyRequiredFieldsFilled {
@@ -158,62 +118,6 @@ definition {
 		}
 	}
 
-	@description = "LPS-180167. Verify if the Additional Resources field can be hidden"
-	@priority = 3
-	test CanHiddenAdditionalResourcesField {
-		task ("And clicks on Additional Resources collapse icon") {
-			ClientExtensionGeneral.openOrCloseCollapseField(
-				key_fieldName = "Additional Resources",
-				key_status = "Close");
-		}
-
-		task ("Then Name and Description fields are hidden") {
-			AssertNotVisible(
-				key_fieldName = "Source Code URL",
-				locator1 = "ClientExtension#ANY_FIELD");
-		}
-	}
-
-	@description = "LPS-180167. Verify if the Content field can be hidden"
-	@priority = 3
-	test CanHiddenContentField {
-		task ("And clicks on Content collapse icon") {
-			ClientExtensionGeneral.openOrCloseCollapseField(
-				key_fieldName = "Content",
-				key_status = "Close");
-		}
-
-		task ("Then JS URL field is hidden") {
-			AssertNotVisible(
-				key_fieldName = "JavaScript URL",
-				locator1 = "ClientExtension#ANY_FIELD");
-
-			AssertNotVisible(
-				key_fieldName = "Bare Specifier",
-				locator1 = "ClientExtension#ANY_FIELD");
-		}
-	}
-
-	@description = "LPS-180167. Verify if the Identity field can be hidden"
-	@priority = 3
-	test CanHiddenIdentityField {
-		task ("And clicks on Identity collapse icon") {
-			ClientExtensionGeneral.openOrCloseCollapseField(
-				key_fieldName = "Identity",
-				key_status = "Close");
-		}
-
-		task ("Then Name and Description fields are hidden") {
-			AssertNotVisible(
-				key_fieldName = "Name",
-				locator1 = "ClientExtension#ANY_FIELD");
-
-			AssertNotVisible(
-				key_fieldName = "Description",
-				locator1 = "ClientExtension#ANY_FIELD");
-		}
-	}
-
 	@description = "LPS-180167. Verify if not is possible publish when Bare Specifier field is empty"
 	@priority = 5
 	test CannotPublishWhenBareSpecifierFieldIsEmpty {
@@ -300,91 +204,4 @@ definition {
 		}
 	}
 
-	@description = "LPS-180167. Verify if JavaScript URL field can convert text to .js"
-	@priority = 4
-	test CanPublishWithAnTextOnJSField {
-		task ("And fills Name field") {
-			Type.typeNoMouseOver(
-				key_text = "Name",
-				locator1 = "TextInput#ANY",
-				value1 = "JS Import Map Entry Test");
-		}
-
-		task ("And fills Bare Specifier field") {
-			Type.typeNoMouseOver(
-				key_text = "Bare Specifier",
-				locator1 = "TextInput#ANY",
-				value1 = "bare-specifier-test");
-		}
-
-		task ("And types "Lorem Ipsum is simply dummy text of the printing and typesetting industry." in JavaScript URL field") {
-			Type.typeNoMouseOver(
-				key_text = "JavaScript URL",
-				locator1 = "TextInput#ANY",
-				value1 = "Lorem Ipsum is simply dummy text of the printing and typesetting industry.");
-		}
-
-		task ("And clicks on Publish button") {
-			Button.clickPublish();
-		}
-
-		task ("Then an success message should be displayed ") {
-			Alert.viewSuccessMessage();
-		}
-
-		task ("And entry name is present on Client Extension admin page") {
-			AssertElementPresent(
-				key_tableEntryName = "JS Import Map Entry Test",
-				locator1 = "ClientExtension#TABLE_ENTRY_NAME_REMOTE_TABLE");
-		}
-	}
-
-	@description = "LPS-180167. Verify if Source Code URL field can convert text to URL"
-	@priority = 4
-	test CanPublishWithAnTextOnSourceCodeURLField {
-		task ("And fills Name field") {
-			Type.typeNoMouseOver(
-				key_text = "Name",
-				locator1 = "TextInput#ANY",
-				value1 = "JS Import Map Entry Test");
-		}
-
-		task ("And fills Bare Specifier field") {
-			Type.typeNoMouseOver(
-				key_text = "Bare Specifier",
-				locator1 = "TextInput#ANY",
-				value1 = "bare-specifier-test");
-		}
-
-		task ("And fills JavaScript URL field") {
-			Type.typeNoMouseOver(
-				key_text = "JavaScript URL",
-				locator1 = "TextInput#ANY",
-				value1 = "https://liferay.github.io/liferay-frontend-projects/");
-		}
-
-		task ("And types “Lorem Ipsum is simply dummy text of the printing and typesetting industry.” on Source Code URL field") {
-			Type(
-				key_text = "Source Code URL",
-				locator1 = "TextInput#ANY",
-				value1 = "Lorem Ipsum is simply dummy text of the printing and typesetting industry.");
-		}
-
-		task ("And clicks on Publish button") {
-			Button.clickPublish();
-		}
-
-		task ("Then an success message should be displayed") {
-			Alert.viewSuccessMessage();
-		}
-
-		task ("And entry name is present on Client Extension admin page") {
-			ClientExtensionGeneral.goToRemoteAppsPortlet();
-
-			AssertElementPresent(
-				key_tableEntryName = "JS Import Map Entry Test",
-				locator1 = "ClientExtension#TABLE_ENTRY_NAME_REMOTE_TABLE");
-		}
-	}
-
 }
\ No newline at end of file
diff --git a/portal-web/test/functional/com/liferay/portalweb/tests/enduser/frontendinfrastructure/uiinfrastructure/remotewebapps/ClientExtensionThemeCSS.testcase b/portal-web/test/functional/com/liferay/portalweb/tests/enduser/frontendinfrastructure/uiinfrastructure/remotewebapps/ClientExtensionThemeCSS.testcase
deleted file mode 100644
index dd2e415ee54861..00000000000000
--- a/portal-web/test/functional/com/liferay/portalweb/tests/enduser/frontendinfrastructure/uiinfrastructure/remotewebapps/ClientExtensionThemeCSS.testcase
+++ /dev/null
@@ -1,88 +0,0 @@
-@component-name = "portal-frontend-infrastructure"
-definition {
-
-	property portal.release = "true";
-	property portal.upstream = "true";
-	property testray.main.component.name = "Frontend Client Extensions";
-
-	static var randomSiteName = StringUtil.randomString(8);
-
-	setUp {
-		task ("Set up virtual instance") {
-			TestCase.setUpPortalInstance();
-		}
-
-		task ("Sign in") {
-			User.firstLoginPG();
-		}
-
-		task ("Add a site") {
-			HeadlessSite.addSite(siteName = ${randomSiteName});
-		}
-	}
-
-	@description = "This is a test for LPS-162031. The site administrator could add a JS remote app."
-	@priority = 3
-	test JSCanBeCreated {
-		task ("Given a site administrator accesses to the Remote Apps admin") {
-			JSONDocument.addFileWithUploadedFile(
-				dmDocumentTitle = "Text Color",
-				groupName = ${randomSiteName},
-				mimeType = "application/javascript",
-				sourceFileName = "TextColor.js");
-
-			var url = JSONDocument.getLatestVersionURL(
-				dmDocumentTitle = "Text Color",
-				groupName = ${randomSiteName});
-
-			ClientExtensionGeneral.goToRemoteAppsPortlet();
-		}
-
-		task ("When the site administrator creates a JS remote app") {
-			var entryName = StringUtil.randomString(8);
-
-			ClientExtensionGeneral.addType(type = "Add JS");
-
-			ClientExtensionGeneral.addApp(
-				entryName = ${entryName},
-				entryURL = ${url});
-		}
-
-		task ("Then the site administrator sees the created JS remote app") {
-			ClientExtensionGeneral.viewTableEntryName(entryName = ${entryName});
-		}
-	}
-
-	@description = "This is a test for LPS-162031. The site administrator could add a Theme CSS remote app."
-	@priority = 3
-	test ThemeCSSCanBeCreated {
-		task ("Given a site administrator accesses to the Remote Apps admin") {
-			JSONDocument.addFileWithUploadedFile(
-				dmDocumentTitle = "Font Family",
-				groupName = ${randomSiteName},
-				mimeType = "text/css",
-				sourceFileName = "font_family.css");
-
-			var url = JSONDocument.getLatestVersionURL(
-				dmDocumentTitle = "Font Family",
-				groupName = ${randomSiteName});
-
-			ClientExtensionGeneral.goToRemoteAppsPortlet();
-		}
-
-		task ("When the site administrator create a Theme CSS remote app") {
-			var entryName = StringUtil.randomString(8);
-
-			ClientExtensionGeneral.addType(type = "Add Theme CSS");
-
-			ClientExtensionGeneral.addApp(
-				entryName = ${entryName},
-				mainURL = ${url});
-		}
-
-		task ("Then the site administrator sees the created Theme CSS remote app") {
-			ClientExtensionGeneral.viewTableEntryName(entryName = ${entryName});
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/portal-web/test/functional/com/liferay/portalweb/tests/enduser/frontendinfrastructure/uiinfrastructure/remotewebapps/ClientExtensionThemeSvg.testcase b/portal-web/test/functional/com/liferay/portalweb/tests/enduser/frontendinfrastructure/uiinfrastructure/remotewebapps/ClientExtensionThemeSvg.testcase
index bb64f7b7801d55..61c2686aca6e3e 100644
--- a/portal-web/test/functional/com/liferay/portalweb/tests/enduser/frontendinfrastructure/uiinfrastructure/remotewebapps/ClientExtensionThemeSvg.testcase
+++ b/portal-web/test/functional/com/liferay/portalweb/tests/enduser/frontendinfrastructure/uiinfrastructure/remotewebapps/ClientExtensionThemeSvg.testcase
@@ -78,34 +78,4 @@ definition {
 		}
 	}
 
-	@description = "LPS-173318. Verify that new SVG spritemap file from external site is applied on the page"
-	@priority = 3
-	test CanExtendSvgFileFromExternalSite {
-		property portal.acceptance = "false";
-
-		task ("A created Theme svg extensions using the external URL") {
-			ClientExtensionGeneral.goToRemoteAppsPortlet();
-
-			ClientExtensionGeneral.addThemeSvgSpritemap(
-				entryName = "external_url_theme",
-				entryURL = "https://liferay.github.io/liferay-frontend-projects/spritemap-svg/spritemap-pencil-swapped-with-cog.svg");
-		}
-
-		task ("And given Go to edit the 'Look and Feel' on page / When Update with registered 'Theme Spritemap Client Extension'") {
-			PagesAdmin.openPagesAdmin(siteURLKey = "guest");
-
-			ClientExtensionGeneral.changeSiteCurrentThemeSvgSpritemap(entryName = "external_url_theme");
-		}
-
-		task ("And When: Navigate to home page") {
-			ProductMenu.gotoHomePage();
-		}
-
-		task ("Then: new SVG spritemap is applied on the page") {
-			AssertVisible(locator1 = "ClientExtension#PENCIL_ICON_IN_CONFIG_ICON_POSITION");
-
-			AssertVisible(locator1 = "ClientExtension#COG_ICON_IN_EDIT_ICON_POSITION");
-		}
-	}
-
 }
\ No newline at end of file
diff --git a/portal-web/test/functional/com/liferay/portalweb/tests/enduser/frontendinfrastructure/uiinfrastructure/remotewebapps/ClientExtensionWorkflow.testcase b/portal-web/test/functional/com/liferay/portalweb/tests/enduser/frontendinfrastructure/uiinfrastructure/remotewebapps/ClientExtensionWorkflow.testcase
deleted file mode 100644
index 1292f4da836360..00000000000000
--- a/portal-web/test/functional/com/liferay/portalweb/tests/enduser/frontendinfrastructure/uiinfrastructure/remotewebapps/ClientExtensionWorkflow.testcase
+++ /dev/null
@@ -1,308 +0,0 @@
-@component-name = "portal-frontend-infrastructure"
-definition {
-
-	property portal.release = "true";
-	property portal.upstream = "true";
-	property testray.main.component.name = "Frontend Client Extensions";
-
-	setUp {
-		TestCase.setUpPortalInstance();
-
-		User.firstLoginPG();
-	}
-
-	tearDown {
-		var testLiferayVirtualInstance = PropsUtil.get("test.liferay.virtual.instance");
-
-		if (${testLiferayVirtualInstance} == "true") {
-			PortalInstances.tearDownCP();
-		}
-	}
-
-	@description = "LPS-141280. Verify approved remote app portlet can be added to page"
-	@priority = 4
-	test AdminCanApproveRemotePortlet {
-		task ("Apply workflow approval process to remote apps") {
-			ClientExtensionWorkflow.applyWorkflow();
-		}
-
-		task ("Add user with permissions to create remote app") {
-			Permissions.setUpRegRoleLoginUserCP(
-				roleTitle = "New Regular Role",
-				userEmailAddress = "userea@liferay.com",
-				userFirstName = "userfn",
-				userLastName = "userln",
-				userScreenName = "usersn");
-
-			ClientExtensionWorkflow.addUserPermissions();
-		}
-
-		task ("Create remote app as user with permissions") {
-			User.logoutAndLoginPG(
-				userLoginEmailAddress = "userea@liferay.com",
-				userLoginFullName = "userfn userln");
-
-			ClientExtensionGeneral.goToRemoteAppsPortlet();
-
-			ClientExtensionWorkflow.addApp(
-				entryName = "Test Remote App",
-				entryURL = "http://www.liferay.com");
-		}
-
-		task ("Approve remote app as admin") {
-			User.logoutAndLoginPG(
-				userLoginEmailAddress = "test@liferay.com",
-				userLoginFullName = "Test Test");
-
-			UserBar.gotoDropdownItem(dropdownItem = "My Workflow Tasks");
-
-			Navigator.gotoNavTab(navTab = "Assigned to My Roles");
-
-			Workflow.assignTaskToUser(
-				assetTitle = "Client Extension Entry",
-				assetType = "Client Extension Entry",
-				assigneeName = "test (Test Test)",
-				workflowTask = "Review");
-
-			Workflow.approveTaskByActions(
-				workflowAssetTitle = "Client Extension Entry",
-				workflowAssetType = "Client Extension Entry",
-				workflowTask = "Review");
-		}
-
-		task ("Assert remote app approved status") {
-			ClientExtensionGeneral.goToRemoteAppsPortlet();
-
-			ClientExtensionWorkflow.assertTableStatus(
-				entryName = "Test Remote App",
-				entryStatus = "Approved");
-		}
-
-		task ("Create widget page") {
-			JSONLayout.addPublicLayout(
-				groupName = "Guest",
-				layoutName = "Test Page");
-
-			Navigator.gotoPage(pageName = "Test Page");
-		}
-
-		task ("Assert remote app portlet can be added to page") {
-			Portlet.addPGCmd(portletName = "Test Remote App");
-
-			AssertElementPresent(
-				key_portletName = "Test Remote App",
-				locator1 = "Portlet#TITLE");
-		}
-	}
-
-	@description = "LPS-141280. Verify rejected remote app portlet cannot be added to page"
-	@priority = 5
-	test AdminCanRejectRemotePortlet {
-		property portal.acceptance = "true";
-
-		task ("Given workflow approval process applied to remote apps") {
-			ClientExtensionWorkflow.applyWorkflow();
-		}
-
-		task ("And given a user with permissions to create remote app") {
-			Permissions.setUpRegRoleLoginUserCP(
-				roleTitle = "New Regular Role",
-				userEmailAddress = "userea@liferay.com",
-				userFirstName = "userfn",
-				userLastName = "userln",
-				userScreenName = "usersn");
-
-			ClientExtensionWorkflow.addUserPermissions();
-		}
-
-		task ("And given a remote app created as user with permissions") {
-			User.logoutAndLoginPG(
-				userLoginEmailAddress = "userea@liferay.com",
-				userLoginFullName = "userfn userln");
-
-			ClientExtensionGeneral.goToRemoteAppsPortlet();
-
-			ClientExtensionWorkflow.addApp(
-				entryName = "Test Remote App",
-				entryURL = "http://www.liferay.com");
-		}
-
-		task ("When admin rejects remote app") {
-			User.logoutAndLoginPG(
-				userLoginEmailAddress = "test@liferay.com",
-				userLoginFullName = "Test Test");
-
-			UserBar.gotoDropdownItem(dropdownItem = "My Workflow Tasks");
-
-			Navigator.gotoNavTab(navTab = "Assigned to My Roles");
-
-			Workflow.assignTaskToUser(
-				assetTitle = "Client Extension Entry",
-				assetType = "Client Extension Entry",
-				assigneeName = "test (Test Test)",
-				workflowTask = "Review");
-
-			Workflow.rejectTaskByActions(
-				workflowAssetTitle = "Client Extension Entry",
-				workflowAssetType = "Client Extension Entry",
-				workflowTask = "Review");
-		}
-
-		task ("Then Assert remote app pending status") {
-			ClientExtensionGeneral.goToRemoteAppsPortlet();
-
-			ClientExtensionWorkflow.assertTableStatus(
-				entryName = "Test Remote App",
-				entryStatus = "Pending");
-		}
-
-		task ("And Then assert remote app portlet cannot be added to page") {
-			JSONLayout.addPublicLayout(
-				groupName = "Guest",
-				layoutName = "Test Page");
-
-			Navigator.gotoPage(pageName = "Test Page");
-
-			Portlet.viewCannotAddPG(portletName = "Test Remote App");
-
-			AssertElementNotPresent(
-				key_portletName = "Test Remote App",
-				locator1 = "Portlet#TITLE");
-		}
-	}
-
-	@description = "LPS-141280. Verify remote app entry workflow can be configured at instance level"
-	@priority = 5
-	test CanConfigureWorkflowInstanceLevel {
-		property portal.acceptance = "true";
-
-		task ("Navigate to workflow configuration") {
-			Workflow.openWorkflowListView();
-
-			Navigator.gotoNavItem(navItem = "Configuration");
-		}
-
-		task ("Search for Remote App Entry") {
-			Search.searchCP(searchTerm = "Client Extension Entry");
-		}
-
-		task ("Assert Remote App Entry is listed") {
-			AssertElementPresent(
-				key_fieldName = "Client Extension Entry",
-				key_order = 1,
-				locator1 = "WorkflowConfiguration#PROCESS_BUILDER_TABLE_FIELD_NAME");
-
-			AssertElementPresent(
-				key_workflowResourceValue = "No Workflow",
-				locator1 = "WorkflowConfiguration#RESOURCE_TABLE_SELECT");
-		}
-	}
-
-	@description = "LPS-141280. Verify admin can receive notification request to approve remote app"
-	@priority = 4
-	test CanSendWorkflowNotification {
-		task ("Apply workflow approval process to remote apps") {
-			ClientExtensionWorkflow.applyWorkflow();
-		}
-
-		task ("Add user with permissions to create remote app") {
-			Permissions.setUpRegRoleLoginUserCP(
-				roleTitle = "New Regular Role",
-				userEmailAddress = "userea@liferay.com",
-				userFirstName = "userfn",
-				userLastName = "userln",
-				userScreenName = "usersn");
-
-			ClientExtensionWorkflow.addUserPermissions();
-		}
-
-		task ("Create remote app as user with permissions") {
-			User.logoutAndLoginPG(
-				userLoginEmailAddress = "userea@liferay.com",
-				userLoginFullName = "userfn userln");
-
-			ClientExtensionGeneral.goToRemoteAppsPortlet();
-
-			ClientExtensionWorkflow.addApp(
-				entryName = "Test Remote App",
-				entryURL = "http://www.liferay.com");
-		}
-
-		task ("Assert admin received notification to approve remote app") {
-			User.logoutAndLoginPG(
-				userLoginEmailAddress = "test@liferay.com",
-				userLoginFullName = "Test Test");
-
-			Notifications.gotoNotifications();
-
-			AssertElementPresent(
-				locator1 = "Notifications#NOTIFICATIONS_WORKFLOW_TITLE",
-				value1 = "userfn userln sent you a Remote App Entry for review in the workflow.");
-		}
-	}
-
-	@description = "LPS-141280. Verify pending remote app portlet cannot be added to page"
-	@priority = 4
-	test PendingRemoteAppCannotBeAddedToPage {
-		task ("Apply workflow approval process to remote apps") {
-			ClientExtensionWorkflow.applyWorkflow();
-		}
-
-		task ("Add user with permissions to create remote app") {
-			Permissions.setUpRegRoleLoginUserCP(
-				roleTitle = "New Regular Role",
-				userEmailAddress = "userea@liferay.com",
-				userFirstName = "userfn",
-				userLastName = "userln",
-				userScreenName = "usersn");
-
-			ClientExtensionWorkflow.addUserPermissions();
-		}
-
-		task ("Create remote app as user with permissions") {
-			User.logoutAndLoginPG(
-				userLoginEmailAddress = "userea@liferay.com",
-				userLoginFullName = "userfn userln");
-
-			ClientExtensionGeneral.goToRemoteAppsPortlet();
-
-			ClientExtensionWorkflow.addApp(
-				entryName = "Test Remote App",
-				entryURL = "http://www.liferay.com");
-		}
-
-		task ("Verify remote app pending status as admin") {
-			User.logoutAndLoginPG(
-				userLoginEmailAddress = "test@liferay.com",
-				userLoginFullName = "Test Test");
-
-			ClientExtensionGeneral.goToRemoteAppsPortlet();
-
-			ClientExtensionWorkflow.assertTableStatus(
-				entryName = "Test Remote App",
-				entryStatus = "Pending");
-		}
-
-		task ("Create content page") {
-			JSONLayout.addPublicLayout(
-				groupName = "Guest",
-				layoutName = "Test Page",
-				type = "content");
-
-			ContentPagesNavigator.openEditContentPage(
-				pageName = "Test Page",
-				siteName = "Guest");
-		}
-
-		task ("Assert remote app portlet cannot be added to page") {
-			Type.sendKeysApplicationSearch(
-				locator1 = "PageEditor#FRAGMENTS_AND_WIDGETS_SEARCH_FIELD",
-				value1 = "Test Remote App");
-
-			AssertElementNotPresent(
-				key_fragmentName = "Test Remote App",
-				locator1 = "PageEditor#FRAGMENTS_AND_WIDGETS_SEARCH_RESULTS");
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/portal-web/test/functional/com/liferay/portalweb/tests/enduser/frontendinfrastructure/uiinfrastructure/usecase/UIInfrastructureUsecase.testcase b/portal-web/test/functional/com/liferay/portalweb/tests/enduser/frontendinfrastructure/uiinfrastructure/usecase/UIInfrastructureUsecase.testcase
index f4bd4798a0d232..a619834851ae2a 100644
--- a/portal-web/test/functional/com/liferay/portalweb/tests/enduser/frontendinfrastructure/uiinfrastructure/usecase/UIInfrastructureUsecase.testcase
+++ b/portal-web/test/functional/com/liferay/portalweb/tests/enduser/frontendinfrastructure/uiinfrastructure/usecase/UIInfrastructureUsecase.testcase
@@ -24,35 +24,6 @@ definition {
 		}
 	}
 
-	@description = "LPS-95157. Verify control menu on an admin page is styled correctly after refreshing page"
-	@priority = 5
-	@refactordone
-	test AdminPageCanDisplayStyleCorrectlyAfterPageRefresh {
-		property app.server.types = "tomcat";
-		property database.types = "mysql";
-		property environment.acceptance = "false";
-		property operating.system.types = "alpine,amazonlinux,centos,debian,fedora,orcllinux,osx,redhat,rockylinux,solaris,suse,ubuntu,windows";
-		property portal.acceptance = "true";
-
-		ProductMenu.gotoPortlet(
-			category = "Content & Data",
-			portlet = "Web Content");
-
-		Refresh();
-
-		AssertCssValue(
-			locator1 = "//*[contains(@id,'controlMenu')]",
-			locator2 = "display",
-			value1 = "flex");
-
-		AssertCssValue(
-			locator1 = "//*[contains(@id,'controlMenu')]",
-			locator2 = "list-style",
-			value1 = "outside none none");
-
-		takeScreenshot();
-	}
-
 	@description = "LRQA-55778. Smoke test to verify portlet configuration is available, look and feel is available"
 	@priority = 5
 	@refactordone
@@ -183,29 +154,6 @@ definition {
 		}
 	}
 
-	@description = "LPS-70390. Non ascii characters would be displayed correctly, when SPA is turned off"
-	@priority = 4
-	@refactordone
-	test CanViewNonASCIICharactersWithSPADisabled {
-		property custom.properties = "javascript.single.page.application.enabled=false";
-
-		User.openUsersAdmin();
-
-		User.addCP(
-			userEmailAddress = "skandi@liferay.com",
-			userFirstName = "Skändi",
-			userLastName = "Ääkkönen",
-			userScreenName = "uskandi");
-
-		User.openUsersAdmin();
-
-		User.viewCP(
-			userEmailAddress = "skandi@liferay.com",
-			userFirstName = "Skändi",
-			userLastName = "Ääkkönen",
-			userScreenName = "uskandi");
-	}
-
 	@description = "Verify portlets have defined boundaries in 3 column page layout."
 	@priority = 5
 	@refactordone