diff --git a/AutomatedTesting/Gem/Code/enabled_gems.cmake b/AutomatedTesting/Gem/Code/enabled_gems.cmake
index 0d4d4b116f..dd68e379dd 100644
--- a/AutomatedTesting/Gem/Code/enabled_gems.cmake
+++ b/AutomatedTesting/Gem/Code/enabled_gems.cmake
@@ -47,7 +47,7 @@ set(ENABLED_GEMS
     LmbrCentral
     LyShine
     HttpRequestor
-    Atom_AtomBridge
+    Atom
     AWSCore
     AWSClientAuth
     AWSMetrics
diff --git a/AutomatedTesting/Gem/PythonTests/smoke/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/smoke/CMakeLists.txt
index af9fc142e2..73af69b93a 100644
--- a/AutomatedTesting/Gem/PythonTests/smoke/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/smoke/CMakeLists.txt
@@ -51,4 +51,18 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
             AutomatedTesting.GameLauncher
             AutomatedTesting.Assets
     )
+
+    ly_add_pytest(
+        NAME AutomatedTesting::GameLauncherWithGPU
+        TEST_SUITE sandbox
+        TEST_REQUIRES gpu
+        PATH ${CMAKE_CURRENT_LIST_DIR}/test_GameLauncher_EnterExitGameMode_Works.py
+        TIMEOUT 100
+        RUNTIME_DEPENDENCIES
+            AZ::AssetProcessor
+            AZ::PythonBindingsExample
+            Legacy::Editor
+            AutomatedTesting.GameLauncher
+            AutomatedTesting.Assets
+    )
 endif()
diff --git a/Code/Editor/CMakeLists.txt b/Code/Editor/CMakeLists.txt
index 8a5f35fb92..5a846a267a 100644
--- a/Code/Editor/CMakeLists.txt
+++ b/Code/Editor/CMakeLists.txt
@@ -111,7 +111,6 @@ ly_add_target(
             AZ::AzCore
             AZ::AzToolsFramework
             Gem::LmbrCentral.Static
-            Legacy::NewsShared
             AZ::AWSNativeSDKInit
             AZ::AtomCore
             Gem::Atom_RPI.Edit
diff --git a/Code/Editor/EditorViewportWidget.cpp b/Code/Editor/EditorViewportWidget.cpp
index fca698e88a..0f911878c3 100644
--- a/Code/Editor/EditorViewportWidget.cpp
+++ b/Code/Editor/EditorViewportWidget.cpp
@@ -463,25 +463,7 @@ void EditorViewportWidget::Update()
         SetFOV(cameraState.m_fovOrZoom);
         m_Camera.SetZRange(cameraState.m_nearClip, cameraState.m_farClip);
     }
-    else if (!ed_useNewCameraSystem)
-    {
-        m_renderViewport->GetViewportContext()->SetCameraTransform(LYTransformToAZTransform(m_Camera.GetMatrix()));
-    }
 
-    // Don't override the game mode FOV
-    if (!GetIEditor()->IsInGameMode())
-    {
-        AZ::Matrix4x4 clipMatrix;
-        AZ::MakePerspectiveFovMatrixRH(
-            clipMatrix,
-            GetFOV(),
-            aznumeric_cast<float>(width()) / aznumeric_cast<float>(height()),
-            m_Camera.GetNearPlane(),
-            m_Camera.GetFarPlane(),
-            true
-        );
-        m_renderViewport->GetViewportContext()->SetCameraProjectionMatrix(clipMatrix);
-    }
     // Reset the camera update flag now that we're finished updating our viewport context
     m_updateCameraPositionNextTick = false;
 
@@ -637,7 +619,6 @@ void EditorViewportWidget::SetViewEntity(const AZ::EntityId& viewEntityId, bool
 void EditorViewportWidget::ResetToViewSourceType(const ViewSourceType& viewSourceType)
 {
     LockCameraMovement(true);
-    m_pCameraFOVVariable = nullptr;
     m_viewEntityId.SetInvalid();
     m_cameraObjectId = GUID_NULL;
     m_viewSourceType = viewSourceType;
@@ -2416,13 +2397,26 @@ void EditorViewportWidget::CenterOnSliceInstance()
 //////////////////////////////////////////////////////////////////////////
 void EditorViewportWidget::SetFOV(float fov)
 {
-    if (m_pCameraFOVVariable)
+    if (m_viewEntityId.IsValid())
     {
-        m_pCameraFOVVariable->Set(fov);
+        Camera::CameraRequestBus::Event(m_viewEntityId, &Camera::CameraComponentRequests::SetFov, AZ::RadToDeg(fov));
     }
     else
     {
         m_camFOV = fov;
+        // Set the active camera's FOV
+        {
+            AZ::Matrix4x4 clipMatrix;
+            AZ::MakePerspectiveFovMatrixRH(
+                clipMatrix,
+                GetFOV(),
+                aznumeric_cast<float>(width()) / aznumeric_cast<float>(height()),
+                m_Camera.GetNearPlane(),
+                m_Camera.GetFarPlane(),
+                true
+            );
+            m_renderViewport->GetViewportContext()->SetCameraProjectionMatrix(clipMatrix);
+        }
     }
 
     if (m_viewPane)
@@ -2449,13 +2443,7 @@ float EditorViewportWidget::GetFOV() const
         }
     }
 
-    if (m_pCameraFOVVariable)
-    {
-        float fov;
-        m_pCameraFOVVariable->Get(fov);
-        return fov;
-    }
-    else if (m_viewEntityId.IsValid())
+    if (m_viewEntityId.IsValid())
     {
         float fov = AZ::RadToDeg(m_camFOV);
         Camera::CameraRequestBus::EventResult(fov, m_viewEntityId, &Camera::CameraComponentRequests::GetFov);
diff --git a/Code/Editor/EditorViewportWidget.h b/Code/Editor/EditorViewportWidget.h
index 682d37199c..e99c963b5a 100644
--- a/Code/Editor/EditorViewportWidget.h
+++ b/Code/Editor/EditorViewportWidget.h
@@ -505,7 +505,6 @@ protected:
 
     CPredefinedAspectRatios m_predefinedAspectRatios;
 
-    IVariable* m_pCameraFOVVariable = nullptr;
     bool m_bCursorHidden = false;
 
     void OnMenuResolutionCustom();
diff --git a/Code/Editor/MainWindow.cpp b/Code/Editor/MainWindow.cpp
index 10dfddbf8c..b2cb2fc8b6 100644
--- a/Code/Editor/MainWindow.cpp
+++ b/Code/Editor/MainWindow.cpp
@@ -41,6 +41,7 @@ AZ_POP_DISABLE_WARNING
 
 // AzToolsFramework
 #include <AzToolsFramework/Application/Ticker.h>
+#include <AzToolsFramework/API/EditorWindowRequestBus.h>
 #include <AzToolsFramework/API/EditorAnimationSystemRequestBus.h>
 #include <AzToolsFramework/SourceControl/QtSourceControlNotificationHandler.h>
 #include <AzToolsFramework/PythonTerminal/ScriptTermDialog.h>
@@ -93,6 +94,8 @@ AZ_POP_DISABLE_WARNING
 #include "AssetEditor/AssetEditorWindow.h"
 #include "ActionManager.h"
 
+#include <ImGuiBus.h>
+
 using namespace AZ;
 using namespace AzQtComponents;
 using namespace AzToolsFramework;
@@ -489,6 +492,16 @@ void MainWindow::Initialize()
     ActionOverrideRequestBus::Event(
         GetEntityContextId(), &ActionOverrideRequests::SetupActionOverrideHandler, this);
 
+    if (auto imGuiManager = AZ::Interface<ImGui::IImGuiManager>::Get())
+    {
+        auto handleImGuiStateChangeFn = [](bool enabled)
+        {
+            EditorWindowUIRequestBus::Broadcast(&EditorWindowUIRequests::SetEditorUiEnabled, enabled);
+        };
+        m_handleImGuiStateChangeHandler = ImGui::IImGuiManager::ImGuiSetEnabledEvent::Handler(handleImGuiStateChangeFn);
+        imGuiManager->ConnectImGuiSetEnabledChangedHandler(m_handleImGuiStateChangeHandler);
+    }
+
     AzToolsFramework::EditorEventsBus::Broadcast(&AzToolsFramework::EditorEvents::NotifyMainWindowInitialized, this);
 }
 
diff --git a/Code/Editor/MainWindow.h b/Code/Editor/MainWindow.h
index 34b121537d..99af2ea326 100644
--- a/Code/Editor/MainWindow.h
+++ b/Code/Editor/MainWindow.h
@@ -249,6 +249,7 @@ private:
 
     QPointer<ToolbarCustomizationDialog> m_toolbarCustomizationDialog;
     QScopedPointer<AzToolsFramework::QtSourceControlNotificationHandler> m_sourceControlNotifHandler;
+    AZ::Event<bool>::Handler m_handleImGuiStateChangeHandler;
     AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
 
     static MainWindow* m_instance;
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/CMakeLists.txt b/Code/Editor/Plugins/ComponentEntityEditorPlugin/CMakeLists.txt
index 4744b4e174..5aab2a2056 100644
--- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/CMakeLists.txt
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/CMakeLists.txt
@@ -27,6 +27,7 @@ ly_add_target(
     BUILD_DEPENDENCIES
         PRIVATE
             3rdParty::Qt::Core
+            3rdParty::Qt::Widgets
             AZ::AzCore
             AZ::AzToolsFramework
             Legacy::CryCommon
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerDisplayOptionsMenu.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerDisplayOptionsMenu.cpp
index c1af8d76d7..a6c1ed6598 100644
--- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerDisplayOptionsMenu.cpp
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerDisplayOptionsMenu.cpp
@@ -66,3 +66,5 @@ namespace EntityOutliner
         emit OnOptionToggled(DisplayOption::AutoExpand, checked);
     }
 }
+
+#include <UI/Outliner/moc_OutlinerDisplayOptionsMenu.cpp>
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerWidget.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerWidget.cpp
index d69480b169..02dabb8b20 100644
--- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerWidget.cpp
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerWidget.cpp
@@ -269,10 +269,12 @@ OutlinerWidget::OutlinerWidget(QWidget* pParent, Qt::WindowFlags flags)
     AzToolsFramework::ComponentModeFramework::EditorComponentModeNotificationBus::Handler::BusConnect(
             AzToolsFramework::GetEntityContextId());
     AzToolsFramework::EditorEntityInfoNotificationBus::Handler::BusConnect();
+    AzToolsFramework::EditorWindowUIRequestBus::Handler::BusConnect();
 }
 
 OutlinerWidget::~OutlinerWidget()
 {
+    AzToolsFramework::EditorWindowUIRequestBus::Handler::BusDisconnect();
     AzToolsFramework::ComponentModeFramework::EditorComponentModeNotificationBus::Handler::BusDisconnect();
     AzToolsFramework::EditorEntityInfoNotificationBus::Handler::BusDisconnect();
     AzToolsFramework::EditorPickModeNotificationBus::Handler::BusDisconnect();
@@ -1321,16 +1323,25 @@ static void SetEntityOutlinerState(Ui::OutlinerWidgetUI* entityOutlinerUi, const
     AzQtComponents::SetWidgetInteractEnabled(entityOutlinerUi->m_searchWidget, on);
 }
 
+void OutlinerWidget::EnableUi(bool enable)
+{
+    SetEntityOutlinerState(m_gui, enable);
+    setEnabled(enable);
+}
+
+void OutlinerWidget::SetEditorUiEnabled(bool enable)
+{
+    EnableUi(enable);
+}
+
 void OutlinerWidget::EnteredComponentMode([[maybe_unused]] const AZStd::vector<AZ::Uuid>& componentModeTypes)
 {
-    SetEntityOutlinerState(m_gui, false);
-    setEnabled(false);
+    EnableUi(false);
 }
 
 void OutlinerWidget::LeftComponentMode([[maybe_unused]] const AZStd::vector<AZ::Uuid>& componentModeTypes)
 {
-    setEnabled(true);
-    SetEntityOutlinerState(m_gui, true);
+    EnableUi(true);
 }
 
 void OutlinerWidget::OnSliceInstantiated(const AZ::Data::AssetId& /*sliceAssetId*/, AZ::SliceComponent::SliceInstanceAddress& sliceAddress, const AzFramework::SliceInstantiationTicket& /*ticket*/)
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerWidget.hxx b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerWidget.hxx
index 75991424bb..aff305e0fe 100644
--- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerWidget.hxx
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerWidget.hxx
@@ -13,6 +13,7 @@
 
 #include <AzCore/Memory/SystemAllocator.h>
 #include <AzCore/base.h>
+#include <AzToolsFramework/API/EditorWindowRequestBus.h>
 #include <AzToolsFramework/API/ToolsApplicationAPI.h>
 #include <AzToolsFramework/ComponentMode/EditorComponentModeBus.h>
 #include <AzToolsFramework/Entity/EditorEntityInfoBus.h>
@@ -57,6 +58,7 @@ class OutlinerWidget
     , private AzToolsFramework::SliceEditorEntityOwnershipServiceNotificationBus::Handler
     , private AzToolsFramework::EditorEntityInfoNotificationBus::Handler
     , private AzToolsFramework::ComponentModeFramework::EditorComponentModeNotificationBus::Handler
+    , private AzToolsFramework::EditorWindowUIRequestBus::Handler
 {
     Q_OBJECT;
 public:
@@ -106,6 +108,9 @@ private:
     void EnteredComponentMode(const AZStd::vector<AZ::Uuid>& componentModeTypes) override;
     void LeftComponentMode(const AZStd::vector<AZ::Uuid>& componentModeTypes) override;
 
+    // EditorWindowUIRequestBus overrides
+    void SetEditorUiEnabled(bool enable) override;
+
     // Build a selection object from the given entities. Entities already in the Widget's selection buffers are ignored.
     template <class EntityIdCollection>
     QItemSelection BuildSelectionFromEntities(const EntityIdCollection& entityIds);
@@ -171,6 +176,7 @@ private:
     AZ::EntityId GetEntityIdFromIndex(const QModelIndex& index) const;
     QModelIndex GetIndexFromEntityId(const AZ::EntityId& entityId) const;
     void ExtractEntityIdsFromSelection(const QItemSelection& selection, AzToolsFramework::EntityIdList& entityIdList) const;
+    void EnableUi(bool enable);
 
     // AzToolsFramework::OutlinerModelNotificationBus::Handler
     // Receive notification from the outliner model that we should scroll
diff --git a/Code/Editor/Plugins/EditorCommon/EditorCommon.def b/Code/Editor/Plugins/EditorCommon/EditorCommon.def
deleted file mode 100644
index a8d10ff297..0000000000
--- a/Code/Editor/Plugins/EditorCommon/EditorCommon.def
+++ /dev/null
@@ -1,6 +0,0 @@
-; EditorCommon.def : Declares the module parameters for the DLL.
-
-LIBRARY
-
-EXPORTS
-    ; Explicit exports can go here
diff --git a/Code/Editor/Plugins/EditorCommon/res/EditorCommon.rc2 b/Code/Editor/Plugins/EditorCommon/res/EditorCommon.rc2
deleted file mode 100644
index 8ffc09417a..0000000000
Binary files a/Code/Editor/Plugins/EditorCommon/res/EditorCommon.rc2 and /dev/null differ
diff --git a/Code/Editor/Plugins/FFMPEGPlugin/CMakeLists.txt b/Code/Editor/Plugins/FFMPEGPlugin/CMakeLists.txt
index 342151f24a..909ec193f3 100644
--- a/Code/Editor/Plugins/FFMPEGPlugin/CMakeLists.txt
+++ b/Code/Editor/Plugins/FFMPEGPlugin/CMakeLists.txt
@@ -23,6 +23,7 @@ ly_add_target(
             .
     BUILD_DEPENDENCIES
         PRIVATE
+            3rdParty::Qt::Core
             AZ::AzCore
             Legacy::CryCommon
             Legacy::EditorLib
diff --git a/Code/Editor/Plugins/FFMPEGPlugin/FFMPEGPlugin_precompiled.h b/Code/Editor/Plugins/FFMPEGPlugin/FFMPEGPlugin_precompiled.h
index 3b015dd9a5..33ca3390f1 100644
--- a/Code/Editor/Plugins/FFMPEGPlugin/FFMPEGPlugin_precompiled.h
+++ b/Code/Editor/Plugins/FFMPEGPlugin/FFMPEGPlugin_precompiled.h
@@ -17,19 +17,8 @@
 /////////////////////////////////////////////////////////////////////////////
 #include <platform.h>
 
-
-/////////////////////////////////////////////////////////////////////////////
-// STL
-/////////////////////////////////////////////////////////////////////////////
-#include <vector>
-#include <list>
-#include <map>
-#include <set>
-#include <algorithm>
-
 /////////////////////////////////////////////////////////////////////////////
 // CRY Stuff ////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
 #include <ISystem.h>
-#include "Util/EditorUtils.h"
 #include "EditorCoreAPI.h"
diff --git a/Code/Editor/Plugins/PerforcePlugin/CMakeLists.txt b/Code/Editor/Plugins/PerforcePlugin/CMakeLists.txt
index 15a1147166..bd4661fa0f 100644
--- a/Code/Editor/Plugins/PerforcePlugin/CMakeLists.txt
+++ b/Code/Editor/Plugins/PerforcePlugin/CMakeLists.txt
@@ -31,6 +31,8 @@ ly_add_target(
             .
     BUILD_DEPENDENCIES
         PRIVATE
+            3rdParty::Qt::Core
+            3rdParty::Qt::Widgets
             AZ::AzCore
             Legacy::CryCommon
             Legacy::EditorLib
diff --git a/Code/Editor/Plugins/QtMocRule.props b/Code/Editor/Plugins/QtMocRule.props
deleted file mode 100644
index af7c107071..0000000000
--- a/Code/Editor/Plugins/QtMocRule.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemDefinitionGroup>
-	<QtMOC>
-	  <OutputFileName>%(RootDir)%(Directory)%(FileName).moc</OutputFileName>
-      <CommandLineTemplate>$(QTDIR)\bin\moc.exe [AllOptions] [Inputs]</CommandLineTemplate>
-      <ExecutionDescription>Moc'ing %(Filename)%(Extension)...</ExecutionDescription>
-    </QtMOC>
-  </ItemDefinitionGroup>
-</Project>
diff --git a/Code/Editor/Plugins/QtMocRule.targets b/Code/Editor/Plugins/QtMocRule.targets
deleted file mode 100644
index fdcb95e6a3..0000000000
--- a/Code/Editor/Plugins/QtMocRule.targets
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <PropertyPageSchema
-      Include="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml" />
-      <AvailableItemName Include="QtMOC">
-        <Targets>_QtMOC</Targets>
-      </AvailableItemName>
-  </ItemGroup>
-  <UsingTask
-	TaskName="QtMOC"
-	TaskFactory="XamlTaskFactory"
-	AssemblyName="Microsoft.Build.Tasks.v4.0">
-	<Task>$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml</Task> 
-  </UsingTask>
-  <Target
-    Name="_QtMOC"
-    BeforeTargets="ClCompile"
-    AfterTargets="CustomBuild"
-    Condition="'@(QtMOC)' != ''"
-    Outputs="%(QtMOC.OutputFileName)"
-    Inputs="%(QtMOC.Identity);$(MSBuildProjectFile)"
-    DependsOnTargets="_SelectedFiles">
-    <ItemGroup Condition="'@(SelectedFiles)' != ''">
-	  <QtMOC Remove="@(QtMOC)" Condition="'%(Identity)' != '@(SelectedFiles)'" />
-    </ItemGroup>
-	<ItemGroup>
-		<QtMOC_tlog Include="%(QtMOC.OutputFileName)" Condition="'%(QtMOC.OutputFileName)' != '' and '%(QtMOC.ExcludedFromBuild)' != 'true'">
-			<Source>@(QtMOC, '|')</Source>
-		</QtMOC_tlog>
-	</ItemGroup>
-    <Message
-      Importance="High"
-      Text="%(QtMOC.ExecutionDescription)" />
-	<WriteLinesToFile
-		Condition="'@(QtMOC_tlog)' != '' and '%(QtMOC_tlog.ExcludedFromBuild)' != 'true'"
-		File="$(IntDir)$(ProjectName).moc.1.tlog"
-		Lines="^%(QtMOC_tlog.Source);@(QtMOC_tlog-&gt;'%(Fullpath)')"/>
-	<QtMOC
-	  Condition="'@(QtMOC)' != '' and '%(QtMOC.ExcludedFromBuild)' != 'true'"
-      CommandLineTemplate="%(QtMOC.CommandLineTemplate)"
-	  OutputFileName="%(QtMOC.OutputFileName)"
-	  AdditionalOptions="%(QtMOC.AdditionalOptions)"
-      Inputs="%(QtMOC.Fullpath)" />
-  </Target>
-</Project>
diff --git a/Code/Editor/Plugins/QtMocRule.xml b/Code/Editor/Plugins/QtMocRule.xml
deleted file mode 100644
index 21850b34ab..0000000000
--- a/Code/Editor/Plugins/QtMocRule.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="http://schemas.microsoft.com/build/2009/properties" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=mscorlib">
-  <Rule
-    Name="QtMOC"
-    PageTemplate="tool"
-    DisplayName="Qt MOC"
-    Order="200">
-    <Rule.DataSource>
-      <DataSource
-        Persistence="ProjectFile"
-        ItemType="QtMOC" />
-    </Rule.DataSource>
-    <Rule.Categories>
-	  <Category
-		Name="General">
-		<Category.DisplayName>
-			<sys:String>General</sys:String>
-		</Category.DisplayName>
-	  </Category>
-      <Category
-        Name="Command Line"
-        Subtype="CommandLine">
-        <Category.DisplayName>
-          <sys:String>Command Line</sys:String>
-        </Category.DisplayName>
-      </Category>
-    </Rule.Categories>
-	<StringProperty
-	  Name="OutputFileName"
-	  Category="General"
-	  DisplayName="Output File Name"
-	  Description="Specifies the name of the output file." 
-	  Switch="-o&quot;[value]&quot;"/>
-    <StringProperty
-      Name="Inputs"
-      Category="Command Line"
-      IsRequired="true">
-      <StringProperty.DataSource>
-        <DataSource
-          Persistence="ProjectFile"
-          ItemType="QtMOC"
-          SourceType="Item" />
-      </StringProperty.DataSource>
-    </StringProperty>
-    <StringProperty
-      Name="CommandLineTemplate"
-      DisplayName="Command Line"
-      Visible="False"
-      IncludeInCommandLine="False" />
-    <StringProperty
-      Name="ExecutionDescription"
-      DisplayName="Execution Description"
-      IncludeInCommandLine="False"
-      Visible="False" />
-	<StringProperty
-	  Subtype="AdditionalOptions"
-	  Name="AdditionalOptions"
-	  Category="Command Line">
-	  <StringProperty.DisplayName>
-	    <sys:String>Additional Options</sys:String>
-	  </StringProperty.DisplayName>
-      <StringProperty.Description>
-	    <sys:String>Additional Options</sys:String>
-	  </StringProperty.Description>
-	</StringProperty>
-  </Rule>
-  <ItemType
-    Name="QtMOC"
-    DisplayName="Qt MOC" />
-  <ContentType
-    Name="QtMOC"
-    DisplayName="Qt MOC"
-    ItemType="QtMOC" />
-</ProjectSchemaDefinitions>
diff --git a/Code/Editor/Plugins/QtRccRule.props b/Code/Editor/Plugins/QtRccRule.props
deleted file mode 100644
index 9c06b5c082..0000000000
--- a/Code/Editor/Plugins/QtRccRule.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemDefinitionGroup>
-	<QtRCC>
-	  <OutputFileName>%(RootDir)%(Directory)rcc_%(FileName).h</OutputFileName>
-      <CommandLineTemplate>$(QTDIR)\bin\rcc.exe [AllOptions] [Inputs]</CommandLineTemplate>
-      <ExecutionDescription>Rcc'ing %(Filename)%(Extension)...</ExecutionDescription>
-    </QtRCC>
-  </ItemDefinitionGroup>
-</Project>
diff --git a/Code/Editor/Plugins/QtRccRule.targets b/Code/Editor/Plugins/QtRccRule.targets
deleted file mode 100644
index bd4e7ae90e..0000000000
--- a/Code/Editor/Plugins/QtRccRule.targets
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <PropertyPageSchema
-      Include="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml" />
-      <AvailableItemName Include="QtRCC">
-        <Targets>_QtRCC</Targets>
-      </AvailableItemName>
-  </ItemGroup>
-  <UsingTask
-	TaskName="QtRCC"
-	TaskFactory="XamlTaskFactory"
-	AssemblyName="Microsoft.Build.Tasks.v4.0">
-	<Task>$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml</Task> 
-  </UsingTask>
-  <Target
-    Name="_QtRCC"
-    BeforeTargets="ClCompile"
-    AfterTargets="CustomBuild"
-    Condition="'@(QtRCC)' != ''"
-    Outputs="%(QtRCC.OutputFileName)"
-    Inputs="%(QtRCC.Identity);$(MSBuildProjectFile)"
-    DependsOnTargets="_SelectedFiles">
-    <ItemGroup Condition="'@(SelectedFiles)' != ''">
-	  <QtRCC Remove="@(QtRCC)" Condition="'%(Identity)' != '@(SelectedFiles)'" />
-    </ItemGroup>
-	<ItemGroup>
-		<QtRCC_tlog Include="%(QtRCC.OutputFileName)" Condition="'%(QtRCC.OutputFileName)' != '' and '%(QtRCC.ExcludedFromBuild)' != 'true'">
-			<Source>@(QtRCC, '|')</Source>
-		</QtRCC_tlog>
-	</ItemGroup>
-    <Message
-      Importance="High"
-      Text="%(QtRCC.ExecutionDescription)" />
-	<WriteLinesToFile
-		Condition="'@(QtRCC_tlog)' != '' and '%(QtRCC_tlog.ExcludedFromBuild)' != 'true'"
-		File="$(IntDir)$(ProjectName).rcc.1.tlog"
-		Lines="^%(QtRCC_tlog.Source);@(QtRCC_tlog-&gt;'%(Fullpath)')"/>
-	<QtRCC
-	  Condition="'@(QtRCC)' != '' and '%(QtRCC.ExcludedFromBuild)' != 'true'"
-      CommandLineTemplate="%(QtRCC.CommandLineTemplate)"
-	  OutputFileName="%(QtRCC.OutputFileName)"
-	  AdditionalOptions="%(QtRCC.AdditionalOptions)"
-      Inputs="%(QtRCC.Fullpath)" />
-  </Target>
-</Project>
diff --git a/Code/Editor/Plugins/QtRccRule.xml b/Code/Editor/Plugins/QtRccRule.xml
deleted file mode 100644
index ce7b98c323..0000000000
--- a/Code/Editor/Plugins/QtRccRule.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="http://schemas.microsoft.com/build/2009/properties" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=mscorlib">
-  <Rule
-    Name="QtRCC"
-    PageTemplate="tool"
-    DisplayName="Qt RCC"
-    Order="200">
-    <Rule.DataSource>
-      <DataSource
-        Persistence="ProjectFile"
-        ItemType="QtRCC" />
-    </Rule.DataSource>
-    <Rule.Categories>
-	  <Category
-		Name="General">
-		<Category.DisplayName>
-			<sys:String>General</sys:String>
-		</Category.DisplayName>
-	  </Category>
-      <Category
-        Name="Command Line"
-        Subtype="CommandLine">
-        <Category.DisplayName>
-          <sys:String>Command Line</sys:String>
-        </Category.DisplayName>
-      </Category>
-    </Rule.Categories>
-	<StringProperty
-	  Name="OutputFileName"
-	  Category="General"
-	  DisplayName="Output File Name"
-	  Description="Specifies the name of the output file." 
-	  Switch="-o &quot;[value]&quot;"/>
-    <StringProperty
-      Name="Inputs"
-      Category="Command Line"
-      IsRequired="true">
-      <StringProperty.DataSource>
-        <DataSource
-          Persistence="ProjectFile"
-          ItemType="QtRCC"
-          SourceType="Item" />
-      </StringProperty.DataSource>
-    </StringProperty>
-    <StringProperty
-      Name="CommandLineTemplate"
-      DisplayName="Command Line"
-      Visible="False"
-      IncludeInCommandLine="False" />
-    <StringProperty
-      Name="ExecutionDescription"
-      DisplayName="Execution Description"
-      IncludeInCommandLine="False"
-      Visible="False" />
-	<StringProperty
-	  Subtype="AdditionalOptions"
-	  Name="AdditionalOptions"
-	  Category="Command Line">
-	  <StringProperty.DisplayName>
-	    <sys:String>Additional Options</sys:String>
-	  </StringProperty.DisplayName>
-      <StringProperty.Description>
-	    <sys:String>Additional Options</sys:String>
-	  </StringProperty.Description>
-	</StringProperty>
-  </Rule>
-  <ItemType
-    Name="QtRCC"
-    DisplayName="Qt RCC" />
-  <ContentType
-    Name="QtRCC"
-    DisplayName="Qt RCC"
-    ItemType="QtRCC" />
-</ProjectSchemaDefinitions>
diff --git a/Code/Editor/Plugins/QtUicRule.props b/Code/Editor/Plugins/QtUicRule.props
deleted file mode 100644
index ce08b40be7..0000000000
--- a/Code/Editor/Plugins/QtUicRule.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemDefinitionGroup>
-	<QtUIC>
-	  <OutputFileName>%(RootDir)%(Directory)ui_%(FileName).h</OutputFileName>
-      <CommandLineTemplate>$(QTDIR)\bin\uic.exe [AllOptions] [Inputs]</CommandLineTemplate>
-      <ExecutionDescription>Uic'ing %(Filename)%(Extension)...</ExecutionDescription>
-    </QtUIC>
-  </ItemDefinitionGroup>
-</Project>
diff --git a/Code/Editor/Plugins/QtUicRule.targets b/Code/Editor/Plugins/QtUicRule.targets
deleted file mode 100644
index a5ada15f79..0000000000
--- a/Code/Editor/Plugins/QtUicRule.targets
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <PropertyPageSchema
-      Include="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml" />
-      <AvailableItemName Include="QtUIC">
-        <Targets>_QtUIC</Targets>
-      </AvailableItemName>
-  </ItemGroup>
-  <UsingTask
-	TaskName="QtUIC"
-	TaskFactory="XamlTaskFactory"
-	AssemblyName="Microsoft.Build.Tasks.v4.0">
-	<Task>$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml</Task> 
-  </UsingTask>
-  <Target
-    Name="_QtUIC"
-    BeforeTargets="ClCompile"
-    AfterTargets="CustomBuild"
-    Condition="'@(QtUIC)' != ''"
-    Outputs="%(QtUIC.OutputFileName)"
-    Inputs="%(QtUIC.Identity);$(MSBuildProjectFile)"
-    DependsOnTargets="_SelectedFiles">
-    <ItemGroup Condition="'@(SelectedFiles)' != ''">
-	  <QtUIC Remove="@(QtUIC)" Condition="'%(Identity)' != '@(SelectedFiles)'" />
-    </ItemGroup>
-	<ItemGroup>
-		<QtUIC_tlog Include="%(QtUIC.OutputFileName)" Condition="'%(QtUIC.OutputFileName)' != '' and '%(QtUIC.ExcludedFromBuild)' != 'true'">
-			<Source>@(QtUIC, '|')</Source>
-		</QtUIC_tlog>
-	</ItemGroup>
-    <Message
-      Importance="High"
-      Text="%(QtUIC.ExecutionDescription)" />
-	<WriteLinesToFile
-		Condition="'@(QtUIC_tlog)' != '' and '%(QtUIC_tlog.ExcludedFromBuild)' != 'true'"
-		File="$(IntDir)$(ProjectName).uic.1.tlog"
-		Lines="^%(QtUIC_tlog.Source);@(QtUIC_tlog-&gt;'%(Fullpath)')"/>
-	<QtUIC
-	  Condition="'@(QtUIC)' != '' and '%(QtUIC.ExcludedFromBuild)' != 'true'"
-      CommandLineTemplate="%(QtUIC.CommandLineTemplate)"
-	  OutputFileName="%(QtUIC.OutputFileName)"
-	  AdditionalOptions="%(QtUIC.AdditionalOptions)"
-      Inputs="%(QtUIC.Fullpath)" /> <!-- CRC TODO: Should use identity instead? Inputs="%(QtUIC.Identity)" /> -->
-      
-  </Target>
-</Project>
diff --git a/Code/Editor/Plugins/QtUicRule.xml b/Code/Editor/Plugins/QtUicRule.xml
deleted file mode 100644
index ec7ce4b214..0000000000
--- a/Code/Editor/Plugins/QtUicRule.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="http://schemas.microsoft.com/build/2009/properties" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=mscorlib">
-  <Rule
-    Name="QtUIC"
-    PageTemplate="tool"
-    DisplayName="Qt UIC"
-    Order="200">
-    <Rule.DataSource>
-      <DataSource
-        Persistence="ProjectFile"
-        ItemType="QtUIC" />
-    </Rule.DataSource>
-    <Rule.Categories>
-	  <Category
-		Name="General">
-		<Category.DisplayName>
-			<sys:String>General</sys:String>
-		</Category.DisplayName>
-	  </Category>
-      <Category
-        Name="Command Line"
-        Subtype="CommandLine">
-        <Category.DisplayName>
-          <sys:String>Command Line</sys:String>
-        </Category.DisplayName>
-      </Category>
-    </Rule.Categories>
-	<StringProperty
-	  Name="OutputFileName"
-	  Category="General"
-	  DisplayName="Output File Name"
-	  Description="Specifies the name of the output file." 
-	  Switch="-o &quot;[value]&quot;"/>
-    <StringProperty
-      Name="Inputs"
-      Category="Command Line"
-      IsRequired="true">
-      <StringProperty.DataSource>
-        <DataSource
-          Persistence="ProjectFile"
-          ItemType="QtUIC"
-          SourceType="Item" />
-      </StringProperty.DataSource>
-    </StringProperty>
-    <StringProperty
-      Name="CommandLineTemplate"
-      DisplayName="Command Line"
-      Visible="False"
-      IncludeInCommandLine="False" />
-    <StringProperty
-      Name="ExecutionDescription"
-      DisplayName="Execution Description"
-      IncludeInCommandLine="False"
-      Visible="False" />
-	<StringProperty
-	  Subtype="AdditionalOptions"
-	  Name="AdditionalOptions"
-	  Category="Command Line">
-	  <StringProperty.DisplayName>
-	    <sys:String>Additional Options</sys:String>
-	  </StringProperty.DisplayName>
-      <StringProperty.Description>
-	    <sys:String>Additional Options</sys:String>
-	  </StringProperty.Description>
-	</StringProperty>
-  </Rule>
-  <ItemType
-    Name="QtUIC"
-    DisplayName="Qt UIC" />
-  <ContentType
-    Name="QtUIC"
-    DisplayName="Qt UIC"
-    ItemType="QtUIC" />
-</ProjectSchemaDefinitions>
diff --git a/Code/Editor/QtViewPaneManager.cpp b/Code/Editor/QtViewPaneManager.cpp
index 35b2160a1f..9f2b9f9cf8 100644
--- a/Code/Editor/QtViewPaneManager.cpp
+++ b/Code/Editor/QtViewPaneManager.cpp
@@ -525,6 +525,7 @@ QtViewPaneManager::QtViewPaneManager(QObject* parent)
 
     // view pane manager is interested when we enter/exit ComponentMode
     m_componentModeNotifications.BusConnect(AzToolsFramework::GetEntityContextId());
+    m_windowRequest.BusConnect();
 
     m_componentModeNotifications.SetEnteredComponentModeFunc(
         [this](const AZStd::vector<AZ::Uuid>& /*componentModeTypes*/)
@@ -545,10 +546,23 @@ QtViewPaneManager::QtViewPaneManager(QObject* parent)
             AzQtComponents::SetWidgetInteractEnabled(widget, on);
         });
     });
+
+    m_windowRequest.SetEnableEditorUiFunc(
+        [this](bool enable)
+        {
+            // gray out panels when entering ImGui mode
+            SetDefaultActionsEnabled(
+                enable, m_registeredPanes,
+                [](QWidget* widget, bool on)
+                {
+                    AzQtComponents::SetWidgetInteractEnabled(widget, on);
+                });
+        });
 }
 
 QtViewPaneManager::~QtViewPaneManager()
 {
+    m_windowRequest.BusDisconnect();
     m_componentModeNotifications.BusDisconnect();
 }
 
diff --git a/Code/Editor/QtViewPaneManager.h b/Code/Editor/QtViewPaneManager.h
index aa382c41c0..2b3412aad6 100644
--- a/Code/Editor/QtViewPaneManager.h
+++ b/Code/Editor/QtViewPaneManager.h
@@ -21,6 +21,7 @@
 #include <AzQtComponents/Components/StyledDockWidget.h>
 #include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
 #include <AzToolsFramework/ComponentMode/EditorComponentModeBus.h>
+#include <AzToolsFramework/API/EditorWindowRequestBus.h>
 
 #include <QObject>
 #include <QVector>
@@ -249,8 +250,12 @@ private:
     QPointer<AzQtComponents::FancyDocking> m_advancedDockManager;
 
     using EditorComponentModeNotificationBusImpl = AzToolsFramework::ComponentModeFramework::EditorComponentModeNotificationBusImpl;
-    EditorComponentModeNotificationBusImpl m_componentModeNotifications; /**< Helper for EditorComponentModeNotificationBus so 
-                                                                           *  QtViewPaneManager does not need to inherit directly from it. */
+    EditorComponentModeNotificationBusImpl m_componentModeNotifications; //!< Helper for EditorComponentModeNotificationBus so
+                                                                         //!< QtViewPaneManager does not need to inherit directly from it. */
+
+    using EditorWindowRequestBusImpl = AzToolsFramework::EditorWindowRequestBusImpl;
+    EditorWindowRequestBusImpl m_windowRequest;                         //!< Helper for EditorWindowRequestBus so
+                                                                        //!< QtViewPaneManager does not need to inherit directly from it. */
     AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
 };
 
diff --git a/Code/Editor/TrackView/AtomOutputFrameCapture.cpp b/Code/Editor/TrackView/AtomOutputFrameCapture.cpp
index d5ceeae9b2..cd5a977367 100644
--- a/Code/Editor/TrackView/AtomOutputFrameCapture.cpp
+++ b/Code/Editor/TrackView/AtomOutputFrameCapture.cpp
@@ -73,7 +73,7 @@ namespace TrackView
         bool startedCapture = false;
         AZ::Render::FrameCaptureRequestBus::BroadcastResult(
             startedCapture, &AZ::Render::FrameCaptureRequestBus::Events::CapturePassAttachmentWithCallback, m_passHierarchy,
-            AZStd::string("Output"), attachmentReadbackCallback);
+            AZStd::string("Output"), attachmentReadbackCallback, AZ::RPI::PassAttachmentReadbackOption::Output);
 
         return startedCapture;
     }
diff --git a/Code/Editor/WelcomeScreen/WelcomeScreenDialog.cpp b/Code/Editor/WelcomeScreen/WelcomeScreenDialog.cpp
index f9560aef55..49d9c58159 100644
--- a/Code/Editor/WelcomeScreen/WelcomeScreenDialog.cpp
+++ b/Code/Editor/WelcomeScreen/WelcomeScreenDialog.cpp
@@ -40,10 +40,6 @@
 #include "CryEdit.h"
 #include "LevelFileDialog.h"
 
-// NewsShared
-#include <NewsShared/ResourceManagement/ResourceManifest.h>     // for News::ResourceManifest
-#include <NewsShared/Qt/ArticleViewContainer.h>                 // for News::ArticleViewContainer
-
 AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
 #include <WelcomeScreen/ui_WelcomeScreenDialog.h>
 AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
diff --git a/Code/Editor/WelcomeScreen/WelcomeScreenDialog.h b/Code/Editor/WelcomeScreen/WelcomeScreenDialog.h
index 4338a8250f..39c0ad6316 100644
--- a/Code/Editor/WelcomeScreen/WelcomeScreenDialog.h
+++ b/Code/Editor/WelcomeScreen/WelcomeScreenDialog.h
@@ -8,8 +8,6 @@
 
 #if !defined(Q_MOC_RUN)
 #include <QDialog>
-#include "NewsShared/LogType.h"
-#include "NewsShared/ErrorCodes.h"
 #endif
 
 namespace News {
@@ -62,9 +60,6 @@ private:
     void OnRecentLevelTableItemClicked(const QModelIndex& index);
     void OnCloseBtnClicked(bool checked);
 
-    void SyncFail(News::ErrorCode error);
-    void SyncSuccess();
-
 private Q_SLOTS:
     void previewAreaScrolled();
 };
diff --git a/Code/Framework/AzCore/AzCore/EBus/Event.inl b/Code/Framework/AzCore/AzCore/EBus/Event.inl
index 006ff81e34..493dea4a3f 100644
--- a/Code/Framework/AzCore/AzCore/EBus/Event.inl
+++ b/Code/Framework/AzCore/AzCore/EBus/Event.inl
@@ -27,11 +27,17 @@ namespace AZ
     template <typename... Params>
     EventHandler<Params...>::EventHandler(const EventHandler& rhs)
         : m_callback(rhs.m_callback)
+        , m_event(rhs.m_event)
     {
-        // Copy the callback function, then perform a Connect with the new event
-        if (rhs.m_event)
+        // Copy the callback and event, then perform a Connect to the event
+        if (m_callback && m_event)
         {
-            rhs.m_event->Connect(*this);
+            m_event->Connect(*this);
+        }
+        else
+        {
+            // It was not possible to connect to the event, set it to nullptr
+            m_event = nullptr;
         }
     }
 
@@ -65,9 +71,16 @@ namespace AZ
         {
             Disconnect();
             m_callback = rhs.m_callback;
-            if (rhs.m_event)
+            m_event = rhs.m_event;
+            // Copy the callback and event, then perform a Connect to the event
+            if (m_callback && m_event)
             {
-                rhs.m_event->Connect(*this);
+                m_event->Connect(*this);
+            }
+            else
+            {
+                // It was not possible to connect to the event, set it to nullptr
+                m_event = nullptr;
             }
         }
 
diff --git a/Code/Framework/AzCore/AzCore/RTTI/TypeInfo.h b/Code/Framework/AzCore/AzCore/RTTI/TypeInfo.h
index 4bb4bac2d3..27a3e9d2cf 100644
--- a/Code/Framework/AzCore/AzCore/RTTI/TypeInfo.h
+++ b/Code/Framework/AzCore/AzCore/RTTI/TypeInfo.h
@@ -145,8 +145,13 @@ namespace AZ
     // also needs to be an overload for every version because they all represent overloads for different non-types.
     namespace AzGenericTypeInfo
     {
-        template<typename...>
-        constexpr bool false_v = false;
+        /// Needs to match declared parameter type.
+        template <template <typename...> class> constexpr bool false_v1 = false;
+        template <template <AZStd::size_t...> class> constexpr bool false_v2 = false;
+        template <template <typename, AZStd::size_t> class> constexpr bool false_v3 = false;
+        template <template <typename, typename, AZStd::size_t> class> constexpr bool false_v4 = false;
+        template <template <typename, typename, typename, AZStd::size_t> class> constexpr bool false_v5 = false;
+        template <template <typename, AZStd::size_t, typename> class> constexpr bool false_v6 = false;
 
         template<typename T>
         inline const AZ::TypeId& Uuid()
@@ -157,7 +162,7 @@ namespace AZ
         template<template<typename...> class T>
         inline const AZ::TypeId& Uuid()
         {
-            static_assert(false_v<T>, "Missing specialization for this template. Make sure it's registered for type info support.");
+            static_assert(false_v1<T>, "Missing specialization for this template. Make sure it's registered for type info support.");
             static const AZ::TypeId s_uuid = AZ::TypeId::CreateNull();
             return s_uuid;
         }
@@ -165,7 +170,7 @@ namespace AZ
         template<template<AZStd::size_t...> class T>
         inline const AZ::TypeId& Uuid()
         {
-            static_assert(false_v<T>, "Missing specialization for this template. Make sure it's registered for type info support.");
+            static_assert(false_v2<T>, "Missing specialization for this template. Make sure it's registered for type info support.");
             static const AZ::TypeId s_uuid = AZ::TypeId::CreateNull();
             return s_uuid;
         }
@@ -173,7 +178,7 @@ namespace AZ
         template<template<typename, AZStd::size_t> class T>
         inline const AZ::TypeId& Uuid()
         {
-            static_assert(false_v<T>, "Missing specialization for this template. Make sure it's registered for type info support.");
+            static_assert(false_v3<T>, "Missing specialization for this template. Make sure it's registered for type info support.");
             static const AZ::TypeId s_uuid = AZ::TypeId::CreateNull();
             return s_uuid;
         }
@@ -181,7 +186,7 @@ namespace AZ
         template<template<typename, typename, AZStd::size_t> class T>
         inline const AZ::TypeId& Uuid()
         {
-            static_assert(false_v<T>, "Missing specialization for this template. Make sure it's registered for type info support.");
+            static_assert(false_v4<T>, "Missing specialization for this template. Make sure it's registered for type info support.");
             static const AZ::TypeId s_uuid = AZ::TypeId::CreateNull();
             return s_uuid;
         }
@@ -189,7 +194,7 @@ namespace AZ
         template<template<typename, typename, typename, AZStd::size_t> class T>
         inline const AZ::TypeId& Uuid()
         {
-            static_assert(false_v<T>, "Missing specialization for this template. Make sure it's registered for type info support.");
+            static_assert(false_v5<T>, "Missing specialization for this template. Make sure it's registered for type info support.");
             static const AZ::TypeId s_uuid = AZ::TypeId::CreateNull();
             return s_uuid;
         }
@@ -197,7 +202,7 @@ namespace AZ
         template<template<typename, AZStd::size_t, typename> class T>
         inline const AZ::TypeId& Uuid()
         {
-            static_assert(false_v<T>, "Missing specialization for this template. Make sure it's registered for type info support.");
+            static_assert(false_v6<T>, "Missing specialization for this template. Make sure it's registered for type info support.");
             static const AZ::TypeId s_uuid = AZ::TypeId::CreateNull();
             return s_uuid;
         }
diff --git a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistry.cpp b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistry.cpp
index efbc0eaa1f..5a709f9324 100644
--- a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistry.cpp
+++ b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistry.cpp
@@ -32,6 +32,15 @@ namespace AZ
     {
         if (m_hashes.size() < m_hashes.max_size())
         {
+            constexpr size_t MaxTagSize = TagName{}.max_size();
+            if (specialization.size() > MaxTagSize)
+            {
+                AZ_Error("Settings Registry", false, R"(Cannot append Specialization tag of "%.*s.")"
+                    " It is longer than the MaxTagNameSize of %zu", AZ_STRING_ARG(specialization),
+                    MaxTagSize);
+                return false;
+            }
+
             m_names.push_back(TagName{ specialization });
             TagName& tag = m_names.back();
             AZStd::to_lower(tag.begin(), tag.end());
diff --git a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistry.h b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistry.h
index baeca89636..f0077db2ca 100644
--- a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistry.h
+++ b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistry.h
@@ -49,7 +49,7 @@ namespace AZ
         class Specializations
         {
         public:
-            static constexpr size_t MaxTagNameSize = 32;
+            static constexpr size_t MaxTagNameSize = 64;
             static constexpr size_t MaxCount = 15;
             static constexpr size_t NotFound = static_cast<size_t>(-1);
             using TagName = AZStd::fixed_string<MaxTagNameSize>;
diff --git a/Code/Framework/AzCore/Platform/Windows/AzCore/Debug/StackTracer_Windows.cpp b/Code/Framework/AzCore/Platform/Windows/AzCore/Debug/StackTracer_Windows.cpp
index 9b2ccbe754..39f6c02bde 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/Debug/StackTracer_Windows.cpp
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/Debug/StackTracer_Windows.cpp
@@ -146,7 +146,7 @@ namespace AZ {
     AZStd::mutex                g_dbgLoadingMutex;
     HANDLE                      g_currentProcess = 0;   /// We deal with only one process for now.
     CRITICAL_SECTION            g_csDbgHelpDll;         /// All dbg help functions are single threaded, so we need to control the access.
-    AZStd::fixed_vector<SymbolStorage::ModuleInfo, 256> g_moduleInfo;
+    AZStd::fixed_vector<SymbolStorage::ModuleInfo, 2048> g_moduleInfo;
     
     // reserve 4k of scratch space so that we can get some callstack information without any allocations and as little stack frame usage as possible.
     const size_t                g_scratchSpaceSize = 2048;
diff --git a/Code/Framework/AzCore/Tests/EventTests.cpp b/Code/Framework/AzCore/Tests/EventTests.cpp
index 7640201e0d..571bdd5345 100644
--- a/Code/Framework/AzCore/Tests/EventTests.cpp
+++ b/Code/Framework/AzCore/Tests/EventTests.cpp
@@ -257,6 +257,48 @@ namespace UnitTest
         EXPECT_FALSE(testEvent1.HasHandlerConnected());
         EXPECT_TRUE(testEvent2.HasHandlerConnected());
     }
+
+    TEST_F(EventTests, TestHandlerCopyConstructorOperator)
+    {
+        int32_t invokedCounter = 0;
+
+        AZ::Event<> testEvent;
+        AZ::Event<>::Handler testHandler([&invokedCounter]() { invokedCounter++; });
+
+        testHandler.Connect(testEvent);
+
+        AZ::Event<>::Handler testHandler2(testHandler);
+
+        EXPECT_TRUE(testHandler.IsConnected());
+        EXPECT_TRUE(testHandler2.IsConnected());
+
+        EXPECT_TRUE(invokedCounter == 0);
+        testEvent.Signal();
+        EXPECT_TRUE(invokedCounter == 2);
+    }
+
+    TEST_F(EventTests, TestHandlerCopyAssignmentOperator)
+    {
+        int32_t invokedCounter = 0;
+
+        AZ::Event<> testEvent;
+        AZ::Event<>::Handler testHandler([&invokedCounter]() { invokedCounter++; });
+
+        testHandler.Connect(testEvent);
+
+        AZ::Event<>::Handler testHandler2;
+
+        EXPECT_TRUE(testHandler.IsConnected());
+        EXPECT_FALSE(testHandler2.IsConnected());
+
+        testHandler2 = testHandler;
+
+        EXPECT_TRUE(testHandler2.IsConnected());
+
+        EXPECT_TRUE(invokedCounter == 0);
+        testEvent.Signal();
+        EXPECT_TRUE(invokedCounter == 2);
+    }
 }
 
 #if defined(HAVE_BENCHMARK)
diff --git a/Code/Framework/AzFramework/Platform/Linux/AzFramework/AzFramework_Traits_Linux.h b/Code/Framework/AzFramework/Platform/Linux/AzFramework/AzFramework_Traits_Linux.h
index 98893e2d01..2cf5b3f87e 100644
--- a/Code/Framework/AzFramework/Platform/Linux/AzFramework/AzFramework_Traits_Linux.h
+++ b/Code/Framework/AzFramework/Platform/Linux/AzFramework/AzFramework_Traits_Linux.h
@@ -12,5 +12,5 @@
 #define AZ_TRAIT_AZFRAMEWORK_USE_ERRNO_T_TYPEDEF 1
 #define AZ_TRAIT_AZFRAMEWORK_USE_POSIX_LOCALTIME_R 0
 #define AZ_TRAIT_AZFRAMEWORK_PYTHON_SHELL "python.sh"
-#define AZ_TRAIT_AZFRAMEWORK_USE_PROJECT_MANAGER 0
+#define AZ_TRAIT_AZFRAMEWORK_USE_PROJECT_MANAGER 1
 #define AZ_TRAIT_AZFRAMEWORK_PROCESSLAUNCH_DEFAULT 0
diff --git a/Code/Framework/AzFramework/Platform/Mac/AzFramework/AzFramework_Traits_Mac.h b/Code/Framework/AzFramework/Platform/Mac/AzFramework/AzFramework_Traits_Mac.h
index 6af4294a5c..73f6d212d4 100644
--- a/Code/Framework/AzFramework/Platform/Mac/AzFramework/AzFramework_Traits_Mac.h
+++ b/Code/Framework/AzFramework/Platform/Mac/AzFramework/AzFramework_Traits_Mac.h
@@ -12,5 +12,5 @@
 #define AZ_TRAIT_AZFRAMEWORK_USE_ERRNO_T_TYPEDEF 0
 #define AZ_TRAIT_AZFRAMEWORK_USE_POSIX_LOCALTIME_R 1
 #define AZ_TRAIT_AZFRAMEWORK_PYTHON_SHELL "python.sh"
-#define AZ_TRAIT_AZFRAMEWORK_USE_PROJECT_MANAGER 0
+#define AZ_TRAIT_AZFRAMEWORK_USE_PROJECT_MANAGER 1
 #define AZ_TRAIT_AZFRAMEWORK_PROCESSLAUNCH_DEFAULT 0
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorWindowRequestBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorWindowRequestBus.h
index 03bb76b03a..ef4d2deb5e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorWindowRequestBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorWindowRequestBus.h
@@ -36,8 +36,47 @@ namespace AzToolsFramework
         /// Retrieve the main application window.
         virtual QWidget* GetAppMainWindow() { return nullptr; }
     };
-
     using EditorWindowRequestBus = AZ::EBus<EditorWindowRequests>;
+
+    class EditorWindowUIRequests : public AZ::EBusTraits
+    {
+    public:
+        using Bus = AZ::EBus<EditorWindowUIRequests>;
+
+        //////////////////////////////////////////////////////////////////////////
+        // EBusTraits overrides
+        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
+        //////////////////////////////////////////////////////////////////////////
+
+        /// Enable/Disable the Editor UI.
+        virtual void SetEditorUiEnabled([[maybe_unused]] bool enable) {}
+    };
+    using EditorWindowUIRequestBus = AZ::EBus<EditorWindowUIRequests>;
+
+    using EnableUiFunction = AZStd::function<void(bool)>;
+
+    /// Helper for EditorWindowRequests to be used as a 
+    /// member instead of inheriting from EBus directly.
+    class EditorWindowRequestBusImpl
+        : public EditorWindowUIRequestBus::Handler
+    {
+    public:
+        /// Set the function to be called when entering ImGui Mode.
+        void SetEnableEditorUiFunc(const EnableUiFunction enableEditorUiFunc)
+        {
+            m_enableEditorUiFunc = AZStd::move(enableEditorUiFunc);
+        }
+
+        private:
+        // EditorWindowRequestBus
+        void SetEditorUiEnabled( [[maybe_unused]] bool enable) override
+        {
+            m_enableEditorUiFunc(enable);
+        }
+
+        EnableUiFunction m_enableEditorUiFunc; ///< Function to call when entering ImGui Mode.
+    };
+
 } // namespace AzToolsFramework
 
 #endif // AZTOOLSFRAMEWORK_EDITORWINDOWREQUESTBUS_H
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTreeView.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTreeView.cpp
index 147e06475e..3bde5bea43 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTreeView.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTreeView.cpp
@@ -210,6 +210,21 @@ namespace AzToolsFramework
 
         void AssetBrowserTreeView::UpdateAfterFilter(bool hasFilter, bool selectFirstValidEntry)
         {
+            const QModelIndexList& selectedIndexes = selectionModel()->selectedRows();
+
+            // If we've cleared the filter but had something selected, ensure it stays selected and visible.
+            if (!hasFilter && !selectedIndexes.isEmpty())
+            {
+                QModelIndex curIndex = selectedIndexes[0];
+                m_expandToEntriesByDefault = true;
+                m_treeStateSaver->ApplySnapshot();
+
+                setCurrentIndex(curIndex);
+                scrollTo(curIndex);
+
+                return;
+            }
+
             // Flag our default expansion state so that we expand down to source entries after filtering
             m_expandToEntriesByDefault = hasFilter;
             // Then ask our state saver to apply its current snapshot again, falling back on asking us if entries should be expanded or not
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.cpp
index 96479bb54c..03784343f5 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.cpp
@@ -291,10 +291,12 @@ namespace AzToolsFramework
             GetEntityContextId());
         EditorEntityInfoNotificationBus::Handler::BusConnect();
         Prefab::PrefabPublicNotificationBus::Handler::BusConnect();
+        EditorWindowUIRequestBus::Handler::BusConnect();
     }
 
     EntityOutlinerWidget::~EntityOutlinerWidget()
     {
+        EditorWindowUIRequestBus::Handler::BusDisconnect();
         Prefab::PrefabPublicNotificationBus::Handler::BusDisconnect();
         ComponentModeFramework::EditorComponentModeNotificationBus::Handler::BusDisconnect();
         EditorEntityInfoNotificationBus::Handler::BusDisconnect();
@@ -1106,16 +1108,25 @@ namespace AzToolsFramework
         AzQtComponents::SetWidgetInteractEnabled(entityOutlinerUi->m_searchWidget, on);
     }
 
+    void EntityOutlinerWidget::EnableUi(bool enable)
+    {
+        SetEntityOutlinerState(m_gui, enable);
+        setEnabled(enable);
+    }
+
+    void EntityOutlinerWidget::SetEditorUiEnabled(bool enable)
+    {
+        EnableUi(enable);
+    }
+
     void EntityOutlinerWidget::EnteredComponentMode([[maybe_unused]] const AZStd::vector<AZ::Uuid>& componentModeTypes)
     {
-        SetEntityOutlinerState(m_gui, false);
-        setEnabled(false);
+        EnableUi(false);
     }
 
     void EntityOutlinerWidget::LeftComponentMode([[maybe_unused]] const AZStd::vector<AZ::Uuid>& componentModeTypes)
     {
-        setEnabled(true);
-        SetEntityOutlinerState(m_gui, true);
+        EnableUi(true);
     }
 
     void EntityOutlinerWidget::OnPrefabInstancePropagationBegin()
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.hxx
index 68f538c3ff..e3f9ad2135 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.hxx
@@ -11,6 +11,7 @@
 #include <AzCore/Memory/SystemAllocator.h>
 #include <AzCore/base.h>
 
+#include <AzToolsFramework/API/EditorWindowRequestBus.h>
 #include <AzToolsFramework/API/ToolsApplicationAPI.h>
 #include <AzToolsFramework/ComponentMode/EditorComponentModeBus.h>
 #include <AzToolsFramework/Entity/EditorEntityInfoBus.h>
@@ -58,6 +59,7 @@ namespace AzToolsFramework
         , private EditorEntityInfoNotificationBus::Handler
         , private ComponentModeFramework::EditorComponentModeNotificationBus::Handler
         , private Prefab::PrefabPublicNotificationBus::Handler
+        , private EditorWindowUIRequestBus::Handler
     {
         Q_OBJECT;
     public:
@@ -105,6 +107,9 @@ namespace AzToolsFramework
         void OnPrefabInstancePropagationBegin() override;
         void OnPrefabInstancePropagationEnd() override;
 
+        // EditorWindowUIRequestBus overrides
+        void SetEditorUiEnabled(bool enable) override;
+
         // Build a selection object from the given entities. Entities already in the Widget's selection buffers are ignored.
         template <class EntityIdCollection>
         QItemSelection BuildSelectionFromEntities(const EntityIdCollection& entityIds);
@@ -155,6 +160,7 @@ namespace AzToolsFramework
         AZ::EntityId GetEntityIdFromIndex(const QModelIndex& index) const;
         QModelIndex GetIndexFromEntityId(const AZ::EntityId& entityId) const;
         void ExtractEntityIdsFromSelection(const QItemSelection& selection, EntityIdList& entityIdList) const;
+        void EnableUi(bool enable);
 
         // OutlinerModelNotificationBus::Handler
         // Receive notification from the outliner model that we should scroll
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.cpp
index 6a399ad816..5d1ec93fda 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.cpp
@@ -376,6 +376,7 @@ namespace AzToolsFramework
         ToolsApplicationEvents::Bus::Handler::BusConnect();
         AZ::EntitySystemBus::Handler::BusConnect();
         EntityPropertyEditorRequestBus::Handler::BusConnect();
+        EditorWindowUIRequestBus::Handler::BusConnect();
         m_spacer = nullptr;
 
         m_emptyIcon = QIcon();
@@ -421,6 +422,7 @@ namespace AzToolsFramework
     {
         qApp->removeEventFilter(this);
 
+        EditorWindowUIRequestBus::Handler::BusDisconnect();
         EntityPropertyEditorRequestBus::Handler::BusDisconnect();
         ToolsApplicationEvents::Bus::Handler::BusDisconnect();
         AZ::EntitySystemBus::Handler::BusDisconnect();
@@ -4961,6 +4963,27 @@ namespace AzToolsFramework
         EnableDisableComponentActions(widget, actions, false);
     }
 
+    void EntityPropertyEditor::SetEditorUiEnabled(bool enable)
+    {
+        if (enable)
+        {
+            EnableComponentActions(this, m_entityComponentActions);
+        }
+        else
+        {
+            DisableComponentActions(this, m_entityComponentActions);
+        }
+        m_disabled = !enable;
+        SetPropertyEditorState(m_gui, enable);
+
+        for (auto componentEditor : m_componentEditors)
+        {
+            AzQtComponents::SetWidgetInteractEnabled(componentEditor, enable);
+        }
+        // record the selected state after entering/leaving component mode
+        SaveComponentEditorState();
+    }
+
     void EntityPropertyEditor::EnteredComponentMode(const AZStd::vector<AZ::Uuid>& componentModeTypes)
     {
         DisableComponentActions(this, m_entityComponentActions);
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.hxx
index b15e27e41a..f2ff4eb927 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.hxx
@@ -21,6 +21,7 @@
 #include <AzCore/Asset/AssetCommon.h>
 #include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
 #include <AzToolsFramework/Undo/UndoSystem.h>
+#include <AzToolsFramework/API/EditorWindowRequestBus.h>
 #include <AzToolsFramework/API/ToolsApplicationAPI.h>
 #include <AzToolsFramework/API/EntityPropertyEditorRequestsBus.h>
 #include <AzToolsFramework/ComponentMode/EditorComponentModeBus.h>
@@ -108,6 +109,7 @@ namespace AzToolsFramework
         , public EditorInspectorComponentNotificationBus::MultiHandler
         , private AzToolsFramework::ComponentModeFramework::EditorComponentModeNotificationBus::Handler
         , public AZ::EntitySystemBus::Handler
+        , private EditorWindowUIRequestBus::Handler
     {
         Q_OBJECT;
     public:
@@ -208,6 +210,9 @@ namespace AzToolsFramework
         void GetSelectedEntities(EntityIdList& selectedEntityIds) override;
         void SetNewComponentId(AZ::ComponentId componentId) override;
 
+        // EditorWindowRequestBus overrides
+        void SetEditorUiEnabled(bool enable) override;
+
         bool IsEntitySelected(const AZ::EntityId& id) const;
         bool IsSingleEntitySelected(const AZ::EntityId& id) const;
 
diff --git a/Code/Tools/AssetProcessor/native/unittests/FileWatcherUnitTests.cpp b/Code/Tools/AssetProcessor/native/unittests/FileWatcherUnitTests.cpp
index 2ffe6a7996..dd39283b22 100644
--- a/Code/Tools/AssetProcessor/native/unittests/FileWatcherUnitTests.cpp
+++ b/Code/Tools/AssetProcessor/native/unittests/FileWatcherUnitTests.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
+ *
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
@@ -277,7 +277,7 @@ void FileWatcherUnitTestRunner::StartTest()
         UNIT_TEST_EXPECT_TRUE(QDir::toNativeSeparators(fileAddName).toLower() == QDir::toNativeSeparators(newName3).toLower());
 
 #if !defined(AZ_PLATFORM_LINUX)
-        // final test... make sure that renaming a DIRECTORY works too. 
+        // final test... make sure that renaming a DIRECTORY works too.
         // Note that linux does not get any callbacks if just the directory is renamed (from inotify)
         QDir renamer;
         fileAddCalled = false;
@@ -312,6 +312,9 @@ void FileWatcherUnitTestRunner::StartTest()
     Q_EMIT UnitTestPassed();
 }
 
-#if !AZ_TRAIT_DISABLE_FAILED_ASSET_PROCESSOR_TESTS
+// File operations on Linux behave differently on Linux than Windows.
+// The system under test doesn't yet handle Linux's file operations, which surfaced as this test arbitrarily passing and failing.
+// This test is disabled on Linux until the system under test can handle Linux file system behavior correctly.
+#if !AZ_TRAIT_DISABLE_FAILED_ASSET_PROCESSOR_TESTS && !defined(AZ_PLATFORM_LINUX)
 REGISTER_UNIT_TEST(FileWatcherUnitTestRunner)
 #endif // !AZ_TRAIT_DISABLE_FAILED_ASSET_PROCESSOR_TESTS
diff --git a/Code/Tools/CMakeLists.txt b/Code/Tools/CMakeLists.txt
index 6c025a0543..1bab1cee77 100644
--- a/Code/Tools/CMakeLists.txt
+++ b/Code/Tools/CMakeLists.txt
@@ -10,7 +10,6 @@ add_subdirectory(AssetProcessor)
 add_subdirectory(AWSNativeSDKInit)
 add_subdirectory(AzTestRunner)
 add_subdirectory(CrashHandler)
-add_subdirectory(News)
 add_subdirectory(PythonBindingsExample)
 add_subdirectory(RemoteConsole)
 add_subdirectory(DeltaCataloger)
diff --git a/Code/Tools/News/CMakeLists.txt b/Code/Tools/News/CMakeLists.txt
deleted file mode 100644
index 78c5774ef0..0000000000
--- a/Code/Tools/News/CMakeLists.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-add_subdirectory(NewsBuilder)
-
-if (NOT PAL_TRAIT_BUILD_HOST_TOOLS)
-    return()
-endif()
-
-ly_add_target(
-    NAME NewsShared STATIC
-    NAMESPACE Legacy
-    AUTOMOC
-    AUTOUIC
-    AUTORCC
-    FILES_CMAKE
-        news_shared_files.cmake
-    INCLUDE_DIRECTORIES
-        PUBLIC
-            .
-    BUILD_DEPENDENCIES
-        PRIVATE
-            3rdParty::Qt::Core
-            3rdParty::Qt::Network
-            3rdParty::Qt::Widgets
-            AZ::AzQtComponents
-)
diff --git a/Code/Tools/News/NewsBuilder/CMakeLists.txt b/Code/Tools/News/NewsBuilder/CMakeLists.txt
deleted file mode 100644
index 218f4e28f5..0000000000
--- a/Code/Tools/News/NewsBuilder/CMakeLists.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME})
-
-include(${pal_dir}/PAL_${PAL_PLATFORM_NAME_LOWERCASE}.cmake)
-
-if (NOT PAL_TRAIT_BUILD_NEWSBUILDER_SUPPORTED OR NOT PAL_TRAIT_BUILD_HOST_TOOLS)
-    return()
-endif()
-
-ly_add_target(
-    NAME NewsBuilder EXECUTABLE
-    NAMESPACE Legacy
-    AUTOMOC
-    AUTOUIC
-    AUTORCC
-    FILES_CMAKE
-        news_builder_files.cmake
-    INCLUDE_DIRECTORIES
-        PUBLIC
-            .
-    BUILD_DEPENDENCIES
-        PRIVATE
-            3rdParty::Qt::Core
-            3rdParty::Qt::Widgets
-            3rdParty::AWSNativeSDK::Dependencies
-            3rdParty::AWSNativeSDK::Core
-            3rdParty::AWSNativeSDK::S3
-            Legacy::NewsShared
-            AZ::AzCore
-            AZ::AzQtComponents
-            AZ::AzFramework
-)
diff --git a/Code/Tools/News/NewsBuilder/EndpointManager.cpp b/Code/Tools/News/NewsBuilder/EndpointManager.cpp
deleted file mode 100644
index 0b2ea4dd5c..0000000000
--- a/Code/Tools/News/NewsBuilder/EndpointManager.cpp
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EndpointManager.h"
-#include <NewsShared/ResourceManagement/ResourceManifest.h>
-
-#include <QDir>
-#include <QFile>
-#include <QTextStream>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QCoreApplication>
-
-namespace News
-{
-
-    Endpoint::Endpoint(QString name, QString awsProfile, QString url, QString bucket)
-        : m_name(name)
-        , m_awsProfile(awsProfile)
-        , m_url(url)
-        , m_bucket(bucket)
-    {}
-
-    Endpoint::Endpoint(const QJsonObject& json)
-        : Endpoint(json["name"].toString(),
-            json["awsProfile"].toString(),
-            json["url"].toString(),
-            json["bucket"].toString())
-    {
-    }
-
-    Endpoint::~Endpoint() {}
-
-    void Endpoint::Write(QJsonObject& json) const
-    {
-        json["name"] = m_name;
-        json["awsProfile"] = m_awsProfile;
-        json["url"] = m_url;
-        json["bucket"] = m_bucket;
-    }
-
-    QString Endpoint::GetName() const
-    {
-        return m_name;
-    }
-
-    void Endpoint::SetName(const QString& name)
-    {
-        m_name = QString(name);
-    }
-
-    QString Endpoint::GetAwsProfile() const
-    {
-        return m_awsProfile;
-    }
-
-    void Endpoint::SetAwsProfile(const QString& awsProfile)
-    {
-        m_awsProfile = QString(awsProfile);
-    }
-
-    QString Endpoint::GetUrl() const
-    {
-        return m_url;
-    }
-
-    void Endpoint::SetUrl(const QString& url)
-    {
-        m_url = QString(url);
-    }
-
-    QString Endpoint::GetBucket() const
-    {
-        return m_bucket;
-    }
-
-    void Endpoint::SetBucket(const QString& bucket)
-    {
-        m_bucket = bucket;
-    }
-
-    EndpointManager::EndpointManager()
-    {
-        Load();
-    }
-
-    EndpointManager::~EndpointManager()
-    {
-        ClearEndpoints();
-    }
-
-    void EndpointManager::Load()
-    {
-        ClearEndpoints();
-        QFile file("newsBuilderConfig.txt");
-        if (file.open(QIODevice::ReadOnly))
-        {
-            QTextStream in(&file);
-            QString str = in.readAll().trimmed();
-            QByteArray array(str.toStdString().c_str());
-            QJsonDocument doc(QJsonDocument::fromJson(array));
-            QJsonObject json = doc.object();
-            QJsonArray endpointArray = json["endpoints"].toArray();
-            for (auto endpointDoc : endpointArray)
-            {
-                m_endpoints.append(new Endpoint(endpointDoc.toObject()));
-            }
-            int endpointIndex = json["currentEndpointIndex"].toInt();
-            if (endpointIndex >= 0 && m_endpoints.count() > endpointIndex)
-            {
-                m_selectedEndpoint = m_endpoints[endpointIndex];
-            }
-            else
-            {
-                m_selectedEndpoint = nullptr;
-            }
-            file.close();
-
-            SaveUrl();
-        }
-    }
-
-    void EndpointManager::Save()
-    {
-        QFile file("newsBuilderConfig.txt");
-        if (file.open(QIODevice::WriteOnly))
-        {
-            QJsonObject json;
-            QJsonArray endpointArray;
-            for (auto endpoint : m_endpoints)
-            {
-                QJsonObject endpointObject;
-                endpoint->Write(endpointObject);
-                endpointArray.append(endpointObject);
-            }
-            json["endpoints"] = endpointArray;
-            json["currentEndpointIndex"] = m_endpoints.indexOf(m_selectedEndpoint);
-            QTextStream out(&file);
-            QJsonDocument doc(json);
-            out << doc.toJson(QJsonDocument::Compact);
-            file.close();
-
-            SaveUrl();
-        }
-    }
-
-    void EndpointManager::SelectEndpoint(Endpoint* endpoint)
-    {
-        m_selectedEndpoint = endpoint;
-    }
-
-    void EndpointManager::AddEndpoint(Endpoint* endpoint)
-    {
-        m_endpoints.append(endpoint);
-    }
-
-    void EndpointManager::RemoveEndpoint(Endpoint* endpoint)
-    {
-        if (endpoint == m_selectedEndpoint)
-        {
-            m_selectedEndpoint = nullptr;
-        }
-        m_endpoints.removeAll(endpoint);
-        delete endpoint;
-    }
-
-    Endpoint* EndpointManager::GetSelectedEndpoint() const
-    {
-        return m_selectedEndpoint;
-    }
-
-    QList<Endpoint*>::const_iterator EndpointManager::begin() const
-    {
-        return m_endpoints.begin();
-    }
-
-    QList<Endpoint*>::const_iterator EndpointManager::end() const
-    {
-        return m_endpoints.end();
-    }
-
-    void EndpointManager::ClearEndpoints()
-    {
-        for (auto endpoint : m_endpoints)
-        {
-            delete endpoint;
-        }
-        m_endpoints.clear();
-    }
-
-    void EndpointManager::SaveUrl() const
-    {
-        if (!m_selectedEndpoint)
-        {
-            return;
-        }
-        // Editor looks for config file in /dev folder, so this file is placed in parent directory
-        QFile file(QCoreApplication::applicationDirPath() + "/newsConfig.txt");
-        if (file.open(QIODevice::WriteOnly))
-        {
-            QTextStream out(&file);
-            out << m_selectedEndpoint->GetUrl();
-            file.close();
-        }
-    }
-
-}
diff --git a/Code/Tools/News/NewsBuilder/EndpointManager.h b/Code/Tools/News/NewsBuilder/EndpointManager.h
deleted file mode 100644
index cc44951d16..0000000000
--- a/Code/Tools/News/NewsBuilder/EndpointManager.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <QList>
-#include <qobjectdefs.h>
-
-class QJsonObject;
-
-namespace News
-{
-    //! Endpoint represents a location of news data
-    class Endpoint
-    {
-    public:
-        Endpoint(QString name, QString awsProfile, QString url, QString bucket);
-        explicit Endpoint(const QJsonObject& json);
-        ~Endpoint();
-
-        void Write(QJsonObject& json) const;
-
-        QString GetName() const;
-        void SetName(const QString& name);
-
-        QString GetAwsProfile() const;
-        void SetAwsProfile(const QString& awsProfile);
-
-        QString GetUrl() const;
-        void SetUrl(const QString& url);
-
-        QString GetBucket() const;
-        void SetBucket(const QString& bucket);
-
-    private:
-        //! name of endpoint to distinguish with others
-        QString m_name;
-        //! name of aws credentials file
-        QString m_awsProfile;
-        //! url location of news data (e.g. cloudfront url)
-        QString m_url;
-        //! name of s3 bucket where news data resides
-        QString m_bucket;
-    };
-
-    //! EndpointManager handles endpoint collection
-    class EndpointManager
-    {
-    public:
-        EndpointManager();
-        ~EndpointManager();
-
-        //! Load endpoints file
-        void Load();
-        //! Save endpoints file
-        void Save();
-        void SelectEndpoint(Endpoint* endpoint);
-        void AddEndpoint(Endpoint* endpoint);
-        void RemoveEndpoint(Endpoint* endpoint);
-        Endpoint* GetSelectedEndpoint() const;
-
-        QList<Endpoint*>::const_iterator begin() const;
-        QList<Endpoint*>::const_iterator end() const;
-
-    private:
-        QList<Endpoint*> m_endpoints;
-        Endpoint* m_selectedEndpoint = nullptr;
-
-        void ClearEndpoints();
-        //! Saves news config file which is used by LY Editor to determine news location
-        void SaveUrl() const;
-    };
-}
diff --git a/Code/Tools/News/NewsBuilder/Platform/Android/PAL_android.cmake b/Code/Tools/News/NewsBuilder/Platform/Android/PAL_android.cmake
deleted file mode 100644
index 929d864fc4..0000000000
--- a/Code/Tools/News/NewsBuilder/Platform/Android/PAL_android.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(PAL_TRAIT_BUILD_NEWSBUILDER_SUPPORTED FALSE)
diff --git a/Code/Tools/News/NewsBuilder/Platform/Linux/PAL_linux.cmake b/Code/Tools/News/NewsBuilder/Platform/Linux/PAL_linux.cmake
deleted file mode 100644
index 929d864fc4..0000000000
--- a/Code/Tools/News/NewsBuilder/Platform/Linux/PAL_linux.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(PAL_TRAIT_BUILD_NEWSBUILDER_SUPPORTED FALSE)
diff --git a/Code/Tools/News/NewsBuilder/Platform/Mac/PAL_mac.cmake b/Code/Tools/News/NewsBuilder/Platform/Mac/PAL_mac.cmake
deleted file mode 100644
index 929d864fc4..0000000000
--- a/Code/Tools/News/NewsBuilder/Platform/Mac/PAL_mac.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(PAL_TRAIT_BUILD_NEWSBUILDER_SUPPORTED FALSE)
diff --git a/Code/Tools/News/NewsBuilder/Platform/Windows/PAL_windows.cmake b/Code/Tools/News/NewsBuilder/Platform/Windows/PAL_windows.cmake
deleted file mode 100644
index 180b7b9492..0000000000
--- a/Code/Tools/News/NewsBuilder/Platform/Windows/PAL_windows.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(PAL_TRAIT_BUILD_NEWSBUILDER_SUPPORTED TRUE)
diff --git a/Code/Tools/News/NewsBuilder/Platform/iOS/PAL_ios.cmake b/Code/Tools/News/NewsBuilder/Platform/iOS/PAL_ios.cmake
deleted file mode 100644
index 929d864fc4..0000000000
--- a/Code/Tools/News/NewsBuilder/Platform/iOS/PAL_ios.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(PAL_TRAIT_BUILD_NEWSBUILDER_SUPPORTED FALSE)
diff --git a/Code/Tools/News/NewsBuilder/Qt/ArticleDetails.cpp b/Code/Tools/News/NewsBuilder/Qt/ArticleDetails.cpp
deleted file mode 100644
index 2872a714e8..0000000000
--- a/Code/Tools/News/NewsBuilder/Qt/ArticleDetails.cpp
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ArticleDetails.h"
-#include "SelectImage.h"
-#include <NewsShared/ResourceManagement/Resource.h>
-#include "ResourceManagement/BuilderResourceManifest.h"
-#include "ResourceManagement/ImageDescriptor.h"
-#include "NewsShared/ErrorCodes.h"
-
-#include <AzCore/Casting/numeric_cast.h>
-
-#include <QButtonGroup>
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QTimer>
-
-#include "Qt/ui_ArticleDetails.h"
-
-namespace News
-{
-
-    ArticleDetails::ArticleDetails(QWidget* parent,
-        Resource& resource,
-        BuilderResourceManifest& manifest)
-        : QWidget(parent)
-        , m_ui(new Ui::ArticleDetailsWidget)
-        , m_filename("")
-        , m_article(resource)
-        , m_manifest(manifest)
-        , m_imageIdOriginal("")
-        , m_imageId("")
-    {
-        m_ui->setupUi(this);
-        m_ui->uidLabel->setText(QString("Article: %1").arg(m_article.GetResource().GetId()));
-
-        resizePreviewImage();
-
-        //! try to load image icon
-        auto pImageResource = m_manifest.FindById(m_article.GetImageId());
-        if (pImageResource)
-        {
-            m_imageIdOriginal = pImageResource->GetId();
-            SetImage(*pImageResource);
-        }
-        else
-        {
-            SetNoImage();
-        }
-
-        m_ui->titleText->setText(m_article.GetTitle());
-        m_ui->descriptionText->setPlainText(m_article.GetBody());
-
-        connect(m_ui->fromFileButton, &QPushButton::clicked, this, &ArticleDetails::OpenImageFromFile);
-        connect(m_ui->fromResourceButton, &QPushButton::clicked, this, &ArticleDetails::OpenImageFromResource);
-        connect(m_ui->clearImageButton, &QPushButton::clicked, this, &ArticleDetails::ClearImage);
-        connect(m_ui->updateButton, &QPushButton::clicked, this, &ArticleDetails::UpdateArticle);
-        connect(m_ui->deleteButton, &QPushButton::clicked, this, &ArticleDetails::DeleteArticle);
-        connect(m_ui->cancelButton, &QPushButton::clicked, this, &ArticleDetails::Close);
-        connect(m_ui->upButton, &QPushButton::clicked, this, &ArticleDetails::MoveUp);
-        connect(m_ui->downButton, &QPushButton::clicked, this, &ArticleDetails::MoveDown);
-    }
-
-    ArticleDetails::~ArticleDetails() {}
-
-    void ArticleDetails::resizeEvent(QResizeEvent *event)
-    {
-        QWidget::resizeEvent(event);
-        resizePreviewImage();
-    }
-
-    void ArticleDetails::resizePreviewImage()
-    {
-        // Resize the imagePreview to keep the proportions
-        int newHeight = aznumeric_cast<int>(m_imageRatio * width());
-        m_ui->imagePreview->setFixedHeight(newHeight);
-    }
-
-    ArticleDescriptor& ArticleDetails::GetArticle()
-    {
-        return m_article;
-    }
-
-    QString ArticleDetails::GetId() const
-    {
-        return m_article.GetResource().GetId();
-    }
-
-    void ArticleDetails::OpenImageFromFile()
-    {
-        m_filename = QFileDialog::getOpenFileName(this,
-            "Open Image", ".", "Image Files (*.png *.jpg *.bmp)");
-        SetImage(m_filename);
-    }
-
-    void ArticleDetails::OpenImageFromResource()
-    {
-        m_pSelectImage = new SelectImage(m_manifest);
-        if (m_pSelectImage->exec() == QDialog::DialogCode::Accepted)
-        {
-            auto pSelectedResource = m_pSelectImage->GetSelected();
-            if (!pSelectedResource)
-            {
-                QMessageBox msgBox(QMessageBox::Critical,
-                    "Error",
-                    "No resource pSelectedResource",
-                    QMessageBox::Ok,
-                    this);
-                msgBox.exec();
-                return;
-            }
-            SetImage(*pSelectedResource);
-        }
-        delete m_pSelectImage;
-    }
-
-    //! once the Update button is clicked, article resource is updated in this function
-    void ArticleDetails::UpdateArticle()
-    {
-        //! this flag remains false if no new changes are detected, thus avoiding unnecessary
-        //! re-uploading unchanged resources
-        bool updated = false;
-
-        m_imageId = LoadImage();
-        if (m_imageId.compare(m_imageIdOriginal) != 0)
-        {
-            m_article.SetImageId(m_imageId);
-            m_filename = "";
-            m_imageIdOriginal = m_imageId;
-            m_ui->imagePathLabel->setText(QString("Image: %1").arg(m_imageId));
-            updated = true;
-        }
-
-        QString newTitle = m_ui->titleText->text();
-        if (m_article.GetTitle().compare(newTitle))
-        {
-            m_article.SetTitle(newTitle);
-            updated = true;
-        }
-        QString newBody = m_ui->descriptionText->toPlainText();
-        if (m_article.GetBody().compare(newBody) != 0)
-        {
-            m_article.SetBody(newBody);
-            updated = true;
-        }
-
-        QString newStyle = m_ui->articleStyleButtonGroup->checkedButton()->property("style").toString();
-        if (m_article.GetArticleStyle() != newStyle)
-        {
-            m_article.SetArticleStyle(newStyle);
-            updated = true;
-        }
-
-        if (updated)
-        {
-            m_article.Update();
-            m_manifest.UpdateResource(&m_article.GetResource());
-            emit logSignal(QString("Article %1 updated")
-                .arg(m_article.GetResource().GetId()), LogOk);
-        }
-        else
-        {
-            emit logSignal("Nothing to update", LogWarning);
-        }
-        emit updateArticleSignal();
-    }
-
-    //! try to load an image either from filename or from another resource,
-    //! update resource manifest accordingly
-    QString ArticleDetails::LoadImage() const
-    {
-        if (!m_filename.isEmpty())
-        {
-            if (!m_imageIdOriginal.isEmpty())
-            {
-                m_manifest.FreeResource(m_imageIdOriginal);
-            }
-            auto pResource = m_manifest.AddImage(m_filename);
-            if (pResource)
-            {
-                return pResource->GetId();
-            }
-            return "";
-        }
-
-        if (m_imageId.compare(m_imageIdOriginal) != 0)
-        {
-            if (!m_imageIdOriginal.isEmpty())
-            {
-                m_manifest.FreeResource(m_imageIdOriginal);
-            }
-            if (!m_imageId.isEmpty())
-            {
-                m_manifest.UseResource(m_imageId);
-            }
-            return m_imageId;
-        }
-
-        return m_imageIdOriginal;
-    }
-
-    void ArticleDetails::SetImage(Resource& resource)
-    {
-        m_ui->imagePathLabel->setText(QString("Image: %1").arg(resource.GetId()));
-
-        QPixmap pixmap;
-        if (pixmap.loadFromData(resource.GetData()))
-        {
-            m_ui->imagePreview->setPixmap(pixmap);
-            m_imageId = resource.GetId();
-        }
-        else
-        {
-            SetNoImage();
-            emit logSignal(QString("Failed to load image: %1.").arg(m_imageId));
-        }
-    }
-
-    void ArticleDetails::SetImage([[maybe_unused]] QString& filename)
-    {
-        m_ui->imagePathLabel->setText(QString("Image: %1").arg(m_filename));
-
-        QPixmap pixmap;
-        if (pixmap.load(m_filename))
-        {
-            m_ui->imagePreview->setPixmap(pixmap);
-        }
-        else
-        {
-            SetNoImage();
-            emit logSignal(QString("Failed to load image: %1.").arg(m_filename));
-        }
-    }
-
-    void ArticleDetails::SetNoImage() const
-    {
-        m_ui->imagePreview->setPixmap(QPixmap(":/images/Resources/missing-image.png"));
-        m_ui->imagePathLabel->setText("no image");
-    }
-
-    void ArticleDetails::ClearImage()
-    {
-        m_imageId = "";
-        m_filename = "";
-        SetNoImage();
-    }
-
-    void ArticleDetails::DeleteArticle()
-    {
-        if (!m_article.GetImageId().isEmpty())
-        {
-            m_manifest.FreeResource(m_article.GetImageId());
-        }
-        m_manifest.FreeResource(m_article.GetResource().GetId());
-        emit deleteArticleSignal();
-    }
-
-    void ArticleDetails::Close()
-    {
-        emit closeArticleSignal();
-    }
-
-    void ArticleDetails::MoveUp()
-    {
-        ErrorCode error;
-        if (!m_manifest.UpdateArticleOrder(m_article.GetResource().GetId(), 1, error))
-        {
-            emit logSignal(GetErrorMessage(error));
-        }
-        else
-        {
-            emit orderChangedSignal(m_article.GetResource().GetId(), 1);
-        }
-    }
-
-    void ArticleDetails::MoveDown()
-    {
-        ErrorCode error;
-        if (!m_manifest.UpdateArticleOrder(m_article.GetResource().GetId(), 0, error))
-        {
-            emit logSignal(GetErrorMessage(error));
-        }
-        else
-        {
-            emit orderChangedSignal(m_article.GetResource().GetId(), 0);
-        }
-    }
-
-#include "Qt/moc_ArticleDetails.cpp"
-
-}
diff --git a/Code/Tools/News/NewsBuilder/Qt/ArticleDetails.h b/Code/Tools/News/NewsBuilder/Qt/ArticleDetails.h
deleted file mode 100644
index 7f8d482e3f..0000000000
--- a/Code/Tools/News/NewsBuilder/Qt/ArticleDetails.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-
-#if !defined(Q_MOC_RUN)
-#include <NewsShared/ResourceManagement/ArticleDescriptor.h>
-#include "ResourceManagement/BuilderResourceManifest.h"
-
-#include <QWidget>
-#endif
-
-namespace Ui
-{
-    class ArticleDetailsWidget;
-}
-
-namespace News {
-    class SelectImage;
-    class ResourceManifest;
-    class Resource;
-
-    //! Control that allows to modify all parameters of a single article
-    class ArticleDetails
-        : public QWidget
-    {
-        Q_OBJECT
-
-    public:
-        ArticleDetails(QWidget* parent,
-            Resource& resource,
-            BuilderResourceManifest& manifest);
-        ~ArticleDetails();
-        ArticleDescriptor& GetArticle();
-        QString GetId() const;
-
-    Q_SIGNALS:
-        void logSignal(QString text, LogType logType = LogInfo);
-        void deleteArticleSignal();
-        void updateArticleSignal();
-        void closeArticleSignal();
-        void orderChangedSignal(QString id, bool direction);
-
-    private:
-        QScopedPointer<Ui::ArticleDetailsWidget> m_ui;
-        QString m_filename;
-        ArticleDescriptor m_article;
-        BuilderResourceManifest& m_manifest;
-        SelectImage* m_pSelectImage;
-        QString m_imageIdOriginal;
-        QString m_imageId;
-        float m_imageRatio = 184.0f / 430.0f;
-
-        void resizeEvent(QResizeEvent *event) override;
-        void resizePreviewImage();
-
-        void OpenImageFromFile();
-        void OpenImageFromResource();
-        QString LoadImage() const;
-        void SetImage(Resource& resource);
-        void SetImage(QString& filename);
-        void SetNoImage() const;
-        void ClearImage();
-
-        void UpdateArticle();
-        void DeleteArticle();
-        void Close();
-        void MoveUp();
-        void MoveDown();
-    };
-} // namespace News
diff --git a/Code/Tools/News/NewsBuilder/Qt/ArticleDetails.ui b/Code/Tools/News/NewsBuilder/Qt/ArticleDetails.ui
deleted file mode 100644
index 92970f1130..0000000000
--- a/Code/Tools/News/NewsBuilder/Qt/ArticleDetails.ui
+++ /dev/null
@@ -1,406 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ArticleDetailsWidget</class>
- <widget class="QWidget" name="ArticleDetailsWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>250</width>
-    <height>420</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>100</width>
-    <height>420</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>640</width>
-    <height>16777215</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QHBoxLayout" name="horizontalLayout">
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QWidget" name="globalLayout" native="true">
-     <layout class="QVBoxLayout" name="verticalLayout_5">
-      <property name="spacing">
-       <number>0</number>
-      </property>
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="AzQtComponents::ExtendedLabel" name="imagePreview">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>100</width>
-          <height>100</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>16777215</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-        <property name="pixmap">
-         <pixmap resource="newsbuilder.qrc">:/images/Resources/missing-image.png</pixmap>
-        </property>
-        <property name="scaledContents">
-         <bool>false</bool>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-        </property>
-        <property name="pixmapSize" stdset="0">
-         <size>
-          <width>100</width>
-          <height>100</height>
-         </size>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QWidget" name="imageLayout" native="true">
-        <property name="maximumSize">
-         <size>
-          <width>16777215</width>
-          <height>140</height>
-         </size>
-        </property>
-        <layout class="QVBoxLayout" name="verticalLayout_2">
-         <property name="spacing">
-          <number>0</number>
-         </property>
-         <item>
-          <widget class="QLabel" name="imagePathLabel">
-           <property name="text">
-            <string>Image:</string>
-           </property>
-           <property name="wordWrap">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QWidget" name="imageLayoutInner" native="true">
-           <layout class="QHBoxLayout" name="horizontalLayout_3">
-            <property name="spacing">
-             <number>0</number>
-            </property>
-            <property name="leftMargin">
-             <number>0</number>
-            </property>
-            <property name="topMargin">
-             <number>0</number>
-            </property>
-            <property name="rightMargin">
-             <number>0</number>
-            </property>
-            <property name="bottomMargin">
-             <number>0</number>
-            </property>
-            <item>
-             <layout class="QHBoxLayout" name="horizontalLayout_5">
-              <property name="spacing">
-               <number>0</number>
-              </property>
-              <item>
-               <widget class="QPushButton" name="clearImageButton">
-                <property name="maximumSize">
-                 <size>
-                  <width>16777215</width>
-                  <height>16777215</height>
-                 </size>
-                </property>
-                <property name="text">
-                 <string>Clear</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QPushButton" name="fromResourceButton">
-                <property name="maximumSize">
-                 <size>
-                  <width>16777215</width>
-                  <height>16777215</height>
-                 </size>
-                </property>
-                <property name="text">
-                 <string>Library...</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QPushButton" name="fromFileButton">
-                <property name="maximumSize">
-                 <size>
-                  <width>16777215</width>
-                  <height>16777215</height>
-                 </size>
-                </property>
-                <property name="text">
-                 <string>Load...</string>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </item>
-           </layout>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item>
-       <widget class="QWidget" name="Title" native="true">
-        <property name="maximumSize">
-         <size>
-          <width>1280</width>
-          <height>1280</height>
-         </size>
-        </property>
-        <layout class="QVBoxLayout" name="verticalLayout_4">
-         <property name="spacing">
-          <number>0</number>
-         </property>
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-         <item>
-          <widget class="QLabel" name="uidLabel">
-           <property name="maximumSize">
-            <size>
-             <width>16777215</width>
-             <height>20</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>Article: 0</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <layout class="QHBoxLayout" name="articleStyleLayout">
-           <property name="spacing">
-            <number>0</number>
-           </property>
-           <property name="leftMargin">
-            <number>0</number>
-           </property>
-           <property name="topMargin">
-            <number>3</number>
-           </property>
-           <property name="rightMargin">
-            <number>0</number>
-           </property>
-           <property name="bottomMargin">
-            <number>3</number>
-           </property>
-           <item>
-            <widget class="QRadioButton" name="defaultStyleRadioButton">
-             <property name="text">
-              <string>Default Style</string>
-             </property>
-             <property name="checked">
-              <bool>true</bool>
-             </property>
-             <property name="style" stdset="0">
-              <string>default</string>
-             </property>
-             <attribute name="buttonGroup">
-              <string notr="true">articleStyleButtonGroup</string>
-             </attribute>
-            </widget>
-           </item>
-           <item>
-            <widget class="QRadioButton" name="pinnedStyleRadioButton">
-             <property name="text">
-              <string>Pinned Style</string>
-             </property>
-             <property name="style" stdset="0">
-              <string>pinned</string>
-             </property>
-             <attribute name="buttonGroup">
-              <string notr="true">articleStyleButtonGroup</string>
-             </attribute>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item>
-          <widget class="QLabel" name="label">
-           <property name="text">
-            <string>Title:</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLineEdit" name="titleText">
-           <property name="clearButtonEnabled">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item>
-       <layout class="QVBoxLayout" name="Description">
-        <property name="spacing">
-         <number>0</number>
-        </property>
-        <item>
-         <widget class="QLabel" name="label_3">
-          <property name="text">
-           <string>Description:</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPlainTextEdit" name="descriptionText"/>
-        </item>
-        <item>
-         <layout class="QVBoxLayout" name="verticalLayout_3">
-          <property name="spacing">
-           <number>0</number>
-          </property>
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_4">
-            <property name="spacing">
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QPushButton" name="deleteButton">
-              <property name="text">
-               <string>Delete</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QPushButton" name="cancelButton">
-              <property name="text">
-               <string>Cancel</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QPushButton" name="updateButton">
-              <property name="text">
-               <string>Save</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_2">
-            <property name="spacing">
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QPushButton" name="upButton">
-              <property name="maximumSize">
-               <size>
-                <width>16777215</width>
-                <height>16777215</height>
-               </size>
-              </property>
-              <property name="text">
-               <string>Move Up</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QPushButton" name="downButton">
-              <property name="maximumSize">
-               <size>
-                <width>16777215</width>
-                <height>16777215</height>
-               </size>
-              </property>
-              <property name="text">
-               <string>Move Down</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-         </layout>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>AzQtComponents::ExtendedLabel</class>
-   <extends>QLabel</extends>
-   <header>AzQtComponents/Components/ExtendedLabel.h</header>
-  </customwidget>
- </customwidgets>
- <resources>
-  <include location="newsbuilder.qrc"/>
- </resources>
- <connections/>
- <buttongroups>
-  <buttongroup name="articleStyleButtonGroup"/>
- </buttongroups>
-</ui>
diff --git a/Code/Tools/News/NewsBuilder/Qt/ArticleDetailsContainer.cpp b/Code/Tools/News/NewsBuilder/Qt/ArticleDetailsContainer.cpp
deleted file mode 100644
index 586978a562..0000000000
--- a/Code/Tools/News/NewsBuilder/Qt/ArticleDetailsContainer.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ArticleDetailsContainer.h"
-#include "ResourceManagement/BuilderResourceManifest.h"
-#include "ArticleDetails.h"
-#include "Qt/ui_ArticleDetailsContainer.h"
-
-namespace News
-{
-
-    ArticleDetailsContainer::ArticleDetailsContainer(
-        QWidget* parent,
-        BuilderResourceManifest& manifest)
-        : QWidget(parent)
-        , m_ui(new Ui::ArticleDetailsContainerWidget)
-        , m_manifest(manifest)
-        , m_articleDetails(nullptr)
-    {
-        m_ui->setupUi(this);
-    }
-
-    ArticleDetailsContainer::~ArticleDetailsContainer() {}
-
-    //! When article is selected, old articleDetails control is removed, new one is created
-    void ArticleDetailsContainer::SelectArticle(const QString& id)
-    {
-        closeArticleSlot();
-
-        if (!id.isEmpty())
-        {
-            auto article = m_manifest.FindById(id);
-            if (article)
-            {
-                m_articleDetails = new ArticleDetails(
-                    m_ui->scrollAreaWidgetContents,
-                    *article,
-                    m_manifest);
-                m_ui->scrollAreaWidgetContents->layout()->addWidget(m_articleDetails);
-                connect(m_articleDetails, &ArticleDetails::updateArticleSignal,
-                    this, &ArticleDetailsContainer::updateArticleSlot);
-                connect(m_articleDetails, &ArticleDetails::deleteArticleSignal,
-                    this, &ArticleDetailsContainer::deleteArticleSlot);
-                connect(m_articleDetails, &ArticleDetails::closeArticleSignal,
-                    this, &ArticleDetailsContainer::closeArticleSlot);
-                connect(m_articleDetails, SIGNAL(logSignal(QString, LogType)),
-                    this, SIGNAL(logSignal(QString, LogType)));
-                connect(m_articleDetails, SIGNAL(orderChangedSignal(QString, bool)),
-                    this, SIGNAL(orderChangedSignal(QString, bool)));
-                m_selectedId = id;
-            }
-        }
-    }
-
-    void ArticleDetailsContainer::Reset()
-    {
-        SelectArticle(m_selectedId);
-    }
-
-    void ArticleDetailsContainer::updateArticleSlot()
-    {
-        emit updateArticleSignal(m_articleDetails->GetId());
-    }
-
-    void ArticleDetailsContainer::deleteArticleSlot()
-    {
-        emit deleteArticleSignal(m_articleDetails->GetId());
-        closeArticleSlot();
-    }
-
-    void ArticleDetailsContainer::closeArticleSlot()
-    {
-        if (m_articleDetails)
-        {
-            emit closeArticleSignal(m_selectedId);
-            delete m_articleDetails;
-            m_articleDetails = nullptr;
-            m_selectedId = "";
-        }
-    }
-
-#include "Qt/moc_ArticleDetailsContainer.cpp"
-
-}
diff --git a/Code/Tools/News/NewsBuilder/Qt/ArticleDetailsContainer.h b/Code/Tools/News/NewsBuilder/Qt/ArticleDetailsContainer.h
deleted file mode 100644
index 1df42198c3..0000000000
--- a/Code/Tools/News/NewsBuilder/Qt/ArticleDetailsContainer.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QWidget>
-#include <NewsShared/LogType.h>
-#endif
-
-namespace Ui
-{
-    class ArticleDetailsContainerWidget;
-}
-
-namespace News 
-{
-    class ArticleDetails;
-    class BuilderResourceManifest;
-    class SelectImage;
-    class ResourceManifest;
-    class Resource;
-
-    //! Control that manages articleDetails control
-    class ArticleDetailsContainer
-        : public QWidget
-    {
-        Q_OBJECT
-
-    public:
-        ArticleDetailsContainer(QWidget* parent, BuilderResourceManifest& manifest);
-        ~ArticleDetailsContainer();
-
-        void SelectArticle(const QString& id);
-        void Reset();
-
-Q_SIGNALS:
-        void logSignal(QString text, LogType logType = LogInfo);
-        void updateArticleSignal(QString id);
-        void deleteArticleSignal(QString id);
-        void closeArticleSignal(QString id);
-        void orderChangedSignal(QString id, bool direction);
-
-    private:
-        QScopedPointer<Ui::ArticleDetailsContainerWidget> m_ui;
-        BuilderResourceManifest& m_manifest;
-        ArticleDetails* m_articleDetails = nullptr;
-        QString m_selectedId;
-
-    private Q_SLOTS:
-        void updateArticleSlot();
-        void deleteArticleSlot();
-        void closeArticleSlot();
-    };
-} // namespace News
diff --git a/Code/Tools/News/NewsBuilder/Qt/ArticleDetailsContainer.ui b/Code/Tools/News/NewsBuilder/Qt/ArticleDetailsContainer.ui
deleted file mode 100644
index 7652fa114d..0000000000
--- a/Code/Tools/News/NewsBuilder/Qt/ArticleDetailsContainer.ui
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ArticleDetailsContainerWidget</class>
- <widget class="QWidget" name="ArticleDetailsContainerWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>250</width>
-    <height>386</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>250</width>
-    <height>0</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>640</width>
-    <height>16777215</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>ArticleDetailsContainer</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QScrollArea" name="scrollArea">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="horizontalScrollBarPolicy">
-      <enum>Qt::ScrollBarAlwaysOff</enum>
-     </property>
-     <property name="widgetResizable">
-      <bool>true</bool>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-     </property>
-     <widget class="QWidget" name="scrollAreaWidgetContents">
-      <property name="geometry">
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>248</width>
-        <height>384</height>
-       </rect>
-      </property>
-      <layout class="QVBoxLayout" name="verticalLayout_3">
-       <property name="spacing">
-        <number>0</number>
-       </property>
-       <property name="leftMargin">
-        <number>0</number>
-       </property>
-       <property name="topMargin">
-        <number>0</number>
-       </property>
-       <property name="rightMargin">
-        <number>0</number>
-       </property>
-       <property name="bottomMargin">
-        <number>0</number>
-       </property>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/Code/Tools/News/NewsBuilder/Qt/AwsDialog.ui b/Code/Tools/News/NewsBuilder/Qt/AwsDialog.ui
deleted file mode 100644
index f58243ed8d..0000000000
--- a/Code/Tools/News/NewsBuilder/Qt/AwsDialog.ui
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Dialog</class>
- <widget class="QDialog" name="Dialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>176</width>
-    <height>137</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle">
-   <string>Dialog</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_4">
-   <item>
-    <layout class="QVBoxLayout" name="verticalLayout_3">
-     <item>
-      <layout class="QVBoxLayout" name="verticalLayout">
-       <item>
-        <widget class="QLabel" name="label">
-         <property name="text">
-          <string>AWS Key Id:</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLineEdit" name="textKeyId"/>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <item>
-        <widget class="QLabel" name="label_2">
-         <property name="text">
-          <string>AWS Secret Key:</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLineEdit" name="textKeyId_2"/>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <widget class="QDialogButtonBox" name="buttonBox">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="standardButtons">
-        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>Dialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>248</x>
-     <y>254</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>Dialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>316</x>
-     <y>260</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
diff --git a/Code/Tools/News/NewsBuilder/Qt/BuilderArticleViewContainer.cpp b/Code/Tools/News/NewsBuilder/Qt/BuilderArticleViewContainer.cpp
deleted file mode 100644
index bf77a89895..0000000000
--- a/Code/Tools/News/NewsBuilder/Qt/BuilderArticleViewContainer.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "BuilderArticleViewContainer.h"
-#include "ResourceManagement/BuilderResourceManifest.h"
-#include "ArticleDetails.h"
-#include <NewsShared/ResourceManagement/Resource.h>
-#include <NewsShared/Qt/ArticleViewContainer.h>
-#include <NewsShared/Qt/ArticleView.h>
-#include "Qt/ui_BuilderArticleViewContainer.h"
-
-#include <AzQtComponents/Components/Style.h>
-
-#include "QCustomMessageBox.h"
-
-namespace News
-{
-
-    BuilderArticleViewContainer::BuilderArticleViewContainer(
-        QWidget* parent,
-        BuilderResourceManifest& manifest)
-        : QWidget(parent)
-        , m_ui(new Ui::BuilderArticleViewContainerWidget)
-        , m_container(new ArticleViewContainer(this, manifest))
-        , m_manifest(manifest)
-    {
-        m_ui->setupUi(this);
-
-        m_ui->ArticleViewContainerRoot->layout()->addWidget(m_container);
-        connect(m_container, SIGNAL(articleSelectedSignal(QString)),
-            this, SLOT(articleSelectedSlot(QString)));
-    }
-
-    BuilderArticleViewContainer::~BuilderArticleViewContainer(){}
-
-    void BuilderArticleViewContainer::AddArticle()
-    {
-        auto pArticleResource = static_cast<BuilderResourceManifest&>(m_manifest).AddArticle();
-        if (pArticleResource)
-        {
-            m_container->AddArticleView(ArticleDescriptor(*pArticleResource));
-            SelectArticle(pArticleResource->GetId());
-        }
-    }
-
-    void BuilderArticleViewContainer::SelectArticle(QString id)
-    {
-        if (m_selectedArticleId.compare(id) == 0)
-        {
-            return;
-        }
-
-        UnselectArticle();
-        m_selectedArticleId = id;
-        auto article = m_container->FindById(id);
-        if (article)
-        {
-            m_container->ScrollToView(article);
-            emit articleSelectedSignal(id);
-
-            // Add class and refresh style
-            AzQtComponents::Style::addClass(article, m_selectedArticleClass);
-            article->style()->unpolish(qApp);
-            article->style()->polish(qApp);
-        }
-    }
-
-    void BuilderArticleViewContainer::Sync()
-    {
-        emit logSignal("Starting sync");
-
-        m_manifest.Sync();
-    }
-
-    void BuilderArticleViewContainer::UpdateArticle(QString& id) const
-    {
-        auto view = m_container->FindById(id);
-        if (view)
-        {
-            view->Update();
-            m_container->ForceRefreshArticleView(view);
-        }
-    }
-
-    void BuilderArticleViewContainer::DeleteArticle(QString& id) const
-    {
-        auto view = m_container->FindById(id);
-        if (view)
-        {
-            m_container->DeleteArticleView(view);
-        }
-    }
-
-    //possibly support multiple selection in future?
-    void BuilderArticleViewContainer::CloseArticle(QString& id)
-    {
-        if (m_selectedArticleId == id)
-        {
-            UnselectArticle();
-        }
-    }
-
-    void BuilderArticleViewContainer::UpdateArticleOrder(QString& id, bool direction) const
-    {
-        auto view = m_container->FindById(id);
-        if (view)
-        {
-            m_container->UpdateArticleOrder(view, direction);
-        }
-    }
-
-    void BuilderArticleViewContainer::PopulateArticles()
-    {
-        m_container->PopulateArticles();
-
-        if (!m_selectedArticleId.isEmpty())
-        {
-            SelectArticle(m_selectedArticleId);
-        }
-    }
-
-    void BuilderArticleViewContainer::AddErrorMessage() const
-    {
-        m_container->AddErrorMessage();
-    }
-
-    void BuilderArticleViewContainer::UnselectArticle()
-    {
-        if (m_selectedArticleId.isEmpty())
-        {
-            return;
-        }
-        auto article = m_container->FindById(m_selectedArticleId);
-    
-        // Remove class and refresh style
-        if (article)
-        {
-            AzQtComponents::Style::removeClass(article, m_selectedArticleClass);
-            article->style()->unpolish(qApp);
-            article->style()->polish(qApp);
-        }
-
-        m_selectedArticleId = "";
-    }
-
-    void BuilderArticleViewContainer::articleSelectedSlot(QString id)
-    {
-        SelectArticle(id);
-    }
-
-#include "Qt/moc_BuilderArticleViewContainer.cpp"
-
-}
diff --git a/Code/Tools/News/NewsBuilder/Qt/BuilderArticleViewContainer.h b/Code/Tools/News/NewsBuilder/Qt/BuilderArticleViewContainer.h
deleted file mode 100644
index 94712ca768..0000000000
--- a/Code/Tools/News/NewsBuilder/Qt/BuilderArticleViewContainer.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QWidget>
-#include <NewsShared/LogType.h>
-#endif
-
-namespace Ui
-{
-    class BuilderArticleViewContainerWidget;
-}
-
-namespace News
-{
-    class ArticleViewContainer;
-    class BuilderResourceManifest;
-
-    //! BuilderArticleViewContainer is a Builder container for ArticleViewContainer.
-    /*!
-        It is a wrapper with additional builder functionality for displaying articles
-    */
-    class BuilderArticleViewContainer
-        : public QWidget
-    {
-        Q_OBJECT
-    public:
-        BuilderArticleViewContainer(QWidget* parent, BuilderResourceManifest& manifest);
-        ~BuilderArticleViewContainer();
-
-        void UpdateArticle(QString& id) const;
-        void DeleteArticle(QString& id) const;
-        void CloseArticle(QString& id);
-        void UpdateArticleOrder(QString& id, bool direction) const;
-        void PopulateArticles();
-        void AddErrorMessage() const;
-        void AddArticle();
-
-Q_SIGNALS:
-        void logSignal(QString text, LogType logType = LogInfo);
-        void articleSelectedSignal(QString id);
-
-    private:
-        QScopedPointer<Ui::BuilderArticleViewContainerWidget> m_ui;
-        ArticleViewContainer* m_container;
-        QString m_selectedArticleId;
-        QString m_selectedArticleClass = "SelectedArticle";
-        BuilderResourceManifest& m_manifest;
-
-        void Sync();
-        void SelectArticle(QString id);
-        void UnselectArticle();
-
-
-    private Q_SLOTS:
-        void articleSelectedSlot(QString id);
-    };
-} // namespace News
diff --git a/Code/Tools/News/NewsBuilder/Qt/BuilderArticleViewContainer.ui b/Code/Tools/News/NewsBuilder/Qt/BuilderArticleViewContainer.ui
deleted file mode 100644
index dafac9b9ff..0000000000
--- a/Code/Tools/News/NewsBuilder/Qt/BuilderArticleViewContainer.ui
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>BuilderArticleViewContainerWidget</class>
- <widget class="QWidget" name="BuilderArticleViewContainerWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>250</width>
-    <height>500</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QWidget" name="ArticleViewContainerRoot" native="true">
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <property name="spacing">
-       <number>0</number>
-      </property>
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/Code/Tools/News/NewsBuilder/Qt/EndpointEntryView.cpp b/Code/Tools/News/NewsBuilder/Qt/EndpointEntryView.cpp
deleted file mode 100644
index 5e698eea97..0000000000
--- a/Code/Tools/News/NewsBuilder/Qt/EndpointEntryView.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EndpointEntryView.h"
-#include "Qt/ui_EndpointEntryView.h"
-#include <EndpointManager.h>
-#include <QToolButton>
-
-namespace News
-{
-
-    const char* EndpointEntryView::SELECTED_CSS =
-        "background-color: rgb(60, 100, 60);\ncolor: white;";
-    const char* EndpointEntryView::UNSELECTED_CSS =
-        "background-color: rgb(60, 60, 60);\ncolor: white;";
-
-    EndpointEntryView::EndpointEntryView(QWidget* parent, Endpoint* pEndpoint)
-        : QWidget(parent)
-        , m_ui(new Ui::EndpointEntryViewWidget)
-        , m_pEndpoint(pEndpoint)
-    {
-        m_ui->setupUi(this);
-
-        m_ui->labelName->setText(pEndpoint->GetName());
-
-        connect(m_ui->labelName, &AzQtComponents::ExtendedLabel::clicked, this, &EndpointEntryView::selectSlot);
-        connect(m_ui->buttonDelete, &QToolButton::clicked, this, &EndpointEntryView::deleteSlot);
-    }
-
-    EndpointEntryView::~EndpointEntryView() {}
-
-    void EndpointEntryView::SetSelected(bool selected)
-    {
-        setStyleSheet(selected ? SELECTED_CSS : UNSELECTED_CSS);
-    }
-
-    Endpoint* EndpointEntryView::GetEndpoint() const
-    {
-        return m_pEndpoint;
-    }
-
-    void EndpointEntryView::selectSlot()
-    {
-        emit selectSignal(this);
-    }
-
-    void EndpointEntryView::deleteSlot()
-    {
-        emit deleteSignal(this);
-    }
-
-#include "Qt/moc_EndpointEntryView.cpp"
-
-}
diff --git a/Code/Tools/News/NewsBuilder/Qt/EndpointEntryView.h b/Code/Tools/News/NewsBuilder/Qt/EndpointEntryView.h
deleted file mode 100644
index c8b014c167..0000000000
--- a/Code/Tools/News/NewsBuilder/Qt/EndpointEntryView.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QWidget>
-#endif
-
-namespace Ui
-{
-    class EndpointEntryViewWidget;
-}
-
-namespace News
-{
-    class Endpoint;
-
-    //! Qt widget representing a single endpoint entry
-    class EndpointEntryView
-        : public QWidget
-    {
-        Q_OBJECT
-    public:
-        EndpointEntryView(QWidget* parent, Endpoint* pEndpoint);
-        ~EndpointEntryView();
-
-        void SetSelected(bool selected);
-
-        Endpoint* GetEndpoint() const;
-
-    Q_SIGNALS:
-        void selectSignal(EndpointEntryView* pEndpointView);
-        void deleteSignal(EndpointEntryView* pEndpointView);
-
-    private:
-        static const char* SELECTED_CSS;
-        static const char* UNSELECTED_CSS;
-
-        QScopedPointer<Ui::EndpointEntryViewWidget> m_ui;
-        Endpoint* m_pEndpoint = nullptr;
-
-    private Q_SLOTS:
-        void selectSlot();
-        void deleteSlot();
-    };
-} // namespace News
diff --git a/Code/Tools/News/NewsBuilder/Qt/EndpointEntryView.ui b/Code/Tools/News/NewsBuilder/Qt/EndpointEntryView.ui
deleted file mode 100644
index 309fcd5662..0000000000
--- a/Code/Tools/News/NewsBuilder/Qt/EndpointEntryView.ui
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>EndpointEntryViewWidget</class>
- <widget class="QWidget" name="EndpointEntryViewWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>356</width>
-    <height>23</height>
-   </rect>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>0</width>
-    <height>23</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>16777215</width>
-    <height>23</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QHBoxLayout" name="horizontalLayout">
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="AzQtComponents::ExtendedLabel" name="labelName">
-     <property name="text">
-      <string>TextLabel</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QToolButton" name="buttonDelete">
-     <property name="minimumSize">
-      <size>
-       <width>25</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>25</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="styleSheet">
-      <string notr="true">background-color: red;</string>
-     </property>
-     <property name="text">
-      <string>X</string>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>AzQtComponents::ExtendedLabel</class>
-   <extends>QLabel</extends>
-   <header>AzQtComponents/Components/ExtendedLabel.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
diff --git a/Code/Tools/News/NewsBuilder/Qt/EndpointManagerView.cpp b/Code/Tools/News/NewsBuilder/Qt/EndpointManagerView.cpp
deleted file mode 100644
index e28245b895..0000000000
--- a/Code/Tools/News/NewsBuilder/Qt/EndpointManagerView.cpp
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EndpointManagerView.h"
-#include "EndpointManager.h"
-#include "EndpointEntryView.h"
-#include "Qt/ui_EndpointManagerView.h"
-#include "Qt/QCustomMessageBox.h"
-#include "ResourceManagement/BuilderResourceManifest.h"
-
-#include <QMessageBox>
-
-namespace News
-{
-
-    EndpointManagerView::EndpointManagerView(QWidget* parent,
-        BuilderResourceManifest& manifest)
-        : QDialog(parent)
-        , m_ui(new Ui::EndpointManagerViewWidget)
-        , m_pManager(manifest.GetEndpointManager())
-        , m_manifest(manifest)
-    {
-        m_ui->setupUi(this);
-
-        for (auto endpoint : *m_pManager)
-        {
-            auto endpointView = AddEndpointEntry(endpoint);
-            if (m_pManager->GetSelectedEndpoint() == endpoint)
-            {
-                selectEndpointSlot(endpointView);
-            }
-        }
-
-        connect(m_ui->buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
-        connect(m_ui->buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
-        connect(m_ui->buttonAdd, &QPushButton::clicked, this, &EndpointManagerView::addEndpointSlot);
-    }
-
-    EndpointManagerView::~EndpointManagerView() {}
-
-    EndpointEntryView* EndpointManagerView::AddEndpointEntry(Endpoint* pEndpoint)
-    {
-        auto endpointView = new EndpointEntryView(m_ui->endpointListContents, pEndpoint);
-        auto layout = static_cast<QVBoxLayout*>(m_ui->endpointListContents->layout());
-        layout->insertWidget(layout->count() - 2, endpointView);
-        m_endpoints.append(endpointView);
-        connect(endpointView, SIGNAL(selectSignal(EndpointEntryView*)),
-            this, SLOT(selectEndpointSlot(EndpointEntryView*)));
-        connect(endpointView, SIGNAL(deleteSignal(EndpointEntryView*)),
-            this, SLOT(deleteEndpointSlot(EndpointEntryView*)));
-        // this lets us modify newly-added widget in the same function
-        qApp->processEvents();
-        return endpointView;
-    }
-
-    void EndpointManagerView::Update() const
-    {
-        if (m_pSelectedEndpoint)
-        {
-            auto pEndpoint = m_pSelectedEndpoint->GetEndpoint();
-            pEndpoint->SetName(m_ui->nameText->text());
-            pEndpoint->SetAwsProfile(m_ui->awsProfileText->text());
-            pEndpoint->SetUrl(m_ui->urlText->text());
-            pEndpoint->SetBucket(m_ui->bucketText->text());
-            m_pManager->SelectEndpoint(m_pSelectedEndpoint->GetEndpoint());
-        }
-        m_pManager->Save();
-    }
-
-    void EndpointManagerView::accept()
-    {
-        enum SyncResponse
-        {
-            Merge, ReplaceLocal, ReplaceRemote, Cancel
-        };
-        enum YesNoResponse
-        {
-            Yes, No
-        };
-
-        QCustomMessageBox msgBox(
-            QCustomMessageBox::Question,
-            tr("Pull data from Endpoint"),
-            tr("You are changing an endpoint. "
-                "What would you like to do with the data on the current endpoint?\n\n"
-                "Merge - merge resources from the endpoint\n"
-                "Replace Local - overwrite local resources with endpoint resources\n"
-                "Replace Endpoint - overwrite endpoint resources with local resources\n"
-                "Cancel - undo endpoint selection"
-            ),
-            this);
-        msgBox.AddButton(tr("Merge"), Merge);
-        msgBox.AddButton(tr("Replace Local"), ReplaceLocal);
-        msgBox.AddButton(tr("Replace Endpoint"), ReplaceRemote);
-        msgBox.AddButton(tr("Cancel"), Cancel);
-
-        switch (msgBox.exec())
-        {
-        case Merge:
-        {
-            m_manifest.SetSyncType(SyncType::Merge);
-            m_manifest.PersistLocalResources();
-        }
-        break;
-        case ReplaceLocal:
-        {
-            if (m_manifest.HasChanges())
-            {
-                QCustomMessageBox msgBoxWarning(
-                    QCustomMessageBox::Critical,
-                    tr("Unsaved changes"),
-                    tr("Local resources were modified but not published."
-                        "Changing endpoints will cause unpublished work to be lost.\n\n"
-                        "Would you like to proceed?"),
-                    this);
-                msgBoxWarning.AddButton(tr("Yes"), Yes);
-                msgBoxWarning.AddButton(tr("No"), No);
-                if (msgBoxWarning.exec() == No)
-                {
-                    return;
-                }
-            }
-            m_manifest.SetSyncType(SyncType::Merge);
-            m_manifest.Reset();
-        }
-        break;
-        case ReplaceRemote:
-        {
-            QCustomMessageBox msgBoxWarning2(
-                QCustomMessageBox::Critical,
-                tr("Warning"),
-                tr("This operation will IRREVERSABLY replace ALL resources on ") +
-                m_pSelectedEndpoint->GetEndpoint()->GetName() +
-                tr(" endpoint with local data.\n\n"
-                    "Are you sure you'd like to proceed?"),
-                this);
-            msgBoxWarning2.AddButton(tr("Yes"), Yes);
-            msgBoxWarning2.AddButton(tr("No"), No);
-            if (msgBoxWarning2.exec() == No)
-            {
-                return;
-            }
-            m_manifest.SetSyncType(SyncType::Overwrite);
-            m_manifest.PersistLocalResources();
-        }
-        break;
-        case Cancel:
-            return;
-        }
-
-        Update();
-
-        QDialog::accept();
-    }
-
-    void EndpointManagerView::addEndpointSlot()
-    {
-        auto pEndpoint = new Endpoint(
-            QObject::tr("New endpoint"),
-            QObject::tr("Enter AWS profile name"),
-            QObject::tr("Enter root URL"),
-            QObject::tr("Enter s3 bucket name"));
-        m_pManager->AddEndpoint(pEndpoint);
-        auto endpointView = AddEndpointEntry(pEndpoint);
-        selectEndpointSlot(endpointView);
-    }
-
-    void EndpointManagerView::selectEndpointSlot(EndpointEntryView* pEndpointView)
-    {
-        m_pSelectedEndpoint = pEndpointView;
-
-        for (auto view : m_endpoints)
-        {
-            view->SetSelected(view == pEndpointView);
-        }
-
-        if (pEndpointView)
-        {
-            auto pEndpoint = pEndpointView->GetEndpoint();
-            m_ui->nameText->setText(pEndpoint->GetName());
-            m_ui->awsProfileText->setText(pEndpoint->GetAwsProfile());
-            m_ui->urlText->setText(pEndpoint->GetUrl());
-            m_ui->bucketText->setText(pEndpoint->GetBucket());
-        }
-        else
-        {
-            m_ui->nameText->setText("");
-            m_ui->awsProfileText->setText("");
-            m_ui->urlText->setText("");
-            m_ui->bucketText->setText("");
-        }
-    }
-
-    void EndpointManagerView::deleteEndpointSlot(EndpointEntryView* pEndpointView)
-    {
-        m_pManager->RemoveEndpoint(pEndpointView->GetEndpoint());
-        m_endpoints.removeAll(pEndpointView);
-
-        if (pEndpointView == m_pSelectedEndpoint)
-        {
-            if (m_endpoints.count() > 0)
-            {
-                selectEndpointSlot(m_endpoints[0]);
-            }
-            else
-            {
-                selectEndpointSlot(nullptr);
-            }
-        }
-
-        delete pEndpointView;
-    }
-
-
-#include "Qt/moc_EndpointManagerView.cpp"
-
-}
diff --git a/Code/Tools/News/NewsBuilder/Qt/EndpointManagerView.h b/Code/Tools/News/NewsBuilder/Qt/EndpointManagerView.h
deleted file mode 100644
index c6362a06af..0000000000
--- a/Code/Tools/News/NewsBuilder/Qt/EndpointManagerView.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QDialog>
-#endif
-
-namespace Ui
-{
-    class EndpointManagerViewWidget;
-}
-
-namespace News
-{
-    class BuilderResourceManifest;
-    class Endpoint;
-    class EndpointEntryView;
-    class EndpointManager;
-
-    //! Qt dialog for managing endpoints
-    class EndpointManagerView
-        : public QDialog
-    {
-        Q_OBJECT
-    public:
-        EndpointManagerView(QWidget* parent,
-            BuilderResourceManifest& manifest);
-        ~EndpointManagerView();
-
-    private:
-        QScopedPointer<Ui::EndpointManagerViewWidget> m_ui;
-        EndpointManager* m_pManager = nullptr;
-        EndpointEntryView* m_pSelectedEndpoint = nullptr;
-        QList<EndpointEntryView*> m_endpoints;
-        BuilderResourceManifest& m_manifest;
-
-        EndpointEntryView* AddEndpointEntry(Endpoint* pEndpoint);
-        void Update() const;
-
-    private Q_SLOTS:
-        void accept() override;
-        void addEndpointSlot();
-        void selectEndpointSlot(EndpointEntryView* pEndpoint);
-        void deleteEndpointSlot(EndpointEntryView* pEndpoint);
-    };
-} // namespace News
diff --git a/Code/Tools/News/NewsBuilder/Qt/EndpointManagerView.ui b/Code/Tools/News/NewsBuilder/Qt/EndpointManagerView.ui
deleted file mode 100644
index 5295e30616..0000000000
--- a/Code/Tools/News/NewsBuilder/Qt/EndpointManagerView.ui
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>EndpointManagerViewWidget</class>
- <widget class="QDialog" name="EndpointManagerViewWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>350</height>
-   </rect>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>400</width>
-    <height>350</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>400</width>
-    <height>350</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>Change Endpoint</string>
-  </property>
-  <property name="layoutDirection">
-   <enum>Qt::LeftToRight</enum>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QScrollArea" name="scrollArea">
-     <property name="verticalScrollBarPolicy">
-      <enum>Qt::ScrollBarAlwaysOn</enum>
-     </property>
-     <property name="horizontalScrollBarPolicy">
-      <enum>Qt::ScrollBarAlwaysOff</enum>
-     </property>
-     <property name="widgetResizable">
-      <bool>true</bool>
-     </property>
-     <widget class="QWidget" name="endpointListContents">
-      <property name="geometry">
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>363</width>
-        <height>189</height>
-       </rect>
-      </property>
-      <layout class="QVBoxLayout" name="verticalLayout_4">
-       <item>
-        <widget class="QPushButton" name="buttonAdd">
-         <property name="text">
-          <string>+</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_3">
-     <item>
-      <widget class="QLabel" name="label">
-       <property name="text">
-        <string>Name:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="nameText">
-       <property name="minimumSize">
-        <size>
-         <width>250</width>
-         <height>0</height>
-        </size>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
-      <widget class="QLabel" name="label_1">
-       <property name="text">
-        <string>AWS Profile Name:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_2">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="awsProfileText">
-       <property name="minimumSize">
-        <size>
-         <width>250</width>
-         <height>0</height>
-        </size>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QLabel" name="label_2">
-       <property name="text">
-        <string>URL:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_3">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="urlText">
-       <property name="minimumSize">
-        <size>
-         <width>250</width>
-         <height>0</height>
-        </size>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_4">
-     <item>
-      <widget class="QLabel" name="label_3">
-       <property name="text">
-        <string>S3 Bucket</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_4">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="bucketText">
-       <property name="minimumSize">
-        <size>
-         <width>250</width>
-         <height>0</height>
-        </size>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/Code/Tools/News/NewsBuilder/Qt/ImageItem.cpp b/Code/Tools/News/NewsBuilder/Qt/ImageItem.cpp
deleted file mode 100644
index 1566b8309d..0000000000
--- a/Code/Tools/News/NewsBuilder/Qt/ImageItem.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ImageItem.h"
-#include "NewsShared/ResourceManagement/Resource.h"
-
-#include "Qt/ui_ImageItem.h"
-
-namespace News
-{
-
-    const char* ImageItem::SELECTED_CSS =
-        "border: 4px solid; border-color: white; background-color: rgb(45, 45, 45);";
-    const char* ImageItem::UN_SELECTED_CSS =
-        "background-color: rgb(45, 45, 45);";
-
-    ImageItem::ImageItem(Resource& resource)
-        : QWidget()
-        , m_ui(new Ui::ImageItemWidget)
-        , m_resource(resource)
-    {
-        m_ui->setupUi(this);
-
-        QPixmap pixmap;
-        pixmap.loadFromData(m_resource.GetData());
-        m_ui->ImageLabel->setPixmap(pixmap);
-
-        connect(m_ui->ImageLabel, &AzQtComponents::ExtendedLabel::clicked, this, &ImageItem::imageClickedSlot);
-    }
-
-    void ImageItem::imageClickedSlot()
-    {
-        emit selectSignal(this);
-    }
-
-    ImageItem::~ImageItem() {}
-
-    void ImageItem::SetSelect(bool selected) const
-    {
-        m_ui->ImageLabel->setStyleSheet(selected ? SELECTED_CSS : UN_SELECTED_CSS);
-    }
-
-    Resource& ImageItem::GetResource() const
-    {
-        return m_resource;
-    }
-
-#include "Qt/moc_ImageItem.cpp"
-
-}
diff --git a/Code/Tools/News/NewsBuilder/Qt/ImageItem.h b/Code/Tools/News/NewsBuilder/Qt/ImageItem.h
deleted file mode 100644
index ba883bc736..0000000000
--- a/Code/Tools/News/NewsBuilder/Qt/ImageItem.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QWidget>
-#endif
-
-namespace Ui
-{
-    class ImageItemWidget;
-}
-
-namespace News {
-    class Resource;
-
-    //! A clickable image in selectImage control
-    class ImageItem
-        : public QWidget
-    {
-        Q_OBJECT
-    public:
-        explicit ImageItem(Resource& resource);
-        ~ImageItem();
-
-        void SetSelect(bool selected) const;
-        Resource& GetResource() const;
-
-    Q_SIGNALS:
-        void selectSignal(ImageItem* imageItem);
-
-    private:
-        QScopedPointer<Ui::ImageItemWidget> m_ui;
-        const static char* SELECTED_CSS;
-        const static char* UN_SELECTED_CSS;
-
-        Resource& m_resource;
-    private Q_SLOTS:
-        void imageClickedSlot();
-    };
-}
diff --git a/Code/Tools/News/NewsBuilder/Qt/ImageItem.ui b/Code/Tools/News/NewsBuilder/Qt/ImageItem.ui
deleted file mode 100644
index 9aef880c10..0000000000
--- a/Code/Tools/News/NewsBuilder/Qt/ImageItem.ui
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ImageItemWidget</class>
- <widget class="QWidget" name="ImageItemWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>200</width>
-    <height>200</height>
-   </rect>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>200</width>
-    <height>200</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>200</width>
-    <height>200</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="leftMargin">
-    <number>20</number>
-   </property>
-   <property name="topMargin">
-    <number>20</number>
-   </property>
-   <property name="rightMargin">
-    <number>20</number>
-   </property>
-   <property name="bottomMargin">
-    <number>20</number>
-   </property>
-   <item>
-    <widget class="AzQtComponents::ExtendedLabel" name="ImageLabel">
-     <property name="text">
-      <string/>
-     </property>
-     <property name="pixmapSize" stdset="0">
-      <size>
-       <width>160</width>
-       <height>90</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>AzQtComponents::ExtendedLabel1</class>
-   <extends>QLabel</extends>
-   <header>AzQtComponents/Components/ExtendedLabel.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
diff --git a/Code/Tools/News/NewsBuilder/Qt/LogContainer.cpp b/Code/Tools/News/NewsBuilder/Qt/LogContainer.cpp
deleted file mode 100644
index 5efda641db..0000000000
--- a/Code/Tools/News/NewsBuilder/Qt/LogContainer.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "LogContainer.h"
-
-#include "Qt/ui_LogContainer.h"
-
-namespace News
-{
-
-    LogContainer::LogContainer(QWidget* parent)
-        : QWidget(parent)
-        , m_ui(new Ui::LogContainerWidget)
-    {
-        m_ui->setupUi(this);
-    }
-
-    LogContainer::~LogContainer() {}
-
-    void LogContainer::AddLog(QString text, LogType logType) const {
-        QString color;
-        switch (logType)
-        {
-        case LogOk:
-            color = "green";
-            break;
-        case LogInfo:
-            color = "white";
-            break;
-        case LogError:
-            color = "red";
-            break;
-        case LogWarning:
-            color = "yellow";
-            break;
-        default:
-            color = "white";
-            break;
-        }
-        auto fullText = QString("<span style=\" color:%1; \"><XMP>%2</XMP></span><br>").arg(color).arg(text);
-        m_ui->logText->setTextFormat(Qt::RichText);
-        m_ui->logText->setText(QString("%2%1").arg(m_ui->logText->text()).arg(fullText));
-    }
-
-#include "Qt/moc_LogContainer.cpp"
-
-}
diff --git a/Code/Tools/News/NewsBuilder/Qt/LogContainer.h b/Code/Tools/News/NewsBuilder/Qt/LogContainer.h
deleted file mode 100644
index 8f46f3b406..0000000000
--- a/Code/Tools/News/NewsBuilder/Qt/LogContainer.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QWidget>
-#include <NewsShared/LogType.h>
-#endif
-
-namespace Ui
-{
-    class LogContainerWidget;
-}
-
-namespace News 
-{
-    //! A control for displaying log
-    class LogContainer
-        : public QWidget
-    {
-        Q_OBJECT
-
-    public:
-        explicit LogContainer(QWidget* parent);
-        ~LogContainer();
-
-        void AddLog(QString text, LogType logType) const;
-
-    private:
-        QScopedPointer<Ui::LogContainerWidget> m_ui;
-    };
-} // namespace News
diff --git a/Code/Tools/News/NewsBuilder/Qt/LogContainer.ui b/Code/Tools/News/NewsBuilder/Qt/LogContainer.ui
deleted file mode 100644
index 3757f52480..0000000000
--- a/Code/Tools/News/NewsBuilder/Qt/LogContainer.ui
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>LogContainerWidget</class>
- <widget class="QWidget" name="LogContainerWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>547</width>
-    <height>125</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>0</width>
-    <height>0</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>16777215</width>
-    <height>16777215</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>LogContainer</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QScrollArea" name="logArea_3">
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="widgetResizable">
-      <bool>true</bool>
-     </property>
-     <widget class="QWidget" name="scrollAreaWidgetContents_3">
-      <property name="geometry">
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>545</width>
-        <height>123</height>
-       </rect>
-      </property>
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="styleSheet">
-       <string notr="true"/>
-      </property>
-      <layout class="QVBoxLayout" name="verticalLayout_5">
-       <property name="spacing">
-        <number>0</number>
-       </property>
-       <property name="leftMargin">
-        <number>0</number>
-       </property>
-       <property name="topMargin">
-        <number>0</number>
-       </property>
-       <property name="rightMargin">
-        <number>0</number>
-       </property>
-       <property name="bottomMargin">
-        <number>0</number>
-       </property>
-       <item>
-        <widget class="QLabel" name="logText">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="styleSheet">
-          <string notr="true">background-color: rgb(45, 45, 45);</string>
-         </property>
-         <property name="text">
-          <string/>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-         </property>
-         <property name="wordWrap">
-          <bool>true</bool>
-         </property>
-         <property name="openExternalLinks">
-          <bool>false</bool>
-         </property>
-         <property name="textInteractionFlags">
-          <set>Qt::TextBrowserInteraction</set>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/Code/Tools/News/NewsBuilder/Qt/NewsBuilder.cpp b/Code/Tools/News/NewsBuilder/Qt/NewsBuilder.cpp
deleted file mode 100644
index 5cbb510dd6..0000000000
--- a/Code/Tools/News/NewsBuilder/Qt/NewsBuilder.cpp
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <AzCore/PlatformDef.h>
-#include <AzCore/IO/Path/Path.h>
-#include "NewsBuilder.h"
-#include "Qt/ArticleDetails.h"
-#include "Qt/BuilderArticleViewContainer.h"
-#include "NewsShared/Qt/ArticleViewContainer.h"
-#include "NewsShared/ResourceManagement/Resource.h"
-#include "ResourceManagement/BuilderResourceManifest.h"
-#include "ArticleDetailsContainer.h"
-#include "LogContainer.h"
-#include "EndpointManagerView.h"
-#include "EndpointManager.h"
-#include "Qt/QCustomMessageBox.h"
-
-#include <AzQtComponents/Components/StyleManager.h>
-#include <AzQtComponents/Utilities/QtPluginPaths.h>
-
-AZ_PUSH_DISABLE_WARNING(4251 4996, "-Wunknown-warning-option")
-#include <aws/core/utils/HashingUtils.h>
-AZ_POP_DISABLE_WARNING
-
-#include <QImage>
-#include <QFileDialog>
-#include <QSignalMapper>
-#include <QTextDocument>
-
-#include "Qt/ui_Newsbuilder.h"
-
-namespace News
-{
-    NewsBuilder::NewsBuilder(QWidget* parent, const AZ::IO::PathView& engineRootPath)
-        : QMainWindow(parent)
-        , m_ui(new Ui::NewsBuilderClass())
-        , m_manifest(new BuilderResourceManifest(
-            std::bind(&NewsBuilder::SyncSuccess, this),
-            std::bind(&NewsBuilder::SyncFail, this, std::placeholders::_1),
-            std::bind(&NewsBuilder::SyncUpdate, this, std::placeholders::_1, std::placeholders::_2)))
-        , m_articleDetailsContainer(new ArticleDetailsContainer(this, *m_manifest))
-        , m_articleViewContainer(new BuilderArticleViewContainer(this, *m_manifest))
-        , m_logContainer(new LogContainer(this))
-    {
-
-        AzQtComponents::StyleManager* m_styleSheet = new AzQtComponents::StyleManager(this);
-        m_styleSheet->initialize(qApp, engineRootPath);
-
-        m_ui->setupUi(this);
-
-        QDir rootDir = QString::fromUtf8(engineRootPath.Native().data(), aznumeric_cast<int>(engineRootPath.Native().size()));
-        const auto pathOnDisk = rootDir.absoluteFilePath("Code/Tools/News/NewsBuilder/Resources");
-        const auto qrcPath = QStringLiteral(":/NewsBuilder");
-        AzQtComponents::StyleManager::addSearchPaths("newsbuilder", pathOnDisk, qrcPath, engineRootPath);
-
-        AzQtComponents::StyleManager::setStyleSheet(this, QStringLiteral("newsbuilder:NewsBuilder.qss"));
-
-        UpdateEndpointLabel();
-
-        m_ui->articleViewContainerRoot->layout()->addWidget(m_articleViewContainer);
-        m_ui->articleDetailsContainerRoot->layout()->addWidget(m_articleDetailsContainer);
-        m_ui->dockWidgetContents->layout()->addWidget(m_logContainer);
-
-        connect(m_articleViewContainer, SIGNAL(articleSelectedSignal(QString)),
-            this, SLOT(selectArticleSlot(QString)));
-        connect(m_articleViewContainer, SIGNAL(logSignal(QString, LogType)),
-            this, SLOT(addLogSlot(QString, LogType)));
-
-        connect(m_articleDetailsContainer, &ArticleDetailsContainer::updateArticleSignal,
-            this, &NewsBuilder::updateArticleSlot);
-        connect(m_articleDetailsContainer, &ArticleDetailsContainer::deleteArticleSignal,
-            this, &NewsBuilder::deleteArticleSlot);
-        connect(m_articleDetailsContainer, &ArticleDetailsContainer::orderChangedSignal,
-            this, &NewsBuilder::orderChangedSlot);
-        connect(m_articleDetailsContainer, &ArticleDetailsContainer::closeArticleSignal,
-            this, &NewsBuilder::closeArticleSlot);
-        connect(m_articleDetailsContainer, SIGNAL(logSignal(QString, LogType)),
-            this, SLOT(addLogSlot(QString, LogType)));
-
-        m_manifest->SetSyncType(SyncType::Merge);
-        m_manifest->Sync();
-
-        // Sync Console pane with View menu
-        connect(m_ui->actionConsole, &QAction::triggered, this, &NewsBuilder::OnViewLogWindow);
-        connect(m_ui->dockWidget, &QDockWidget::visibilityChanged, this, &NewsBuilder::OnViewVisibilityChanged);
-    }
-
-    NewsBuilder::~NewsBuilder() {}
-
-    void NewsBuilder::selectArticleSlot(const QString& id) const
-    {
-        m_articleDetailsContainer->SelectArticle(id);
-    }
-
-    void NewsBuilder::addLogSlot(QString text, LogType logType) const
-    {
-        AddLog(text, logType);
-    }
-
-    void NewsBuilder::addArticleToBottomSlot() const
-    {
-        m_articleViewContainer->AddArticle();
-    }
-
-    void NewsBuilder::updateArticleSlot(QString id) const
-    {
-        m_articleViewContainer->UpdateArticle(id);
-    }
-
-    void NewsBuilder::deleteArticleSlot(QString id) const
-    {
-        m_articleViewContainer->DeleteArticle(id);
-    }
-
-    void NewsBuilder::closeArticleSlot(QString id) const
-    {
-        m_articleViewContainer->CloseArticle(id);
-    }
-
-    void NewsBuilder::orderChangedSlot(QString id, bool direction) const
-    {
-        m_articleViewContainer->UpdateArticleOrder(id, direction);
-    }
-
-    void NewsBuilder::openSlot()
-    {
-        EndpointManagerView endpointManagerView(
-            m_ui->centralWidget,
-            *m_manifest);
-        if (endpointManagerView.exec() == QDialog::Accepted)
-        {
-            m_manifest->Sync();
-        }
-        UpdateEndpointLabel();
-    }
-
-    void NewsBuilder::publishSlot()
-    {
-        if (!m_manifest->HasChanges())
-        {
-            QCustomMessageBox msgBox(
-                QCustomMessageBox::Information,
-                tr("Nothing to publish"),
-                tr("No local changes were made, nothing to publish."),
-                this);
-            msgBox.AddButton(tr("Good"), 0);
-            msgBox.exec();
-            return;
-        }
-
-        enum Response
-        {
-            Yes, No
-        };
-
-        QCustomMessageBox msgBox(
-            QCustomMessageBox::Critical,
-            tr("Publish resources"),
-            tr("You are about to overwrite the current Open 3D Engine Welcome Message. Are you sure you want to publish?"),
-            this);
-        msgBox.AddButton("Yes", Yes);
-        msgBox.AddButton("No", No);
-        if (msgBox.exec() == Yes)
-        {
-            m_manifest->SetSyncType(SyncType::Verify);
-            m_manifest->Sync();
-        }
-    }
-
-    void NewsBuilder::OnViewVisibilityChanged([[maybe_unused]] bool visibility)
-    {
-        UpdateViewMenu();
-    }
-
-    void NewsBuilder::UpdateViewMenu()
-    {
-        if (m_ui->actionConsole->isChecked() != m_ui->dockWidget->isVisible())
-        {
-            QSignalBlocker signalBlocker(m_ui->actionConsole);
-            m_ui->actionConsole->setChecked(m_ui->dockWidget->isVisible());
-        }
-    }
-
-    void NewsBuilder::OnViewLogWindow()
-    {
-        if (m_ui->dockWidget)
-        {
-            m_ui->dockWidget->toggleViewAction()->trigger();
-        }
-    }
-
-    void NewsBuilder::UpdateEndpointLabel()
-    {
-        auto pEndpoint = m_manifest->GetEndpointManager()->GetSelectedEndpoint();
-        if (pEndpoint)
-        {
-            this->setWindowTitle("News Builder (" + pEndpoint->GetName() + ")");
-        }
-        else
-        {
-            this->setWindowTitle("News Builder (No endpoint selected)");
-        }
-    }
-
-    void NewsBuilder::AddLog(QString text, LogType logType) const
-    {
-        m_logContainer->AddLog(text, logType);
-    }
-
-    void NewsBuilder::SyncUpdate(const QString& message, LogType logType) const
-    {
-        AddLog(message, logType);
-    }
-
-    void NewsBuilder::SyncFail(ErrorCode error)
-    {
-        const char* errorMessage = GetErrorMessage(error);
-        AddLog(tr("Sync failed: %1").arg(errorMessage), LogError);
-        QCustomMessageBox msgBoxSyncFail(
-            QCustomMessageBox::Critical,
-            tr("Sync failed"),
-            errorMessage,
-            this);
-        msgBoxSyncFail.AddButton("Ok", 0);
-        msgBoxSyncFail.exec();
-
-        m_articleViewContainer->PopulateArticles();
-        m_articleDetailsContainer->Reset();
-    }
-
-    void NewsBuilder::SyncSuccess() const
-    {
-        AddLog("Sync completed", LogOk);
-        m_articleViewContainer->PopulateArticles();
-        m_articleDetailsContainer->Reset();
-    }
-#include "Qt/moc_NewsBuilder.cpp"
-
-}
diff --git a/Code/Tools/News/NewsBuilder/Qt/NewsBuilder.h b/Code/Tools/News/NewsBuilder/Qt/NewsBuilder.h
deleted file mode 100644
index 61e25bda1b..0000000000
--- a/Code/Tools/News/NewsBuilder/Qt/NewsBuilder.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QMainWindow>
-
-#include "NewsShared/LogType.h"
-#include "NewsShared/ErrorCodes.h"
-
-#include <AzCore/IO/Path/Path_fwd.h>
-#endif
-
-class QSignalMapper;
-class QPushButton;
-
-namespace Ui
-{
-    class NewsBuilderClass;
-}
-
-namespace News
-{
-    class BuilderArticleViewContainer;
-    class LogContainer;
-    class BuilderResourceManifest;
-    class ArticleDetailsContainer;
-
-    //! A central control of News Builder.
-    class NewsBuilder
-        : public QMainWindow
-    {
-        Q_OBJECT
-
-    public:
-        explicit NewsBuilder(QWidget* parent, const AZ::IO::PathView& engineRootPath);
-        ~NewsBuilder();
-
-    private:
-        QScopedPointer<Ui::NewsBuilderClass> m_ui;
-        BuilderResourceManifest* m_manifest = nullptr;
-        ArticleDetailsContainer* m_articleDetailsContainer = nullptr;
-        BuilderArticleViewContainer* m_articleViewContainer = nullptr;
-        LogContainer* m_logContainer = nullptr;
-
-        void UpdateEndpointLabel();
-        void AddLog(QString text, LogType logType = LogInfo) const;
-
-        void SyncUpdate(const QString& message, LogType logType) const;
-        void SyncFail(ErrorCode error);
-        void SyncSuccess() const;
-
-        void OnViewVisibilityChanged(bool visibility);
-        void UpdateViewMenu();
-        void OnViewLogWindow();
-
-    private Q_SLOTS:
-        void selectArticleSlot(const QString& id) const;
-        void addLogSlot(QString text, LogType logType) const;
-        void addArticleToBottomSlot() const;
-        void updateArticleSlot(QString id) const;
-        void deleteArticleSlot(QString id) const;
-        void closeArticleSlot(QString id) const;
-        void orderChangedSlot(QString id, bool direction) const;
-        void openSlot();
-        void publishSlot();
-    };
-} // namespace News
diff --git a/Code/Tools/News/NewsBuilder/Qt/Newsbuilder.qrc b/Code/Tools/News/NewsBuilder/Qt/Newsbuilder.qrc
deleted file mode 100644
index 768281fb12..0000000000
--- a/Code/Tools/News/NewsBuilder/Qt/Newsbuilder.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<RCC>
-  <qresource prefix="images">
-    <file>../Resources/missing-image.png</file>
-  </qresource>
-</RCC>
diff --git a/Code/Tools/News/NewsBuilder/Qt/Newsbuilder.ui b/Code/Tools/News/NewsBuilder/Qt/Newsbuilder.ui
deleted file mode 100644
index 55e7fe5b68..0000000000
--- a/Code/Tools/News/NewsBuilder/Qt/Newsbuilder.ui
+++ /dev/null
@@ -1,326 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>NewsBuilderClass</class>
- <widget class="QMainWindow" name="NewsBuilderClass">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>800</width>
-    <height>540</height>
-   </rect>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>0</width>
-    <height>480</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>1024</width>
-    <height>16777215</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>News Builder</string>
-  </property>
-  <widget class="QWidget" name="centralWidget">
-   <layout class="QVBoxLayout" name="verticalLayout_4">
-    <property name="spacing">
-     <number>0</number>
-    </property>
-    <property name="leftMargin">
-     <number>0</number>
-    </property>
-    <property name="topMargin">
-     <number>0</number>
-    </property>
-    <property name="rightMargin">
-     <number>0</number>
-    </property>
-    <property name="bottomMargin">
-     <number>0</number>
-    </property>
-    <item>
-     <widget class="QWidget" name="verticalLayout1" native="true">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="minimumSize">
-       <size>
-        <width>800</width>
-        <height>0</height>
-       </size>
-      </property>
-      <layout class="QHBoxLayout" name="horizontalLayout">
-       <property name="spacing">
-        <number>0</number>
-       </property>
-       <property name="leftMargin">
-        <number>0</number>
-       </property>
-       <property name="topMargin">
-        <number>0</number>
-       </property>
-       <property name="rightMargin">
-        <number>0</number>
-       </property>
-       <property name="bottomMargin">
-        <number>0</number>
-       </property>
-       <item>
-        <widget class="QWidget" name="articleViewContainerRoot" native="true">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>480</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>16777215</width>
-           <height>16777215</height>
-          </size>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_2">
-          <property name="spacing">
-           <number>0</number>
-          </property>
-          <property name="leftMargin">
-           <number>0</number>
-          </property>
-          <property name="topMargin">
-           <number>0</number>
-          </property>
-          <property name="rightMargin">
-           <number>0</number>
-          </property>
-          <property name="bottomMargin">
-           <number>0</number>
-          </property>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QWidget" name="articleDetailsContainerRoot" native="true">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>100</width>
-           <height>0</height>
-          </size>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_3">
-          <property name="spacing">
-           <number>0</number>
-          </property>
-          <property name="leftMargin">
-           <number>5</number>
-          </property>
-          <property name="topMargin">
-           <number>5</number>
-          </property>
-          <property name="rightMargin">
-           <number>5</number>
-          </property>
-          <property name="bottomMargin">
-           <number>5</number>
-          </property>
-         </layout>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-    </item>
-   </layout>
-  </widget>
-  <widget class="QMenuBar" name="menuBar">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>800</width>
-     <height>21</height>
-    </rect>
-   </property>
-   <widget class="QMenu" name="menuFile">
-    <property name="title">
-     <string>File</string>
-    </property>
-    <addaction name="actionOpen"/>
-    <addaction name="actionPublish"/>
-   </widget>
-   <widget class="QMenu" name="menuArticle">
-    <property name="title">
-     <string>Article</string>
-    </property>
-    <addaction name="actionAdd_New"/>
-   </widget>
-   <widget class="QMenu" name="menuView">
-    <property name="title">
-     <string>View</string>
-    </property>
-    <addaction name="actionConsole"/>
-   </widget>
-   <addaction name="menuFile"/>
-   <addaction name="menuArticle"/>
-   <addaction name="menuView"/>
-  </widget>
-  <widget class="AzQtComponents::StyledDockWidget" name="dockWidget">
-   <property name="sizePolicy">
-    <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
-     <horstretch>0</horstretch>
-     <verstretch>0</verstretch>
-    </sizepolicy>
-   </property>
-   <property name="minimumSize">
-    <size>
-     <width>63</width>
-     <height>66</height>
-    </size>
-   </property>
-   <property name="features">
-    <set>QDockWidget::DockWidgetClosable</set>
-   </property>
-   <property name="allowedAreas">
-    <set>Qt::BottomDockWidgetArea</set>
-   </property>
-   <property name="windowTitle">
-    <string>Console</string>
-   </property>
-   <attribute name="dockWidgetArea">
-    <number>8</number>
-   </attribute>
-   <widget class="QWidget" name="dockWidgetContents">
-    <layout class="QVBoxLayout" name="verticalLayout">
-     <property name="spacing">
-      <number>5</number>
-     </property>
-     <property name="leftMargin">
-      <number>0</number>
-     </property>
-     <property name="topMargin">
-      <number>0</number>
-     </property>
-     <property name="rightMargin">
-      <number>0</number>
-     </property>
-     <property name="bottomMargin">
-      <number>0</number>
-     </property>
-    </layout>
-   </widget>
-  </widget>
-  <action name="actionOpen">
-   <property name="text">
-    <string>Change Endpoint</string>
-   </property>
-   <property name="autoRepeat">
-    <bool>false</bool>
-   </property>
-  </action>
-  <action name="actionPublish">
-   <property name="text">
-    <string>Publish Resources</string>
-   </property>
-   <property name="autoRepeat">
-    <bool>false</bool>
-   </property>
-  </action>
-  <action name="actionAdd_New">
-   <property name="text">
-    <string>Add to Bottom</string>
-   </property>
-  </action>
-  <action name="actionDelete_Selected">
-   <property name="text">
-    <string>Delete Selected</string>
-   </property>
-  </action>
-  <action name="actionConsole">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Console</string>
-   </property>
-  </action>
- </widget>
- <layoutdefault spacing="0" margin="0"/>
- <customwidgets>
-  <customwidget>
-   <class>AzQtComponents::StyledDockWidget</class>
-   <extends>QDockWidget</extends>
-   <header>AzQtComponents/Components/StyledDockWidget.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
- <resources>
-  <include location="newsbuilder.qrc"/>
- </resources>
- <connections>
-  <connection>
-   <sender>actionOpen</sender>
-   <signal>triggered()</signal>
-   <receiver>NewsBuilderClass</receiver>
-   <slot>openSlot()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>-1</x>
-     <y>-1</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>399</x>
-     <y>269</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>actionPublish</sender>
-   <signal>triggered()</signal>
-   <receiver>NewsBuilderClass</receiver>
-   <slot>publishSlot()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>-1</x>
-     <y>-1</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>399</x>
-     <y>269</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>actionAdd_New</sender>
-   <signal>triggered()</signal>
-   <receiver>NewsBuilderClass</receiver>
-   <slot>addArticleToBottomSlot()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>-1</x>
-     <y>-1</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>399</x>
-     <y>269</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
diff --git a/Code/Tools/News/NewsBuilder/Qt/QCustomMessageBox.cpp b/Code/Tools/News/NewsBuilder/Qt/QCustomMessageBox.cpp
deleted file mode 100644
index 1b92f91e42..0000000000
--- a/Code/Tools/News/NewsBuilder/Qt/QCustomMessageBox.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "QCustomMessageBox.h"
-#include "Qt/ui_QCustomMessageBox.h"
-
-#include <QSignalMapper>
-#include <QPushButton>
-#include <QStyle>
-
-namespace News
-{
-
-    QCustomMessageBox::QCustomMessageBox(
-        Icon icon,
-        const QString& title,
-        const QString& text,
-        QWidget* parent)
-        : QDialog(parent, Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint)
-        , m_ui(new Ui::CustomMessageBoxDialog)
-    {
-        m_ui->setupUi(this);
-
-        m_signalMapper = new QSignalMapper(this);
-
-        this->setWindowTitle(title);
-        m_ui->labelText->setText(text);
-
-        QStyle* style = QApplication::style();
-        QIcon tmpIcon;
-        switch (icon)
-        {
-        case Information:
-            tmpIcon = style->standardIcon(QStyle::SP_MessageBoxInformation);
-            break;
-        case Warning:
-            tmpIcon = style->standardIcon(QStyle::SP_MessageBoxWarning);
-            break;
-        case Critical:
-            tmpIcon = style->standardIcon(QStyle::SP_MessageBoxCritical);
-            break;
-        case Question:
-            tmpIcon = style->standardIcon(QStyle::SP_MessageBoxQuestion);
-        default:
-            break;
-        }
-        if (!tmpIcon.isNull())
-        {
-            QLabel* iconLabel = new QLabel(this);
-            iconLabel->setPixmap(tmpIcon.pixmap(64, 64));
-            m_ui->bodyLayout->insertWidget(0, iconLabel);
-        }
-
-        connect(m_signalMapper, SIGNAL(mapped(int)),
-            this, SLOT(clickedSlot(int)));
-    }
-
-    QCustomMessageBox::~QCustomMessageBox()
-    {
-        delete m_signalMapper;
-    }
-
-    void QCustomMessageBox::AddButton(const QString& name, int result)
-    {
-        auto button = new QPushButton(name, this);
-        connect(button, SIGNAL(clicked()), m_signalMapper, SLOT(map()));
-        m_signalMapper->setMapping(button, result);
-        m_ui->buttonLayout->layout()->addWidget(button);
-    }
-
-    void QCustomMessageBox::clickedSlot(int result)
-    {
-        done(result);
-    }
-
-#include "Qt/moc_QCustomMessageBox.cpp"
-
-}
diff --git a/Code/Tools/News/NewsBuilder/Qt/QCustomMessageBox.h b/Code/Tools/News/NewsBuilder/Qt/QCustomMessageBox.h
deleted file mode 100644
index 6cd6771514..0000000000
--- a/Code/Tools/News/NewsBuilder/Qt/QCustomMessageBox.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QDialog>
-#endif
-
-class QSignalMapper;
-
-namespace Ui
-{
-    class CustomMessageBoxDialog;
-}
-
-namespace News 
-{
-    class ArticleDetails;
-    class BuilderResourceManifest;
-    class SelectImage;
-    class ResourceManifest;
-    class Resource;
-
-    //! Allows to add custom buttons which is not well-supported by default QMessageBox
-    class QCustomMessageBox
-        : public QDialog
-    {
-        Q_OBJECT
-
-    public:
-        enum Icon {
-            NoIcon = 0,
-            Information = 1,
-            Warning = 2,
-            Critical = 3,
-            Question = 4
-        };
-
-        QCustomMessageBox(
-            Icon,
-            const QString& title,
-            const QString& text,
-            QWidget* parent);
-        ~QCustomMessageBox();
-
-        void AddButton(const QString& name, int result);
-
-    private:
-        QScopedPointer<Ui::CustomMessageBoxDialog> m_ui;
-        QSignalMapper* m_signalMapper = nullptr;
-
-    private Q_SLOTS:
-        void clickedSlot(int result);
-    };
-} // namespace News
diff --git a/Code/Tools/News/NewsBuilder/Qt/QCustomMessageBox.ui b/Code/Tools/News/NewsBuilder/Qt/QCustomMessageBox.ui
deleted file mode 100644
index c1fb5f40bf..0000000000
--- a/Code/Tools/News/NewsBuilder/Qt/QCustomMessageBox.ui
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>CustomMessageBoxDialog</class>
- <widget class="QDialog" name="CustomMessageBoxDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>102</width>
-    <height>43</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle">
-   <string>Message Title</string>
-  </property>
-  <property name="whatsThis">
-   <string notr="true"/>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <layout class="QHBoxLayout" name="bodyLayout">
-     <item>
-      <widget class="QLabel" name="labelText">
-       <property name="text">
-        <string>Message text</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <property name="spacing">
-      <number>0</number>
-     </property>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>0</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <layout class="QHBoxLayout" name="buttonLayout">
-       <property name="spacing">
-        <number>10</number>
-       </property>
-      </layout>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_2">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>0</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/Code/Tools/News/NewsBuilder/Qt/SelectImage.cpp b/Code/Tools/News/NewsBuilder/Qt/SelectImage.cpp
deleted file mode 100644
index 7a9e427f4b..0000000000
--- a/Code/Tools/News/NewsBuilder/Qt/SelectImage.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "SelectImage.h"
-#include "ImageItem.h"
-#include "NewsShared/ResourceManagement/Resource.h"
-#include "ResourceManagement/BuilderResourceManifest.h"
-
-#include "Qt/ui_SelectImage.h"
-
-namespace News
-{
-
-    const int SelectImage::MAX_COLS = 2;
-
-    SelectImage::SelectImage(const ResourceManifest& manifest)
-        : QDialog()
-        , m_ui(new Ui::SelectImageDialog)
-        , m_manifest(manifest)
-    {
-        m_ui->setupUi(this);
-
-        auto layout = static_cast<QGridLayout*>(m_ui->scrollAreaContents->layout());
-        layout->setAlignment(Qt::AlignTop | Qt::AlignLeft);
-        int row = 0;
-        int col = 0;
-        //! read all image resources and populate the container
-        for (auto pResource : m_manifest)
-        {
-            if (pResource->GetType().compare("image") == 0)
-            {
-                auto imageItem = new ImageItem(*pResource);
-                connect(imageItem, &ImageItem::selectSignal, this, &SelectImage::ImageSelected);
-                layout->addWidget(imageItem, row, col, Qt::AlignLeft);
-                m_images.append(imageItem);
-                col++;
-                if (col >= MAX_COLS)
-                {
-                    col = 0;
-                    row++;
-                }
-            }
-        }
-
-        connect(m_ui->buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
-        connect(m_ui->buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
-    }
-
-    SelectImage::~SelectImage() {}
-
-    Resource* SelectImage::GetSelected() const
-    {
-        return m_pSelected;
-    }
-
-    void SelectImage::ImageSelected(ImageItem* imageItem)
-    {
-        for (auto image : m_images)
-        {
-            image->SetSelect(image == imageItem);
-        }
-        if (imageItem)
-        {
-            m_pSelected = &imageItem->GetResource();
-        }
-    }
-
-#include "Qt/moc_SelectImage.cpp"
-
-}
diff --git a/Code/Tools/News/NewsBuilder/Qt/SelectImage.h b/Code/Tools/News/NewsBuilder/Qt/SelectImage.h
deleted file mode 100644
index 5fc80cfe5a..0000000000
--- a/Code/Tools/News/NewsBuilder/Qt/SelectImage.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QDialog>
-#endif
-
-namespace Ui
-{
-    class SelectImageDialog;
-}
-
-namespace News {
-    class ImageItem;
-    class Resource;
-    class ResourceManifest;
-
-    //! Allows to select existing images for multiple messages without re-uploading same one
-    class SelectImage
-        : public QDialog
-    {
-        Q_OBJECT
-    public:
-        explicit SelectImage(const ResourceManifest& manifest);
-        ~SelectImage();
-
-        void Select();
-        void Close();
-        Resource* GetSelected() const;
-
-    private:
-        const static int MAX_COLS;
-        QScopedPointer<Ui::SelectImageDialog> m_ui;
-        const ResourceManifest& m_manifest;
-        QList<ImageItem*> m_images;
-        Resource* m_pSelected = nullptr;
-
-        void ImageSelected(ImageItem* imageItem);
-    };
-} // namespace News
diff --git a/Code/Tools/News/NewsBuilder/Qt/SelectImage.ui b/Code/Tools/News/NewsBuilder/Qt/SelectImage.ui
deleted file mode 100644
index 55b27bfb7f..0000000000
--- a/Code/Tools/News/NewsBuilder/Qt/SelectImage.ui
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>SelectImageDialog</class>
- <widget class="QDialog" name="SelectImageDialog">
-  <property name="windowModality">
-   <enum>Qt::ApplicationModal</enum>
-  </property>
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>439</width>
-    <height>406</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Select Image</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QScrollArea" name="scrollArea">
-     <property name="layoutDirection">
-      <enum>Qt::LeftToRight</enum>
-     </property>
-     <property name="horizontalScrollBarPolicy">
-      <enum>Qt::ScrollBarAlwaysOff</enum>
-     </property>
-     <property name="widgetResizable">
-      <bool>true</bool>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-     </property>
-     <widget class="QWidget" name="scrollAreaContents">
-      <property name="geometry">
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>437</width>
-        <height>379</height>
-       </rect>
-      </property>
-      <layout class="QGridLayout" name="gridLayout">
-       <property name="leftMargin">
-        <number>0</number>
-       </property>
-       <property name="topMargin">
-        <number>0</number>
-       </property>
-       <property name="rightMargin">
-        <number>0</number>
-       </property>
-       <property name="bottomMargin">
-        <number>0</number>
-       </property>
-       <property name="spacing">
-        <number>2</number>
-       </property>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QDialogButtonBox" name="buttonBox">
-       <property name="standardButtons">
-        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/Code/Tools/News/NewsBuilder/ResourceManagement/BuilderResourceManifest.cpp b/Code/Tools/News/NewsBuilder/ResourceManagement/BuilderResourceManifest.cpp
deleted file mode 100644
index 0a845216fe..0000000000
--- a/Code/Tools/News/NewsBuilder/ResourceManagement/BuilderResourceManifest.cpp
+++ /dev/null
@@ -1,497 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "BuilderResourceManifest.h"
-#include "NewsShared/ResourceManagement/QtDownloadManager.h"
-#include "NewsBuilder/S3Connector.h"
-#include "UidGenerator.h"
-#include "NewsShared/ResourceManagement/Resource.h"
-#include "NewsBuilder/ResourceManagement/UploadDescriptor.h"
-#include "NewsBuilder/ResourceManagement/DeleteDescriptor.h"
-#include "NewsShared/ResourceManagement/ArticleDescriptor.h"
-#include "NewsBuilder/ResourceManagement/ImageDescriptor.h"
-#include "EndpointManager.h"
-
-#include <QJsonArray>
-#include <QByteArray>
-
-#include <aws/core/utils/memory/stl/AwsStringStream.h>
-#include <QMessageBox>
-
-namespace News {
-
-    BuilderResourceManifest::BuilderResourceManifest(
-        std::function<void()> syncSuccessCallback,
-        std::function<void(ErrorCode)> syncFailCallback,
-        std::function<void(QString, LogType)> syncUpdateCallback)
-        : ResourceManifest(syncSuccessCallback, syncFailCallback, syncUpdateCallback)
-        , m_s3Connector(new S3Connector)
-        , m_uidGenerator(new UidGenerator)
-        , m_endpointManager(new EndpointManager) {}
-
-
-    Resource* BuilderResourceManifest::AddArticle()
-    {
-        auto pResource = new Resource(
-            QString("%1").arg(m_uidGenerator->GenerateUid()),
-            "article");
-        QJsonObject json;
-        json["title"] = "New Article";
-        json["body"] = "Enter article body here";
-        json["imageId"] = "0";
-        QJsonDocument doc(json);
-        QByteArray data = doc.toJson(QJsonDocument::Compact).toStdString().data();
-        pResource->SetData(data);
-        m_toUpload.push(pResource);
-        AppendResource(pResource);
-        m_order.append(pResource->GetId());
-        return pResource;
-    }
-
-    Resource* BuilderResourceManifest::AddImage(const QString& filename)
-    {
-        auto pResource = new Resource(
-            QString("%1").arg(m_uidGenerator->GenerateUid()),
-            "image");
-        ImageDescriptor descriptor(*pResource);
-        QString error;
-        if (!descriptor.Read(filename, error))
-        {
-            m_syncUpdateCallback(error, LogError);
-            delete pResource;
-            return nullptr;
-        }
-        m_toUpload.push(pResource);
-        AppendResource(pResource);
-        return pResource;
-    }
-
-    void BuilderResourceManifest::UpdateResource(Resource* pResource)
-    {
-        if (!m_toUpload.contains(pResource))
-        {
-            pResource->SetVersion(pResource->GetVersion() + 1);
-            m_toUpload.push(pResource);
-        }
-    }
-
-    void BuilderResourceManifest::UseResource(const QString& id)
-    {
-        auto pResource = FindById(id, m_resources);
-        if (!pResource)
-        {
-            return;
-        }
-        pResource->SetRefCount(pResource->GetRefCount() + 1);
-        UpdateResource(pResource);
-    }
-
-    void BuilderResourceManifest::FreeResource(const QString& id)
-    {
-        auto pResource = FindById(id, m_resources);
-        if (!pResource)
-        {
-            return;
-        }
-        if (m_toDelete.contains(pResource))
-        {
-            return;
-        }
-        pResource->SetRefCount(pResource->GetRefCount() - 1);
-        if (pResource->GetRefCount() <= 0)
-        {
-            m_toDelete.push(pResource);
-            RemoveResource(pResource);
-            m_toUpload.removeAll(pResource);
-
-            if (pResource->GetType().compare("article") == 0)
-            {
-                m_order.removeAll(pResource->GetId());
-            }
-        }
-        else
-        {
-            m_toUpload.push(pResource);
-        }
-    }
-
-    bool BuilderResourceManifest::UpdateArticleOrder(const QString& id, bool direction, ErrorCode& error)
-    {
-        int index = m_order.indexOf(id);
-        if (index == -1)
-        {
-            m_syncUpdateCallback(QString("Couldn't find article: %1").arg(id), LogError);
-            error = ErrorCode::MissingArticle;
-            return false;
-        }
-        m_order.removeAll(id);
-
-        index = index + (direction ? -1 : 1);
-        if (index < 0)
-        {
-            index = 0;
-        }
-        if (index > m_order.count())
-        {
-            index = m_order.count();
-        }
-        m_order.insert(index, id);
-        return true;
-    }
-
-    EndpointManager* BuilderResourceManifest::GetEndpointManager() const
-    {
-        return m_endpointManager;
-    }
-
-    void BuilderResourceManifest::Sync()
-    {
-        if (!m_endpointManager->GetSelectedEndpoint())
-        {
-            FailSync(ErrorCode::NoEndpoint);
-            return;
-        }
-        if (!InitS3Connector())
-        {
-            FailSync(ErrorCode::S3Fail);
-            return;
-        }
-        ResourceManifest::Sync();
-    }
-
-    void BuilderResourceManifest::Reset()
-    {
-        if (s_syncing)
-        {
-            m_syncUpdateCallback("Sync is already running", LogError);
-            return;
-        }
-
-        m_toUpload.clear();
-
-        for (auto pResource : m_toDelete)
-        {
-            delete pResource;
-        }
-        m_toDelete.clear();
-
-        m_uidGenerator->Clear();
-
-        ResourceManifest::Reset();
-    }
-
-    void BuilderResourceManifest::PersistLocalResources()
-    {
-        // we are switching to another manifest here, while having the local data still present
-        // so we need to explicitly mark it for uploading so that it does not get deleted
-        for (auto pResource : m_resources)
-        {
-            if (!m_toUpload.contains(pResource))
-            {
-                m_toUpload.push(pResource);
-            }
-        }
-    }
-
-    void BuilderResourceManifest::SetSyncType(SyncType syncType)
-    {
-        m_syncType = syncType;
-    }
-
-    bool BuilderResourceManifest::HasChanges() const
-    {
-        return m_toUpload.count() > 0 || m_toDelete.count() > 0;
-    }
-
-    void BuilderResourceManifest::AppendResource(Resource* pResource)
-    {
-        m_uidGenerator->AddUid(pResource->GetId().toInt());
-        ResourceManifest::AppendResource(pResource);
-    }
-
-    void BuilderResourceManifest::RemoveResource(Resource* pResource)
-    {
-        m_uidGenerator->RemoveUid(pResource->GetId().toInt());
-        ResourceManifest::RemoveResource(pResource);
-    }
-
-    void BuilderResourceManifest::OnDownloadFail()
-    {
-        QMessageBox msgBox(QMessageBox::Critical,
-            "Sync failed",
-            QString("%1\n\n%2")
-            .arg(GetErrorMessage(ErrorCode::ManifestDownloadFail))
-            .arg(QObject::tr("Overwrite resource manifest?")),
-            QMessageBox::Yes | QMessageBox::No);
-        if (msgBox.exec() == QMessageBox::Yes)
-        {
-            if (!UploadManifest())
-            {
-                m_failed = true;
-                m_errorCode = ErrorCode::ManifestUploadFail;
-            }
-        }
-        ResourceManifest::OnDownloadFail();
-    }
-
-    //! This function overrides ResourceManifest Read and tries to do some minimal version checking
-    //! NOTE: version checking is not done yet, this needs a lot more work to version check properly
-    ErrorCode BuilderResourceManifest::Read(const QJsonObject& json)
-    {
-        int version = json["version"].toInt();
-        if (version > m_version && m_syncType == SyncType::Verify)
-        {
-            return ErrorCode::OutOfSync;
-        }
-
-        m_version = version;
-        QJsonArray resourceArray = json["resources"].toArray();
-
-        // initially mark ALL existing resource for deletion
-        QList<Resource*> toDelete = m_resources;
-
-        for (auto resourceDoc : resourceArray)
-        {
-            auto pNewResource = new Resource(resourceDoc.toObject());
-            // find local resource with the same id as new resource
-            auto pOldResource = FindById(pNewResource->GetId(), m_resources);
-            // if resource with the same id already exists then check its version
-            if (pOldResource)
-            {
-                // local resource is outdated, keep its in delete list, and download new one instead
-                if (pNewResource->GetVersion() > pOldResource->GetVersion())
-                {
-                    if (m_syncType == SyncType::Merge)
-                    {
-                        m_toDownload.push(pNewResource);
-                    }
-                    else if (m_syncType == SyncType::Overwrite)
-                    {
-                        m_toDelete.push(pNewResource);
-                    }
-                }
-                // local resource is newer or same version, keep it (remove from toDelete list)
-                // and don't need to download new one
-                else
-                {
-                    delete pNewResource;
-                    toDelete.removeAll(pOldResource);
-                }
-            }
-            else
-            {
-                // if remote resource was NOT deleted locally then download it
-                if (!FindById(pNewResource->GetId(), m_toDelete))
-                {
-                    if (m_syncType == SyncType::Merge)
-                    {
-                        m_toDownload.push(pNewResource);
-                    }
-                    else if (m_syncType == SyncType::Overwrite)
-                    {
-                        m_toDelete.push(pNewResource);
-                    }
-                }
-                // otherwise user deleted it... needs version check here
-                else
-                {
-                    delete pNewResource;
-                }
-            }
-        }
-
-        for (auto pResource : m_toUpload)
-        {
-            toDelete.removeAll(pResource);
-        }
-
-        for (auto pResource : toDelete)
-        {
-            RemoveResource(pResource);
-            m_toDelete.removeAll(pResource);
-            delete pResource;
-        }
-
-        //! Sync article display order
-        //! this is more complex to implement because articles may have been added or deleted
-        //! remotely by another developer while newsbuilder was running
-        //! for now just overwrite s3 version
-        QJsonArray orderArray = json["order"].toArray();
-        for (auto idObject : orderArray)
-        {
-            QString id = idObject.toString();
-            if (FindById(id, m_toDownload) && !m_order.contains(id))
-            {
-                m_order.append(id);
-            }
-        }
-        return ErrorCode::None;
-    }
-
-    //! Write resource manifest to JSON
-    void BuilderResourceManifest::Write(QJsonObject& json) const
-    {
-        QJsonArray resourceArray;
-        foreach(auto pResource, m_resources)
-        {
-            QJsonObject resourceObject;
-            pResource->Write(resourceObject);
-            resourceArray.append(resourceObject);
-        }
-        json["resources"] = resourceArray;
-
-        QJsonArray orderArray;
-        foreach(auto id, m_order)
-        {
-            orderArray.append(id);
-        }
-        json["order"] = orderArray;
-        json["version"] = m_version;
-    }
-
-    //! Figure out how many resources need to be synced
-    void BuilderResourceManifest::PrepareForSync()
-    {
-        // if resource is locally marked for deletion, then we don't need to upload/download it
-        for (auto pResource : m_toDelete)
-        {
-            m_toDownload.removeAll(pResource);
-            m_toUpload.removeAll(pResource);
-        }
-
-        m_syncLeft =
-            m_toDownload.size() +
-            m_toUpload.size() +
-            m_toDelete.size();
-    }
-
-    void BuilderResourceManifest::SyncResources()
-    {
-        ResourceManifest::SyncResources();
-        UploadResources();
-        DeleteResources();
-    }
-
-    void BuilderResourceManifest::UploadResources()
-    {
-        QStack<Resource*> failures;
-        while (m_toUpload.count() > 0)
-        {
-            m_syncUpdateCallback(
-                QString("Uploading: %1 resources left").arg(m_toUpload.count()),
-                LogInfo);
-
-            auto pResource = m_toUpload.pop();
-
-            auto uploadDescriptor = UploadDescriptor(*pResource);
-            uploadDescriptor.Upload(*m_s3Connector,
-                [&](QString url)
-                {
-                    UpdateSync();
-                },
-                [&, pResource](QString error)
-                {
-                    failures.push(pResource);
-                    m_failed = true;
-                    UpdateSync();
-                    m_syncUpdateCallback(
-                        error,
-                        LogError);
-                });
-        }
-        while (failures.count() > 0)
-        {
-            m_toUpload.push(failures.pop());
-        }
-    }
-
-    void BuilderResourceManifest::DeleteResources()
-    {
-        while (m_toDelete.count() > 0)
-        {
-            m_syncUpdateCallback(
-                QString("Deleting: %1 resources left").arg(m_toDelete.count()),
-                LogInfo);
-
-            auto pResource = m_toDelete.pop();
-
-            auto deleteDescriptor = DeleteDescriptor(*pResource);
-            deleteDescriptor.Delete(*m_s3Connector,
-                [&, pResource]()
-                {
-                    delete pResource;
-                    UpdateSync();
-                },
-                [&, pResource](QString error)
-                {
-                    m_failed = true;
-                    delete pResource;
-                    UpdateSync();
-                    m_syncUpdateCallback(
-                        QString("Failed to delete resource: %1").arg(error),
-                        LogError);
-                });
-        }
-    }
-
-    void BuilderResourceManifest::FinishSync()
-    {
-        if (!m_failed)
-        {
-            QString error;
-            if (!UploadManifest())
-            {
-                m_failed = true;
-                m_errorCode = ErrorCode::ManifestUploadFail;
-            }
-        }
-        ResourceManifest::FinishSync();
-    }
-
-    bool BuilderResourceManifest::UploadManifest()
-    {
-        m_syncUpdateCallback(QObject::tr("%1 to %2")
-            .arg("Uploading manifest")
-            .arg(m_endpointManager->GetSelectedEndpoint()->GetBucket()),
-            LogInfo);
-        m_version++;
-        Aws::String awsError;
-        QJsonObject manifestObject;
-        Write(manifestObject);
-        QJsonDocument doc(manifestObject);
-        auto ss = Aws::MakeShared<Aws::StringStream>(
-            S3Connector::ALLOCATION_TAG,
-            std::ios::in | std::ios::out | std::ios::binary);
-        *ss << QString(doc.toJson(QJsonDocument::Compact)).toStdString();
-        Aws::String url;
-        if (!m_s3Connector->PutObject("resourceManifest", ss, url, awsError))
-        {
-            m_syncUpdateCallback(QObject::tr(awsError.c_str()), LogError);
-            return false;
-        }
-        return true;
-    }
-
-    bool BuilderResourceManifest::InitS3Connector() const
-    {
-        auto awsProfileName =
-            m_endpointManager->GetSelectedEndpoint()->GetAwsProfile();
-        auto bucketName =
-            m_endpointManager->GetSelectedEndpoint()->GetBucket();
-        Aws::String awsError;
-        if (!m_s3Connector->Init(
-            awsProfileName.toStdString().c_str(),
-            bucketName.toStdString().c_str(),
-            awsError))
-        {
-            m_syncUpdateCallback(QObject::tr(awsError.c_str()), LogError);
-            return false;
-        }
-        return true;
-    }
-
-}
diff --git a/Code/Tools/News/NewsBuilder/ResourceManagement/BuilderResourceManifest.h b/Code/Tools/News/NewsBuilder/ResourceManagement/BuilderResourceManifest.h
deleted file mode 100644
index b6c20df571..0000000000
--- a/Code/Tools/News/NewsBuilder/ResourceManagement/BuilderResourceManifest.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include "NewsShared/ResourceManagement/ResourceManifest.h"
-
-#include <QStack>
-
-class QJsonObject;
-
-namespace News
-{
-    class EndpointManager;
-    class ArticleDescriptor;
-    class UidGenerator;
-    class S3Connector;
-    class QtDownloadManager;
-    class Descriptor;
-    class DownloadDescriptor;
-    class Resource;
-
-    //! Type of sync behavior
-    enum class SyncType
-    {
-        Merge, // merge resources from both endpoints, i.e. replacing outdated and appending missing (also normal sync behavior)
-        Overwrite, // overwrite resources on new endpoint with old endpoint
-        Verify // attempt to publish changes but abort if out of sync
-    };
-
-    //! Adds news-builder functionality layer to resource manager
-    class BuilderResourceManifest
-        : public ResourceManifest
-    {
-    public:
-        explicit BuilderResourceManifest(
-            std::function<void()> syncSuccessCallback,
-            std::function<void(ErrorCode)> syncFailCallback,
-            std::function<void(QString, LogType)> syncUpdateCallback);
-
-        //! Create new article resource
-        /*!
-            Create new article with default parameters,
-            Add it to resource collection,
-            Mark it for upload.
-
-            \retval Resource * - a pointer to an article Resource
-        */
-        Resource* AddArticle();
-
-        //! Create new image resource
-        /*!
-            Create new image from file,
-            add it to resource collection,
-            mark it for upload.
-
-            \param filename - path to an image on hard drive
-            \retval Resource * - a pointer to an image Resource
-        */
-        Resource* AddImage(const QString& filename);
-
-        //! If resource was modified, add it to upload list and increment its version
-        void UpdateResource(Resource* resource);
-
-        //! When resource is used by several other resources, this function is called
-        //! to increment its ref count
-        void UseResource(const QString& id);
-
-        //! When resource is no longer used by another resource
-        //! decrement refCount,
-        //! if nothing else is using it, then mark for delete
-        void FreeResource(const QString& id);
-
-        //! Move article either up or down in order queue
-        bool UpdateArticleOrder(const QString& id, bool direction, ErrorCode& error);
-
-        EndpointManager* GetEndpointManager() const;
-
-        void Sync() override;
-
-        void Reset() override;
-
-        //! When switching endpoints Merge allows to persist resources to another endpoint,
-        //! thus copying news from one location to another upon next Sync
-        void PersistLocalResources();
-
-        void SetSyncType(SyncType syncType);
-
-        //! Are there local changes
-        bool HasChanges() const;
-
-    protected:
-        void AppendResource(Resource* pResource) override;
-        void RemoveResource(Resource* pResource) override;
-        void OnDownloadFail() override;
-        void FinishSync() override;
-
-    private:
-        S3Connector* m_s3Connector = nullptr;
-        UidGenerator* m_uidGenerator = nullptr;
-        EndpointManager* m_endpointManager = nullptr;
-        SyncType m_syncType = SyncType::Merge;
-
-        QStack<Resource*> m_toUpload;
-        QStack<Resource*> m_toDelete;
-
-        ErrorCode Read(const QJsonObject& json) override;
-        void Write(QJsonObject& json) const;
-
-        void PrepareForSync() override;
-        void SyncResources() override;
-
-        void UploadResources();
-        void DeleteResources();
-
-        bool UploadManifest();
-
-        //! Initializes S3 connector with selected endpoint
-        bool InitS3Connector() const;
-    };
-} // namespace News
diff --git a/Code/Tools/News/NewsBuilder/ResourceManagement/DeleteDescriptor.cpp b/Code/Tools/News/NewsBuilder/ResourceManagement/DeleteDescriptor.cpp
deleted file mode 100644
index 63cdb46218..0000000000
--- a/Code/Tools/News/NewsBuilder/ResourceManagement/DeleteDescriptor.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "DeleteDescriptor.h"
-#include "NewsBuilder/S3Connector.h"
-#include "NewsShared/ResourceManagement/Resource.h"
-
-#include <functional>
-
-namespace News
-{
-
-    DeleteDescriptor::DeleteDescriptor(Resource& resource)
-        : Descriptor(resource) {}
-
-    void DeleteDescriptor::Delete(S3Connector& s3Connector,
-        std::function<void()> deleteSuccessCallback,
-        std::function<void(QString)> deleteFailCallback) const
-    {
-        Aws::String error;
-        if (!s3Connector.DeleteObject(
-            m_resource.GetId().toStdString().c_str(),
-            error))
-        {
-            deleteFailCallback(QString("Error deleting resource %1: %2")
-                .arg(m_resource.GetId())
-                .arg(error.c_str()));
-        }
-        else
-        {
-            deleteSuccessCallback();
-        }
-    }
-
-}
diff --git a/Code/Tools/News/NewsBuilder/ResourceManagement/DeleteDescriptor.h b/Code/Tools/News/NewsBuilder/ResourceManagement/DeleteDescriptor.h
deleted file mode 100644
index 8928e9e19d..0000000000
--- a/Code/Tools/News/NewsBuilder/ResourceManagement/DeleteDescriptor.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include "NewsShared/ResourceManagement/Descriptor.h"
-
-#include <QString>
-#include <functional>
-
-namespace News
-{
-    class S3Connector;
-
-    class DeleteDescriptor
-        : public Descriptor
-    {
-    public:
-        explicit DeleteDescriptor(Resource& resource);
-
-        void Delete(S3Connector& s3Connector,
-            std::function<void()> deleteSuccessCallback,
-            std::function<void(QString)> deleteFailCallback) const;
-    };
-}
diff --git a/Code/Tools/News/NewsBuilder/ResourceManagement/ImageDescriptor.cpp b/Code/Tools/News/NewsBuilder/ResourceManagement/ImageDescriptor.cpp
deleted file mode 100644
index a16ec48851..0000000000
--- a/Code/Tools/News/NewsBuilder/ResourceManagement/ImageDescriptor.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ImageDescriptor.h"
-#include "NewsShared/ResourceManagement/Resource.h"
-
-#include <QImageReader>
-#include <QBuffer>
-#include <QPixmap>
-#include <QVariant>
-#include <QFile>
-
-namespace News
-{
-
-    ImageDescriptor::ImageDescriptor(
-        Resource& resource)
-        : Descriptor(resource)
-    {
-    }
-
-    bool ImageDescriptor::Read(const QString& filename, QString& error) const
-    {
-        QImageReader reader(filename);
-        if (!reader.canRead())
-        {
-            error = reader.errorString();
-            return false;
-        }
-        QImage image = reader.read();
-
-        QPixmap pixmap(filename);
-        QByteArray data;
-        QBuffer buffer(&data);
-        buffer.open(QIODevice::WriteOnly);
-        QFile test("test.png");
-        if (pixmap.save(&buffer, "PNG"))
-        {
-            m_resource.SetData(data);
-            return true;
-        }
-        error = QString("failed to save image %1").arg(filename);
-        return false;
-    }
-
-}
diff --git a/Code/Tools/News/NewsBuilder/ResourceManagement/ImageDescriptor.h b/Code/Tools/News/NewsBuilder/ResourceManagement/ImageDescriptor.h
deleted file mode 100644
index ba4533b0c0..0000000000
--- a/Code/Tools/News/NewsBuilder/ResourceManagement/ImageDescriptor.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <NewsShared/ResourceManagement/Descriptor.h>
-
-class QString;
-
-namespace News
-{
-    class ImageDescriptor
-        : public Descriptor
-    {
-    public:
-        explicit ImageDescriptor(Resource& resource);
-
-        bool Read(const QString& filename, QString& error) const;
-    };
-}
diff --git a/Code/Tools/News/NewsBuilder/ResourceManagement/UploadDescriptor.cpp b/Code/Tools/News/NewsBuilder/ResourceManagement/UploadDescriptor.cpp
deleted file mode 100644
index 699959ed85..0000000000
--- a/Code/Tools/News/NewsBuilder/ResourceManagement/UploadDescriptor.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "NewsBuilder/S3Connector.h"
-#include "UploadDescriptor.h"
-#include "NewsShared/ResourceManagement/Resource.h"
-
-#include <functional>
-#include <aws/core/utils/memory/stl/AwsStringStream.h>
-#include <aws/core/utils/memory/stl/AWSStreamFwd.h>
-
-#include <QObject>
-
-namespace News
-{
-
-    UploadDescriptor::UploadDescriptor(Resource& resource)
-        : Descriptor(resource) {}
-
-    void UploadDescriptor::Upload(S3Connector& s3Connector,
-        std::function<void(QString)> uploadSuccessCallback,
-        std::function<void(QString)> uploadFailCallback) const
-    {
-        Aws::String error;
-
-        auto ss =
-            Aws::MakeShared<Aws::StringStream>(S3Connector::ALLOCATION_TAG,
-                std::ios::in | std::ios::out | std::ios::binary);
-        auto* pbuf = ss->rdbuf();
-        pbuf->sputn(m_resource.GetData().data(), m_resource.GetData().size());
-        Aws::String awsUrl;
-
-        if (!s3Connector.PutObject(
-            m_resource.GetId().toStdString().c_str(),
-            ss,
-            m_resource.GetData().size(),
-            awsUrl,
-            error))
-        {
-            uploadFailCallback(QObject::tr("Error uploading resource %1: %2")
-                .arg(m_resource.GetId())
-                .arg(error.c_str()));
-        }
-        else
-        {
-            uploadSuccessCallback(QString(awsUrl.c_str()));
-        }
-    }
-
-}
diff --git a/Code/Tools/News/NewsBuilder/ResourceManagement/UploadDescriptor.h b/Code/Tools/News/NewsBuilder/ResourceManagement/UploadDescriptor.h
deleted file mode 100644
index 71a7732c1e..0000000000
--- a/Code/Tools/News/NewsBuilder/ResourceManagement/UploadDescriptor.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include "NewsShared/ResourceManagement/Descriptor.h"
-
-#include <QString>
-#include <functional>
-
-namespace News
-{
-    class S3Connector;
-
-    class UploadDescriptor
-        : public Descriptor
-    {
-    public:
-        explicit UploadDescriptor(Resource& resource);
-
-        void Upload(S3Connector& s3Connector,
-            std::function<void(QString)> uploadSuccessCallback,
-            std::function<void(QString)> uploadFailCallback) const;
-    };
-}
diff --git a/Code/Tools/News/NewsBuilder/Resources/NewsBuilder.qss b/Code/Tools/News/NewsBuilder/Resources/NewsBuilder.qss
deleted file mode 100644
index 01ca308585..0000000000
--- a/Code/Tools/News/NewsBuilder/Resources/NewsBuilder.qss
+++ /dev/null
@@ -1,44 +0,0 @@
-QLabel
-{
-    font-size: 12px;
-    color: #FFFFFF;
-    line-height: 20px;
-    background-color: transparent;
-    margin: 0;
-}
-
-QLabel#titleLabel
-{
-    font-size: 22px;
-    line-height: 32px;
-}
-
-QLabel#bodyLabel
-{
-    font-size: 14px;
-    line-height: 20px;
-}
-
-QFrame#viewContainer[articleStyle="pinned"]
-{
-    background: rgba(180,139,255,5%);
-    border: 1px solid #B48BFF;
-    box-shadow: 0 0 4px 0 rgba(0,0,0,50%);
-}
-
-QWidget#articleViewContainerRoot
-{
-    background: #222222;
-}
-
-QScrollArea#previewArea,
-QWidget#articleViewContents,
-QFrame#imageFrame
-{
-    background-color: transparent;
-}
-
-News--ArticleView.SelectedArticle > QWidget
-{
-    background: #333333;
-}
diff --git a/Code/Tools/News/NewsBuilder/Resources/missing-image.png b/Code/Tools/News/NewsBuilder/Resources/missing-image.png
deleted file mode 100644
index 889493e628..0000000000
--- a/Code/Tools/News/NewsBuilder/Resources/missing-image.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4255a25636d77a54809592bc98bef47fa9044be03cd65d73daa821711489e00f
-size 7379
diff --git a/Code/Tools/News/NewsBuilder/S3Connector.cpp b/Code/Tools/News/NewsBuilder/S3Connector.cpp
deleted file mode 100644
index a54b6fa8f8..0000000000
--- a/Code/Tools/News/NewsBuilder/S3Connector.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "S3Connector.h"
-
-#include <fstream>
-#include <iostream>
-#include <AzFramework/AzFramework_Traits_Platform.h>
-
-
-AZ_PUSH_DISABLE_WARNING(4251 4819, "-Wunknown-warning-option") // Invalid character not in default code page
-#include <aws/core/auth/AWSCredentialsProviderChain.h>
-#include <aws/core/utils/Outcome.h>
-#include <aws/s3/model/PutObjectRequest.h>
-#include <aws/s3/model/GetObjectRequest.h>
-#include <aws/s3/model/DeleteObjectRequest.h>
-#include <aws/core/utils/memory/stl/AwsStringStream.h>
-#include <aws/core/utils/HashingUtils.h>
-#include <aws/core/Aws.h>
-AZ_POP_DISABLE_WARNING
-
-namespace News
-{
-    const char* S3Connector::ALLOCATION_TAG = "NewsBuilder";
-
-    S3Connector::S3Connector()
-        : m_s3Client(nullptr)
-        , m_limiter(nullptr)
-        , m_valid(false)
-    {
-    }
-
-    S3Connector::~S3Connector() {}
-
-    bool S3Connector::Init(const char* awsProfileName, const char* bucket, Aws::String& error)
-    {
-        Aws::SDKOptions options;
-        options.loggingOptions.logLevel = Aws::Utils::Logging::LogLevel::Trace;
-        Aws::InitAPI(options);
-
-        Aws::Client::ClientConfiguration config;
-        config.enableTcpKeepAlive = AZ_TRAIT_AZFRAMEWORK_AWS_ENABLE_TCP_KEEP_ALIVE_SUPPORTED;
-        config.scheme = Aws::Http::Scheme::HTTPS;
-        config.connectTimeoutMs = 30000;
-        config.requestTimeoutMs = 30000;
-        config.readRateLimiter = m_limiter;
-        config.writeRateLimiter = m_limiter;
-
-        auto provider =
-            Aws::MakeShared<Aws::Auth::ProfileConfigFileAWSCredentialsProvider>(
-                ALLOCATION_TAG,
-                awsProfileName);
-
-        auto accessKeyId = provider->GetAWSCredentials().GetAWSAccessKeyId();
-
-        //! verify that credential file exists
-        if (accessKeyId.empty())
-        {
-            error = "LY_NEWS_DEVELOPER AWS credentials not found. Add credentials in LY Editor AWS->ClientManager";
-            m_valid = false;
-            return false;
-        }
-
-        m_bucket = Aws::String(bucket);
-        m_s3Client = Aws::MakeShared<Aws::S3::S3Client>(
-                ALLOCATION_TAG,
-                provider,
-                config);
-
-        m_valid = true;
-        return true;
-    }
-
-    bool S3Connector::GetObject(const char* key,
-        Aws::String& data,
-        Aws::String& url,
-        Aws::String& error) const
-    {
-        if (!m_valid)
-        {
-            error = "Client not initialized";
-            return false;
-        }
-
-        Aws::S3::Model::GetObjectRequest getObjectRequest;
-        getObjectRequest.SetBucket(m_bucket);
-        getObjectRequest.SetKey(key);
-        auto outcome = m_s3Client->GetObject(getObjectRequest);
-        if (!outcome.IsSuccess())
-        {
-            error = outcome.GetError().GetMessage();
-            return false;
-        }
-        url = m_s3Client->GeneratePresignedUrl(m_bucket, key, Aws::Http::HttpMethod::HTTP_GET);
-        Aws::StringStream ss;
-        ss << outcome.GetResult().GetBody().rdbuf();
-        data = ss.str();
-        return true;
-    }
-
-    bool S3Connector::PutObject(const char* key,
-        STREAM_PTR stream,
-        Aws::String& url,
-        Aws::String& error) const
-    {
-        return PutObject(key, stream, GetStreamLength(stream), url, error);
-    }
-
-    bool S3Connector::PutObject(const char* key,
-        STREAM_PTR stream,
-        int length,
-        Aws::String& url,
-        Aws::String& error) const
-    {
-        if (!m_valid)
-        {
-            error = "Client not initialized";
-            return false;
-        }
-
-        Aws::S3::Model::PutObjectRequest putObjectRequest;
-        putObjectRequest.SetBucket(m_bucket);
-        putObjectRequest.SetBody(stream);
-        putObjectRequest.SetContentLength(length);
-        putObjectRequest.SetContentMD5(
-            Aws::Utils::HashingUtils::Base64Encode(
-                Aws::Utils::HashingUtils::CalculateMD5(*putObjectRequest.GetBody())));
-        putObjectRequest.SetContentType(Aws::String("binary/octet-stream"));
-        putObjectRequest.SetKey(key);
-        putObjectRequest.SetACL(Aws::S3::Model::ObjectCannedACL::public_read);
-        auto outcome = m_s3Client->PutObject(putObjectRequest);
-        if (!outcome.IsSuccess())
-        {
-            error = outcome.GetError().GetMessage();
-            return false;
-        }
-        url = m_s3Client->GeneratePresignedUrl(m_bucket, key, Aws::Http::HttpMethod::HTTP_GET);
-        return true;
-    }
-
-    bool S3Connector::DeleteObject(const char* key, Aws::String& error) const
-    {
-        if (!m_valid)
-        {
-            error = "Client not initialized";
-            return false;
-        }
-
-        Aws::S3::Model::DeleteObjectRequest deleteObjectRequest;
-        deleteObjectRequest.SetBucket(m_bucket);
-        deleteObjectRequest.SetKey(key);
-        auto outcome = m_s3Client->DeleteObject(deleteObjectRequest);
-        if (!outcome.IsSuccess())
-        {
-            error = outcome.GetError().GetMessage();
-            return false;
-        }
-        return true;
-    }
-
-    int S3Connector::GetStreamLength(STREAM_PTR stream)
-    {
-        stream->seekg(0, std::ios::end);
-        auto length = stream->tellg();
-        stream->seekg(0, std::ios::beg);
-        return static_cast<int>(length);
-    }
-
-}
diff --git a/Code/Tools/News/NewsBuilder/S3Connector.h b/Code/Tools/News/NewsBuilder/S3Connector.h
deleted file mode 100644
index d0404bfddb..0000000000
--- a/Code/Tools/News/NewsBuilder/S3Connector.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/PlatformDef.h>
-#include <memory>
-AZ_PUSH_DISABLE_WARNING(4251 4355 4996, "-Wunknown-warning-option") // <future> includes ppltasks.h which throws a C4355 warning: 'this' used in base member initializer list
-#include <aws/s3/S3Client.h>
-AZ_POP_DISABLE_WARNING
-
-typedef std::shared_ptr<Aws::IOStream> STREAM_PTR;
-
-namespace News
-{
-    //! A light wrapper around AWS SDK
-    class S3Connector
-    {
-    public:
-        static const char* ALLOCATION_TAG;
-
-        S3Connector();
-        ~S3Connector();
-
-        //! Make s3 client using credentials stored in [user]/.aws/credentials file
-        /*!
-            \param awsProfileName - name of AWS credentials
-            \param bucket - name of s3 bucket to use for AWS operations
-            \param error - error string
-            \retval bool - true if success else false
-        */
-        bool Init(const char* awsProfileName, const char* bucket, Aws::String& error);
-
-        bool GetObject(const char* key,
-            Aws::String& data,
-            Aws::String& url,
-            Aws::String& error) const;
-
-        bool PutObject(const char* key,
-            STREAM_PTR stream,
-            Aws::String& url,
-            Aws::String& error) const;
-
-        bool PutObject(const char* key,
-            STREAM_PTR stream,
-            int length,
-            Aws::String& url,
-            Aws::String& error) const;
-
-        bool DeleteObject(const char* key,
-            Aws::String& error) const;
-
-    private:
-        Aws::String m_bucket;
-        std::shared_ptr<Aws::S3::S3Client> m_s3Client;
-        std::shared_ptr<Aws::Utils::RateLimits::RateLimiterInterface> m_limiter;
-        bool m_valid;
-
-        static int GetStreamLength(STREAM_PTR stream);
-    };
-} // namespace News
diff --git a/Code/Tools/News/NewsBuilder/UidGenerator.cpp b/Code/Tools/News/NewsBuilder/UidGenerator.cpp
deleted file mode 100644
index 060f593996..0000000000
--- a/Code/Tools/News/NewsBuilder/UidGenerator.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "UidGenerator.h"
-
-#include <ctime>
-
-namespace News
-{
-
-    UidGenerator::UidGenerator()
-    {
-        srand(static_cast<int>(time(nullptr)));
-    }
-
-    int UidGenerator::GenerateUid()
-    {
-        int uid;
-        do
-        {
-            uid = rand();
-        } 
-        while (std::find(m_uids.begin(), m_uids.end(), uid) != m_uids.end());
-        m_uids.push_back(uid);
-        return uid;
-    }
-
-    int UidGenerator::AddUid(int uid)
-    {
-        if (std::find(m_uids.begin(), m_uids.end(), uid) == m_uids.end())
-        {
-            m_uids.push_back(uid);
-        }
-        return uid;
-    }
-
-    void UidGenerator::RemoveUid(int uid)
-    {
-        auto it = std::find(m_uids.begin(), m_uids.end(), uid);
-        if (it != m_uids.end())
-        {
-            m_uids.erase(it);
-        }
-    }
-
-    void UidGenerator::Clear()
-    {
-        m_uids.clear();
-    }
-
-}
diff --git a/Code/Tools/News/NewsBuilder/UidGenerator.h b/Code/Tools/News/NewsBuilder/UidGenerator.h
deleted file mode 100644
index 825df9e340..0000000000
--- a/Code/Tools/News/NewsBuilder/UidGenerator.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <vector>
-
-namespace News
-{
-    //! A simple unique id generator.
-    class UidGenerator
-    {
-    public:
-        UidGenerator();
-        int GenerateUid();
-        int AddUid(int uid);
-        void RemoveUid(int uid);
-        void Clear();
-
-    private:
-        std::vector<int> m_uids;
-    };
-}
diff --git a/Code/Tools/News/NewsBuilder/main.cpp b/Code/Tools/News/NewsBuilder/main.cpp
deleted file mode 100644
index 6a43c681b1..0000000000
--- a/Code/Tools/News/NewsBuilder/main.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <windows.h>
-#include <QApplication>
-
-#include "Qt/NewsBuilder.h"
-#include <AzCore/base.h>
-#include <AzCore/Component/ComponentApplication.h>
-#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
-#include <AzCore/IO/Path/Path.h>
-
-
-int main(int argc, char *argv[])
-{
-    // Must be set before QApplication is initialized, so that we support HighDpi monitors, like the Retina displays
-    // on Windows 10
-    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-    QGuiApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
-
-    QApplication a(argc, argv);
-    AZ::IO::FixedMaxPath engineRootPath;
-    {
-        AZ::ComponentApplication componentApplication;
-        auto settingsRegistry = AZ::SettingsRegistry::Get();
-        settingsRegistry->Get(engineRootPath.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_EngineRootFolder);
-    }
-    News::NewsBuilder w(nullptr, engineRootPath);
-    w.show();
-    return a.exec();
-}
diff --git a/Code/Tools/News/NewsBuilder/news_builder.qrc b/Code/Tools/News/NewsBuilder/news_builder.qrc
deleted file mode 100644
index 010ac598f1..0000000000
--- a/Code/Tools/News/NewsBuilder/news_builder.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-    <qresource>
-        <file>Resources/NewsBuilder.qss</file>
-    </qresource>
-</RCC>
diff --git a/Code/Tools/News/NewsBuilder/news_builder_files.cmake b/Code/Tools/News/NewsBuilder/news_builder_files.cmake
deleted file mode 100644
index c46e66a357..0000000000
--- a/Code/Tools/News/NewsBuilder/news_builder_files.cmake
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES
-    main.cpp
-    S3Connector.cpp
-    S3Connector.h
-    UidGenerator.cpp
-    UidGenerator.h
-    EndpointManager.cpp
-    EndpointManager.h
-    Qt/ArticleDetails.cpp
-    Qt/ArticleDetails.h
-    Qt/ArticleDetails.ui
-    Qt/ArticleDetailsContainer.cpp
-    Qt/ArticleDetailsContainer.h
-    Qt/ArticleDetailsContainer.ui
-    Qt/AwsDialog.ui
-    Qt/BuilderArticleViewContainer.cpp
-    Qt/BuilderArticleViewContainer.h
-    Qt/BuilderArticleViewContainer.ui
-    Qt/EndpointEntryView.cpp
-    Qt/EndpointEntryView.h
-    Qt/EndpointEntryView.ui
-    Qt/EndpointManagerView.cpp
-    Qt/EndpointManagerView.h
-    Qt/EndpointManagerView.ui
-    Qt/ImageItem.cpp
-    Qt/ImageItem.h
-    Qt/ImageItem.ui
-    Qt/LogContainer.cpp
-    Qt/LogContainer.h
-    Qt/LogContainer.ui
-    Qt/NewsBuilder.cpp
-    Qt/NewsBuilder.h
-    Qt/Newsbuilder.qrc
-    Qt/Newsbuilder.ui
-    Qt/QCustomMessageBox.cpp
-    Qt/QCustomMessageBox.h
-    Qt/QCustomMessageBox.ui
-    Qt/SelectImage.cpp
-    Qt/SelectImage.h
-    Qt/SelectImage.ui
-    ResourceManagement/BuilderResourceManifest.cpp
-    ResourceManagement/BuilderResourceManifest.h
-    ResourceManagement/DeleteDescriptor.cpp
-    ResourceManagement/DeleteDescriptor.h
-    ResourceManagement/ImageDescriptor.cpp
-    ResourceManagement/ImageDescriptor.h
-    ResourceManagement/UploadDescriptor.cpp
-    ResourceManagement/UploadDescriptor.h
-)
-
-set(SKIP_UNITY_BUILD_INCLUSION_FILES
-    # Fix for unity causing the 'News::BuilderResourceManifest::UpdateResourceA' symbol to be unresolved
-    Qt/ArticleDetails.cpp
-    # Fix for unity causing the ' Aws::S3::S3Client::GetObjectA' symbol to be unresolved
-    S3Connector.cpp
-
-)
diff --git a/Code/Tools/News/NewsShared/ErrorCodes.h b/Code/Tools/News/NewsShared/ErrorCodes.h
deleted file mode 100644
index 444e0c6f67..0000000000
--- a/Code/Tools/News/NewsShared/ErrorCodes.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <QString>
-
-namespace News
-{
-    enum class ErrorCode : int
-    {
-        None,
-        OutOfSync,
-        ManifestDownloadFail,
-        FailedToSync,
-        AlreadySyncing,
-        FailedToParseManifest,
-        MissingArticle,
-        NoEndpoint,
-        ManifestUploadFail,
-        S3Fail
-    };
-
-    inline extern const char* GetErrorMessage(ErrorCode errorCode)
-    {
-        static const char* errors[]
-        {
-            "",
-            "Your manifest is out of sync. Reopen the same endpoint and sync to resolve the conflict and try again.",
-            "Failed to download resource manifest",
-            "Failed to sync resources",
-            "Sync is already running",
-            "Failed to parse resource manifest",
-            "Could not find article, try syncing again",
-            "Missing or incorrect endpoint selected",
-            "Failed to upload resource manifest",
-            "Failed to init S3 connection"
-        };
-        int errorCount = sizeof errors / sizeof errors[0];
-        int typeIndex = static_cast<int>(errorCode);
-        if (typeIndex < 0 || typeIndex >= errorCount)
-        {
-            return "Invalid error code";
-        }
-        return errors[typeIndex];
-    }
-} // namespace News
diff --git a/Code/Tools/News/NewsShared/LogType.h b/Code/Tools/News/NewsShared/LogType.h
deleted file mode 100644
index 92834adc58..0000000000
--- a/Code/Tools/News/NewsShared/LogType.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-namespace News {
-    enum LogType
-    {
-        LogOk,
-        LogInfo,
-        LogError,
-        LogWarning
-    };
-} // namespace News
diff --git a/Code/Tools/News/NewsShared/Qt/ArticleErrorView.cpp b/Code/Tools/News/NewsShared/Qt/ArticleErrorView.cpp
deleted file mode 100644
index 6f2a7e3c9c..0000000000
--- a/Code/Tools/News/NewsShared/Qt/ArticleErrorView.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ArticleErrorView.h"
-#include "NewsShared/Qt/ui_ArticleErrorView.h"
-
-using namespace News;
-
-ArticleErrorView::ArticleErrorView(
-    QWidget* parent)
-    : QWidget(parent)
-    , m_ui(new Ui::ArticleErrorViewWidget())
-{
-    m_ui->setupUi(this);
-}
-
-ArticleErrorView::~ArticleErrorView(){}
-
-#include "NewsShared/Qt/moc_ArticleErrorView.cpp"
diff --git a/Code/Tools/News/NewsShared/Qt/ArticleErrorView.h b/Code/Tools/News/NewsShared/Qt/ArticleErrorView.h
deleted file mode 100644
index 3130690dc1..0000000000
--- a/Code/Tools/News/NewsShared/Qt/ArticleErrorView.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QWidget>
-#endif
-
-namespace Ui
-{
-    class ArticleErrorViewWidget;
-}
-
-namespace AzQtComponents
-{
-    class ExtendedLabel;
-}
-
-namespace News
-{
-    class ArticleErrorView
-        : public QWidget
-    {
-        Q_OBJECT
-    public:
-        ArticleErrorView(QWidget* parent);
-        ~ArticleErrorView();
-
-    private:
-        QScopedPointer<Ui::ArticleErrorViewWidget> m_ui;
-    };
-}
diff --git a/Code/Tools/News/NewsShared/Qt/ArticleErrorView.ui b/Code/Tools/News/NewsShared/Qt/ArticleErrorView.ui
deleted file mode 100644
index c94c636720..0000000000
--- a/Code/Tools/News/NewsShared/Qt/ArticleErrorView.ui
+++ /dev/null
@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ArticleErrorViewWidget</class>
- <widget class="QWidget" name="ArticleErrorViewWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>192</width>
-    <height>228</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>0</width>
-    <height>0</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>16777215</width>
-    <height>16777215</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>ArticleView</string>
-  </property>
-  <property name="styleSheet">
-   <string notr="true">background-color: none; text-align: left;</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_3">
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QWidget" name="widget" native="true">
-     <property name="styleSheet">
-      <string notr="true">border: none;</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <property name="spacing">
-       <number>0</number>
-      </property>
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item>
-       <spacer name="verticalSpacer">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Fixed</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>14</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <property name="spacing">
-         <number>0</number>
-        </property>
-        <item>
-         <spacer name="horizontalSpacer_2">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Fixed</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>14</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <layout class="QVBoxLayout" name="verticalLayout">
-          <property name="spacing">
-           <number>0</number>
-          </property>
-          <item>
-           <widget class="AzQtComponents::ExtendedLabel" name="label">
-            <property name="minimumSize">
-             <size>
-              <width>160</width>
-              <height>90</height>
-             </size>
-            </property>
-            <property name="text">
-             <string/>
-            </property>
-            <property name="pixmap">
-             <pixmap resource="NewsShared.qrc">:/images/Resources/ErrorImage.jpg</pixmap>
-            </property>
-            <property name="pixmapSize" stdset="0">
-             <size>
-              <width>160</width>
-              <height>90</height>
-             </size>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <spacer name="verticalSpacer_3">
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>20</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item>
-           <widget class="QLabel" name="titleLabel">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="font">
-             <font>
-              <family>Open Sans</family>
-              <pointsize>8</pointsize>
-              <weight>50</weight>
-              <bold>false</bold>
-             </font>
-            </property>
-            <property name="styleSheet">
-             <string notr="true">a { text-decoration: underline; color: red }</string>
-            </property>
-            <property name="text">
-             <string>We couldn’t connect to the network or access our news database. To see the latest Open 3D Engine news, blogs, tutorials, and more, please visit the &lt;a href=&quot;http://aws.amazon.com/lumberyard/&quot;&gt;Lumberyard website&lt;/a&gt;.</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-            </property>
-            <property name="wordWrap">
-             <bool>true</bool>
-            </property>
-            <property name="openExternalLinks">
-             <bool>true</bool>
-            </property>
-            <property name="textInteractionFlags">
-             <set>Qt::LinksAccessibleByMouse</set>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Fixed</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>14</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <spacer name="verticalSpacer_2">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Fixed</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>10</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>AzQtComponents::ExtendedLabel</class>
-   <extends>QLabel</extends>
-   <header>AzQtComponents/Components/ExtendedLabel.h</header>
-  </customwidget>
- </customwidgets>
- <resources>
-  <include location="NewsShared.qrc"/>
- </resources>
- <connections/>
-</ui>
diff --git a/Code/Tools/News/NewsShared/Qt/ArticleView.cpp b/Code/Tools/News/NewsShared/Qt/ArticleView.cpp
deleted file mode 100644
index 082a29d38a..0000000000
--- a/Code/Tools/News/NewsShared/Qt/ArticleView.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ArticleView.h"
-
-#include <AzQtComponents/Components/ExtendedLabel.h>
-
-AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option") // 4251: '...' needs to have dll-interface to be used by clients of class '...'
-#include "NewsShared/ResourceManagement/ArticleDescriptor.h"
-#include "NewsShared/Qt/ui_ArticleView.h"
-#include "NewsShared/Qt/ui_PinnedArticleView.h"
-#include "NewsShared/ResourceManagement/ResourceManifest.h"
-#include "NewsShared/ResourceManagement/Resource.h"
-
-
-#include <QDesktopServices>
-#include <QUrl>
-AZ_POP_DISABLE_WARNING
-
-using namespace News;
-
-ArticleView::ArticleView(
-    QWidget* parent,
-    const ArticleDescriptor& article,
-    const ResourceManifest& manifest)
-    : QWidget(parent)
-    , m_pArticle(new ArticleDescriptor(article))
-    , m_manifest(manifest)
-    , m_icon(nullptr)
-{
-    
-}
-
-void ArticleView::Update()
-{
-    Q_ASSERT(m_widgetImageFrame && m_widgetTitle && m_widgetBody);
-
-    auto pResource = m_manifest.FindById(m_pArticle->GetResource().GetId());
-    m_pArticle.reset();
-    if (pResource)
-    {
-        m_pArticle = QSharedPointer<ArticleDescriptor>(new ArticleDescriptor(*pResource));
-        m_widgetTitle->setText(m_pArticle->GetTitle());
-        m_widgetBody->setText(m_pArticle->GetBody());
-        auto pImageResource = m_manifest.FindById(m_pArticle->GetImageId());
-        if (pImageResource)
-        {
-            QPixmap pixmap;
-            if (pixmap.loadFromData(pImageResource->GetData()))
-            {
-                if (!m_icon)
-                {
-                    m_icon = new AzQtComponents::ExtendedLabel(this);
-                    m_icon->setStyleSheet("border: none;");
-                    m_icon->setAlignment(Qt::AlignCenter);
-                    static_cast<QVBoxLayout*>(
-                        m_widgetImageFrame->layout())->insertWidget(0, m_icon);
-                    connect(m_icon, &AzQtComponents::ExtendedLabel::clicked, this, &ArticleView::articleSelectedSlot);
-                }
-                m_icon->setPixmap(pixmap.scaled(m_widgetImageFrame->minimumWidth(), 
-                    m_widgetImageFrame->minimumHeight(),
-                    Qt::KeepAspectRatioByExpanding));
-            }
-            else
-            {
-                RemoveIcon();
-            }
-        }
-        else
-        {
-            RemoveIcon();
-        }
-    }
-}
-
-void ArticleView::mousePressEvent([[maybe_unused]] QMouseEvent* event)
-{
-    articleSelectedSlot();
-}
-
-void ArticleView::RemoveIcon()
-{
-    if (m_icon)
-    {
-        delete m_icon;
-        m_icon = nullptr;
-    }
-}
-
-void ArticleView::linkActivatedSlot(const QString& link)
-{
-    QDesktopServices::openUrl(QUrl(link));
-    Q_EMIT linkActivatedSignal(link);
-}
-
-void ArticleView::articleSelectedSlot()
-{
-    Q_EMIT articleSelectedSignal(m_pArticle->GetResource().GetId());
-}
-
-QSharedPointer<const ArticleDescriptor> ArticleView::GetArticle() const
-{
-    return m_pArticle;
-}
-
-void ArticleView::SetupViewWidget(QFrame* widgetImageFrame, AzQtComponents::ExtendedLabel* widgetTitle, AzQtComponents::ExtendedLabel* widgetBody)
-{
-    Q_ASSERT(m_widgetImageFrame == nullptr && m_widgetTitle == nullptr && m_widgetBody == nullptr);
-
-    m_widgetImageFrame = widgetImageFrame;
-    m_widgetTitle = widgetTitle;
-    m_widgetBody = widgetBody;
-
-    connect(m_widgetTitle, &QLabel::linkActivated, this, &ArticleView::linkActivatedSlot);
-    connect(m_widgetBody, &QLabel::linkActivated, this, &ArticleView::linkActivatedSlot);
-    connect(m_widgetTitle, &AzQtComponents::ExtendedLabel::clicked, this, &ArticleView::articleSelectedSlot);
-    connect(m_widgetBody, &AzQtComponents::ExtendedLabel::clicked, this, &ArticleView::articleSelectedSlot);
-
-    Q_ASSERT(m_widgetImageFrame && m_widgetTitle && m_widgetBody);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// ArticleViewDefaultWidget
-////////////////////////////////////////////////////////////////////////////////////////////////////
-ArticleViewDefaultWidget::ArticleViewDefaultWidget(QWidget* parent,
-    const ArticleDescriptor& article,
-    const ResourceManifest& manifest)
-    : ArticleView(parent, article, manifest)
-    , m_ui(new Ui::ArticleViewWidget())
-{
-    m_ui->setupUi(this);
-    SetupViewWidget(m_ui->imageFrame, m_ui->titleLabel, m_ui->bodyLabel);
-    Update();
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// ArticleViewPinnedWidget
-////////////////////////////////////////////////////////////////////////////////////////////////////
-ArticleViewPinnedWidget::ArticleViewPinnedWidget(QWidget* parent,
-    const ArticleDescriptor& article,
-    const ResourceManifest& manifest)
-    : ArticleView(parent, article, manifest)
-    , m_ui(new Ui::PinnedArticleViewWidget())
-{
-    m_ui->setupUi(this);
-    SetupViewWidget(m_ui->imageFrame, m_ui->titleLabel, m_ui->bodyLabel);
-    Update();
-}
-
-#include "NewsShared/Qt/moc_ArticleView.cpp"
diff --git a/Code/Tools/News/NewsShared/Qt/ArticleView.h b/Code/Tools/News/NewsShared/Qt/ArticleView.h
deleted file mode 100644
index 16a29732f0..0000000000
--- a/Code/Tools/News/NewsShared/Qt/ArticleView.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QWidget>
-#endif
-
-namespace Ui
-{
-    class ArticleViewWidget;
-    class PinnedArticleViewWidget;
-}
-
-namespace AzQtComponents
-{
-    class ExtendedLabel;
-}
-
-class QFrame;
-
-namespace News
-{
-    class ArticleDescriptor;
-    class ResourceManifest;
-
-    class ArticleView
-        : public QWidget
-    {
-        Q_OBJECT
-    public:
-        ArticleView(QWidget* parent,
-            const ArticleDescriptor& article,
-            const ResourceManifest& manifest);
-        ~ArticleView() = default;
-
-        void Update();
-        QSharedPointer<const ArticleDescriptor> GetArticle() const;
-
-    Q_SIGNALS:
-        void articleSelectedSignal(QString resourceId);
-        void linkActivatedSignal(const QString& link);
-
-    protected:
-        void SetupViewWidget(QFrame* widgetImageFrame, AzQtComponents::ExtendedLabel* widgetTitle, AzQtComponents::ExtendedLabel* widgetBody);
-        void mousePressEvent(QMouseEvent* event);
-
-    private:
-
-        QFrame* m_widgetImageFrame = nullptr;
-        AzQtComponents::ExtendedLabel* m_widgetTitle = nullptr;
-        AzQtComponents::ExtendedLabel* m_widgetBody = nullptr;
-        AzQtComponents::ExtendedLabel* m_icon = nullptr;
-
-        QSharedPointer<const ArticleDescriptor> m_pArticle;
-        const ResourceManifest& m_manifest;
-
-        void RemoveIcon();
-
-    private Q_SLOTS:
-        void linkActivatedSlot(const QString& link);
-        void articleSelectedSlot();
-    };
-
-    class ArticleViewDefaultWidget : public ArticleView
-    {
-    public:
-        ArticleViewDefaultWidget(QWidget* parent,
-            const ArticleDescriptor& article,
-            const ResourceManifest& manifest);
-        ~ArticleViewDefaultWidget() = default;
-
-    private:
-        Ui::ArticleViewWidget* m_ui = nullptr;
-    };
-
-    class ArticleViewPinnedWidget : public ArticleView
-    {
-    public:
-        ArticleViewPinnedWidget(QWidget* parent,
-            const ArticleDescriptor& article,
-            const ResourceManifest& manifest);
-        ~ArticleViewPinnedWidget() = default;
-
-    private:
-        Ui::PinnedArticleViewWidget* m_ui = nullptr;
-    };
-}
diff --git a/Code/Tools/News/NewsShared/Qt/ArticleView.ui b/Code/Tools/News/NewsShared/Qt/ArticleView.ui
deleted file mode 100644
index 67d1d8857b..0000000000
--- a/Code/Tools/News/NewsShared/Qt/ArticleView.ui
+++ /dev/null
@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ArticleViewWidget</class>
- <widget class="QWidget" name="ArticleViewWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>430</width>
-    <height>376</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>430</width>
-    <height>0</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>430</width>
-    <height>16777215</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>ArticleView</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QFrame" name="viewContainer">
-     <property name="articleStyle" stdset="0">
-      <string>default</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <property name="spacing">
-       <number>0</number>
-      </property>
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="QFrame" name="imageFrame">
-        <property name="minimumSize">
-         <size>
-          <width>430</width>
-          <height>184</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>430</width>
-          <height>184</height>
-         </size>
-        </property>
-        <property name="frameShape">
-         <enum>QFrame::StyledPanel</enum>
-        </property>
-        <property name="frameShadow">
-         <enum>QFrame::Raised</enum>
-        </property>
-        <layout class="QVBoxLayout" name="verticalLayout_4">
-         <property name="spacing">
-          <number>0</number>
-         </property>
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-        </layout>
-       </widget>
-      </item>
-      <item>
-       <spacer name="verticalSpacer_3">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Fixed</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>0</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="AzQtComponents::ExtendedLabel" name="titleLabel">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="font">
-         <font>
-          <family>Open Sans</family>
-          <pointsize>14</pointsize>
-          <weight>50</weight>
-          <bold>false</bold>
-         </font>
-        </property>
-        <property name="text">
-         <string>Title:</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-        </property>
-        <property name="wordWrap">
-         <bool>true</bool>
-        </property>
-        <property name="openExternalLinks">
-         <bool>false</bool>
-        </property>
-        <property name="textInteractionFlags">
-         <set>Qt::LinksAccessibleByMouse</set>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="verticalSpacer_2">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Fixed</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>12</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="AzQtComponents::ExtendedLabel" name="bodyLabel">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="font">
-         <font>
-          <family>Open Sans</family>
-          <pointsize>8</pointsize>
-          <weight>50</weight>
-          <bold>false</bold>
-         </font>
-        </property>
-        <property name="text">
-         <string>Body</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-        </property>
-        <property name="wordWrap">
-         <bool>true</bool>
-        </property>
-        <property name="margin">
-         <number>0</number>
-        </property>
-        <property name="indent">
-         <number>0</number>
-        </property>
-        <property name="openExternalLinks">
-         <bool>false</bool>
-        </property>
-        <property name="textInteractionFlags">
-         <set>Qt::LinksAccessibleByMouse</set>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="verticalSpacer">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Fixed</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>0</width>
-          <height>24</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>AzQtComponents::ExtendedLabel</class>
-   <extends>QLabel</extends>
-   <header>AzQtComponents/Components/ExtendedLabel.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
diff --git a/Code/Tools/News/NewsShared/Qt/ArticleViewContainer.cpp b/Code/Tools/News/NewsShared/Qt/ArticleViewContainer.cpp
deleted file mode 100644
index 1d718d1bb8..0000000000
--- a/Code/Tools/News/NewsShared/Qt/ArticleViewContainer.cpp
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ArticleViewContainer.h"
-#include "ArticleView.h"
-#include "NewsShared/ResourceManagement/ResourceManifest.h"
-#include "NewsShared/ResourceManagement/ArticleDescriptor.h"
-#include "NewsShared/ResourceManagement/Resource.h"
-#include "NewsShared/Qt/ArticleErrorView.h"
-#include "NewsShared/Qt/KeepInTouchView.h"
-#include "NewsShared/Qt/ui_ArticleViewContainer.h"
-
-#include <QLabel>
-#include <QMap>
-
-namespace News
-{
-
-    ArticleViewContainer::ArticleViewContainer(QWidget* parent, ResourceManifest& manifest)
-        : QWidget(parent)
-        , m_ui(new Ui::ArticleViewContainerWidget)
-        , m_manifest(manifest)
-        , m_loadingLabel(nullptr)
-        , m_errorMessage(nullptr)
-    {
-        m_ui->setupUi(this);
-        AddLoadingMessage();
-
-        m_keepInTouchViewWidget = new KeepInTouchView(this);
-        m_keepInTouchViewWidget->setVisible(false);
-        connect(m_keepInTouchViewWidget, &KeepInTouchView::linkActivatedSignal,
-            this, &ArticleViewContainer::linkActivatedSignal);
-    }
-
-    ArticleViewContainer::~ArticleViewContainer() {}
-
-    void ArticleViewContainer::PopulateArticles()
-    {
-        Clear();
-
-        bool articlesFound = false;
-        for (auto id : m_manifest.GetOrder())
-        {
-            auto pResource = m_manifest.FindById(id);
-            if (pResource && pResource->GetType().compare("article") == 0)
-            {
-                AddArticleView(ArticleDescriptor(*pResource));
-                articlesFound = true;
-            }
-        }
-
-        if (!articlesFound)
-        {
-            AddErrorMessage();
-        }
-        else
-        {
-            auto layout = static_cast<QVBoxLayout*>(m_ui->articleViewContents->layout());
-            layout->insertWidget(layout->count() - 1, m_keepInTouchViewWidget);
-            m_keepInTouchViewWidget->setVisible(true);
-        }
-
-        qApp->processEvents();
-    }
-
-    ArticleView* ArticleViewContainer::FindById(const QString& id)
-    {
-        auto it = std::find_if(
-            m_articles.begin(),
-            m_articles.end(),
-            [id](ArticleView* articleView) -> bool
-        {
-            if (!articleView)
-            {
-                return false;
-            }
-            return articleView->GetArticle()->GetResource().GetId().compare(id) == 0;
-        });
-        if (it == m_articles.end())
-        {
-            return nullptr;
-        }
-        return *it;
-    }
-
-    void ArticleViewContainer::AddArticleView(const ArticleDescriptor& articleDesc, int articlePosition)
-    {
-        ClearError();
-
-        ArticleView* view = CreateArticleView(articleDesc);
-        if (view == nullptr)
-        {
-            return;
-        }
-
-        m_articles.append(view);
-
-        connect(view, &ArticleView::articleSelectedSignal,
-            this, &ArticleViewContainer::articleSelectedSlot);
-        connect(view, &ArticleView::linkActivatedSignal,
-            this, &ArticleViewContainer::linkActivatedSignal);
-
-        auto layout = static_cast<QVBoxLayout*>(m_ui->articleViewContents->layout());
-        if (articlePosition == -1)
-        {
-            articlePosition = layout->count() - 1;
-        }
-
-        layout->insertWidget(articlePosition, view);
-        qApp->processEvents();
-    }
-
-    void ArticleViewContainer::DeleteArticleView(ArticleView* view)
-    {
-        m_articles.removeAll(view);
-        m_ui->articleViewContents->layout()->removeWidget(view);
-        delete view;
-    }
-
-    void ArticleViewContainer::ForceRefreshArticleView(ArticleView* articleView)
-    {
-        if (articleView == nullptr)
-        {
-            return;
-        }
-
-        QSharedPointer<const ArticleDescriptor> articleDesc = articleView->GetArticle();
-        auto layout = static_cast<QVBoxLayout*>(m_ui->articleViewContents->layout());
-        const int viewIndex = layout->indexOf(articleView);
-
-        DeleteArticleView(articleView);
-        AddArticleView(*articleDesc, viewIndex);
-    }
-
-    void ArticleViewContainer::ScrollToView(ArticleView* view) const
-    {
-        m_ui->previewArea->ensureWidgetVisible(view);
-    }
-
-    void ArticleViewContainer::ClearError()
-    {
-        //delete loading label
-        if (m_loadingLabel)
-        {
-            delete m_loadingLabel;
-            m_loadingLabel = nullptr;
-        }
-
-        //delete error message
-        if (m_errorMessage)
-        {
-            delete m_errorMessage;
-            m_errorMessage = nullptr;
-        }
-    }
-
-    void ArticleViewContainer::articleSelectedSlot(QString id)
-    {
-        emit articleSelectedSignal(id);
-    }
-
-    void ArticleViewContainer::UpdateArticleOrder(ArticleView* view, bool direction) const
-    {
-        QVBoxLayout* layout = qobject_cast<QVBoxLayout*>(m_ui->articleViewContents->layout());
-
-        const int index = layout->indexOf(view);
-
-        if (direction && index == 0)
-        {
-            return;
-        }
-
-        if (!direction && index == layout->count() - 2)
-        {
-            return;
-        }
-
-        const int newIndex = direction ? index - 1 : index + 1;
-        layout->removeWidget(view);
-        layout->insertWidget(newIndex, view);
-    }
-
-    void ArticleViewContainer::AddLoadingMessage()
-    {
-        if (m_errorMessage)
-        {
-            delete m_errorMessage;
-            m_errorMessage = nullptr;
-        }
-
-        if (!m_loadingLabel)
-        {
-            m_loadingLabel = new QLabel(this);
-            m_loadingLabel->setText("Retrieving news...");
-            auto layout = static_cast<QVBoxLayout*>(m_ui->articleViewContents->layout());
-            layout->insertWidget(0, m_loadingLabel);
-        }
-    }
-
-    void ArticleViewContainer::AddErrorMessage()
-    {
-        if (m_loadingLabel)
-        {
-            delete m_loadingLabel;
-            m_loadingLabel = nullptr;
-        }
-
-        if (!m_errorMessage)
-        {
-            m_errorMessage = new ArticleErrorView(this);
-            auto layout = static_cast<QVBoxLayout*>(m_ui->articleViewContents->layout());
-            layout->insertWidget(0, m_errorMessage);
-        }
-    }
-
-    void ArticleViewContainer::Clear()
-    {
-        ClearError();
-
-        for (auto articleView : m_articles)
-        {
-            delete articleView;
-        }
-
-        m_articles.clear();
-    }
-
-    ArticleViewContainer::ArticleStyle ArticleViewContainer::GetArticleStyleEnumFromString(const QString& articleStyleStr) const
-    {
-        static const QMap<QString, ArticleStyle> articleStyleStringEnumMap = {
-            { "default", ArticleStyle::Default },
-            { "pinned", ArticleStyle::Pinned }
-        };
-
-        if (articleStyleStringEnumMap.contains(articleStyleStr) == false)
-        {
-            Q_ASSERT(false);
-            return ArticleStyle::Default;
-        }
-
-        return articleStyleStringEnumMap.value(articleStyleStr);
-    }
-
-    ArticleView* ArticleViewContainer::CreateArticleView(const ArticleDescriptor& articleDesc)
-    {
-        ArticleStyle articleStyle = GetArticleStyleEnumFromString(articleDesc.GetArticleStyle());
-
-        switch(articleStyle)
-        {
-        case ArticleStyle::Default:
-            return new ArticleViewDefaultWidget(this, articleDesc, m_manifest);
-        case ArticleStyle::Pinned:
-            return new ArticleViewPinnedWidget(this, articleDesc, m_manifest);
-        default:
-            Q_ASSERT(false);
-            return nullptr;
-        }
-    }
-
-}
-
-#include "NewsShared/Qt/moc_ArticleViewContainer.cpp"
diff --git a/Code/Tools/News/NewsShared/Qt/ArticleViewContainer.h b/Code/Tools/News/NewsShared/Qt/ArticleViewContainer.h
deleted file mode 100644
index c0ae3b2701..0000000000
--- a/Code/Tools/News/NewsShared/Qt/ArticleViewContainer.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include "NewsShared/LogType.h"
-
-#include <QWidget>
-#include <QList>
-#endif
-
-class QLabel;
-
-namespace Ui
-{
-    class ArticleViewContainerWidget;
-}
-
-namespace News
-{
-    class Resource;
-    class ArticleView;
-    class ArticleDescriptor;
-    class ResourceManifest;
-    class ArticleErrorView;
-    class KeepInTouchView;
-
-    class ArticleViewContainer
-        : public QWidget
-    {
-        Q_OBJECT
-
-        enum ArticleStyle
-        {
-            Default,
-            Pinned
-        };
-
-    public:
-        explicit ArticleViewContainer(QWidget* parent, ResourceManifest& manifest);
-        ~ArticleViewContainer();
-
-        virtual void PopulateArticles();
-        ArticleView* FindById(const QString& id);
-        void AddArticleView(const ArticleDescriptor& articleDesc, int articlePosition = -1);
-        void DeleteArticleView(ArticleView* view);
-        void ForceRefreshArticleView(ArticleView* articleView);
-        void ScrollToView(ArticleView* view) const;
-        void UpdateArticleOrder(ArticleView* view, bool direction) const;
-        void AddLoadingMessage();
-        void AddErrorMessage();
-        void Clear();
-
-    Q_SIGNALS:
-        void articleSelectedSignal(QString resourceId);
-        void addArticle(Resource* article);
-        void logSignal(QString text, LogType logType = LogInfo);
-        void scrolled(); 
-        void linkActivatedSignal(const QString& link);
-
-    private:
-        QScopedPointer<Ui::ArticleViewContainerWidget> m_ui;
-        QList<ArticleView*> m_articles;
-        ResourceManifest& m_manifest;
-        QLabel* m_loadingLabel;
-        ArticleErrorView* m_errorMessage;
-        KeepInTouchView* m_keepInTouchViewWidget = nullptr;
-
-        void ClearError();
-        ArticleStyle GetArticleStyleEnumFromString(const QString& articleStyleStr) const;
-        ArticleView* CreateArticleView(const ArticleDescriptor& articleDesc);
-
-    private Q_SLOTS:
-        virtual void articleSelectedSlot(QString id);
-    };
-}
diff --git a/Code/Tools/News/NewsShared/Qt/ArticleViewContainer.ui b/Code/Tools/News/NewsShared/Qt/ArticleViewContainer.ui
deleted file mode 100644
index dfb71ea31f..0000000000
--- a/Code/Tools/News/NewsShared/Qt/ArticleViewContainer.ui
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ArticleViewContainerWidget</class>
- <widget class="QWidget" name="ArticleViewContainerWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>606</width>
-    <height>753</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_5">
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QScrollArea" name="previewArea">
-     <property name="styleSheet">
-      <string notr="true"/>
-     </property>
-     <property name="frameShape">
-      <enum>QFrame::NoFrame</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Plain</enum>
-     </property>
-     <property name="lineWidth">
-      <number>0</number>
-     </property>
-     <property name="verticalScrollBarPolicy">
-      <enum>Qt::ScrollBarAlwaysOn</enum>
-     </property>
-     <property name="horizontalScrollBarPolicy">
-      <enum>Qt::ScrollBarAlwaysOff</enum>
-     </property>
-     <property name="widgetResizable">
-      <bool>true</bool>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignHCenter|Qt::AlignTop</set>
-     </property>
-     <widget class="QWidget" name="articleViewContents">
-      <property name="geometry">
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>589</width>
-        <height>753</height>
-       </rect>
-      </property>
-      <layout class="QVBoxLayout" name="verticalLayout">
-       <property name="spacing">
-        <number>16</number>
-       </property>
-       <property name="leftMargin">
-        <number>15</number>
-       </property>
-       <property name="topMargin">
-        <number>15</number>
-       </property>
-       <property name="rightMargin">
-        <number>15</number>
-       </property>
-       <property name="bottomMargin">
-        <number>15</number>
-       </property>
-       <item>
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>0</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/Code/Tools/News/NewsShared/Qt/KeepInTouchView.cpp b/Code/Tools/News/NewsShared/Qt/KeepInTouchView.cpp
deleted file mode 100644
index 43c32c43fc..0000000000
--- a/Code/Tools/News/NewsShared/Qt/KeepInTouchView.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "KeepInTouchView.h"
-#include "NewsShared/Qt/ui_KeepInTouchView.h"
-
-#include <QMap>
-#include <QUrl>
-#include <QString>
-#include <QDesktopServices>
-
-namespace News
-{
-    KeepInTouchView::KeepInTouchView(QWidget* parent)
-        : QWidget(parent)
-        , m_ui(new Ui::KeepInTouchViewWidget())
-    {
-        m_ui->setupUi(this);
-
-        m_ui->twich_container->setCursor(Qt::PointingHandCursor);
-        m_ui->twitter_container->setCursor(Qt::PointingHandCursor);
-        m_ui->youtube_container->setCursor(Qt::PointingHandCursor);
-        m_ui->facebook_container->setCursor(Qt::PointingHandCursor);
-
-        m_ui->twich_container->installEventFilter(this);
-        m_ui->twitter_container->installEventFilter(this);
-        m_ui->youtube_container->installEventFilter(this);
-        m_ui->facebook_container->installEventFilter(this);
-    }
-
-    bool KeepInTouchView::eventFilter(QObject *watched, QEvent *event)
-    {
-        if (event->type() == QEvent::MouseButtonRelease)
-        {
-            if (watched == m_ui->twich_container)
-            {
-                return LaunchSocialMediaUrl(SocialMediaType::Twitch);
-            }
-            else if (watched == m_ui->twitter_container)
-            {
-                return LaunchSocialMediaUrl(SocialMediaType::Twitter);
-            }
-            else if (watched == m_ui->youtube_container)
-            {
-                return LaunchSocialMediaUrl(SocialMediaType::YouTube);
-            }
-            else if (watched == m_ui->facebook_container)
-            {
-                return LaunchSocialMediaUrl(SocialMediaType::Facebook);
-            }
-        }
-
-        return QWidget::eventFilter(watched, event);
-    }
-
-    bool KeepInTouchView::LaunchSocialMediaUrl(SocialMediaType type)
-    {
-        static const QMap<SocialMediaType, const char*> socialMediaTypeToUrlMap =
-        {
-            { SocialMediaType::Twitch, m_twitchUrl },
-            { SocialMediaType::Twitter, m_twitterUrl },
-            { SocialMediaType::YouTube, m_youtubeUrl },
-            { SocialMediaType::Facebook, m_facebookUrl }
-        };
-
-        if (socialMediaTypeToUrlMap.contains(type) == false)
-        {
-            return false;
-        }
-
-        QString link = socialMediaTypeToUrlMap[type];
-        Q_EMIT linkActivatedSignal(link);
-
-        return QDesktopServices::openUrl(QUrl(link));
-    }
-}
-
-#include "NewsShared/Qt/moc_KeepInTouchView.cpp"
diff --git a/Code/Tools/News/NewsShared/Qt/KeepInTouchView.h b/Code/Tools/News/NewsShared/Qt/KeepInTouchView.h
deleted file mode 100644
index 5d5c6a9e36..0000000000
--- a/Code/Tools/News/NewsShared/Qt/KeepInTouchView.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QWidget>
-#endif
-
-namespace Ui 
-{
-    class KeepInTouchViewWidget;
-}
-
-namespace News
-{
-    class KeepInTouchView
-        : public QWidget
-    {
-        Q_OBJECT
-
-        enum class SocialMediaType
-        {
-            Twitch,
-            Twitter,
-            YouTube,
-            Facebook
-        };
-
-    public:
-        KeepInTouchView(QWidget* parent);
-        ~KeepInTouchView() = default;
-
-        bool eventFilter(QObject *watched, QEvent *event);
-
-    Q_SIGNALS:
-        void linkActivatedSignal(const QString& link);
-
-    private:
-        bool LaunchSocialMediaUrl(SocialMediaType type);
-
-        Ui::KeepInTouchViewWidget* m_ui = nullptr;
-
-        const char* m_twitchUrl = "https://docs.aws.amazon.com/console/lumberyard/twitch";
-        const char* m_twitterUrl = "https://docs.aws.amazon.com/console/lumberyard/twitter";
-        const char* m_youtubeUrl = "https://docs.aws.amazon.com/console/lumberyard/youtube";
-        const char* m_facebookUrl = "https://docs.aws.amazon.com/console/lumberyard/facebook";
-    };
-}
diff --git a/Code/Tools/News/NewsShared/Qt/KeepInTouchView.ui b/Code/Tools/News/NewsShared/Qt/KeepInTouchView.ui
deleted file mode 100644
index 076059f49d..0000000000
--- a/Code/Tools/News/NewsShared/Qt/KeepInTouchView.ui
+++ /dev/null
@@ -1,423 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>KeepInTouchViewWidget</class>
- <widget class="QWidget" name="KeepInTouchViewWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>430</width>
-    <height>336</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>430</width>
-    <height>0</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>430</width>
-    <height>16777215</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>ArticleView</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item alignment="Qt::AlignTop">
-    <widget class="QFrame" name="viewContainer">
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <property name="spacing">
-       <number>0</number>
-      </property>
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="QLabel" name="label">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>430</width>
-          <height>184</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>430</width>
-          <height>184</height>
-         </size>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-        <property name="pixmap">
-         <pixmap resource="NewsShared.qrc">:/images/Resources/KeepInTouchBanner.jpg</pixmap>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="verticalSpacer_3">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Fixed</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>0</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="AzQtComponents::ExtendedLabel" name="titleLabel">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="font">
-         <font>
-          <family>Open Sans</family>
-          <pointsize>14</pointsize>
-          <weight>50</weight>
-          <bold>false</bold>
-         </font>
-        </property>
-        <property name="text">
-         <string>Keep in touch!</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-        </property>
-        <property name="wordWrap">
-         <bool>true</bool>
-        </property>
-        <property name="openExternalLinks">
-         <bool>false</bool>
-        </property>
-        <property name="textInteractionFlags">
-         <set>Qt::LinksAccessibleByMouse</set>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="verticalSpacer_2">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Fixed</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>12</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="AzQtComponents::ExtendedLabel" name="bodyLabel">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="font">
-         <font>
-          <family>Open Sans</family>
-          <pointsize>8</pointsize>
-          <weight>50</weight>
-          <bold>false</bold>
-         </font>
-        </property>
-        <property name="text">
-         <string>Want to know the latest news at AmazonGameDev? Sign up for our newsletter and use the following links to find us!</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-        </property>
-        <property name="wordWrap">
-         <bool>true</bool>
-        </property>
-        <property name="margin">
-         <number>0</number>
-        </property>
-        <property name="indent">
-         <number>0</number>
-        </property>
-        <property name="openExternalLinks">
-         <bool>false</bool>
-        </property>
-        <property name="textInteractionFlags">
-         <set>Qt::LinksAccessibleByMouse</set>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="verticalSpacer">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Fixed</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>16</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QWidget" name="socialMediaContainer" native="true">
-        <property name="styleSheet">
-         <string notr="true">background: transparent;</string>
-        </property>
-        <layout class="QHBoxLayout" name="horizontalLayout">
-         <property name="spacing">
-          <number>20</number>
-         </property>
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-         <item>
-          <widget class="QWidget" name="twich_container" native="true">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <layout class="QHBoxLayout" name="horizontalLayout_2">
-            <property name="spacing">
-             <number>8</number>
-            </property>
-            <property name="leftMargin">
-             <number>0</number>
-            </property>
-            <property name="topMargin">
-             <number>0</number>
-            </property>
-            <property name="rightMargin">
-             <number>0</number>
-            </property>
-            <property name="bottomMargin">
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QLabel" name="twitch_icon">
-              <property name="text">
-               <string/>
-              </property>
-              <property name="pixmap">
-               <pixmap resource="NewsShared.qrc">:/images/Resources/icon_twitch.png</pixmap>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLabel" name="twitch_label">
-              <property name="text">
-               <string>Twitch</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </widget>
-         </item>
-         <item>
-          <widget class="QWidget" name="twitter_container" native="true">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <layout class="QHBoxLayout" name="horizontalLayout_3">
-            <property name="spacing">
-             <number>8</number>
-            </property>
-            <property name="leftMargin">
-             <number>0</number>
-            </property>
-            <property name="topMargin">
-             <number>0</number>
-            </property>
-            <property name="rightMargin">
-             <number>0</number>
-            </property>
-            <property name="bottomMargin">
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QLabel" name="twitter_icon">
-              <property name="text">
-               <string/>
-              </property>
-              <property name="pixmap">
-               <pixmap resource="NewsShared.qrc">:/images/Resources/icon_twitter.png</pixmap>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLabel" name="twitter_label">
-              <property name="text">
-               <string>Twitter</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </widget>
-         </item>
-         <item alignment="Qt::AlignVCenter">
-          <widget class="QWidget" name="youtube_container" native="true">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <layout class="QHBoxLayout" name="horizontalLayout_4">
-            <property name="spacing">
-             <number>8</number>
-            </property>
-            <property name="topMargin">
-             <number>0</number>
-            </property>
-            <property name="rightMargin">
-             <number>0</number>
-            </property>
-            <property name="bottomMargin">
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QLabel" name="youtube_icon">
-              <property name="text">
-               <string/>
-              </property>
-              <property name="pixmap">
-               <pixmap resource="NewsShared.qrc">:/images/Resources/icon_youtube.png</pixmap>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLabel" name="youtube_label">
-              <property name="text">
-               <string>Youtube</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </widget>
-         </item>
-         <item alignment="Qt::AlignLeft">
-          <widget class="QWidget" name="facebook_container" native="true">
-           <layout class="QHBoxLayout" name="horizontalLayout_5">
-            <property name="spacing">
-             <number>8</number>
-            </property>
-            <property name="leftMargin">
-             <number>0</number>
-            </property>
-            <property name="topMargin">
-             <number>0</number>
-            </property>
-            <property name="rightMargin">
-             <number>0</number>
-            </property>
-            <property name="bottomMargin">
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QLabel" name="facebook_icon">
-              <property name="text">
-               <string/>
-              </property>
-              <property name="pixmap">
-               <pixmap resource="NewsShared.qrc">:/images/Resources/icon_facebook.png</pixmap>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLabel" name="facebook_label">
-              <property name="text">
-               <string>Facebook</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>AzQtComponents::ExtendedLabel</class>
-   <extends>QLabel</extends>
-   <header>AzQtComponents/Components/ExtendedLabel.h</header>
-  </customwidget>
- </customwidgets>
- <resources>
-  <include location="NewsShared.qrc"/>
- </resources>
- <connections/>
-</ui>
diff --git a/Code/Tools/News/NewsShared/Qt/NewsShared.qrc b/Code/Tools/News/NewsShared/Qt/NewsShared.qrc
deleted file mode 100644
index 8d5b84494b..0000000000
--- a/Code/Tools/News/NewsShared/Qt/NewsShared.qrc
+++ /dev/null
@@ -1,10 +0,0 @@
-<RCC>
-  <qresource prefix="images">
-    <file>../Resources/ErrorImage.jpg</file>
-    <file>../Resources/KeepInTouchBanner.jpg</file>
-    <file>../Resources/icon_facebook.png</file>
-    <file>../Resources/icon_twitch.png</file>
-    <file>../Resources/icon_twitter.png</file>
-    <file>../Resources/icon_youtube.png</file>
-  </qresource>
-</RCC>
diff --git a/Code/Tools/News/NewsShared/Qt/PinnedArticleView.ui b/Code/Tools/News/NewsShared/Qt/PinnedArticleView.ui
deleted file mode 100644
index 928046a064..0000000000
--- a/Code/Tools/News/NewsShared/Qt/PinnedArticleView.ui
+++ /dev/null
@@ -1,260 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>PinnedArticleViewWidget</class>
- <widget class="QWidget" name="PinnedArticleViewWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>430</width>
-    <height>376</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>430</width>
-    <height>0</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>430</width>
-    <height>16777215</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>ArticleView</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QFrame" name="viewContainer">
-     <property name="articleStyle" stdset="0">
-      <string>pinned</string>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <property name="spacing">
-       <number>12</number>
-      </property>
-      <property name="leftMargin">
-       <number>16</number>
-      </property>
-      <property name="topMargin">
-       <number>16</number>
-      </property>
-      <property name="rightMargin">
-       <number>16</number>
-      </property>
-      <property name="bottomMargin">
-       <number>16</number>
-      </property>
-      <item alignment="Qt::AlignTop">
-       <widget class="QFrame" name="frame_2">
-        <property name="minimumSize">
-         <size>
-          <width>128</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>128</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="styleSheet">
-         <string notr="true">background-color: transparent;</string>
-        </property>
-        <layout class="QVBoxLayout" name="verticalLayout_3">
-         <property name="spacing">
-          <number>0</number>
-         </property>
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-         <item>
-          <widget class="QFrame" name="imageFrame">
-           <property name="minimumSize">
-            <size>
-             <width>128</width>
-             <height>96</height>
-            </size>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>128</width>
-             <height>96</height>
-            </size>
-           </property>
-           <property name="frameShape">
-            <enum>QFrame::StyledPanel</enum>
-           </property>
-           <property name="frameShadow">
-            <enum>QFrame::Raised</enum>
-           </property>
-           <layout class="QVBoxLayout" name="verticalLayout_4">
-            <property name="spacing">
-             <number>0</number>
-            </property>
-            <property name="leftMargin">
-             <number>0</number>
-            </property>
-            <property name="topMargin">
-             <number>0</number>
-            </property>
-            <property name="rightMargin">
-             <number>0</number>
-            </property>
-            <property name="bottomMargin">
-             <number>0</number>
-            </property>
-           </layout>
-          </widget>
-         </item>
-         <item>
-          <spacer name="verticalSpacer">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>0</width>
-             <height>0</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item alignment="Qt::AlignTop">
-       <widget class="QFrame" name="frame">
-        <property name="styleSheet">
-         <string notr="true">background-color: transparent;</string>
-        </property>
-        <layout class="QVBoxLayout" name="verticalLayout">
-         <property name="spacing">
-          <number>0</number>
-         </property>
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-         <item>
-          <widget class="AzQtComponents::ExtendedLabel" name="titleLabel">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="font">
-            <font>
-             <family>Open Sans</family>
-             <pointsize>14</pointsize>
-             <weight>50</weight>
-             <bold>false</bold>
-            </font>
-           </property>
-           <property name="text">
-            <string>Title:</string>
-           </property>
-           <property name="wordWrap">
-            <bool>true</bool>
-           </property>
-           <property name="openExternalLinks">
-            <bool>false</bool>
-           </property>
-           <property name="textInteractionFlags">
-            <set>Qt::LinksAccessibleByMouse</set>
-           </property>
-           <property name="fontStyle" stdset="0">
-            <string>sectionTitle</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="AzQtComponents::ExtendedLabel" name="bodyLabel">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="font">
-            <font>
-             <family>Open Sans</family>
-             <pointsize>8</pointsize>
-             <weight>50</weight>
-             <bold>false</bold>
-            </font>
-           </property>
-           <property name="text">
-            <string>Body</string>
-           </property>
-           <property name="wordWrap">
-            <bool>true</bool>
-           </property>
-           <property name="openExternalLinks">
-            <bool>false</bool>
-           </property>
-           <property name="textInteractionFlags">
-            <set>Qt::LinksAccessibleByMouse</set>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>AzQtComponents::ExtendedLabel</class>
-   <extends>QLabel</extends>
-   <header>AzQtComponents/Components/ExtendedLabel.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
diff --git a/Code/Tools/News/NewsShared/ResourceManagement/ArticleDescriptor.cpp b/Code/Tools/News/NewsShared/ResourceManagement/ArticleDescriptor.cpp
deleted file mode 100644
index c26d2357d7..0000000000
--- a/Code/Tools/News/NewsShared/ResourceManagement/ArticleDescriptor.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ArticleDescriptor.h"
-#include "Resource.h"
-
-#include <QJsonArray>
-#include <QJsonDocument>
-
-using namespace News;
-
-ArticleDescriptor::ArticleDescriptor(
-    Resource& resource)
-    : JsonDescriptor(resource)
-    , m_imageId(m_json["image"].toString())
-    , m_title(m_json["title"].toString())
-    , m_body(m_json["body"].toString())
-    , m_order(m_json["order"].toInt())
-{
-    if (m_json.contains("articleStyle") == true)
-    {
-        m_articleStyle = m_json["articleStyle"].toString();
-    }
-}
-
-void ArticleDescriptor::Update() const
-{
-    QJsonObject json;
-    json["image"] = m_imageId;
-    json["title"] = m_title;
-    json["body"] = m_body;
-    json["order"] = m_order;
-    json["articleStyle"] = m_articleStyle;
-    QJsonDocument doc(json);
-    QByteArray data = doc.toJson(QJsonDocument::Compact).toStdString().data();
-    m_resource.SetData(data);
-}
-
-const QString& ArticleDescriptor::GetArticleStyle() const
-{
-    return m_articleStyle;
-}
-
-void ArticleDescriptor::SetArticleStyle(const QString& style)
-{
-    m_articleStyle = style;
-}
-
-const QString& ArticleDescriptor::GetImageId() const
-{
-    return m_imageId;
-}
-
-void ArticleDescriptor::SetImageId(const QString& imageId)
-{
-    m_imageId = imageId;
-}
-
-const QString& ArticleDescriptor::GetTitle() const
-{
-    return m_title;
-}
-
-void ArticleDescriptor::SetTitle(const QString& title)
-{
-    m_title = title;
-}
-
-const QString& ArticleDescriptor::GetBody() const
-{
-    return m_body;
-}
-
-void ArticleDescriptor::SetBody(const QString& body)
-{
-    m_body = body;
-}
diff --git a/Code/Tools/News/NewsShared/ResourceManagement/ArticleDescriptor.h b/Code/Tools/News/NewsShared/ResourceManagement/ArticleDescriptor.h
deleted file mode 100644
index c0ca459cf4..0000000000
--- a/Code/Tools/News/NewsShared/ResourceManagement/ArticleDescriptor.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include "JsonDescriptor.h"
-
-#include <QJsonObject>
-
-namespace News
-{
-    class Resource;
-
-    //! ArticleDescriptor represents Resource as an article
-    class ArticleDescriptor
-        : public JsonDescriptor
-    {
-    public:
-        explicit ArticleDescriptor(Resource& resource);
-
-        //! If article was modified, call this to update resource data
-        void Update() const;
-
-        const QString& GetArticleStyle() const;
-
-        void SetArticleStyle(const QString& style);
-
-        const QString& GetImageId() const;
-
-        void SetImageId(const QString& imageId);
-
-        const QString& GetTitle() const;
-
-        void SetTitle(const QString& title);
-
-        const QString& GetBody() const;
-
-        void SetBody(const QString& body);
-
-    private:
-        QString m_articleStyle = "default";
-        QString m_imageId;
-        QString m_title;
-        QString m_body;
-        int m_order;
-    };
-}
diff --git a/Code/Tools/News/NewsShared/ResourceManagement/Descriptor.cpp b/Code/Tools/News/NewsShared/ResourceManagement/Descriptor.cpp
deleted file mode 100644
index 0d21a18c05..0000000000
--- a/Code/Tools/News/NewsShared/ResourceManagement/Descriptor.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "Descriptor.h"
-
-using namespace News;
-
-Descriptor::Descriptor(Resource& resource)
-    : m_resource(resource) {}
-
-Descriptor::~Descriptor() {}
diff --git a/Code/Tools/News/NewsShared/ResourceManagement/Descriptor.h b/Code/Tools/News/NewsShared/ResourceManagement/Descriptor.h
deleted file mode 100644
index 3d56037543..0000000000
--- a/Code/Tools/News/NewsShared/ResourceManagement/Descriptor.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-namespace News
-{
-    class Resource;
-
-    //! Descriptor is a simple solution to add additional functionality to a Resource
-    /*!
-        Some descriptors can only work with certain resource types, like AerticleDescriptor
-    */
-    class Descriptor
-    {
-    public:
-        explicit Descriptor(Resource& resource);
-        virtual ~Descriptor();
-
-        Resource& GetResource() const
-        {
-            return m_resource;
-        }
-
-    protected:
-        Resource& m_resource;
-    };
-}
diff --git a/Code/Tools/News/NewsShared/ResourceManagement/JsonDescriptor.cpp b/Code/Tools/News/NewsShared/ResourceManagement/JsonDescriptor.cpp
deleted file mode 100644
index 5e71c8f10b..0000000000
--- a/Code/Tools/News/NewsShared/ResourceManagement/JsonDescriptor.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "JsonDescriptor.h"
-#include "Resource.h"
-
-#include <QJsonDocument>
-
-using namespace News;
-
-JsonDescriptor::JsonDescriptor(Resource& resource)
-    : Descriptor(resource)
-    , m_doc(QJsonDocument::fromJson(m_resource.GetData()))
-    , m_json(m_doc.object())
-{
-}
diff --git a/Code/Tools/News/NewsShared/ResourceManagement/JsonDescriptor.h b/Code/Tools/News/NewsShared/ResourceManagement/JsonDescriptor.h
deleted file mode 100644
index 286e66c4ac..0000000000
--- a/Code/Tools/News/NewsShared/ResourceManagement/JsonDescriptor.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include "Descriptor.h"
-
-#include <QJsonDocument>
-#include <QJsonObject>
-
-namespace News
-{
-    //! JsonDescriptor assumes Resource is a JSON file
-    class JsonDescriptor
-        : public Descriptor
-    {
-    public:
-        explicit JsonDescriptor(Resource& resource);
-
-    protected:
-        QJsonDocument m_doc;
-        QJsonObject m_json;
-    };
-}
diff --git a/Code/Tools/News/NewsShared/ResourceManagement/QtDownloadManager.cpp b/Code/Tools/News/NewsShared/ResourceManagement/QtDownloadManager.cpp
deleted file mode 100644
index e70285fd31..0000000000
--- a/Code/Tools/News/NewsShared/ResourceManagement/QtDownloadManager.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "QtDownloadManager.h"
-#include "QtDownloader.h"
-
-namespace News
-{
-
-QtDownloadManager::QtDownloadManager()
-    : QObject()
-    , m_worker(new QtDownloader) // this will start the thread which does downloads
-{
-    // make sure the response handlers are queued connections as the worker runs in a different thread
-    connect(m_worker, &QtDownloader::failed, this, &QtDownloadManager::failedReply, Qt::QueuedConnection);
-    connect(m_worker, &QtDownloader::successfullyFinished, this, &QtDownloadManager::successfulReply, Qt::QueuedConnection);
-}
-
-QtDownloadManager::~QtDownloadManager()
-{
-    // NOTE: we don't delete the QtDownloader; it deletes itself.
-    // We just tell it to stop
-    m_worker->Finish();
-}
-
-void QtDownloadManager::Download(const QString& url,
-    std::function<void(QByteArray)> downloadSuccessCallback,
-    std::function<void()> downloadFailCallback)
-{
-    int downloadId = m_worker->Download(url);
-    m_downloads[downloadId] = { downloadSuccessCallback, downloadFailCallback };
-}
-
-void QtDownloadManager::Abort()
-{
-    m_worker->Abort();
-    m_downloads.clear();
-}
-
-void QtDownloadManager::successfulReply(int downloadId, QByteArray data)
-{
-    m_downloads[downloadId].downloadSuccessCallback(data);
-    m_downloads.remove(downloadId);
-}
-
-void QtDownloadManager::failedReply(int downloadId)
-{
-    m_downloads[downloadId].downloadFailCallback();
-    m_downloads.remove(downloadId);
-}
-
-} // namespace News
-
-#include "NewsShared/ResourceManagement/moc_QtDownloadManager.cpp"
diff --git a/Code/Tools/News/NewsShared/ResourceManagement/QtDownloadManager.h b/Code/Tools/News/NewsShared/ResourceManagement/QtDownloadManager.h
deleted file mode 100644
index 6a7c93a51f..0000000000
--- a/Code/Tools/News/NewsShared/ResourceManagement/QtDownloadManager.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <mutex>
-#include <functional>
-
-#include <QObject>
-#include <QMap>
-#endif
-
-namespace News
-{
-    class QtDownloader;
-
-    //! QtDownloadManager handles multiple asynchronous downloads
-    class QtDownloadManager
-        : public QObject
-    {
-        Q_OBJECT
-    public:
-        QtDownloadManager();
-        ~QtDownloadManager();
-
-        //! Asynchronously download a file from the input url and return it as QByteArray via the success callback
-        /*!
-        \param url - file url to download
-        \param downloadSuccessCallback - if download is successful pass file's data as QByteArray
-        \param downloadFailCallback - if download failed, pass error message
-        */
-        void Download(const QString& url,
-            std::function<void(QByteArray)> downloadSuccessCallback,
-            std::function<void()> downloadFailCallback);
-
-        //! Aborts all currently active downloads. Success/failure callbacks will not be called.
-        void Abort();
-
-    private:
-        void successfulReply(int downloadId, QByteArray data);
-        void failedReply(int downloadId);
-
-        QtDownloader* m_worker = nullptr;
-
-        struct DownloadResponses
-        {
-            std::function<void(QByteArray)> downloadSuccessCallback;
-            std::function<void()> downloadFailCallback;
-        };
-        QMap<int, DownloadResponses> m_downloads;
-    };
-}
diff --git a/Code/Tools/News/NewsShared/ResourceManagement/QtDownloader.cpp b/Code/Tools/News/NewsShared/ResourceManagement/QtDownloader.cpp
deleted file mode 100644
index 0139ec5344..0000000000
--- a/Code/Tools/News/NewsShared/ResourceManagement/QtDownloader.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "QtDownloader.h"
-
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QThread>
-
-
-namespace News
-{
-    QtDownloader::QtDownloader()
-        : m_thread(new QThread())
-    {
-        // make sure that everything that QObject::connects to us knows we're running in a different thread
-        moveToThread(m_thread);
-
-        // handle clean up of both ourselves and of our thread.
-        // We manage thread clean up so that it can keep running and be cleaned up later, regardless of what
-        // the thing that created the QtDownloader does
-        connect(m_thread, &QThread::finished, m_thread, [this] {
-            m_thread->deleteLater();
-            deleteLater();
-            });
-
-        auto abortDownloadsHandler = [this] {
-            auto replies = m_downloads.keys();
-            for (QNetworkReply* reply : replies)
-            {
-                reply->abort();
-            }
-
-            m_downloads.clear();
-        };
-
-        auto queueDownloadHandler = [this](int downloadId, QString url) {
-            if (m_networkManager)
-            {
-                QNetworkReply* reply = m_networkManager->get(QNetworkRequest(QUrl(url)));
-                m_downloads.insert(reply, downloadId);
-            }
-        };
-
-        auto createNetworkManagerHandler = [this] {
-            m_networkManager = new QNetworkAccessManager;
-            connect(m_networkManager, &QNetworkAccessManager::finished, this, &QtDownloader::downloadFinished);
-        };
-
-        auto deleteNetworkManagerHandler = [this] {
-            delete m_networkManager;
-            m_networkManager = nullptr;
-        };
-
-        auto quitHandler = [this] {
-            // call quit via this callback, so that it executes in the running thread.
-            // QThread::quit() is actually blocking and waits until everything finishes, so
-            // we don't want to call it in the main thread
-            m_thread->quit();
-        };
-
-        // make sure the response handlers are queued connections as the worker runs in one thread, but these triggers
-        // will be emitted from the main thread
-        connect(this, &QtDownloader::triggerAbortAll, this, abortDownloadsHandler, Qt::QueuedConnection);
-        connect(this, &QtDownloader::triggerDownload, this, queueDownloadHandler, Qt::QueuedConnection);
-        connect(this, &QtDownloader::triggerQuit, this, quitHandler, Qt::QueuedConnection);
-
-        // create/delete the QNetworkAccessManager in our thread, to ensure that any slowdowns caused by
-        // having to create network connectors / load drivers are done in our non-ui thread.
-        // make sure that these connections are direct so that network requests can't predate the network engine itself
-        connect(m_thread, &QThread::started, this, createNetworkManagerHandler, Qt::DirectConnection);
-        connect(m_thread, &QThread::finished, this, deleteNetworkManagerHandler, Qt::DirectConnection);
-
-        m_thread->start();
-    }
-
-    QtDownloader::~QtDownloader()
-    {
-    }
-
-    int QtDownloader::Download(const QString& url)
-    {
-        // create a unique id for this download
-        int downloadId = m_lastId++;
-
-        // trigger a download running in our worker thread
-        Q_EMIT triggerDownload(downloadId, url);
-
-        return downloadId;
-    }
-
-    void QtDownloader::Abort()
-    {
-        // trigger an abort in our worker thread
-        Q_EMIT triggerAbortAll();
-    }
-
-    void QtDownloader::Finish()
-    {
-        // trigger a quit in our worker thread
-        Q_EMIT triggerQuit();
-    }
-
-    void QtDownloader::downloadFinished(QNetworkReply* reply)
-    {
-        // Note: this will run in our worker thread
-        int downloadId = m_downloads[reply];
-
-        // emit the signal back to the main thread indicating that we're finished, either
-        // successfully or unsuccessfully
-        if (reply->error() == QNetworkReply::NoError)
-        {
-            Q_EMIT successfullyFinished(downloadId, reply->readAll());
-        }
-        else
-        {
-            Q_EMIT failed(downloadId);
-        }
-
-        // clean up the reply; have to do this later, according to the Qt docs
-        reply->deleteLater();
-
-        // make sure to remove our reference to this reply from our list of active downloads
-        m_downloads.remove(reply);
-    }
-
-    #include "NewsShared/ResourceManagement/moc_QtDownloader.cpp"
-}
diff --git a/Code/Tools/News/NewsShared/ResourceManagement/QtDownloader.h b/Code/Tools/News/NewsShared/ResourceManagement/QtDownloader.h
deleted file mode 100644
index 0dcc86e951..0000000000
--- a/Code/Tools/News/NewsShared/ResourceManagement/QtDownloader.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <mutex>
-#include <functional>
-#include <QObject>
-#include <QMap>
-#endif
-
-class QNetworkAccessManager;
-class QNetworkReply;
-class QThread;
-
-namespace News
-{
-    //! QtDownloader is a wrapper around Qt's file download functions
-    /*!
-        The QtDownloader spins up another thread and does all downloads in that thread.
-        The public slot methods (Finish, Download and Abort) can all be called from any thread.
-        The response signals (successfullyFinished and failed) should be QObject::connect to with
-        Qt::QueuedConnection, as they will be emitted from the worker thread.
-    */
-    class QtDownloader
-        : public QObject
-    {
-        Q_OBJECT
-
-    public:
-        QtDownloader();
-        ~QtDownloader();
-
-    public Q_SLOTS:
-        void Finish();
-
-        int Download(const QString& url);
-        void Abort();
-
-    Q_SIGNALS:
-        void successfullyFinished(int downloadId, QByteArray data);
-        void failed(int downloadId);
-
-        // ***********************************************
-        // private - DO NOT CONNECT TO outside of the class!
-        // (qt signals can't be made private)
-        void triggerAbortAll();
-        void triggerDownload(int downloadId, QString url);
-        void triggerQuit();
-        // ***********************************************
-
-    private:
-        void downloadFinished(QNetworkReply* reply);
-
-        int m_lastId = 0;
-
-        QMap<QNetworkReply*, int> m_downloads;
-        QNetworkAccessManager* m_networkManager = nullptr;
-        QThread* m_thread;
-    };
-}
diff --git a/Code/Tools/News/NewsShared/ResourceManagement/Resource.cpp b/Code/Tools/News/NewsShared/ResourceManagement/Resource.cpp
deleted file mode 100644
index d40b66d6d7..0000000000
--- a/Code/Tools/News/NewsShared/ResourceManagement/Resource.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "Resource.h"
-
-#include <QJsonObject>
-
-using namespace News;
-
-Resource::Resource(const QJsonObject& json)
-    : Resource(
-        json["id"].toString(),
-        QByteArray(),
-        json["url"].toString(),
-        json["type"].toString(),
-        json["refCount"].toInt(),
-        json["version"].toInt()) {}
-
-Resource::Resource(const QString& id, const QString& type)
-    : Resource(
-        id, 
-        QByteArray(),
-        "",
-        type,
-        1,
-        0) {}
-
-Resource::Resource(const QString& id,
-    const QByteArray& data,
-    [[maybe_unused]] const QString& url,
-    const QString& type,
-    int refCount,
-    int version)
-    : m_id(id)
-    , m_data(data)
-    , m_type(type)
-    , m_refCount(refCount)
-    , m_version(version) {}
-
-Resource::~Resource() {}
-
-void Resource::Write(QJsonObject& json) const
-{
-    json["id"] = m_id;
-    json["type"] = m_type;
-    json["refCount"] = m_refCount;
-    json["version"] = m_version;
-}
-
-QString Resource::GetId() const
-{
-    return m_id;
-}
-
-void Resource::SetId(const QString& id)
-{
-    m_id = id;
-}
-
-QByteArray Resource::GetData() const
-{
-    return m_data;
-}
-
-void Resource::SetData(QByteArray data)
-{
-    m_data = data;
-}
-
-QString Resource::GetType() const
-{
-    return m_type;
-}
-
-int Resource::GetRefCount() const
-{
-    return m_refCount;
-}
-
-void Resource::SetRefCount(int refCount)
-{
-    m_refCount = refCount;
-}
-
-int Resource::GetVersion() const
-{
-    return m_version;
-}
-
-void Resource::SetVersion(int version)
-{
-    m_version = version;
-}
diff --git a/Code/Tools/News/NewsShared/ResourceManagement/Resource.h b/Code/Tools/News/NewsShared/ResourceManagement/Resource.h
deleted file mode 100644
index 1174fea788..0000000000
--- a/Code/Tools/News/NewsShared/ResourceManagement/Resource.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <QString>
-
-class QJsonObject;
-
-namespace News
-{
-    class Descriptor;
-
-    //! Resource is a central element of in-editor messages
-    //! It represents articles, images, and anything else that is part of news feed
-    class Resource
-    {
-    public:
-        //! resources are stored as json objects in \ref News::ResourceManifest
-        //! this creates resource with empty data array, that can be downloaded later
-        //! by calling News::ResourceManifest::Sync
-        explicit Resource(const QJsonObject& json);
-
-        explicit Resource(const QString& id,
-            const QString& type);
-
-        Resource(const QString& id,
-            const QByteArray& data,
-            const QString& url,
-            const QString& type,
-            int refCount,
-            int version);
-
-        ~Resource();
-
-        //! Saves resource's description to a json file
-        void Write(QJsonObject& json) const;
-
-        QString GetId() const;
-
-        void SetId(const QString& id);
-
-        QByteArray GetData() const;
-
-        void SetData(QByteArray data);
-
-        QString GetType() const;
-
-        int GetRefCount() const;
-
-        void SetRefCount(int refCount);
-
-        int GetVersion() const;
-
-        void SetVersion(int version);
-
-    private:
-        QString m_id;
-        QByteArray m_data;
-        QString m_type;
-        int m_refCount;
-        int m_version;
-    };
-}
diff --git a/Code/Tools/News/NewsShared/ResourceManagement/ResourceManifest.cpp b/Code/Tools/News/NewsShared/ResourceManagement/ResourceManifest.cpp
deleted file mode 100644
index 969c4ec8f1..0000000000
--- a/Code/Tools/News/NewsShared/ResourceManagement/ResourceManifest.cpp
+++ /dev/null
@@ -1,349 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ResourceManifest.h"
-#include "NewsShared/ResourceManagement/QtDownloadManager.h"
-#include "NewsShared/ResourceManagement/Resource.h"
-#include "NewsShared/ResourceManagement/ArticleDescriptor.h"
-
-#include <QJsonArray>
-#include <QByteArray>
-#include <QFile>
-#include <QTextStream>
-#include <QCoreApplication>
-
-namespace News
-{
-
-    const QString ResourceManifest::MANIFEST_NAME = "resourceManifest";
-    bool ResourceManifest::s_syncing = false;
-
-    ResourceManifest::ResourceManifest(
-        std::function<void()> syncSuccessCallback,
-        std::function<void(ErrorCode)> syncFailCallback,
-        std::function<void(QString, LogType)> syncUpdateCallback)
-        : m_downloader(new QtDownloadManager)
-        , m_syncSuccessCallback(syncSuccessCallback)
-        , m_syncFailCallback(syncFailCallback)
-        , m_syncUpdateCallback(syncUpdateCallback)
-    {
-    }
-
-    ResourceManifest::~ResourceManifest()
-    {
-        // clean everything up
-        DeleteResources();
-
-        delete m_downloader;
-    }
-
-    Resource* ResourceManifest::FindById(const QString& id) const
-    {
-        return FindById(id, m_resources);
-    }
-
-    Resource* ResourceManifest::FindById(const QString& id, const QList<Resource*>& resources)
-    {
-        auto it = std::find_if(
-            resources.begin(),
-            resources.end(),
-            [id](Resource* resource) -> bool
-            {
-                return resource->GetId().compare(id) == 0;
-            });
-        if (it == resources.end())
-        {
-            return nullptr;
-        }
-        return *it;
-    }
-
-    Resource* ResourceManifest::FindById(const QString& id,
-        const QStack<Resource*>& resources)
-    {
-        auto it = std::find_if(
-            resources.begin(),
-            resources.end(),
-            [id](Resource* resource) -> bool
-            {
-                return resource->GetId().compare(id) == 0;
-            });
-        if (it == resources.end())
-        {
-            return nullptr;
-        }
-        return *it;
-    }
-
-    void ResourceManifest::Sync()
-    {
-        if (s_syncing)
-        {
-            FailSync(ErrorCode::AlreadySyncing);
-            return;
-        }
-        s_syncing = true;
-        m_failed = false;
-
-        m_syncUpdateCallback("Starting sync", LogInfo);
-
-        ReadConfig();
-
-        // first download the manifest json
-        m_syncUpdateCallback("Downloading manifest", LogInfo);
-        m_downloader->Download(QString(m_url).append(MANIFEST_NAME),
-            std::bind(&ResourceManifest::OnDownloadSuccess, this, std::placeholders::_1),
-            std::bind(&ResourceManifest::OnDownloadFail, this));
-    }
-
-    void ResourceManifest::Abort()
-    {
-        m_aborted = true;
-        m_downloader->Abort();
-    }
-
-    void ResourceManifest::Reset()
-    {
-        if (s_syncing)
-        {
-            m_syncUpdateCallback("Sync is already running", LogError);
-            return;
-        }
-
-        m_aborted = false;
-        m_failed = false;
-        m_version = -1;
-
-        DeleteResources();
-
-        m_order.clear();
-    }
-
-    QList<Resource*>::const_iterator ResourceManifest::begin() const
-    {
-        return m_resources.constBegin();
-    }
-
-    QList<Resource*>::const_iterator ResourceManifest::end() const
-    {
-        return m_resources.constEnd();
-    }
-
-    QList<QString> ResourceManifest::GetOrder() const
-    {
-        return m_order;
-    }
-
-    void ResourceManifest::OnDownloadSuccess(QByteArray data)
-    {
-        QJsonDocument doc(QJsonDocument::fromJson(data));
-        if (doc.isNull())
-        {
-            FailSync(ErrorCode::FailedToParseManifest);
-            return;
-        }
-
-        ErrorCode error = Read(doc.object());
-        if (error != ErrorCode::None)
-        {
-            FailSync(error);
-            return;
-        }
-
-        // check how many resources to sync
-        PrepareForSync();
-        // if there is anything to sync, do that
-        if (m_syncLeft > 0)
-        {
-            m_syncUpdateCallback("Syncing resources", LogInfo);
-            SyncResources();
-        }
-        // otherwise just finish sync
-        else
-        {
-            m_syncUpdateCallback("No new resources to sync", LogInfo);
-            FinishSync();
-        }
-    }
-
-    void ResourceManifest::OnDownloadFail()
-    {
-        FailSync(ErrorCode::ManifestDownloadFail);
-    }
-
-    ErrorCode ResourceManifest::Read(const QJsonObject& json)
-    {
-        m_version = json["version"].toInt();
-        QJsonArray resourceArray = json["resources"].toArray();
-        // initially mark ALL existing resource for deletion
-        QList<Resource*> toDelete = m_resources;
-
-        for (auto resourceDoc : resourceArray)
-        {
-            auto pNewResource = new Resource(resourceDoc.toObject());
-            // find local resource with the same id as new resource
-            auto pOldResource = FindById(pNewResource->GetId(), m_resources);
-            // if resource with the same id already exists then check its version
-            if (pOldResource)
-            {
-                // local resource is outdated, keep it in delete list, and download new one instead
-                if (pNewResource->GetVersion() > pOldResource->GetVersion())
-                {
-                    m_toDownload.push(pNewResource);
-                }
-                // local resource is newer or same version, keep it (remove from toDelete list)
-                // and don't need to download new one
-                else
-                {
-                    delete pNewResource;
-                    toDelete.removeAll(pOldResource);
-                }
-            }
-            // resource with same id not found
-            else
-            {
-                m_toDownload.push(pNewResource);
-            }
-        }
-
-        // delete everything that's not in s3
-        for (auto pResource : toDelete)
-        {
-            RemoveResource(pResource);
-            delete pResource;
-        }
-
-        // parse order of articles
-        m_order.clear();
-        QJsonArray orderArray = json["order"].toArray();
-        for (auto idObject : orderArray)
-        {
-            m_order.append(idObject.toString());
-        }
-        return ErrorCode::None;
-    }
-
-    void ResourceManifest::PrepareForSync()
-    {
-        if (m_aborted)
-        {
-            m_syncLeft = 0;
-        }
-
-        m_syncLeft = m_toDownload.count();
-    }
-
-    void ResourceManifest::SyncResources()
-    {
-        DownloadResources();
-    }
-
-    void ResourceManifest::DownloadResources()
-    {
-        while (m_toDownload.count() > 0)
-        {
-            m_syncUpdateCallback(
-                QString("Downloading: %1 resources left").arg(m_toDownload.count()),
-                LogInfo);
-
-            auto pResource = m_toDownload.pop();
-
-            m_downloader->Download(QString(m_url).append(pResource->GetId()),
-                //download success
-                [&, pResource](QByteArray data)
-                {
-                    pResource->SetData(data);
-                    AppendResource(pResource);
-                    UpdateSync();
-                },
-                //download fail
-                    [&, pResource]()
-                {
-                    m_failed = true;
-                    delete pResource;
-                    m_syncUpdateCallback("Failed to download resource", LogError);
-                    UpdateSync();
-                });
-        }
-    }
-
-    void ResourceManifest::ReadConfig()
-    {
-        QFile file(QCoreApplication::applicationDirPath() + "/newsConfig.txt");
-        if (file.exists())
-        {
-            if (file.open(QIODevice::ReadOnly))
-            {
-                QTextStream in(&file);
-                m_url = in.readAll().trimmed();
-                file.close();
-            }
-        }
-    }
-
-    void ResourceManifest::DeleteResources()
-    {
-        for (auto pResource : m_toDownload)
-        {
-            delete pResource;
-        }
-        m_toDownload.clear();
-
-        for (auto pResource : m_resources)
-        {
-            delete pResource;
-        }
-        m_resources.clear();
-    }
-
-    void ResourceManifest::UpdateSync()
-    {
-        m_syncLeft--;
-        if (m_syncLeft == 0)
-        {
-            if (!m_failed)
-            {
-                FinishSync();
-            }
-            else
-            {
-                FailSync(ErrorCode::FailedToSync);
-            }
-        }
-    }
-
-    void ResourceManifest::FinishSync()
-    {
-        if (!m_failed)
-        {
-            m_syncSuccessCallback();
-        }
-        else
-        {
-            m_syncFailCallback(m_errorCode);
-        }
-        s_syncing = false;
-    }
-
-    void ResourceManifest::FailSync(ErrorCode error)
-    {
-        m_failed = true;
-        m_errorCode = error;
-        FinishSync();
-    }
-
-    void ResourceManifest::AppendResource(Resource* pResource)
-    {
-        m_resources.append(pResource);
-    }
-
-    void ResourceManifest::RemoveResource(Resource* pResource)
-    {
-        m_resources.removeAll(pResource);
-    }
-
-}
diff --git a/Code/Tools/News/NewsShared/ResourceManagement/ResourceManifest.h b/Code/Tools/News/NewsShared/ResourceManagement/ResourceManifest.h
deleted file mode 100644
index 3a0f31de8f..0000000000
--- a/Code/Tools/News/NewsShared/ResourceManagement/ResourceManifest.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <QList>
-#include <QStack>
-#include <functional>
-
-#include "NewsShared/LogType.h"
-#include "NewsShared/ErrorCodes.h"
-
-class QJsonObject;
-
-namespace News
-{
-    class ArticleDescriptor;
-    class UidGenerator;
-    class S3Connector;
-    class QtDownloadManager;
-    class Descriptor;
-    class DownloadDescriptor;
-    class Resource;
-
-    //! ResourceManifest manages resources.
-    /*!
-        Manifest contains information on resources, it handles syncing resources with s3
-    */
-    class ResourceManifest
-    {
-    public:
-        //! ResourceManifest ctor
-        /*!
-            \param syncSuccessCallback - called once when everything is synced
-            \param syncFailCallback - called once when sync failed
-            \param syncUpdateCallback - called multiple times to update information on sync process
-        */
-        explicit ResourceManifest(
-            std::function<void()> syncSuccessCallback,
-            std::function<void(ErrorCode)> syncFailCallback,
-            std::function<void(QString, LogType)> syncUpdateCallback);
-        virtual ~ResourceManifest();
-
-        //! Find a resource that matches id
-        /*!
-            \retval Resource * - a pointer to a Resource with matching id, if none found return nullptr
-        */
-        Resource* FindById(const QString& id) const;
-        static Resource* FindById(const QString& id, const QList<Resource*>& resources);
-        static Resource* FindById(const QString& id, const QStack<Resource*>& resources);
-
-        //! Sync resources with s3
-        /*
-            1) First download resource manifest file
-            2) Parse manifest
-            3) Determine which resources need to be downloaded, updated, or deleted
-            4) Download missing resources or resource that are out of date
-            5) Call m_syncSuccessCallback
-        */
-        virtual void Sync();
-
-        //! Gracegully stop sync process
-        /*!
-            Aborting works differently depending at what point during sync porocess it is called
-            If called before resources started to download, then skip download altogether
-            Otherwise gracefully abort all downloads and call m_syncFailCallback
-        */
-        void Abort();
-
-        //! Called when switching endpoints to reset resource manifest to a clean state
-        virtual void Reset();
-
-        QList<Resource*>::const_iterator begin() const;
-        QList<Resource*>::const_iterator end() const;
-
-        //! Get order of article resources, so they can be displayed properly in ArticleViewContainer
-        QList<QString> GetOrder() const;
-
-    protected:
-        //! The root location of cloudfront resources
-        QString m_url = "https://lumberyard-data.amazon.com/";
-        //! Name of resourceManifest file that links all other resources
-        static const QString MANIFEST_NAME;
-        //! Identifies whether syncing is in progress
-        static bool s_syncing;
-        //! Manifest Version
-        int m_version = -1;
-        //! Number of resources left to sync
-        int m_syncLeft = 0;
-        //! Identifies whether sync process was aborted
-        bool m_aborted = false;
-        //! Indentifies whether sync process has failed
-        bool m_failed = false;
-        ErrorCode m_errorCode = ErrorCode::None;
-
-        QtDownloadManager* m_downloader = nullptr;
-
-        QList<Resource*> m_resources;
-        QList<QString> m_order;
-        QStack<Resource*> m_toDownload;
-
-        std::function<void()> m_syncSuccessCallback;
-        std::function<void(ErrorCode)> m_syncFailCallback;
-        std::function<void(QString, LogType)> m_syncUpdateCallback;
-
-        //! Parse resource manifest json, and figure out which resources need to be downloaded
-        virtual ErrorCode Read(const QJsonObject& json);
-
-        //! Executed before sync to figure out how many resources need to be synced
-        virtual void PrepareForSync();
-        //! Actual sync function
-        virtual void SyncResources();
-        //! Check whether everything is synced, if so call ResourceManifest::FinishSync
-        void UpdateSync();
-        //! Notify that everything is synced
-        virtual void FinishSync();
-        void FailSync(ErrorCode error);
-
-        virtual void AppendResource(Resource* pResource);
-        virtual void RemoveResource(Resource* pResource);
-
-        virtual void OnDownloadSuccess(QByteArray data);
-        virtual void OnDownloadFail();
-        virtual void DownloadResources();
-
-    private:
-        void ReadConfig();
-        void DeleteResources();
-    };
-} // namespace News
diff --git a/Code/Tools/News/NewsShared/Resources/ErrorImage.jpg b/Code/Tools/News/NewsShared/Resources/ErrorImage.jpg
deleted file mode 100644
index 216fe14bd5..0000000000
--- a/Code/Tools/News/NewsShared/Resources/ErrorImage.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0a7430d63820b3b00e03b4a8ec73b5e8e3946659031e3aeeb355b632acca4122
-size 8857
diff --git a/Code/Tools/News/NewsShared/Resources/KeepInTouchBanner.jpg b/Code/Tools/News/NewsShared/Resources/KeepInTouchBanner.jpg
deleted file mode 100644
index b47040b717..0000000000
--- a/Code/Tools/News/NewsShared/Resources/KeepInTouchBanner.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:09c1733f116c11b56c54f7c3b6b4462884116db06605ca3cdfa23c45a3695385
-size 68024
diff --git a/Code/Tools/News/NewsShared/Resources/icon_facebook.png b/Code/Tools/News/NewsShared/Resources/icon_facebook.png
deleted file mode 100644
index 0fb823969b..0000000000
--- a/Code/Tools/News/NewsShared/Resources/icon_facebook.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f8b5493c81354b6757a21bea6baedd5665b8cb9ca19a6ff4fbd40afef534f35f
-size 1257
diff --git a/Code/Tools/News/NewsShared/Resources/icon_twitch.png b/Code/Tools/News/NewsShared/Resources/icon_twitch.png
deleted file mode 100644
index 50d7436b0d..0000000000
--- a/Code/Tools/News/NewsShared/Resources/icon_twitch.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2882aad73e2ecf310934ec3eacd0c1fa0a6ff012a4c3c9cf4ca96a72cef2fb8c
-size 514
diff --git a/Code/Tools/News/NewsShared/Resources/icon_twitter.png b/Code/Tools/News/NewsShared/Resources/icon_twitter.png
deleted file mode 100644
index d1cf7eb3dd..0000000000
--- a/Code/Tools/News/NewsShared/Resources/icon_twitter.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:046e14f1d90f77bb6ea0fe700bb10049748b46bb84c8ac3620642d4bca9df533
-size 954
diff --git a/Code/Tools/News/NewsShared/Resources/icon_youtube.png b/Code/Tools/News/NewsShared/Resources/icon_youtube.png
deleted file mode 100644
index d3e7869387..0000000000
--- a/Code/Tools/News/NewsShared/Resources/icon_youtube.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3abaf8b178763441ac6812ae518c2f8cbea9b228aa1f84052a65836b33dc980c
-size 976
diff --git a/Code/Tools/News/news_shared_files.cmake b/Code/Tools/News/news_shared_files.cmake
deleted file mode 100644
index 2f20029068..0000000000
--- a/Code/Tools/News/news_shared_files.cmake
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES
-    NewsShared/LogType.h
-    NewsShared/ErrorCodes.h
-    NewsShared/Qt/ArticleErrorView.cpp
-    NewsShared/Qt/ArticleErrorView.h
-    NewsShared/Qt/ArticleErrorView.ui
-    NewsShared/Qt/ArticleView.cpp
-    NewsShared/Qt/ArticleView.h
-    NewsShared/Qt/ArticleView.ui
-    NewsShared/Qt/PinnedArticleView.ui
-    NewsShared/Qt/ArticleViewContainer.cpp
-    NewsShared/Qt/ArticleViewContainer.h
-    NewsShared/Qt/ArticleViewContainer.ui
-    NewsShared/Qt/KeepInTouchView.cpp
-    NewsShared/Qt/KeepInTouchView.h
-    NewsShared/Qt/KeepInTouchView.ui
-    NewsShared/Qt/NewsShared.qrc
-    NewsShared/ResourceManagement/ArticleDescriptor.cpp
-    NewsShared/ResourceManagement/ArticleDescriptor.h
-    NewsShared/ResourceManagement/Descriptor.cpp
-    NewsShared/ResourceManagement/Descriptor.h
-    NewsShared/ResourceManagement/JsonDescriptor.cpp
-    NewsShared/ResourceManagement/JsonDescriptor.h
-    NewsShared/ResourceManagement/QtDownloader.cpp
-    NewsShared/ResourceManagement/QtDownloader.h
-    NewsShared/ResourceManagement/QtDownloadManager.cpp
-    NewsShared/ResourceManagement/QtDownloadManager.h
-    NewsShared/ResourceManagement/Resource.cpp
-    NewsShared/ResourceManagement/Resource.h
-    NewsShared/ResourceManagement/ResourceManifest.cpp
-    NewsShared/ResourceManagement/ResourceManifest.h
-    NewsShared/Resources/ErrorImage.jpg
-    NewsShared/Resources/KeepInTouchBanner.jpg
-    NewsShared/Resources/icon_facebook.png
-    NewsShared/Resources/icon_twitch.png
-    NewsShared/Resources/icon_twitter.png
-    NewsShared/Resources/icon_youtube.png
-)
diff --git a/Code/Tools/ProjectManager/Resources/FeatureTagClose.svg b/Code/Tools/ProjectManager/Resources/FeatureTagClose.svg
new file mode 100644
index 0000000000..9ab30acd65
--- /dev/null
+++ b/Code/Tools/ProjectManager/Resources/FeatureTagClose.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2.55069 19.5506L19.5213 2.58008L21.289 4.34785L4.31845 21.3184L2.55069 19.5506Z" fill="#94D2FF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.28706 2.65039L21.2576 19.6209L19.4899 21.3887L2.51929 4.41815L4.28706 2.65039Z" fill="#94D2FF"/>
+</svg>
diff --git a/Code/Tools/ProjectManager/Resources/ProjectManager.qrc b/Code/Tools/ProjectManager/Resources/ProjectManager.qrc
index cfe4b37fbc..2e93e9eca9 100644
--- a/Code/Tools/ProjectManager/Resources/ProjectManager.qrc
+++ b/Code/Tools/ProjectManager/Resources/ProjectManager.qrc
@@ -34,5 +34,6 @@
         <file>Warning.svg</file>
         <file>Backgrounds/DefaultBackground.jpg</file>
         <file>Backgrounds/FtueBackground.jpg</file>
+        <file>FeatureTagClose.svg</file>
     </qresource>
 </RCC>
diff --git a/Code/Tools/ProjectManager/Resources/ProjectManager.qss b/Code/Tools/ProjectManager/Resources/ProjectManager.qss
index d6a2476e83..74acc1c7ef 100644
--- a/Code/Tools/ProjectManager/Resources/ProjectManager.qss
+++ b/Code/Tools/ProjectManager/Resources/ProjectManager.qss
@@ -435,8 +435,6 @@ QProgressBar {
     border: none;
     background-color: transparent;
     padding: 0px;
-    min-height: 14px;
-    font-size: 2px;
 }
 
 QProgressBar::chunk {
@@ -478,6 +476,13 @@ QProgressBar::chunk {
     background-color: #333333;
 }
 
+/************** Filter tag widget **************/
+
+#FilterTagWidgetTextLabel {
+    color: #94D2FF;
+    font-size: 10px;
+}
+
 /************** Gem Catalog (Inspector) **************/
 
 #GemCatalogInspector {
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemFilterTagWidget.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemFilterTagWidget.cpp
new file mode 100644
index 0000000000..c4612debc8
--- /dev/null
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemFilterTagWidget.cpp
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <GemCatalog/GemFilterTagWidget.h>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QPushButton>
+#include <QSpacerItem>
+#include <QWidget>
+
+namespace O3DE::ProjectManager
+{
+    FilterTagWidget::FilterTagWidget(const QString& text, QWidget* parent)
+        : QFrame(parent)
+    {
+        setFrameShape(QFrame::NoFrame);
+
+        auto* layout = new QHBoxLayout();
+        layout->setContentsMargins(6, 5, 4, 4);
+        layout->setSpacing(2);
+        setLayout(layout);
+
+        setStyleSheet("background-color: #555555;");
+
+        m_textLabel = new QLabel();
+        m_textLabel->setObjectName("FilterTagWidgetTextLabel");
+        m_textLabel->setText(text);
+        layout->addWidget(m_textLabel);
+
+        m_closeButton = new QPushButton();
+        m_closeButton->setFlat(true);
+        m_closeButton->setIcon(QIcon(":/FeatureTagClose.svg"));
+        m_closeButton->setIconSize(QSize(12, 12));
+        m_closeButton->setStyleSheet("QPushButton { background-color: transparent; border: 0px }");
+        layout->addWidget(m_closeButton);
+        connect(m_closeButton, &QPushButton::clicked, this, [=]{ emit RemoveClicked(); });
+    }
+
+    QString FilterTagWidget::text() const
+    {
+        return m_textLabel->text();
+    }
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    FilterTagWidgetContainer::FilterTagWidgetContainer(QWidget* parent)
+        : QWidget(parent)
+    {
+        m_layout = new QHBoxLayout();
+        m_layout->setMargin(0);
+        m_layout->setSpacing(0);
+        setLayout(m_layout);
+    }
+
+    void FilterTagWidgetContainer::Reinit(const QVector<QString>& tags)
+    {
+        if (m_widget)
+        {
+            // Hide the old widget and request deletion.
+            m_widget->hide();
+            m_widget->deleteLater();
+        }
+
+        m_widget = new QWidget(this);
+
+        QHBoxLayout* hLayout = new QHBoxLayout();
+        hLayout->setAlignment(Qt::AlignLeft);
+        hLayout->setMargin(0);
+        hLayout->setSpacing(8);
+
+        const int numTags = tags.count();
+        for (int i = 0; i < numTags; ++i)
+        {
+            FilterTagWidget* tagWidget = new FilterTagWidget(tags[i]);
+
+            // Add the tag widget to the current row.
+            hLayout->addWidget(tagWidget);
+
+            // Connect the clicked event of the close button of the tag widget to the remove tag function in the container.
+            connect(tagWidget, &FilterTagWidget::RemoveClicked, this, [this, tagWidget]{ emit TagRemoved(tagWidget->text()); });
+        }
+
+        QWidget* spacerWidget = new QWidget();
+        spacerWidget->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed);
+        hLayout->addWidget(spacerWidget);
+
+        m_widget->setLayout(hLayout);
+        m_layout->addWidget(m_widget);
+
+        setFixedHeight(30);
+    }
+} // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemFilterTagWidget.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemFilterTagWidget.h
new file mode 100644
index 0000000000..0994618d4e
--- /dev/null
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemFilterTagWidget.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QFrame>
+#include <QString>
+#include <QVector>
+#endif
+
+QT_FORWARD_DECLARE_CLASS(QHBoxLayout)
+QT_FORWARD_DECLARE_CLASS(QLabel)
+QT_FORWARD_DECLARE_CLASS(QPushButton)
+QT_FORWARD_DECLARE_CLASS(QWidget)
+
+namespace O3DE::ProjectManager
+{
+    class FilterTagWidget
+        : public QFrame
+    {
+        Q_OBJECT
+
+    public:
+        FilterTagWidget(const QString& text, QWidget* parent = nullptr);
+        QString text() const;
+
+    signals:
+        void RemoveClicked();
+
+    private:
+        QLabel* m_textLabel = nullptr;
+        QPushButton* m_closeButton = nullptr;
+    };
+
+    // Horizontally expanding filter tag container widget
+    class FilterTagWidgetContainer
+        : public QWidget
+    {
+        Q_OBJECT
+
+    public:
+        FilterTagWidgetContainer(QWidget* parent = nullptr);
+        void Reinit(const QVector<QString>& tags);
+
+    signals:
+        void TagRemoved(QString tagName);
+
+    private:
+        QWidget* m_widget = nullptr;
+        QHBoxLayout* m_layout = nullptr;
+    };
+} // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemFilterWidget.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemFilterWidget.cpp
index 753371ba52..268e793ee8 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemFilterWidget.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemFilterWidget.cpp
@@ -14,6 +14,7 @@
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 #include <QPushButton>
+#include <QSignalBlocker>
 
 namespace O3DE::ProjectManager
 {
@@ -485,6 +486,7 @@ namespace O3DE::ProjectManager
             const QString& feature = elementNames[i];
             QAbstractButton* button = buttons[i];
 
+            // Adjust the proxy model and enable or disable the clicked feature used for filtering.
             connect(button, &QAbstractButton::toggled, this, [=](bool checked)
                 {
                     QSet<QString> features = m_filterProxyModel->GetFeatures();
@@ -498,6 +500,15 @@ namespace O3DE::ProjectManager
                     }
                     m_filterProxyModel->SetFeatures(features);
                 });
+
+            // Sync the UI state with the proxy model filtering.
+            connect(m_filterProxyModel, &GemSortFilterProxyModel::OnInvalidated, this, [=]
+                {
+                    const QSet<QString>& filteredFeatureTags = m_filterProxyModel->GetFeatures();
+                    const bool isChecked = filteredFeatureTags.contains(button->text());
+                    QSignalBlocker signalsBlocker(button);
+                    button->setChecked(isChecked);
+                });
         }
     }
 } // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.cpp
index b9dc3e9fcc..f5bedb79eb 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.cpp
@@ -102,9 +102,11 @@ namespace O3DE::ProjectManager
 
         // In case there are feature tags displayed at the bottom, decrease the size of the summary text field.
         const QStringList featureTags = GemModel::GetFeatures(modelIndex);
-        const int summaryHeight = contentRect.height() - (!featureTags.empty() * 30);
+        const int featureTagAreaHeight = 30;
+        const int summaryHeight = contentRect.height() - (!featureTags.empty() * featureTagAreaHeight);
 
-        const QSize summarySize = QSize(contentRect.width() - s_summaryStartX - s_buttonWidth - s_itemMargins.right() * 3,
+        const int additionalSummarySpacing = s_itemMargins.right() * 3;
+        const QSize summarySize = QSize(contentRect.width() - s_summaryStartX - s_buttonWidth - additionalSummarySpacing,
             summaryHeight);
         const QRect summaryRect = QRect(/*topLeft=*/QPoint(contentRect.left() + s_summaryStartX, contentRect.top()), summarySize);
 
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemListHeaderWidget.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemListHeaderWidget.cpp
index 5e2f93c2fc..3d6fd1947c 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemListHeaderWidget.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemListHeaderWidget.cpp
@@ -7,10 +7,13 @@
 
 #include <GemCatalog/GemItemDelegate.h>
 #include <GemCatalog/GemListHeaderWidget.h>
-#include <QStandardItemModel>
+#include <AzQtComponents/Components/TagSelector.h>
+#include <QAbstractItemModel>
+#include <QItemSelectionModel>
 #include <QLabel>
-#include <QVBoxLayout>
 #include <QSpacerItem>
+#include <QStandardItemModel>
+#include <QVBoxLayout>
 
 namespace O3DE::ProjectManager
 {
@@ -23,11 +26,34 @@ namespace O3DE::ProjectManager
 
         setStyleSheet("background-color: #333333;");
 
-        vLayout->addSpacing(20);
+        vLayout->addSpacing(13);
 
         // Top section
         QHBoxLayout* topLayout = new QHBoxLayout();
+        topLayout->addSpacing(16);
         topLayout->setMargin(0);
+
+        auto* tagWidget = new FilterTagWidgetContainer();
+
+        // Adjust the proxy model and disable the given feature used for filtering.
+        connect(tagWidget, &FilterTagWidgetContainer::TagRemoved, this, [=](QString tagName)
+            {
+                QSet<QString> filteredFeatureTags = proxyModel->GetFeatures();
+                filteredFeatureTags.remove(tagName);
+                proxyModel->SetFeatures(filteredFeatureTags);
+            });
+
+        // Reinitialize the tag widget in case the filter in the proxy model got invalided.
+        connect(proxyModel, &GemSortFilterProxyModel::OnInvalidated, this, [=]
+            {
+                const QSet<QString>& tagSet = proxyModel->GetFeatures();
+                QVector<QString> sortedTags(tagSet.begin(), tagSet.end());
+                std::sort(sortedTags.begin(), sortedTags.end());
+                tagWidget->Reinit(sortedTags);
+            });
+
+        topLayout->addWidget(tagWidget);
+
         topLayout->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Expanding));
 
         QLabel* showCountLabel = new QLabel();
@@ -43,7 +69,7 @@ namespace O3DE::ProjectManager
 
         vLayout->addLayout(topLayout);
 
-        vLayout->addSpacing(20);
+        vLayout->addSpacing(13);
 
         // Separating line
         QFrame* hLine = new QFrame();
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemListHeaderWidget.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemListHeaderWidget.h
index a9b3b3aa36..fcad58a321 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemListHeaderWidget.h
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemListHeaderWidget.h
@@ -8,9 +8,8 @@
 #pragma once
 
 #if !defined(Q_MOC_RUN)
+#include <GemCatalog/GemFilterTagWidget.h>
 #include <GemCatalog/GemSortFilterProxyModel.h>
-#include <QAbstractItemModel>
-#include <QItemSelectionModel>
 #include <QFrame>
 #endif
 
diff --git a/Code/Tools/ProjectManager/Source/NewProjectSettingsScreen.cpp b/Code/Tools/ProjectManager/Source/NewProjectSettingsScreen.cpp
index c0c96d8281..508b7256d1 100644
--- a/Code/Tools/ProjectManager/Source/NewProjectSettingsScreen.cpp
+++ b/Code/Tools/ProjectManager/Source/NewProjectSettingsScreen.cpp
@@ -6,6 +6,7 @@
  */
 
 #include <NewProjectSettingsScreen.h>
+#include <ProjectManagerDefs.h>
 #include <PythonBindingsInterface.h>
 #include <FormBrowseEditWidget.h>
 #include <FormLineEditWidget.h>
@@ -117,7 +118,7 @@ namespace O3DE::ProjectManager
                 for (int index = 0; index < m_templates.size(); ++index)
                 {
                     ProjectTemplateInfo projectTemplate = m_templates.at(index);
-                    QString projectPreviewPath = projectTemplate.m_path + "/Template/preview.png";
+                    QString projectPreviewPath = QDir(projectTemplate.m_path).filePath(ProjectPreviewImagePath);
                     QFileInfo doesPreviewExist(projectPreviewPath);
                     if (!doesPreviewExist.exists() || !doesPreviewExist.isFile())
                     {
diff --git a/Code/Tools/ProjectManager/Source/ProjectManagerDefs.h b/Code/Tools/ProjectManager/Source/ProjectManagerDefs.h
index f74233db51..79ad04c43a 100644
--- a/Code/Tools/ProjectManager/Source/ProjectManagerDefs.h
+++ b/Code/Tools/ProjectManager/Source/ProjectManagerDefs.h
@@ -12,6 +12,7 @@ namespace O3DE::ProjectManager
 {
     inline constexpr static int ProjectPreviewImageWidth = 210;
     inline constexpr static int ProjectPreviewImageHeight = 280;
+    inline constexpr static int ProjectTemplateImageWidth = 92;
 
     static const QString ProjectBuildPathPostfix = "build/windows_vs2019";
     static const QString ProjectBuildPathCmakeFiles = "CMakeFiles";
diff --git a/Code/Tools/ProjectManager/Source/ProjectUtils.cpp b/Code/Tools/ProjectManager/Source/ProjectUtils.cpp
index f7a90f5e0c..82944aa41a 100644
--- a/Code/Tools/ProjectManager/Source/ProjectUtils.cpp
+++ b/Code/Tools/ProjectManager/Source/ProjectUtils.cpp
@@ -10,11 +10,13 @@
 
 #include <QFileDialog>
 #include <QDir>
+#include <QtMath>
 #include <QMessageBox>
 #include <QFileInfo>
 #include <QProcess>
 #include <QProcessEnvironment>
 #include <QGuiApplication>
+#include <QProgressDialog>
 
 namespace O3DE::ProjectManager
 {
@@ -55,7 +57,42 @@ namespace O3DE::ProjectManager
             return false;
         }
 
-        static bool CopyDirectory(const QString& origPath, const QString& newPath)
+        typedef AZStd::function<void(/*fileCount=*/int, /*totalSizeInBytes=*/int)> StatusFunction;
+        static void RecursiveGetAllFiles(const QDir& directory, QStringList& outFileList, qint64& outTotalSizeInBytes, StatusFunction statusCallback)
+        {
+            const QStringList entries = directory.entryList(QDir::Dirs | QDir::Files | QDir::NoSymLinks | QDir::NoDotAndDotDot);
+            for (const QString& entryPath : entries)
+            {
+                const QString filePath = QDir::toNativeSeparators(QString("%1/%2").arg(directory.path()).arg(entryPath));
+                QFileInfo fileInfo(filePath);
+
+                if (fileInfo.isDir())
+                {
+                    QDir subDirectory(filePath);
+                    RecursiveGetAllFiles(subDirectory, outFileList, outTotalSizeInBytes, statusCallback);
+                }
+                else
+                {
+                    outFileList.push_back(filePath);
+                    outTotalSizeInBytes += fileInfo.size();
+
+                    const int updateStatusEvery = 64;
+                    if (outFileList.size() % updateStatusEvery == 0)
+                    {
+                        statusCallback(outFileList.size(), outTotalSizeInBytes);
+                    }
+                }
+            }
+        }
+
+        static bool CopyDirectory(QProgressDialog* progressDialog,
+            const QString& origPath,
+            const QString& newPath,
+            QStringList& filesToCopy,
+            int& outNumCopiedFiles,
+            qint64 totalSizeToCopy,
+            qint64& outCopiedFileSize,
+            bool& showIgnoreFileDialog)
         {
             QDir original(origPath);
             if (!original.exists())
@@ -65,19 +102,91 @@ namespace O3DE::ProjectManager
 
             for (QString directory : original.entryList(QDir::Dirs | QDir::NoDotAndDotDot))
             {
+                if (progressDialog->wasCanceled())
+                {
+                    return false;
+                }
+
                 QString newDirectoryPath = newPath + QDir::separator() + directory;
                 original.mkpath(newDirectoryPath);
 
-                if (!CopyDirectory(origPath + QDir::separator() + directory, newDirectoryPath))
+                if (!CopyDirectory(progressDialog, origPath + QDir::separator() + directory,
+                    newDirectoryPath, filesToCopy, outNumCopiedFiles, totalSizeToCopy, outCopiedFileSize, showIgnoreFileDialog))
                 {
                     return false;
                 }
             }
 
+            QLocale locale;
+            const float progressDialogRangeHalf = qFabs(progressDialog->maximum() - progressDialog->minimum()) * 0.5f;
             for (QString file : original.entryList(QDir::Files))
             {
-                if (!QFile::copy(origPath + QDir::separator() + file, newPath + QDir::separator() + file))
+                if (progressDialog->wasCanceled())
+                {
                     return false;
+                }
+
+                // Progress window update
+                {
+                    // Weight in the number of already copied files as well as the copied bytes to get a better progress indication
+                    // for cases combining many small files and some really large files.
+                    const float normalizedNumFiles = static_cast<float>(outNumCopiedFiles) / filesToCopy.count();
+                    const float normalizedFileSize = static_cast<float>(outCopiedFileSize) / totalSizeToCopy;
+                    const int progress = normalizedNumFiles * progressDialogRangeHalf + normalizedFileSize * progressDialogRangeHalf;
+                    progressDialog->setValue(progress);
+
+                    const QString copiedFileSizeString = locale.formattedDataSize(outCopiedFileSize);
+                    const QString totalFileSizeString = locale.formattedDataSize(totalSizeToCopy);
+                    progressDialog->setLabelText(QString("Coping file %1 of %2 (%3 of %4) ...").arg(QString::number(outNumCopiedFiles),
+                        QString::number(filesToCopy.count()),
+                        copiedFileSizeString,
+                        totalFileSizeString));
+                    qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
+                }
+
+                const QString toBeCopiedFilePath = origPath + QDir::separator() + file;
+                const QString copyToFilePath = newPath + QDir::separator() + file;
+                if (!QFile::copy(toBeCopiedFilePath, copyToFilePath))
+                {
+                    // Let the user decide to ignore files that failed to copy or cancel the whole operation.
+                    if (showIgnoreFileDialog)
+                    {
+                        QMessageBox ignoreFileMessageBox;
+                        const QString text = QString("Cannot copy <b>%1</b>.<br><br>"
+                            "Source: %2<br>"
+                            "Destination: %3<br><br>"
+                            "Press <b>Yes</b> to ignore the file, <b>YesToAll</b> to ignore all upcoming non-copyable files or "
+                            "<b>Cancel</b> to abort duplicating the project.").arg(file, toBeCopiedFilePath, copyToFilePath);
+
+                        ignoreFileMessageBox.setModal(true);
+                        ignoreFileMessageBox.setWindowTitle("Cannot copy file");
+                        ignoreFileMessageBox.setText(text);
+                        ignoreFileMessageBox.setIcon(QMessageBox::Question);
+                        ignoreFileMessageBox.setStandardButtons(QMessageBox::YesToAll | QMessageBox::Yes | QMessageBox::Cancel);
+
+                        int ignoreFile = ignoreFileMessageBox.exec();
+                        if (ignoreFile == QMessageBox::YesToAll)
+                        {
+                            showIgnoreFileDialog = false;
+                            continue;
+                        }
+                        else if (ignoreFile == QMessageBox::Yes)
+                        {
+                            continue;
+                        }
+                        else
+                        {
+                            return false;
+                        }
+                    }
+                }
+                else
+                {
+                    outNumCopiedFiles++;
+
+                    QFileInfo fileInfo(toBeCopiedFilePath);
+                    outCopiedFileSize += fileInfo.size();
+                }
             }
 
             return true;
@@ -119,16 +228,13 @@ namespace O3DE::ProjectManager
                     return false;
                 }
 
-                QGuiApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
-                copyResult = CopyProject(origPath, newPath);
-                QGuiApplication::restoreOverrideCursor();
-
+                copyResult = CopyProject(origPath, newPath, parent);
             }
 
             return copyResult;
         }
 
-        bool CopyProject(const QString& origPath, const QString& newPath)
+        bool CopyProject(const QString& origPath, const QString& newPath, QWidget* parent)
         {
             // Disallow copying from or into subdirectory
             if (IsDirectoryDescedent(origPath, newPath) || IsDirectoryDescedent(newPath, origPath))
@@ -136,19 +242,49 @@ namespace O3DE::ProjectManager
                 return false;
             }
 
-            if (!CopyDirectory(origPath, newPath))
+            QStringList filesToCopy;
+            qint64 totalSizeInBytes = 0;
+
+            QProgressDialog* progressDialog = new QProgressDialog(parent);
+            progressDialog->setAutoClose(true);
+            progressDialog->setValue(0);
+            progressDialog->setRange(0, 1000);
+            progressDialog->setModal(true);
+            progressDialog->setWindowTitle("Copying project ...");
+            progressDialog->show();
+
+            QLocale locale;
+            RecursiveGetAllFiles(origPath, filesToCopy, totalSizeInBytes, [=](int fileCount, int sizeInBytes)
+                {
+                    // Create a human-readable version of the file size.
+                    const QString fileSizeString = locale.formattedDataSize(sizeInBytes);
+
+                    progressDialog->setLabelText(QString("Indexing files ... %1 files found, %2 to copy.").arg(fileCount).arg(fileSizeString));
+                    qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
+                });
+
+            int numFilesCopied = 0;
+            qint64 copiedFileSize = 0;
+
+            // Phase 1: Copy files
+            bool showIgnoreFileDialog = true;
+            bool success = CopyDirectory(progressDialog, origPath, newPath, filesToCopy, numFilesCopied, totalSizeInBytes, copiedFileSize, showIgnoreFileDialog);
+            if (success)
             {
-                // Cleanup whatever mess was made
-                DeleteProjectFiles(newPath, true);
-                return false;
+                // Phase 2: Register project
+                success = RegisterProject(newPath);
             }
 
-            if (!RegisterProject(newPath))
+            if (!success)
             {
+                progressDialog->setLabelText("Duplicating project failed/cancelled, removing already copied files ...");
+                qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
+
                 DeleteProjectFiles(newPath, true);
             }
 
-            return true;
+            progressDialog->deleteLater();
+            return success;
         }
 
         bool DeleteProjectFiles(const QString& path, bool force)
@@ -184,7 +320,7 @@ namespace O3DE::ProjectManager
             if (!newDirectory.rename(origPath, newPath))
             {
                 // Likely failed because trying to move to another partition, try copying
-                if (!CopyProject(origPath, newPath))
+                if (!CopyProject(origPath, newPath, parent))
                 {
                     return false;
                 }
@@ -272,7 +408,6 @@ namespace O3DE::ProjectManager
         bool IsVS2019Installed()
         {
             static bool vs2019Installed = IsVS2019Installed_internal();
-
             return vs2019Installed;
         }
 
diff --git a/Code/Tools/ProjectManager/Source/ProjectUtils.h b/Code/Tools/ProjectManager/Source/ProjectUtils.h
index 786ff34b88..2829a45180 100644
--- a/Code/Tools/ProjectManager/Source/ProjectUtils.h
+++ b/Code/Tools/ProjectManager/Source/ProjectUtils.h
@@ -17,7 +17,7 @@ namespace O3DE::ProjectManager
         bool RegisterProject(const QString& path);
         bool UnregisterProject(const QString& path);
         bool CopyProjectDialog(const QString& origPath, QWidget* parent = nullptr);
-        bool CopyProject(const QString& origPath, const QString& newPath);
+        bool CopyProject(const QString& origPath, const QString& newPath, QWidget* parent);
         bool DeleteProjectFiles(const QString& path, bool force = false);
         bool MoveProject(QString origPath, QString newPath, QWidget* parent = nullptr, bool ignoreRegister = false);
 
diff --git a/Code/Tools/ProjectManager/Source/PythonBindings.cpp b/Code/Tools/ProjectManager/Source/PythonBindings.cpp
index 167cf6d10e..f8e90b0a59 100644
--- a/Code/Tools/ProjectManager/Source/PythonBindings.cpp
+++ b/Code/Tools/ProjectManager/Source/PythonBindings.cpp
@@ -394,13 +394,20 @@ namespace O3DE::ProjectManager
             if (pybind11::isinstance<pybind11::dict>(o3deData))
             {
                 engineInfo.m_path = Py_To_String(enginePath);
-                engineInfo.m_defaultGemsFolder = Py_To_String(o3deData["default_gems_folder"]);
-                engineInfo.m_defaultProjectsFolder = Py_To_String(o3deData["default_projects_folder"]);
-                engineInfo.m_defaultRestrictedFolder = Py_To_String(o3deData["default_restricted_folder"]);
-                engineInfo.m_defaultTemplatesFolder = Py_To_String(o3deData["default_templates_folder"]);
+                auto defaultGemsFolder = m_manifest.attr("get_o3de_gems_folder")();
+                engineInfo.m_defaultGemsFolder = Py_To_String_Optional(o3deData, "default_gems_folder", Py_To_String(defaultGemsFolder));
+
+                auto defaultProjectsFolder = m_manifest.attr("get_o3de_projects_folder")();
+                engineInfo.m_defaultProjectsFolder = Py_To_String_Optional(o3deData, "default_projects_folder", Py_To_String(defaultProjectsFolder));
+
+                auto defaultRestrictedFolder = m_manifest.attr("get_o3de_restricted_folder")();
+                engineInfo.m_defaultRestrictedFolder = Py_To_String_Optional(o3deData, "default_restricted_folder", Py_To_String(defaultRestrictedFolder));
+
+                auto defaultTemplatesFolder = m_manifest.attr("get_o3de_templates_folder")();
+                engineInfo.m_defaultTemplatesFolder = Py_To_String_Optional(o3deData, "default_templates_folder", Py_To_String(defaultTemplatesFolder));
 
                 auto defaultThirdPartyFolder = m_manifest.attr("get_o3de_third_party_folder")();
-                engineInfo.m_thirdPartyPath = Py_To_String_Optional(o3deData,"default_third_party_folder", Py_To_String(defaultThirdPartyFolder));
+                engineInfo.m_thirdPartyPath = Py_To_String_Optional(o3deData, "default_third_party_folder", Py_To_String(defaultThirdPartyFolder));
             }
 
             auto engineData = m_manifest.attr("get_engine_json_data")(pybind11::none(), enginePath);
diff --git a/Code/Tools/ProjectManager/Source/TemplateButtonWidget.cpp b/Code/Tools/ProjectManager/Source/TemplateButtonWidget.cpp
index d20b91ac8e..638b821e5d 100644
--- a/Code/Tools/ProjectManager/Source/TemplateButtonWidget.cpp
+++ b/Code/Tools/ProjectManager/Source/TemplateButtonWidget.cpp
@@ -6,6 +6,7 @@
  */
 
 #include <TemplateButtonWidget.h>
+#include <ProjectManagerDefs.h>
 
 #include <QVBoxLayout>
 #include <QLabel>
@@ -16,7 +17,6 @@
 
 namespace O3DE::ProjectManager
 {
-
     TemplateButton::TemplateButton(const QString& imagePath, const QString& labelText, QWidget* parent)
         : QPushButton(parent)
     {
@@ -31,8 +31,8 @@ namespace O3DE::ProjectManager
 
         QLabel* image = new QLabel(this);
         image->setObjectName("templateImage");
-        image->setPixmap(
-            QPixmap(imagePath).scaled(QSize(s_templateImageWidth,s_templateImageHeight) , Qt::KeepAspectRatio, Qt::SmoothTransformation));
+        image->setPixmap(QPixmap(imagePath).scaled(
+            QSize(ProjectTemplateImageWidth, ProjectTemplateImageWidth), Qt::KeepAspectRatio, Qt::SmoothTransformation));
         vLayout->addWidget(image);
 
         QLabel* label = new QLabel(labelText, this);
diff --git a/Code/Tools/ProjectManager/Source/TemplateButtonWidget.h b/Code/Tools/ProjectManager/Source/TemplateButtonWidget.h
index 2b2b3474c2..0607b8fbfe 100644
--- a/Code/Tools/ProjectManager/Source/TemplateButtonWidget.h
+++ b/Code/Tools/ProjectManager/Source/TemplateButtonWidget.h
@@ -24,9 +24,5 @@ namespace O3DE::ProjectManager
 
     protected slots:
         void onToggled();
-
-    private:
-        inline constexpr static int s_templateImageWidth = 92;
-        inline constexpr static int s_templateImageHeight = 122;
     };
 } // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/project_manager_files.cmake b/Code/Tools/ProjectManager/project_manager_files.cmake
index a5632f082c..07c649624e 100644
--- a/Code/Tools/ProjectManager/project_manager_files.cmake
+++ b/Code/Tools/ProjectManager/project_manager_files.cmake
@@ -71,6 +71,8 @@ set(FILES
     Source/GemCatalog/GemCatalogHeaderWidget.cpp
     Source/GemCatalog/GemCatalogScreen.h
     Source/GemCatalog/GemCatalogScreen.cpp
+    Source/GemCatalog/GemFilterTagWidget.h
+    Source/GemCatalog/GemFilterTagWidget.cpp
     Source/GemCatalog/GemFilterWidget.h
     Source/GemCatalog/GemFilterWidget.cpp
     Source/GemCatalog/GemInfo.h
diff --git a/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderVariantAssetBuilder.cpp b/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderVariantAssetBuilder.cpp
index 99aed41502..5f195d1787 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderVariantAssetBuilder.cpp
+++ b/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderVariantAssetBuilder.cpp
@@ -428,16 +428,16 @@ namespace AZ
         {
             const auto& jobParameters = request.m_jobDescription.m_jobParameters;
 
-            if (jobParameters.find(ShaderVariantLoadErrorParam) != jobParameters.end())
+            if (jobParameters.contains(ShaderVariantLoadErrorParam))
             {
                 AZ_Error(ShaderVariantAssetBuilderName, false, "Error during CreateJobs: %s", jobParameters.at(ShaderVariantLoadErrorParam).c_str());
                 response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Failed;
                 return;
             }
             
-            if (jobParameters.find(ShouldExitEarlyFromProcessJobParam) != jobParameters.end())
+            if (jobParameters.contains(ShouldExitEarlyFromProcessJobParam))
             {
-                AZ_TracePrintf(ShaderVariantAssetBuilderName, "Doing nothing on behalf of [%s] because it's been overridden by game project.", jobParameters.at(ShaderVariantLoadErrorParam).c_str());
+                AZ_TracePrintf(ShaderVariantAssetBuilderName, "Doing nothing on behalf of [%s] because it's been overridden by game project.", jobParameters.at(ShouldExitEarlyFromProcessJobParam).c_str());
                 response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Success;
                 return;
             }
diff --git a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ParallaxMapping.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ParallaxMapping.azsli
index 2c2f956f8f..c979cff128 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ParallaxMapping.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ParallaxMapping.azsli
@@ -427,7 +427,7 @@ PixelDepthOffset CalcPixelDepthOffset(  float depthFactor,
     float4 clipOffsetPosition = mul(viewProjectionMatrix, float4(worldOffsetPosition, 1.0));
 
     PixelDepthOffset pdo;
-    pdo.m_depthCS = clipOffsetPosition.z;
+    pdo.m_depthCS = clipOffsetPosition.w;
     pdo.m_depthNDC = clipOffsetPosition.z / clipOffsetPosition.w;
     pdo.m_worldPosition = worldOffsetPosition;
     return pdo;
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/SkinnedMesh/LinearSkinningCS.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/SkinnedMesh/LinearSkinningCS.azsl
index fc5684fe7f..99d38463c7 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/SkinnedMesh/LinearSkinningCS.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/SkinnedMesh/LinearSkinningCS.azsl
@@ -14,6 +14,15 @@ option enum class SkinningMethod { LinearSkinning, DualQuaternion } o_skinningMe
 option bool o_applyMorphTargets = false;
 option bool o_applyColorMorphTargets = false;
 
+float3 ReadFloat3FromFloatBuffer(Buffer<float> buffer, uint index)
+{
+    float3 result;
+    result.x = buffer[index * 3];
+    result.y = buffer[index * 3 + 1];
+    result.z = buffer[index * 3 + 2];
+    return result;
+}
+
 // Apply a morph target delta with three components
 void ApplyMorphTargetDelta(uint streamOffset, uint vertexIndex, inout float3 modifiedValue)
 {
@@ -162,10 +171,10 @@ void MainCS(uint3 thread_id: SV_DispatchThreadID)
             return;
         }
 
-        float3 position = InstanceSrg::m_sourcePositions[i];
-        float3 normal = InstanceSrg::m_sourceNormals[i];        
-        float4 tangent = InstanceSrg::m_sourceTangents[i];        
-        float3 bitangent = InstanceSrg::m_sourceBiTangents[i];
+        float3 position = ReadFloat3FromFloatBuffer(InstanceSrg::m_sourcePositions, i);
+        float3 normal = ReadFloat3FromFloatBuffer(InstanceSrg::m_sourceNormals, i);    
+        float4 tangent = InstanceSrg::m_sourceTangents[i];      
+        float3 bitangent = ReadFloat3FromFloatBuffer(InstanceSrg::m_sourceBiTangents, i);
         
         // Four indices, 16-bits each, stored in 2 32-bit uints
         uint2 rawIndices = InstanceSrg::m_sourceBlendIndices.Load2(i * 8);
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/SkinnedMesh/LinearSkinningPassSRG.azsli b/Gems/Atom/Feature/Common/Assets/Shaders/SkinnedMesh/LinearSkinningPassSRG.azsli
index 95802ddbb7..066cefdc37 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/SkinnedMesh/LinearSkinningPassSRG.azsli
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/SkinnedMesh/LinearSkinningPassSRG.azsli
@@ -20,10 +20,12 @@ ShaderResourceGroup InstanceSrg : SRG_PerDraw
     uint m_totalNumberOfThreadsX;
 
     // Per-model input
-    Buffer<float3> m_sourcePositions; // POSITION 0
-    Buffer<float3> m_sourceNormals; // NORMAL 0
+    // Positions, normals, and bitangents are all 3-component per-vertex buffers,
+    // but Metal doesn't support float3 buffers so Buffer<float> is used instead
+    Buffer<float> m_sourcePositions; // POSITION 0
+    Buffer<float> m_sourceNormals; // NORMAL 0
     Buffer<float4> m_sourceTangents; // TANGENT 0
-    Buffer<float3> m_sourceBiTangents; // BITANGENT 0
+    Buffer<float> m_sourceBiTangents; // BITANGENT 0
     ByteAddressBuffer m_sourceBlendIndices; // BLENDINDICES 0
     Buffer<float> m_sourceBlendWeights; // BLENDWEIGHTS 0
 
diff --git a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/FrameCaptureBus.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/FrameCaptureBus.h
index e783a03071..53e7de9148 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/FrameCaptureBus.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/FrameCaptureBus.h
@@ -46,14 +46,16 @@ namespace AZ
             //! Save a buffer attachment or a image attachment binded to a pass's slot to a data file.
             //! @param passHierarchy For finding the pass by using PassHierarchyFilter
             //! @param slotName Name of the pass's slot. The attachment bound to this slot will be captured.
+            //! @param option Only valid for an InputOutput attachment. Use PassAttachmentReadbackOption::Input to capture the input state
+            //!               and use PassAttachmentReadbackOption::Output to capture the output state
             //! @param outputFilename The output file path. 
             virtual bool CapturePassAttachment(const AZStd::vector<AZStd::string>& passHierarchy, const AZStd::string& slotName
-                , const AZStd::string& outputFilePath) = 0;
+                , const AZStd::string& outputFilePath, RPI::PassAttachmentReadbackOption option) = 0;
 
             //! Similar to CapturePassAttachment. But instead of saving the read back result to a file, it will call the callback function provide
             //! in the input when callback is finished
             virtual bool CapturePassAttachmentWithCallback(const AZStd::vector<AZStd::string>& passHierarchy, const AZStd::string& slotName
-                , RPI::AttachmentReadback::CallbackFunction callback) = 0;
+                , RPI::AttachmentReadback::CallbackFunction callback, RPI::PassAttachmentReadbackOption option) = 0;
 
         };
         using FrameCaptureRequestBus = EBus<FrameCaptureRequests>;
diff --git a/Gems/Atom/Feature/Common/Code/Source/FrameCaptureSystemComponent.cpp b/Gems/Atom/Feature/Common/Code/Source/FrameCaptureSystemComponent.cpp
index a115bfa6e8..e8e4609ec4 100644
--- a/Gems/Atom/Feature/Common/Code/Source/FrameCaptureSystemComponent.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/FrameCaptureSystemComponent.cpp
@@ -343,7 +343,7 @@ namespace AZ
         }
 
         bool FrameCaptureSystemComponent::CapturePassAttachment(const AZStd::vector<AZStd::string>& passHierarchy, const AZStd::string& slot,
-            const AZStd::string& outputFilePath)
+            const AZStd::string& outputFilePath, RPI::PassAttachmentReadbackOption option)
         {
             InitReadback();
 
@@ -376,40 +376,22 @@ namespace AZ
                 return false;
             }
 
-            AZ::RPI::RenderPass* renderPass = azrtti_cast<AZ::RPI::RenderPass*>(foundPasses[0]);
-            if (renderPass)
+            AZ::RPI::Pass* pass = foundPasses[0];
+            if (pass->ReadbackAttachment(m_readback, Name(slot), option))
             {
-                Name slotName = Name(slot);
-                AZ::RPI::PassAttachment* attachment = nullptr;
-                for (auto& binding : renderPass->GetAttachmentBindings())
-                {
-                    if (binding.m_name == slotName)
-                    {
-                        attachment = binding.m_attachment.get();
-                        break;
-                    }
-                }
-                if (attachment)
-                {
-                    m_state = State::Pending;
-                    m_result = FrameCaptureResult::None;
-                    SystemTickBus::Handler::BusConnect();
-                    renderPass->ReadbackAttachment(m_readback, attachment);
-                }
-                else
-                {
-                    AZ_Warning("FrameCaptureSystemComponent", false, "Failed to find attachment bound to pass [%s] slot [%s]",
-                        renderPass->GetName().GetCStr(), slotName.GetCStr());
-                    return false;
-                }
+                m_state = State::Pending;
+                m_result = FrameCaptureResult::None;
+                SystemTickBus::Handler::BusConnect();
+                return true;
             }
-            return true;
+            AZ_Warning("FrameCaptureSystemComponent", false, "Failed to readback the attachment bound to pass [%s] slot [%s]", pass->GetName().GetCStr(), slot.c_str());
+            return false;
         }
 
         bool FrameCaptureSystemComponent::CapturePassAttachmentWithCallback(const AZStd::vector<AZStd::string>& passHierarchy, const AZStd::string& slotName
-            , RPI::AttachmentReadback::CallbackFunction callback)
+            , RPI::AttachmentReadback::CallbackFunction callback, RPI::PassAttachmentReadbackOption option)
         {
-            bool result = CapturePassAttachment(passHierarchy, slotName, "");
+            bool result = CapturePassAttachment(passHierarchy, slotName, "", option);
 
             // Append state change to user provided call back
             AZ::RPI::AttachmentReadback::CallbackFunction callbackSetState = [&, callback](const AZ::RPI::AttachmentReadback::ReadbackResult& result)
diff --git a/Gems/Atom/Feature/Common/Code/Source/FrameCaptureSystemComponent.h b/Gems/Atom/Feature/Common/Code/Source/FrameCaptureSystemComponent.h
index 472dd5da74..eb08494699 100644
--- a/Gems/Atom/Feature/Common/Code/Source/FrameCaptureSystemComponent.h
+++ b/Gems/Atom/Feature/Common/Code/Source/FrameCaptureSystemComponent.h
@@ -36,9 +36,10 @@ namespace AZ
             bool CaptureScreenshot(const AZStd::string& filePath) override;
             bool CaptureScreenshotForWindow(const AZStd::string& filePath, AzFramework::NativeWindowHandle windowHandle) override;
             bool CaptureScreenshotWithPreview(const AZStd::string& outputFilePath) override;
-            bool CapturePassAttachment(const AZStd::vector<AZStd::string>& passHierarchy, const AZStd::string& slotName, const AZStd::string& outputFilePath) override;
+            bool CapturePassAttachment(const AZStd::vector<AZStd::string>& passHierarchy, const AZStd::string& slotName, const AZStd::string& outputFilePath,
+                RPI::PassAttachmentReadbackOption option) override;
             bool CapturePassAttachmentWithCallback(const AZStd::vector<AZStd::string>& passHierarchy, const AZStd::string& slotName
-                , RPI::AttachmentReadback::CallbackFunction callback) override;
+                , RPI::AttachmentReadback::CallbackFunction callback, RPI::PassAttachmentReadbackOption option) override;
 
         private:
             void CaptureAttachmentCallback(const AZ::RPI::AttachmentReadback::ReadbackResult& readbackResult);
diff --git a/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreTexturePass.cpp b/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreTexturePass.cpp
index 5faaba136e..63437ebbad 100644
--- a/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreTexturePass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreTexturePass.cpp
@@ -64,23 +64,9 @@ namespace AZ
                 // Set up read back attachment before children prepare
                 if (m_readback->IsReady())
                 {
-                    AZ::RPI::RenderPass* renderPass = azrtti_cast<AZ::RPI::RenderPass*>(m_renderTargetPass.get());
-                    if (renderPass)
+                    if (m_renderTargetPass)
                     {
-                        RPI::PassAttachment* attachment = nullptr;
-                        for (auto& binding : renderPass->GetAttachmentBindings())
-                        {
-                            if (binding.m_slotType == RPI::PassSlotType::Output)
-                            {
-                                attachment = binding.m_attachment.get();
-                                break;
-                            }
-                        }
-                        if (attachment)
-                        {
-                            renderPass->ReadbackAttachment(m_readback, attachment);
-                            m_attachmentReadbackComplete = true;
-                        }
+                        m_attachmentReadbackComplete = m_renderTargetPass->ReadbackAttachment(m_readback, AZ::Name("RenderTargetOutput"));                           
                     }
                 }
             }
diff --git a/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbeFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbeFeatureProcessor.cpp
index 39c0d0592e..ac7b4b94b9 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbeFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbeFeatureProcessor.cpp
@@ -256,6 +256,10 @@ namespace AZ
         {
             AZ_Assert(probe.get(), "SetProbeCubeMap called with an invalid handle");
             probe->SetCubeMapImage(cubeMapImage, relativePath);
+
+            // notify the MeshFeatureProcessor that the reflection probe changed
+            MeshFeatureProcessor* meshFeatureProcessor = GetParentScene()->GetFeatureProcessor<MeshFeatureProcessor>();
+            meshFeatureProcessor->UpdateMeshReflectionProbes();
         }
 
         void ReflectionProbeFeatureProcessor::SetProbeTransform(const ReflectionProbeHandle& probe, const AZ::Transform& transform)
diff --git a/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshInputBuffers.cpp b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshInputBuffers.cpp
index 75d079c937..8ef82dfac4 100644
--- a/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshInputBuffers.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshInputBuffers.cpp
@@ -118,7 +118,29 @@ namespace AZ
             }
 
             m_inputBufferAssets[static_cast<uint8_t>(inputStream)] = bufferAsset;
-            m_inputBuffers[static_cast<uint8_t>(inputStream)] = RPI::Buffer::FindOrCreate(bufferAsset);
+            Data::Instance<RPI::Buffer> buffer = RPI::Buffer::FindOrCreate(bufferAsset);
+            m_inputBuffers[static_cast<uint8_t>(inputStream)] = buffer;
+
+            // Create a buffer view to use as input to the skinning shader
+            AZ::RHI::Ptr<AZ::RHI::BufferView> bufferView = RHI::Factory::Get().CreateBufferView();                
+            bufferView->SetName(Name{ AZStd::string(buffer->GetBufferView()->GetName().GetStringView()) + "_SkinningInputBufferView" });
+            RHI::BufferViewDescriptor bufferViewDescriptor = bufferAsset->GetBufferViewDescriptor();
+
+            // 3-component float buffers are not supported on metal for non-input assembly buffer views, so use a float view instead
+            if (bufferViewDescriptor.m_elementFormat == RHI::Format::R32G32B32_FLOAT)
+            {
+                // Use one float per element, with 3x as many elements
+                bufferViewDescriptor = RHI::BufferViewDescriptor::CreateTyped(
+                    bufferViewDescriptor.m_elementOffset * 3, bufferViewDescriptor.m_elementCount * 3, RHI::Format::R32_FLOAT);
+            }
+
+            [[maybe_unused]] RHI::ResultCode resultCode =
+                bufferView->Init(*buffer->GetRHIBuffer(), bufferViewDescriptor);
+            AZ_Error(
+                "SkinnedMeshInputBuffers", resultCode == RHI::ResultCode::Success,
+                "Failed to initialize buffer view for skinned mesh input.");
+                
+            m_bufferViews[static_cast<uint8_t>(inputStream)] = bufferView;
         }
 
         void SkinnedMeshInputLod::SetStaticBufferAsset(const Data::Asset<RPI::BufferAsset> bufferAsset, SkinnedMeshStaticVertexStreams staticStream)
@@ -315,7 +337,7 @@ namespace AZ
                 [[maybe_unused]] bool success = false;
                 if (m_lods[lodIndex].m_inputBuffers[inputStream])
                 {
-                    success = perInstanceSRG->SetBufferView(srgIndex, m_lods[lodIndex].m_inputBuffers[inputStream]->GetBufferView());
+                    success = perInstanceSRG->SetBufferView(srgIndex, m_lods[lodIndex].m_bufferViews[inputStream].get());
                 }
 
                 AZ_Error("SkinnedMeshInputBuffers", success, "Failed to bind buffer view for %s", streamInfo.m_bufferName.GetCStr());
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Pass.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Pass.h
index c6667e660a..736252a8a2 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Pass.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Pass.h
@@ -57,6 +57,7 @@ namespace AZ
         class PassTemplate;
         struct PassRequest;
         struct PassValidationResults;
+        class AttachmentReadback;
 
         using SortedPipelineViewTags = AZStd::set<PipelineViewTag, AZNameSortAscending>;
         using PassesByDrawList = AZStd::map<RHI::DrawListTag, const Pass*>;
@@ -65,7 +66,12 @@ namespace AZ
         const uint32_t PassInputBindingCountMax = 16;
         const uint32_t PassInputOutputBindingCountMax = PassInputBindingCountMax;
         const uint32_t PassOutputBindingCountMax = PassInputBindingCountMax;
-
+                
+        enum class PassAttachmentReadbackOption : uint8_t
+        {
+            Input = 0,
+            Output
+        };
 
         //! Atom's base pass class (every pass class in Atom must derive from this class).
         //! 
@@ -222,6 +228,14 @@ namespace AZ
             //! Enables/Disables PipelineStatistics queries for this pass
             virtual void SetPipelineStatisticsQueryEnabled(bool enable);
 
+            //! Readback an attachment attached to the specified slot name
+            //! @param readback The AttachmentReadback object which is used for readback. Its callback function will be called when readback is finished.
+            //! @param slotName The attachment bind to the slot with this slotName is to be readback
+            //! @param option The option is used for choosing input or output state when readback an InputOutput attachment.
+            //!               It's ignored if the attachment isn't an InputOutput attachment.
+            //! Return true if the readback request was successful. User may expect the AttachmentReadback's callback function would be called. 
+            bool ReadbackAttachment(AZStd::shared_ptr<AttachmentReadback> readback, const Name& slotName, PassAttachmentReadbackOption option = PassAttachmentReadbackOption::Output);
+
             //! Returns whether the Timestamp queries is enabled/disabled for this pass
             bool IsTimestampQueryEnabled() const;
 
@@ -266,7 +280,6 @@ namespace AZ
             // Update output bindings on this pass that are connected to bindings on other passes
             void UpdateConnectedOutputBindings();
 
-
         protected:
             explicit Pass(const PassDescriptor& descriptor);
 
@@ -349,6 +362,7 @@ namespace AZ
             void FrameEnd();
             virtual void FrameEndInternal() { }
 
+            void UpdateReadbackAttachment(FramePrepareParams params, bool beforeAddScopes);
 
             // --- Protected Members ---
 
@@ -442,7 +456,10 @@ namespace AZ
             // Sort type to be used by the default sort implementation. Passes can also provide
             // fully custom sort implementations by overriding the SortDrawList() function.
             RHI::DrawListSortType m_drawListSortType = RHI::DrawListSortType::KeyThenDepth;
-
+            
+            // For read back attachment
+            AZStd::shared_ptr<AttachmentReadback> m_attachmentReadback;
+            PassAttachmentReadbackOption m_readbackOption;
 
         private:
             // Return the Timestamp result of this pass
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/RenderPass.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/RenderPass.h
index b13091082b..3d4ab0a573 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/RenderPass.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/RenderPass.h
@@ -55,10 +55,7 @@ namespace AZ
 
             //! Get MultisampleState of this pass from its output attachments
             RHI::MultisampleState GetMultisampleState() const;
-
-            //! Capture pass's output and input/output attachments in following frames
-            void ReadbackAttachment(AZStd::shared_ptr<AttachmentReadback> readback, const PassAttachment* attachment);
-
+            
             //! Returns a pointer to the Pass ShaderResourceGroup
             Data::Instance<ShaderResourceGroup> GetShaderResourceGroup();
 
@@ -145,9 +142,6 @@ namespace AZ
             // Readback the results from the ScopeQueries
             void ReadbackScopeQueryResults();
 
-            // For read back attachments
-            AZStd::shared_ptr<AttachmentReadback> m_attachmentReadback;
-
             AZStd::weak_ptr<ImageAttachmentCopy> m_attachmentCopy;
 
             // Readback results from the Timestamp queries
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/ImageAttachmentPreviewPass.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/ImageAttachmentPreviewPass.h
index f855154975..fac9abfe28 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/ImageAttachmentPreviewPass.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/ImageAttachmentPreviewPass.h
@@ -166,9 +166,6 @@ namespace AZ
             AZ::Vector2 m_position = AZ::Vector2(0, 0.6f);
             AZ::Vector2 m_size = AZ::Vector2(0.4f, 0.4f);
             bool m_keepAspectRatio = true;
-
-            // For readback the output image attachment 
-            AZStd::shared_ptr<AttachmentReadback> m_readback;
         };
     }   // namespace RPI
 }   // namespace AZ
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/RenderToTexturePass.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/RenderToTexturePass.h
index 0a689f2f74..f96fe92610 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/RenderToTexturePass.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/RenderToTexturePass.h
@@ -60,9 +60,6 @@ namespace AZ
             // Name of the template used to create the child pass. Needed for Recreate()
             Name m_childTemplateName;
 
-            // For read back output
-            AZStd::shared_ptr<AttachmentReadback> m_readback;
-
             Ptr<PassAttachment> m_outputAttachment;
 
             // saved settings for this pass
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/SelectorPass.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/SelectorPass.h
index 6b9559e824..9d1376c840 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/SelectorPass.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/SelectorPass.h
@@ -15,7 +15,6 @@
 #include <Atom/RHI.Reflect/Format.h>
 #include <Atom/RHI.Reflect/SwapChainDescriptor.h>
 
-#include <Atom/RPI.Public/Pass/AttachmentReadback.h>
 #include <Atom/RPI.Public/Pass/ParentPass.h>
 
 #include <AzFramework/Windowing/WindowBus.h>
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/SwapChainPass.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/SwapChainPass.h
index e7869d463c..e8aeddf7e7 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/SwapChainPass.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/SwapChainPass.h
@@ -15,7 +15,6 @@
 #include <Atom/RHI.Reflect/Format.h>
 #include <Atom/RHI.Reflect/SwapChainDescriptor.h>
 
-#include <Atom/RPI.Public/Pass/AttachmentReadback.h>
 #include <Atom/RPI.Public/Pass/ParentPass.h>
 
 #include <AzFramework/Windowing/WindowBus.h>
@@ -88,9 +87,6 @@ namespace AZ
 
             // Name of the template used to create the child pass. Needed for Recreate()
             Name m_childTemplateName;
-
-            // For read back swap chain
-            AZStd::shared_ptr<AttachmentReadback> m_swapChainReadback;
         };
 
     }   // namespace RPI
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Pass.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Pass.cpp
index 9d3a776b80..dfe470c3f8 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Pass.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Pass.cpp
@@ -19,6 +19,7 @@
 #include <Atom/RPI.Public/Buffer/Buffer.h>
 #include <Atom/RPI.Public/Image/AttachmentImage.h>
 #include <Atom/RPI.Reflect/Image/Image.h>
+#include <Atom/RPI.Public/Pass/AttachmentReadback.h>
 #include <Atom/RPI.Public/Pass/ParentPass.h>
 #include <Atom/RPI.Public/Pass/Pass.h>
 #include <Atom/RPI.Public/Pass/PassLibrary.h>
@@ -36,8 +37,7 @@
 namespace AZ
 {
     namespace RPI
-    {
-
+    {             
         // --- Constructors ---
 
         Pass::Pass(const PassDescriptor& descriptor)
@@ -1285,9 +1285,15 @@ namespace AZ
             CreateTransientAttachments(params.m_frameGraphBuilder->GetAttachmentDatabase());
             ImportAttachments(params.m_frameGraphBuilder->GetAttachmentDatabase());
 
+            // readback attachment with input state
+            UpdateReadbackAttachment(params, true);
+
             // FrameBeginInternal needs to be the last function be called in FrameBegin because its implementation expects 
             // all the attachments are imported to database (for example, ImageAttachmentPreview)
             FrameBeginInternal(params);
+            
+            // readback attachment with output state
+            UpdateReadbackAttachment(params, false);
 
             UpdateConnectedOutputBindings();
         }
@@ -1426,6 +1432,57 @@ namespace AZ
             m_flags.m_pipelineStatisticsQueryEnabled = enable;
         }
 
+        bool Pass::ReadbackAttachment(AZStd::shared_ptr<AttachmentReadback> readback, const Name& slotName, PassAttachmentReadbackOption option)
+        {
+            // Return false if it's already readback
+            if (m_attachmentReadback)
+            {
+                AZ_Warning("Pass", false, "ReadbackAttachment: skip readback pass [%s] slot [%s]because there is an another active readback", m_name.GetCStr(), slotName.GetCStr());
+                return false;
+            }
+            uint32_t bindingIndex = 0;
+            for (auto& binding : m_attachmentBindings)
+            {
+                if (slotName == binding.m_name)
+                {
+                    RHI::AttachmentType type = binding.m_attachment->GetAttachmentType();
+                    if (type == RHI::AttachmentType::Buffer || type == RHI::AttachmentType::Image)
+                    {
+                        RHI::AttachmentId attachmentId = binding.m_attachment->GetAttachmentId();
+
+                        // Append slot index and pass name so the read back's name won't be same as the attachment used in other passes.
+                        AZStd::string readbackName = AZStd::string::format("%s_%d_%s", attachmentId.GetCStr(),
+                            bindingIndex, GetName().GetCStr());
+                        if (readback->ReadPassAttachment(binding.m_attachment.get(), AZ::Name(readbackName)))
+                        {
+                            m_readbackOption = PassAttachmentReadbackOption::Output;
+                            // The m_readbackOption is only meaningful if the attachment is used for InputOutput.
+                            if (binding.m_slotType == PassSlotType::InputOutput)
+                            {
+                                m_readbackOption = option;
+                            }
+                            m_attachmentReadback = readback;
+                            return true;
+                        }
+                        return false;
+                    }
+                }
+                bindingIndex++;
+            }
+            AZ_Warning("Pass", false, "ReadbackAttachment: failed to find slot [%s] from pass [%s]", slotName.GetCStr(), m_name.GetCStr());
+            return false;
+        }
+
+        void Pass::UpdateReadbackAttachment(FramePrepareParams params, bool beforeAddScopes)
+        {
+            if (beforeAddScopes == (m_readbackOption == PassAttachmentReadbackOption::Input) && m_attachmentReadback)
+            {
+                // Read the attachment for one frame. The reference can be released afterwards
+                m_attachmentReadback->FrameBegin(params);
+                m_attachmentReadback = nullptr;
+            }
+        }
+
         bool Pass::IsTimestampQueryEnabled() const
         {
             return m_flags.m_timestampQueryEnabled;
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/RenderPass.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/RenderPass.cpp
index f386c93f63..a3e7e2a9e2 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/RenderPass.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/RenderPass.cpp
@@ -188,14 +188,8 @@ namespace AZ
             {
                 SetScopeId(RHI::ScopeId(GetPathName()));
             }
-            params.m_frameGraphBuilder->ImportScopeProducer(*this);
 
-            // Read the attachment for one frame. The reference can be released afterwards
-            if (m_attachmentReadback)
-            {
-                m_attachmentReadback->FrameBegin(params);
-                m_attachmentReadback = nullptr;
-            }
+            params.m_frameGraphBuilder->ImportScopeProducer(*this);
 
             // Read back the ScopeQueries submitted from previous frames
             ReadbackScopeQueryResults();
@@ -414,31 +408,6 @@ namespace AZ
             m_flags.m_hasPipelineViewTag = !viewTag.IsEmpty();
         }
 
-        void RenderPass::ReadbackAttachment(AZStd::shared_ptr<AttachmentReadback> readback, const PassAttachment* attachment)
-        {
-            m_attachmentReadback = readback;
-
-            uint32_t bindingIndex = 0;
-            for (auto& binding : m_attachmentBindings)
-            {
-                if (attachment == binding.m_attachment)
-                {
-                    RHI::AttachmentType type = binding.m_attachment->GetAttachmentType();
-                    if (type == RHI::AttachmentType::Buffer || type == RHI::AttachmentType::Image)
-                    {
-                        RHI::AttachmentId attachmentId = binding.m_attachment->GetAttachmentId();
-
-                        // Append slot index and pass name so the read back's name won't be same as the attachment used in other passes.
-                        AZStd::string readbackName = AZStd::string::format("%s_%d_%s", attachmentId.GetCStr(),
-                            bindingIndex, GetName().GetCStr());
-                        m_attachmentReadback->ReadPassAttachment(binding.m_attachment.get(), AZ::Name(readbackName));
-                        return;
-                    }
-                }
-                bindingIndex++;
-            }
-        }
-
         TimestampResult RenderPass::GetTimestampResultInternal() const
         {
             return m_timestampResult;
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/ImageAttachmentPreviewPass.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/ImageAttachmentPreviewPass.cpp
index abca45493a..66c994e113 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/ImageAttachmentPreviewPass.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/ImageAttachmentPreviewPass.cpp
@@ -334,22 +334,16 @@ namespace AZ
                 m_passSrg->Compile();
                 m_passSrgChanged = false;
             }
-
-            // Read preview output
-            if (m_readback)
-            {
-                m_readback->FrameBegin(params);
-                m_readback = nullptr;
-            }
         }
 
         bool ImageAttachmentPreviewPass::ReadbackOutput(AZStd::shared_ptr<AttachmentReadback> readback)
         {
             if (m_outputColorAttachment)
             {
-                m_readback = readback;
+                m_readbackOption = PassAttachmentReadbackOption::Output;
+                m_attachmentReadback = readback;
                 AZStd::string readbackName = AZStd::string::format("%s_%s", m_outputColorAttachment->GetAttachmentId().GetCStr(), GetName().GetCStr());
-                return m_readback->ReadPassAttachment(m_outputColorAttachment.get(), AZ::Name(readbackName));
+                return m_attachmentReadback->ReadPassAttachment(m_outputColorAttachment.get(), AZ::Name(readbackName));
             }
             return false;
         }
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/RenderToTexturePass.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/RenderToTexturePass.cpp
index 8b4c9b8aab..c532a1324f 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/RenderToTexturePass.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/RenderToTexturePass.cpp
@@ -8,6 +8,7 @@
 #include <Atom/RHI/FrameScheduler.h>
 #include <Atom/RHI.Reflect/Format.h>
 
+#include <Atom/RPI.Public/Pass/AttachmentReadback.h>
 #include <Atom/RPI.Public/Pass/PassSystemInterface.h>
 #include <Atom/RPI.Public/Pass/PassUtils.h>
 #include <Atom/RPI.Public/Pass/Specific/RenderToTexturePass.h>
@@ -77,17 +78,6 @@ namespace AZ
             params.m_viewportState = m_viewport;
 
             Base::FrameBeginInternal(params);
-
-            // for read back output
-            if (m_readback)
-            {
-                m_readback->FrameBegin(params);
-                if (m_readback->IsFinished())
-                {
-                    // Done reading. Remove the reference
-                    m_readback = nullptr;
-                }
-            }
         }
 
         void RenderToTexturePass::ResizeOutput(uint32_t width, uint32_t height)
@@ -118,9 +108,10 @@ namespace AZ
         {
             if (m_outputAttachment)
             {
-                m_readback = readback;
+                m_readbackOption = PassAttachmentReadbackOption::Output;
+                m_attachmentReadback = readback;
                 AZStd::string readbackName = AZStd::string::format("%s_%s", m_outputAttachment->GetAttachmentId().GetCStr(), GetName().GetCStr());
-                m_readback->ReadPassAttachment(m_outputAttachment.get(), AZ::Name(readbackName));
+                m_attachmentReadback->ReadPassAttachment(m_outputAttachment.get(), AZ::Name(readbackName));
             }
         }
 
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/SwapChainPass.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/SwapChainPass.cpp
index 7a3bf3a011..62649cd0b2 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/SwapChainPass.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/SwapChainPass.cpp
@@ -8,6 +8,7 @@
 #include <Atom/RHI/FrameScheduler.h>
 
 #include <Atom/RPI.Public/WindowContext.h>
+#include <Atom/RPI.Public/Pass/AttachmentReadback.h>
 #include <Atom/RPI.Public/Pass/PassSystemInterface.h>
 #include <Atom/RPI.Public/Pass/Specific/SwapChainPass.h>
 #include <Atom/RHI/RHISystemInterface.h>
@@ -134,13 +135,6 @@ namespace AZ
             attachmentDatabase.ImportSwapChain(m_windowContext->GetSwapChainAttachmentId(), m_windowContext->GetSwapChain());
 
             ParentPass::FrameBeginInternal(params);
-
-            // Read swap chain for one frame. The reference can be released afterwards
-            if (m_swapChainReadback)
-            {
-                m_swapChainReadback->FrameBegin(params);
-                m_swapChainReadback = nullptr;
-            }
         }
         
         void SwapChainPass::OnWindowResized([[maybe_unused]] uint32_t width, [[maybe_unused]] uint32_t height)
@@ -152,9 +146,11 @@ namespace AZ
         {
             if (m_swapChainAttachment)
             {
-                m_swapChainReadback = readback;
+                m_readbackOption = PassAttachmentReadbackOption::Output;
+                m_attachmentReadback = readback;
+
                 AZStd::string readbackName = AZStd::string::format("%s_%s", m_swapChainAttachment->GetAttachmentId().GetCStr(), GetName().GetCStr());
-                m_swapChainReadback->ReadPassAttachment(m_swapChainAttachment.get(), AZ::Name(readbackName));
+                m_attachmentReadback->ReadPassAttachment(m_swapChainAttachment.get(), AZ::Name(readbackName));
             }
         }
 
diff --git a/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiPassTree.h b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiPassTree.h
index e735852926..d907e7e7eb 100644
--- a/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiPassTree.h
+++ b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiPassTree.h
@@ -32,11 +32,14 @@ namespace AZ
 
             void ReadbackCallback(const AZ::RPI::AttachmentReadback::ReadbackResult& readbackResult);
 
+            void DrawPassAttachments(AZ::RPI::Pass* pass);
+
             bool m_previewAttachment = false;
             bool m_showAttachments = false;
 
             AZ::RPI::Pass* m_selectedPass = nullptr;
             AZ::RHI::AttachmentId m_attachmentId;
+            AZ::Name m_slotName;
             bool m_selectedChanged = false;
 
             AZStd::shared_ptr<AZ::RPI::AttachmentReadback> m_readback;
diff --git a/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiPassTree.inl b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiPassTree.inl
index cd53131933..d31674754e 100644
--- a/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiPassTree.inl
+++ b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiPassTree.inl
@@ -76,6 +76,7 @@ namespace AZ::Render
                 {
                     m_selectedChanged = true;
                     m_attachmentId = AZ::RHI::AttachmentId{};
+                    m_slotName = AZ::Name{};
                 }
             }
 
@@ -88,13 +89,12 @@ namespace AZ::Render
                     m_readback->SetCallback(AZStd::bind(&ImGuiPassTree::ReadbackCallback, this, AZStd::placeholders::_1));
                 }
 
-                if (m_selectedPass && !m_attachmentId.IsEmpty())
+                if (m_selectedPass && !m_slotName.IsEmpty())
                 {
-                    AZ::RPI::RenderPass* renderPass = azrtti_cast<AZ::RPI::RenderPass*>(m_selectedPass);
-                    if (renderPass)
+                    bool readbackResult = m_selectedPass->ReadbackAttachment(m_readback, m_slotName);
+                    if (!readbackResult)
                     {
-                        AZ::RPI::PassAttachment* attachment = FindPassAttachment(renderPass, m_attachmentId);
-                        renderPass->ReadbackAttachment(m_readback, attachment);
+                        AZ_Error("ImGuiPassTree", false, "Failed to readback attachment from pass [%s] slot [%s]", m_selectedPass->GetName().GetCStr(), m_slotName.GetCStr());
                     }
                 }
             }
@@ -144,6 +144,77 @@ namespace AZ::Render
         }
         ImGui::End();
     }
+        
+    inline void ImGuiPassTree::DrawPassAttachments(AZ::RPI::Pass* pass)
+    {
+        for (const auto& binding : pass->GetAttachmentBindings())
+        {
+            // Binding info: [slot type] [slot name]
+            AZStd::string label = AZStd::string::format("[%s] [%s]", AZ::RPI::ToString(binding.m_slotType),
+                binding.m_name.GetCStr());
+
+            // Append attachment info if the attachment exists
+            if (binding.m_attachment)
+            {
+                AZ::RHI::AttachmentType type = binding.m_attachment->GetAttachmentType();
+
+                // Append attachment info: [attachment type] attachment name
+                label += AZStd::string::format(" [%s] %s",
+                    AZ::RHI::ToString(type),
+                    binding.m_attachment->m_name.GetCStr());
+
+                if (type == AZ::RHI::AttachmentType::Image)
+                {
+                    // Append image info: [format] [size] [msaa]
+                    AZ::RHI::ImageDescriptor descriptor;
+                    if (binding.m_attachment->m_importedResource)
+                    {
+                        AZ::RPI::Image* image = static_cast<AZ::RPI::Image*>(binding.m_attachment->m_importedResource.get());
+                        descriptor = image->GetRHIImage()->GetDescriptor();
+                    }
+                    else
+                    {
+                        descriptor = binding.m_attachment->m_descriptor.m_image;
+                    }
+                    auto format = descriptor.m_format;
+                    auto size = descriptor.m_size;
+                    label += AZStd::string::format(" [%s] [%dx%d]", AZ::RHI::ToString(format), size.m_width, size.m_height);
+
+                    if (descriptor.m_multisampleState.m_samples > 1)
+                    {
+                        if (descriptor.m_multisampleState.m_customPositionsCount > 0)
+                        {
+                            label += AZStd::string::format(" [MSAA_Custom_%dx]", descriptor.m_multisampleState.m_samples);
+                        }
+                        else
+                        {
+                            label += AZStd::string::format(" [MSAA_%dx]", descriptor.m_multisampleState.m_samples);
+                        }
+                    }
+                }
+                else if (type == AZ::RHI::AttachmentType::Buffer)
+                {
+                    // Append buffer info: [size]
+                    auto size = binding.m_attachment->m_descriptor.m_buffer.m_byteCount;
+                    label += AZStd::string::format(" [%llu]", size);
+                }
+
+                if (Scriptable_ImGui::Selectable(label.c_str(), m_attachmentId == binding.m_attachment->GetAttachmentId()))
+                {
+                    m_selectedPass = pass;
+                    m_attachmentId = binding.m_attachment->GetAttachmentId();
+                    m_slotName = binding.m_name;
+                    m_selectedChanged = true;
+                }
+            }
+            else
+            {
+                // Only draw text (not selectable) if there is no attachment binded to the slot.
+                ImGui::Text(label.c_str());
+            }
+        }
+
+    }
 
     inline void ImGuiPassTree::DrawTreeView(AZ::RPI::Pass* pass)
     {
@@ -164,6 +235,7 @@ namespace AZ::Render
                 {
                     m_selectedPass = pass;
                     m_attachmentId = AZ::RHI::AttachmentId{};
+                    m_slotName = AZ::Name{};
                     m_selectedChanged = true;
                 }
             }
@@ -179,76 +251,13 @@ namespace AZ::Render
                 {
                     m_selectedPass = pass;
                     m_attachmentId = AZ::RHI::AttachmentId{};
+                    m_slotName = AZ::Name{};
                     m_selectedChanged = true;
                 }
 
                 if (nodeOpen)
                 {
-                    for (const auto& binding : pass->GetAttachmentBindings())
-                    {
-                        // Binding info: [slot type] [slot name]
-                        AZStd::string label = AZStd::string::format("[%s] [%s]", AZ::RPI::ToString(binding.m_slotType),
-                            binding.m_name.GetCStr());
-
-                        // Append attachment info if the attachment exists
-                        if (binding.m_attachment)
-                        {
-                            AZ::RHI::AttachmentType type = binding.m_attachment->GetAttachmentType();
-
-                            // Append attachment info: [attachment type] attachment name
-                            label += AZStd::string::format(" [%s] %s",
-                                AZ::RHI::ToString(type),
-                                binding.m_attachment->m_name.GetCStr());
-
-                            if (type == AZ::RHI::AttachmentType::Image)
-                            {
-                                // Append image info: [format] [size] [msaa]
-                                AZ::RHI::ImageDescriptor descriptor;
-                                if (binding.m_attachment->m_importedResource)
-                                {
-                                    AZ::RPI::Image* image = static_cast<AZ::RPI::Image*>(binding.m_attachment->m_importedResource.get());
-                                    descriptor = image->GetRHIImage()->GetDescriptor();
-                                }
-                                else
-                                {
-                                    descriptor = binding.m_attachment->m_descriptor.m_image;
-                                }
-                                auto format = descriptor.m_format;
-                                auto size = descriptor.m_size;
-                                label += AZStd::string::format(" [%s] [%dx%d]", AZ::RHI::ToString(format), size.m_width, size.m_height);
-
-                                if (descriptor.m_multisampleState.m_samples > 1)
-                                {
-                                    if (descriptor.m_multisampleState.m_customPositionsCount > 0)
-                                    {
-                                        label += AZStd::string::format(" [MSAA_Custom_%dx]", descriptor.m_multisampleState.m_samples);
-                                    }
-                                    else
-                                    {
-                                        label += AZStd::string::format(" [MSAA_%dx]", descriptor.m_multisampleState.m_samples);
-                                    }
-                                }
-                            }
-                            else if (type == AZ::RHI::AttachmentType::Buffer)
-                            {
-                                // Append buffer info: [size]
-                                auto size = binding.m_attachment->m_descriptor.m_buffer.m_byteCount;
-                                label += AZStd::string::format(" [%llu]", size);
-                            }
-
-                            if (Scriptable_ImGui::Selectable(label.c_str(), m_attachmentId == binding.m_attachment->GetAttachmentId()))
-                            {
-                                m_selectedPass = pass;
-                                m_attachmentId = binding.m_attachment->GetAttachmentId();
-                                m_selectedChanged = true;
-                            }
-                        }
-                        else
-                        {
-                            // Only draw text (not selectable) if there is no attachment binded to the slot.
-                            ImGui::Text(label.c_str());
-                        }
-                    }
+                    DrawPassAttachments(pass);
 
                     Scriptable_ImGui::TreePop();
                 }
@@ -266,11 +275,13 @@ namespace AZ::Render
             {
                 m_selectedPass = pass;
                 m_attachmentId = AZ::RHI::AttachmentId{};
+                m_slotName = AZ::Name{};
                 m_selectedChanged = true;
             }
 
             if (nodeOpen)
             {
+                DrawPassAttachments(pass);
                 for (const auto& child : asParent->GetChildren())
                 {
                     DrawTreeView(child.get());
@@ -354,6 +365,7 @@ namespace AZ::Render
 
         m_selectedPass = nullptr;
         m_attachmentId = AZ::RHI::AttachmentId{};
+         m_slotName = AZ::Name{};
         m_selectedChanged = false;
         m_readback = nullptr;
         m_previewPass = nullptr;
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DirectionalLightComponentConfig.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DirectionalLightComponentConfig.cpp
index 3923136bcc..5325ba911d 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DirectionalLightComponentConfig.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DirectionalLightComponentConfig.cpp
@@ -9,6 +9,7 @@
 #include <AtomLyIntegration/CommonFeatures/CoreLights/DirectionalLightComponentConfig.h>
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
+#include <AzCore/std/limits.h>
 
 namespace AZ
 {
@@ -55,21 +56,15 @@ namespace AZ
             case PhotometricUnit::Lux:
                 return 0.0f;
             case PhotometricUnit::Ev100Illuminance:
-                return -10.0f;
+                return AZStd::numeric_limits<float>::lowest();
             }
             return 0.0f;
         }
 
         float DirectionalLightComponentConfig::GetIntensityMax() const
         {
-            switch (m_intensityMode)
-            {
-            case PhotometricUnit::Lux:
-                return 1'000'000.0f;
-            case PhotometricUnit::Ev100Illuminance:
-                return 20.0f;
-            }
-            return 0.0f;
+            // While there is no hard-max, a max must be included when there is a hard min.
+            return AZStd::numeric_limits<float>::max();
         }
 
         float DirectionalLightComponentConfig::GetIntensitySoftMin() const
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorAreaLightComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorAreaLightComponent.cpp
index 81e87f3cb5..c27faa2241 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorAreaLightComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorAreaLightComponent.cpp
@@ -154,19 +154,19 @@ namespace AZ
                             ->Attribute(Edit::Attributes::Visibility, &AreaLightComponentConfig::SupportsShadows)
                             ->Attribute(Edit::Attributes::ReadOnly, &AreaLightComponentConfig::IsPcfBoundarySearchDisabled)
                         ->DataElement(Edit::UIHandlers::Slider, &AreaLightComponentConfig::m_predictionSampleCount, "Prediction sample count",
-                            "Sample Count for prediction of whether the pixel is on the boundary. Specific to PCF and ESM+PCF.")
+                            "Sample count for prediction of whether the pixel is on the boundary. Specific to PCF and ESM+PCF.")
                             ->Attribute(Edit::Attributes::Min, 4)
                             ->Attribute(Edit::Attributes::Max, 16)
                             ->Attribute(Edit::Attributes::Visibility, &AreaLightComponentConfig::SupportsShadows)
                             ->Attribute(Edit::Attributes::ReadOnly, &AreaLightComponentConfig::IsPcfBoundarySearchDisabled)
                         ->DataElement(Edit::UIHandlers::Slider, &AreaLightComponentConfig::m_filteringSampleCount, "Filtering sample count",
-                            "It is used only when the pixel is predicted to be on the boundary. Specific to PCF and ESM+PCF.")
+                            "This is only used when the pixel is predicted to be on the boundary. Specific to PCF and ESM+PCF.")
                             ->Attribute(Edit::Attributes::Min, 4)
                             ->Attribute(Edit::Attributes::Max, 64)
                             ->Attribute(Edit::Attributes::Visibility, &AreaLightComponentConfig::SupportsShadows)
                             ->Attribute(Edit::Attributes::ReadOnly, &AreaLightComponentConfig::IsShadowPcfDisabled)
                         ->DataElement(
-                            Edit::UIHandlers::ComboBox, &AreaLightComponentConfig::m_pcfMethod, "Pcf method",
+                            Edit::UIHandlers::ComboBox, &AreaLightComponentConfig::m_pcfMethod, "PCF method",
                             "Type of PCF to use.\n"
                             "  Bicubic: a smooth, fixed-size kernel \n"
                             "  Boundary search: do several taps to first determine if we are on a shadow boundary\n")
@@ -176,8 +176,8 @@ namespace AZ
                             ->Attribute(Edit::Attributes::Visibility, &AreaLightComponentConfig::SupportsShadows)
                             ->Attribute(Edit::Attributes::ReadOnly, &AreaLightComponentConfig::IsShadowPcfDisabled)
                         ->DataElement(
-                            Edit::UIHandlers::Slider, &AreaLightComponentConfig::m_esmExponent, "Esm Exponent",
-                            "Exponent used by Esm shadows. "
+                            Edit::UIHandlers::Slider, &AreaLightComponentConfig::m_esmExponent, "ESM exponent",
+                            "Exponent used by ESM shadows. "
                             "Larger values increase the sharpness of the border between lit and unlit areas.")
                             ->Attribute(Edit::Attributes::Min, 50.0f)
                             ->Attribute(Edit::Attributes::Max, 5000.0f)
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorDirectionalLightComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorDirectionalLightComponent.cpp
index 8163dcfe20..4d43c23e25 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorDirectionalLightComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorDirectionalLightComponent.cpp
@@ -57,74 +57,74 @@ namespace AZ
                     editContext->Class<DirectionalLightComponentConfig>("DirectionalLightComponentConfig", "")
                         ->ClassElement(Edit::ClassElements::EditorData, "")
                         ->DataElement(Edit::UIHandlers::Color, &DirectionalLightComponentConfig::m_color, "Color", "Color of the light")
-                        ->Attribute(Edit::Attributes::ChangeNotify, Edit::PropertyRefreshLevels::ValuesOnly)
-                        ->Attribute("ColorEditorConfiguration", AZ::RPI::ColorUtils::GetLinearRgbEditorConfig())
-                        ->DataElement(Edit::UIHandlers::ComboBox, &DirectionalLightComponentConfig::m_intensityMode, "Intensity Mode", "Allows specifying light values in lux or Ev100")
-                        ->EnumAttribute(PhotometricUnit::Lux, "Lux")
-                        ->EnumAttribute(PhotometricUnit::Ev100Illuminance, "Ev100")
-                        ->Attribute(Edit::Attributes::ChangeNotify, Edit::PropertyRefreshLevels::AttributesAndValues)
+                            ->Attribute(Edit::Attributes::ChangeNotify, Edit::PropertyRefreshLevels::ValuesOnly)
+                            ->Attribute("ColorEditorConfiguration", AZ::RPI::ColorUtils::GetLinearRgbEditorConfig())
+                        ->DataElement(Edit::UIHandlers::ComboBox, &DirectionalLightComponentConfig::m_intensityMode, "Intensity mode", "Allows specifying light values in lux or Ev100")
+                            ->EnumAttribute(PhotometricUnit::Lux, "Lux")
+                            ->EnumAttribute(PhotometricUnit::Ev100Illuminance, "Ev100")
+                            ->Attribute(Edit::Attributes::ChangeNotify, Edit::PropertyRefreshLevels::AttributesAndValues)
                         ->DataElement(Edit::UIHandlers::Slider, &DirectionalLightComponentConfig::m_intensity, "Intensity", "Intensity of the light in the set photometric unit.")
-                        ->Attribute(Edit::Attributes::Min, &DirectionalLightComponentConfig::GetIntensityMin)
-                        ->Attribute(Edit::Attributes::Max, &DirectionalLightComponentConfig::GetIntensityMax)
-                        ->Attribute(Edit::Attributes::SoftMin, &DirectionalLightComponentConfig::GetIntensitySoftMin)
-                        ->Attribute(Edit::Attributes::SoftMax, &DirectionalLightComponentConfig::GetIntensitySoftMax)
-                        ->Attribute(Edit::Attributes::Suffix, &DirectionalLightComponentConfig::GetIntensitySuffix)
-                        ->DataElement(Edit::UIHandlers::Slider, &DirectionalLightComponentConfig::m_angularDiameter, "Angular Diameter", "Angular Diameter of the directional light in degrees. The sun is about 0.5.")
-                        ->Attribute(Edit::Attributes::Min, 0.0f)
-                        ->Attribute(Edit::Attributes::Max, 5.0f)
-                        ->Attribute(Edit::Attributes::SoftMax, 1.0f)
-                        ->Attribute(Edit::Attributes::Suffix, " deg")
+                            ->Attribute(Edit::Attributes::Min, &DirectionalLightComponentConfig::GetIntensityMin)
+                            ->Attribute(Edit::Attributes::Max, &DirectionalLightComponentConfig::GetIntensityMax)
+                            ->Attribute(Edit::Attributes::SoftMin, &DirectionalLightComponentConfig::GetIntensitySoftMin)
+                            ->Attribute(Edit::Attributes::SoftMax, &DirectionalLightComponentConfig::GetIntensitySoftMax)
+                            ->Attribute(Edit::Attributes::Suffix, &DirectionalLightComponentConfig::GetIntensitySuffix)
+                        ->DataElement(Edit::UIHandlers::Slider, &DirectionalLightComponentConfig::m_angularDiameter, "Angular diameter", "Angular diameter of the directional light in degrees. The sun is about 0.5.")
+                            ->Attribute(Edit::Attributes::Min, 0.0f)
+                            ->Attribute(Edit::Attributes::Max, 5.0f)
+                            ->Attribute(Edit::Attributes::SoftMax, 1.0f)
+                            ->Attribute(Edit::Attributes::Suffix, " deg")
                         ->ClassElement(AZ::Edit::ClassElements::Group, "Shadow")
-                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
+                            ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->DataElement(Edit::UIHandlers::EntityId, &DirectionalLightComponentConfig::m_cameraEntityId, "Camera", "Entity of the camera for cascaded shadowmap view frustum.")
                             ->Attribute(Edit::Attributes::ChangeNotify, Edit::PropertyRefreshLevels::ValuesOnly)
-                        ->DataElement(Edit::UIHandlers::Default, &DirectionalLightComponentConfig::m_shadowFarClipDistance, "Shadow Far Clip", "Shadow sepcific far clip distance.")
+                        ->DataElement(Edit::UIHandlers::Default, &DirectionalLightComponentConfig::m_shadowFarClipDistance, "Shadow far clip", "Shadow specific far clip distance.")
                             ->Attribute(Edit::Attributes::ChangeNotify, Edit::PropertyRefreshLevels::ValuesOnly)
-                        ->DataElement(Edit::UIHandlers::ComboBox, &DirectionalLightComponentConfig::m_shadowmapSize, "Shadowmap Size", "Width/Height of shadowmap")
+                        ->DataElement(Edit::UIHandlers::ComboBox, &DirectionalLightComponentConfig::m_shadowmapSize, "Shadowmap size", "Width/Height of shadowmap")
                             ->EnumAttribute(ShadowmapSize::Size256, " 256")
                             ->EnumAttribute(ShadowmapSize::Size512, " 512")
                             ->EnumAttribute(ShadowmapSize::Size1024, "1024")
                             ->EnumAttribute(ShadowmapSize::Size2048, "2048")
                             ->Attribute(Edit::Attributes::ChangeNotify, Edit::PropertyRefreshLevels::ValuesOnly)
-                        ->DataElement(Edit::UIHandlers::Slider, &DirectionalLightComponentConfig::m_cascadeCount, "Cascade Count", "Number of cascades")
+                        ->DataElement(Edit::UIHandlers::Slider, &DirectionalLightComponentConfig::m_cascadeCount, "Cascade count", "Number of cascades")
                             ->Attribute(Edit::Attributes::Min, 1)
                             ->Attribute(Edit::Attributes::Max, Shadow::MaxNumberOfCascades)
                             ->Attribute(Edit::Attributes::ChangeNotify, Edit::PropertyRefreshLevels::ValuesOnly)
-                        ->DataElement(Edit::UIHandlers::Default, &DirectionalLightComponentConfig::m_isShadowmapFrustumSplitAutomatic, "Split Automatic",
+                        ->DataElement(Edit::UIHandlers::Default, &DirectionalLightComponentConfig::m_isShadowmapFrustumSplitAutomatic, "Automatic splitting",
                             "Switch splitting of shadowmap frustum to cascades automatically or not.")
-                        ->DataElement(Edit::UIHandlers::Slider, &DirectionalLightComponentConfig::m_shadowmapFrustumSplitSchemeRatio, "Split Ratio",
+                        ->DataElement(Edit::UIHandlers::Slider, &DirectionalLightComponentConfig::m_shadowmapFrustumSplitSchemeRatio, "Split ratio",
                             "Ratio to lerp between the two types of frustum splitting scheme.\n"
-                            "0 = Uniform scheme which will split the Frustum evenly across all cascades.\n"
+                            "0 = Uniform scheme which will split the frustum evenly across all cascades.\n"
                             "1 = Logarithmic scheme which is designed to split the frustum in a logarithmic fashion "
                             "in order to enable us to produce a more optimal perspective aliasing across the frustum.")
                             ->Attribute(Edit::Attributes::Min, 0.f)
                             ->Attribute(Edit::Attributes::Max, 1.f)
                             ->Attribute(Edit::Attributes::ChangeNotify, Edit::PropertyRefreshLevels::ValuesOnly)
-                        ->Attribute(Edit::Attributes::ReadOnly, &DirectionalLightComponentConfig::IsSplitManual)
-                        ->DataElement(Edit::UIHandlers::Vector4, &DirectionalLightComponentConfig::m_cascadeFarDepths, "Far Depth Cascade",
-                            "Far Depth of each cascade.  The value of the index greater than or equal to cascade count is ignored.")
+                            ->Attribute(Edit::Attributes::ReadOnly, &DirectionalLightComponentConfig::IsSplitManual)
+                        ->DataElement(Edit::UIHandlers::Vector4, &DirectionalLightComponentConfig::m_cascadeFarDepths, "Far depth cascade",
+                            "Far depth of each cascade.  The value of the index greater than or equal to cascade count is ignored.")
                             ->Attribute(Edit::Attributes::Min, 0.01f)
                             ->Attribute(Edit::Attributes::Max, &DirectionalLightComponentConfig::m_shadowFarClipDistance)
                             ->Attribute(Edit::Attributes::ChangeNotify, Edit::PropertyRefreshLevels::ValuesOnly)
                             ->Attribute(Edit::Attributes::ReadOnly, &DirectionalLightComponentConfig::IsSplitAutomatic)
-                        ->DataElement(Edit::UIHandlers::Default, &DirectionalLightComponentConfig::m_groundHeight, "Ground Height",
+                        ->DataElement(Edit::UIHandlers::Default, &DirectionalLightComponentConfig::m_groundHeight, "Ground height",
                             "Height of the ground. Used to correct position of cascades.")
                             ->Attribute(Edit::Attributes::Suffix, " m")
                             ->Attribute(Edit::Attributes::ChangeNotify, Edit::PropertyRefreshLevels::ValuesOnly)
-                        ->Attribute(Edit::Attributes::ReadOnly, &DirectionalLightComponentConfig::IsCascadeCorrectionDisabled)
+                            ->Attribute(Edit::Attributes::ReadOnly, &DirectionalLightComponentConfig::IsCascadeCorrectionDisabled)
                         ->DataElement(Edit::UIHandlers::CheckBox,
-                            &DirectionalLightComponentConfig::m_isCascadeCorrectionEnabled, "Enable Cascade Correction?",
+                            &DirectionalLightComponentConfig::m_isCascadeCorrectionEnabled, "Cascade correction",
                             "Enable position correction of cascades to optimize the appearance for certain camera positions.")
                             ->Attribute(Edit::Attributes::ChangeNotify, Edit::PropertyRefreshLevels::ValuesOnly)
                         ->DataElement(Edit::UIHandlers::CheckBox,
-                            &DirectionalLightComponentConfig::m_isDebugColoringEnabled, "Enable Debug Coloring?",
+                            &DirectionalLightComponentConfig::m_isDebugColoringEnabled, "Debug coloring",
                             "Enable coloring to see how cascades places 0:red, 1:green, 2:blue, 3:yellow.")
                             ->Attribute(Edit::Attributes::ChangeNotify, Edit::PropertyRefreshLevels::ValuesOnly)
-                        ->DataElement(Edit::UIHandlers::ComboBox, &DirectionalLightComponentConfig::m_shadowFilterMethod, "Shadow Filter Method",
+                        ->DataElement(Edit::UIHandlers::ComboBox, &DirectionalLightComponentConfig::m_shadowFilterMethod, "Shadow filter method",
                             "Filtering method of edge-softening of shadows.\n"
-                            "  None: no filtering\n"
-                            "  PCF: Percentage-Closer Filtering\n"
-                            "  ESM: Exponential Shadow Maps\n"
+                            "  None: No filtering\n"
+                            "  PCF: Percentage-closer filtering\n"
+                            "  ESM: Exponential shadow maps\n"
                             "  ESM+PCF: ESM with a PCF fallback\n"
                             "For BehaviorContext (or TrackView), None=0, PCF=1, ESM=2, ESM+PCF=3")
                             ->EnumAttribute(ShadowFilterMethod::None, "None")
@@ -132,7 +132,7 @@ namespace AZ
                             ->EnumAttribute(ShadowFilterMethod::Esm, "ESM")
                             ->EnumAttribute(ShadowFilterMethod::EsmPcf, "ESM+PCF")
                             ->Attribute(Edit::Attributes::ChangeNotify, Edit::PropertyRefreshLevels::ValuesOnly)
-                        ->DataElement(Edit::UIHandlers::Slider, &DirectionalLightComponentConfig::m_boundaryWidth, "Softening Boundary Width",
+                        ->DataElement(Edit::UIHandlers::Slider, &DirectionalLightComponentConfig::m_boundaryWidth, "Softening boundary width",
                             "Width of the boundary between shadowed area and lit one. "
                             "Units are in meters. "
                             "If this is 0, softening edge is disabled.")
@@ -141,29 +141,29 @@ namespace AZ
                             ->Attribute(Edit::Attributes::Suffix, " m")
                             ->Attribute(Edit::Attributes::ChangeNotify, Edit::PropertyRefreshLevels::ValuesOnly)
                         ->Attribute(Edit::Attributes::ReadOnly, &DirectionalLightComponentConfig::IsPcfBoundarySearchDisabled)
-                        ->DataElement(Edit::UIHandlers::Slider, &DirectionalLightComponentConfig::m_predictionSampleCount, "Prediction Sample Count",
-                            "Sample Count for prediction of whether the pixel is on the boundary. "
+                        ->DataElement(Edit::UIHandlers::Slider, &DirectionalLightComponentConfig::m_predictionSampleCount, "Prediction sample count",
+                            "Sample count for prediction of whether the pixel is on the boundary. "
                             "Specific to PCF and ESM+PCF.")
                             ->Attribute(Edit::Attributes::Min, 4)
                             ->Attribute(Edit::Attributes::Max, 16)
                             ->Attribute(Edit::Attributes::ChangeNotify, Edit::PropertyRefreshLevels::ValuesOnly)
                         ->Attribute(Edit::Attributes::ReadOnly, &DirectionalLightComponentConfig::IsPcfBoundarySearchDisabled)
-                        ->DataElement(Edit::UIHandlers::Slider, &DirectionalLightComponentConfig::m_filteringSampleCount, "Filtering Sample Count",
-                            "It is used only when the pixel is predicted as on the boundary. "
+                        ->DataElement(Edit::UIHandlers::Slider, &DirectionalLightComponentConfig::m_filteringSampleCount, "Filtering sample count",
+                            "This is used only when the pixel is predicted as on the boundary. "
                             "Specific to PCF and ESM+PCF.")
                             ->Attribute(Edit::Attributes::Min, 4)
                             ->Attribute(Edit::Attributes::Max, 64)
                             ->Attribute(Edit::Attributes::ChangeNotify, Edit::PropertyRefreshLevels::ValuesOnly)
                             ->Attribute(Edit::Attributes::ReadOnly, &DirectionalLightComponentConfig::IsShadowPcfDisabled)
                         ->DataElement(
-                            Edit::UIHandlers::ComboBox, &DirectionalLightComponentConfig::m_pcfMethod, "Pcf Method",
-                            "Type of Pcf to use.\n"
+                            Edit::UIHandlers::ComboBox, &DirectionalLightComponentConfig::m_pcfMethod, "Pcf method",
+                            "Type of PCF to use.\n"
                             "  Bicubic: a smooth, fixed-size kernel \n"
                             "  Boundary search: do several taps to first determine if we are on a shadow boundary\n")
-                        ->EnumAttribute(PcfMethod::Bicubic, "Bicubic")
-                        ->EnumAttribute(PcfMethod::BoundarySearch, "Boundary Search")
-                        ->Attribute(Edit::Attributes::ChangeNotify, Edit::PropertyRefreshLevels::ValuesOnly)
-                        ->Attribute(Edit::Attributes::ReadOnly, &DirectionalLightComponentConfig::IsShadowPcfDisabled);
+                            ->EnumAttribute(PcfMethod::Bicubic, "Bicubic")
+                            ->EnumAttribute(PcfMethod::BoundarySearch, "Boundary search")
+                            ->Attribute(Edit::Attributes::ChangeNotify, Edit::PropertyRefreshLevels::ValuesOnly)
+                            ->Attribute(Edit::Attributes::ReadOnly, &DirectionalLightComponentConfig::IsShadowPcfDisabled);
                             ;
 
                 }
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/CaptureStep.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/CaptureStep.cpp
index 46d9b59edb..3881a8c8f8 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/CaptureStep.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/CaptureStep.cpp
@@ -114,7 +114,7 @@ namespace AZ
                     Render::FrameCaptureRequestBus::BroadcastResult(
                         startedCapture,
                         &Render::FrameCaptureRequestBus::Events::CapturePassAttachmentWithCallback,
-                        m_context->GetData()->m_passHierarchy, AZStd::string("Output"), readbackCallback);
+                        m_context->GetData()->m_passHierarchy, AZStd::string("Output"), readbackCallback, RPI::PassAttachmentReadbackOption::Output);
                     // Reset the capture flag if the capture request was successful. Otherwise try capture it again next tick.
                     if (startedCapture)
                     {
diff --git a/Gems/AtomLyIntegration/ImguiAtom/Code/Source/ImguiAtomSystemComponent.cpp b/Gems/AtomLyIntegration/ImguiAtom/Code/Source/ImguiAtomSystemComponent.cpp
index 843f30fced..c9fcbe33ca 100644
--- a/Gems/AtomLyIntegration/ImguiAtom/Code/Source/ImguiAtomSystemComponent.cpp
+++ b/Gems/AtomLyIntegration/ImguiAtom/Code/Source/ImguiAtomSystemComponent.cpp
@@ -115,7 +115,7 @@ namespace AZ
 #endif //define(IMGUI_ENABLED)
         }
 
-        void ImguiAtomSystemComponent::OnViewportDpiScalingChanged(float dpiScale)
+        void ImguiAtomSystemComponent::OnViewportDpiScalingChanged([[maybe_unused]] float dpiScale)
         {
 #if defined(IMGUI_ENABLED)
             ImGui::ImGuiManagerBus::Broadcast(&ImGui::ImGuiManagerBus::Events::SetDpiScalingFactor, dpiScale);
diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeLookAtNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeLookAtNode.cpp
index 57fa502abd..76b788facd 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeLookAtNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeLookAtNode.cpp
@@ -433,12 +433,12 @@ namespace EMotionFX
             ->Attribute(AZ::Edit::Attributes::ChangeNotify, AZ::Edit::PropertyRefreshLevels::EntireTree)
             ->DataElement(AZ::Edit::UIHandlers::Default, &BlendTreeLookAtNode::m_limitMin, "Yaw/pitch min", "The minimum rotational yaw and pitch angle limits, in degrees.")
             ->Attribute(AZ::Edit::Attributes::Visibility, &BlendTreeLookAtNode::GetLimitWidgetsVisibility)
-            ->Attribute(AZ::Edit::Attributes::Min, AZ::Vector2(-90.0f, -90.0f))
-            ->Attribute(AZ::Edit::Attributes::Max, AZ::Vector2(90.0f, 90.0f))
+            ->Attribute(AZ::Edit::Attributes::Min, -90.0f)
+            ->Attribute(AZ::Edit::Attributes::Max, 90.0f)
             ->DataElement(AZ::Edit::UIHandlers::Default, &BlendTreeLookAtNode::m_limitMax, "Yaw/pitch max", "The maximum rotational yaw and pitch angle limits, in degrees.")
             ->Attribute(AZ::Edit::Attributes::Visibility, &BlendTreeLookAtNode::GetLimitWidgetsVisibility)
-            ->Attribute(AZ::Edit::Attributes::Min, AZ::Vector2(-90.0f, -90.0f))
-            ->Attribute(AZ::Edit::Attributes::Max, AZ::Vector2(90.0f, 90.0f))
+            ->Attribute(AZ::Edit::Attributes::Min, -90.0f)
+            ->Attribute(AZ::Edit::Attributes::Max, 90.0f)
             ->DataElement(AZ::Edit::UIHandlers::Default, &BlendTreeLookAtNode::m_constraintRotation, "Constraint rotation", "A rotation that rotates the constraint space.")
             ->Attribute(AZ::Edit::Attributes::Visibility, &BlendTreeLookAtNode::GetLimitWidgetsVisibility)
             ->DataElement(AZ::Edit::UIHandlers::ComboBox, &BlendTreeLookAtNode::m_twistAxis, "Roll axis", "The axis used for twist/roll.")
diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeTransformNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeTransformNode.cpp
index b8abf2cc90..f67bf831f9 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeTransformNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeTransformNode.cpp
@@ -261,23 +261,15 @@ namespace EMotionFX
             ->Attribute(AZ::Edit::Attributes::ChangeNotify, &BlendTreeTransformNode::Reinit)
             ->Attribute(AZ::Edit::Attributes::ChangeNotify, AZ::Edit::PropertyRefreshLevels::EntireTree)
             ->DataElement(AZ::Edit::UIHandlers::Default, &BlendTreeTransformNode::m_minTranslation, "Min Translation", "The minimum translation value, used when the input translation amount equals zero.")
-            ->Attribute(AZ::Edit::Attributes::Min, AZ::Vector3(-std::numeric_limits<float>::max()))
-            ->Attribute(AZ::Edit::Attributes::Max, AZ::Vector3(std::numeric_limits<float>::max()))
             ->DataElement(AZ::Edit::UIHandlers::Default, &BlendTreeTransformNode::m_maxTranslation, "Max Translation", "The maximum translation value, used when the input translation amount equals one.")
-            ->Attribute(AZ::Edit::Attributes::Min, AZ::Vector3(-std::numeric_limits<float>::max()))
-            ->Attribute(AZ::Edit::Attributes::Max, AZ::Vector3(std::numeric_limits<float>::max()))
             ->DataElement(AZ::Edit::UIHandlers::Default, &BlendTreeTransformNode::m_minRotation, "Min Rotation", "The minimum rotation value, in degrees, used when the input rotation amount equals zero.")
-            ->Attribute(AZ::Edit::Attributes::Min, AZ::Vector3(-360.0f, -360.0f, -360.0f))
-            ->Attribute(AZ::Edit::Attributes::Max, AZ::Vector3(360.0f,  360.0f,  360.0f))
+            ->Attribute(AZ::Edit::Attributes::Min, -360.0f)
+            ->Attribute(AZ::Edit::Attributes::Max, 360.0f)
             ->DataElement(AZ::Edit::UIHandlers::Default, &BlendTreeTransformNode::m_maxRotation, "Max Rotation", "The maximum rotation value, in degrees, used when the input rotation amount equals one.")
-            ->Attribute(AZ::Edit::Attributes::Min, AZ::Vector3(-360.0f, -360.0f, -360.0f))
-            ->Attribute(AZ::Edit::Attributes::Max, AZ::Vector3(360.0f,  360.0f,  360.0f))
+            ->Attribute(AZ::Edit::Attributes::Min, -360.0f)
+            ->Attribute(AZ::Edit::Attributes::Max, 360.0f)
             ->DataElement(AZ::Edit::UIHandlers::Default, &BlendTreeTransformNode::m_minScale, "Min Scale", "The minimum scale value, used when the input scale amount equals zero.")
-            ->Attribute(AZ::Edit::Attributes::Min, AZ::Vector3(-std::numeric_limits<float>::max()))
-            ->Attribute(AZ::Edit::Attributes::Max, AZ::Vector3(std::numeric_limits<float>::max()))
             ->DataElement(AZ::Edit::UIHandlers::Default, &BlendTreeTransformNode::m_maxScale, "Max Scale", "The maximum scale value, used when the input scale amount equals one.")
-            ->Attribute(AZ::Edit::Attributes::Min, AZ::Vector3(-std::numeric_limits<float>::max()))
-            ->Attribute(AZ::Edit::Attributes::Max, AZ::Vector3(std::numeric_limits<float>::max()))
         ;
     }
 } // namespace EMotionFX
diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector3Math2Node.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector3Math2Node.cpp
index 2ee0d92dcc..356fa78b59 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector3Math2Node.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector3Math2Node.cpp
@@ -254,8 +254,6 @@ namespace EMotionFX
                 ->EnumAttribute(MATHFUNCTION_DIVIDE,       "Divide")
                 ->EnumAttribute(MATHFUNCTION_ANGLEDEGREES, "AngleDegrees")
             ->DataElement(AZ::Edit::UIHandlers::Default, &BlendTreeVector3Math2Node::m_defaultValue, "Default Value", "The default value for x or y when one of them has no incomming connection.")
-                ->Attribute(AZ::Edit::Attributes::Min, AZ::Vector3(-std::numeric_limits<float>::max()))
-                ->Attribute(AZ::Edit::Attributes::Max, AZ::Vector3(std::numeric_limits<float>::max()))
             ;
     }
 } // namespace EMotionFX
diff --git a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Editor/GraphModelBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Editor/GraphModelBus.h
index b59a4162d1..e7a05c5ee9 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Editor/GraphModelBus.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Editor/GraphModelBus.h
@@ -90,19 +90,6 @@ namespace GraphCanvas
             return result;
         }
 
-        //! This is sent to confirm whether or not a variable assignment can take place.
-        virtual bool IsValidVariableAssignment(const AZ::EntityId& variableId, const Endpoint& targetPoint) const = 0;
-
-        //! This will return the structure needed to display why a variable could not be assigned to a specific reference inside of GraphCanvas.
-        virtual ConnectionValidationTooltip GetVariableAssignmentValidityTooltip(const AZ::EntityId& variableId, const Endpoint& targetPoint) const
-        {
-            ConnectionValidationTooltip result;
-
-            result.m_isValid = IsValidVariableAssignment(variableId, targetPoint);
-
-            return result;
-        }
-
         //! Get the Display Type name for the given AZ type
         virtual AZStd::string GetDataTypeString(const AZ::Uuid& typeId) = 0;
 
diff --git a/Gems/GraphModel/Code/Include/GraphModel/Integration/GraphController.h b/Gems/GraphModel/Code/Include/GraphModel/Integration/GraphController.h
index 84e54ea6bf..817b709b70 100644
--- a/Gems/GraphModel/Code/Include/GraphModel/Integration/GraphController.h
+++ b/Gems/GraphModel/Code/Include/GraphModel/Integration/GraphController.h
@@ -147,8 +147,6 @@ namespace GraphModelIntegration
         bool CreateConnection(const AZ::EntityId& connectionUiId, const GraphCanvas::Endpoint& sourcePoint, const GraphCanvas::Endpoint& targetPoint) override;
 
         bool IsValidConnection(const GraphCanvas::Endpoint& sourcePoint, const GraphCanvas::Endpoint& targetPoint) const override;
-        bool IsValidVariableAssignment(const AZ::EntityId& variableId, const GraphCanvas::Endpoint& targetPoint) const override;
-
 
         ////////////////////////////////////////////////////////////////////////////////////
         // GraphCanvas::GraphModelRequestBus, undo
diff --git a/Gems/GraphModel/Code/Source/Integration/GraphController.cpp b/Gems/GraphModel/Code/Source/Integration/GraphController.cpp
index dff224b03d..e61cd7671e 100644
--- a/Gems/GraphModel/Code/Source/Integration/GraphController.cpp
+++ b/Gems/GraphModel/Code/Source/Integration/GraphController.cpp
@@ -1187,14 +1187,6 @@ namespace GraphModelIntegration
         return dataTypesMatch && !CheckForLoopback(sourceSlot->GetParentNode(), targetSlot->GetParentNode());
     }
 
-
-    bool GraphController::IsValidVariableAssignment([[maybe_unused]] const AZ::EntityId& variableId, [[maybe_unused]] const GraphCanvas::Endpoint& targetPoint) const
-    {
-        AZ_Assert(false, "This Graph Canvas does not support graph variables");
-        return false;
-    }
-    
-
     //! Helper function to create a GraphCanvas::NodePropertyDisplay and a data interface for editing input pin values
     //! \typename  DataInterfaceType  One of the data interface types. Ex: BooleanDataInterface
     //! \typename  CreateDisplayFunctionType  Function pointer type should be filled automatically
diff --git a/Gems/ImGui/Code/Include/ImGuiBus.h b/Gems/ImGui/Code/Include/ImGuiBus.h
index ea7fe1631e..06a3b472da 100644
--- a/Gems/ImGui/Code/Include/ImGuiBus.h
+++ b/Gems/ImGui/Code/Include/ImGuiBus.h
@@ -8,6 +8,7 @@
 #pragma once
 
 #include <AzCore/EBus/EBus.h>
+#include <AzCore/EBus/Event.h>
 
 // Forward Declares
 struct ImVec2;
@@ -86,9 +87,19 @@ namespace ImGui
         virtual void SetImGuiRenderResolution(const ImVec2& res) = 0;
         virtual void OverrideRenderWindowSize(uint32_t width, uint32_t height) = 0;
         virtual void RestoreRenderWindowSizeToDefault() = 0;
+        virtual void ToggleThroughImGuiVisibleState() = 0;
         virtual void SetDpiScalingFactor(float dpiScalingFactor) = 0;
         virtual float GetDpiScalingFactor() const = 0;
         virtual void Render() = 0;
+
+        using ImGuiSetEnabledEvent = AZ::Event<bool>;
+        ImGuiSetEnabledEvent m_setEnabledEvent;
+
+        // interface
+        void ConnectImGuiSetEnabledChangedHandler(ImGuiSetEnabledEvent::Handler& handler)
+        {
+            handler.Connect(m_setEnabledEvent);
+        }
     };
 
     class IImGuiManagerRequests
@@ -101,19 +112,30 @@ namespace ImGui
     };
     using ImGuiManagerBus = AZ::EBus<IImGuiManager, IImGuiManagerRequests>;
 
-    // Bus for getting notifications from the IMGUI Entity Outliner
-    class IImGuiEntityOutlinerNotifcations : public AZ::EBusTraits
+    class IImGuiManagerNotifications : public AZ::EBusTraits
     {
     public:
-        static const char* GetUniqueName() { return "IImGuiEntityOutlinerNotifcations"; }
         static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
         static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
-        using Bus = AZ::EBus<IImGuiEntityOutlinerNotifcations>;
+        using Bus = AZ::EBus<IImGuiManagerNotifications>;
+
+        virtual void ImGuiSetEnabled( [[maybe_unused]] bool enabled) {}
+    };
+    using ImGuiManagerNotificationBus = AZ::EBus<IImGuiManagerNotifications>;
+
+    // Bus for getting notifications from the IMGUI Entity Outliner
+    class IImGuiEntityOutlinerNotifications : public AZ::EBusTraits
+    {
+    public:
+        static const char* GetUniqueName() { return "IImGuiEntityOutlinerNotifications"; }
+        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
+        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
+        using Bus = AZ::EBus<IImGuiEntityOutlinerNotifications>;
 
         // Callback for game code to handle targetting an IMGUI entity
         virtual void OnImGuiEntityOutlinerTarget(AZ::EntityId target) { (void)target;  }
     };
-    typedef AZ::EBus<IImGuiEntityOutlinerNotifcations> ImGuiEntityOutlinerNotifcationBus;
+    typedef AZ::EBus<IImGuiEntityOutlinerNotifications> ImGuiEntityOutlinerNotificationBus;
 
     // a pair of an entity id, and a typeid, used to represent component rtti type info
     typedef AZStd::pair<AZ::EntityId, AZ::TypeId> ImGuiEntComponentId;
diff --git a/Gems/ImGui/Code/Source/ImGuiManager.cpp b/Gems/ImGui/Code/Source/ImGuiManager.cpp
index 42c8d3929c..7b2506fbcb 100644
--- a/Gems/ImGui/Code/Source/ImGuiManager.cpp
+++ b/Gems/ImGui/Code/Source/ImGuiManager.cpp
@@ -738,8 +738,15 @@ void ImGuiManager::ToggleThroughImGuiVisibleState(int controllerIndex)
     }
 
     m_menuBarStatusChanged = true;
+    m_setEnabledEvent.Signal(m_clientMenuBarState == DisplayState::Hidden);
 }
 
+void ImGuiManager::ToggleThroughImGuiVisibleState()
+{
+    ToggleThroughImGuiVisibleState(-1);
+}
+
+
 void ImGuiManager::RenderImGuiBuffers(const ImVec2& scaleRects)
 {
     ImGui::ImGuiContextScope contextScope(m_imguiContext);
diff --git a/Gems/ImGui/Code/Source/ImGuiManager.h b/Gems/ImGui/Code/Source/ImGuiManager.h
index 1509f27c57..02af3d0c09 100644
--- a/Gems/ImGui/Code/Source/ImGuiManager.h
+++ b/Gems/ImGui/Code/Source/ImGuiManager.h
@@ -60,6 +60,7 @@ namespace ImGui
         void SetDpiScalingFactor(float dpiScalingFactor) override;
         float GetDpiScalingFactor() const override;
         void Render() override;
+        void ToggleThroughImGuiVisibleState() override;
         // -- ImGuiManagerBus Interface -------------------------------------------------------------------
 
         // -- AzFramework::InputChannelEventListener and AzFramework::InputTextEventListener Interface ------------
diff --git a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYAssetExplorer.cpp b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYAssetExplorer.cpp
index 2f996f5768..d9d81c24f2 100644
--- a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYAssetExplorer.cpp
+++ b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYAssetExplorer.cpp
@@ -465,7 +465,7 @@ namespace ImGui
                                     ImGui::BeginGroup();
                                     if (ImGui::SmallButton(AZStd::string::format("-View #%03d-##%s", ++instanceCount, meshInstance.first.ToString().c_str()).c_str()))
                                     {
-                                        ImGuiEntityOutlinerNotifcationBus::Broadcast(&IImGuiEntityOutlinerNotifcations::OnImGuiEntityOutlinerTarget, meshInstance.first);
+                                        ImGuiEntityOutlinerNotificationBus::Broadcast(&IImGuiEntityOutlinerNotifications::OnImGuiEntityOutlinerTarget, meshInstance.first);
                                     }
                                     // Build the Label String.
                                     ImGui::SameLine();
diff --git a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCommonMenu.cpp b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCommonMenu.cpp
index 9994851faa..eb918041f7 100644
--- a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCommonMenu.cpp
+++ b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCommonMenu.cpp
@@ -571,7 +571,26 @@ namespace ImGui
                 // End LY Common Tools menu
                 ImGui::EndMenu();
             }
+            const int labelSize{ 100 };
+            const int buttonSize{ 40 };
             ImGuiUpdateListenerBus::Broadcast(&IImGuiUpdateListener::OnImGuiMainMenuUpdate);
+            ImGui::SameLine(ImGui::GetWindowContentRegionMax().x - labelSize);
+            float backgroundHeight = ImGui::GetTextLineHeight() + 3;
+            ImVec2 cursorPos = ImGui::GetCursorScreenPos();
+            ImGui::GetWindowDrawList()->AddRectFilled(
+                cursorPos, ImVec2(cursorPos.x + labelSize, cursorPos.y + backgroundHeight), IM_COL32(0, 115, 187, 255));
+            ImGui::SameLine(ImGui::GetWindowContentRegionMax().x - labelSize);
+            ImGui::SetCursorPosY(ImGui::GetCursorPosY() - 1);
+            ImGui::Text("ImGui:ON");
+            ImGui::SameLine(ImGui::GetWindowContentRegionMax().x - buttonSize);
+            ImGui::PushStyleColor(ImGuiCol_Text, IM_COL32(0, 0, 0, 255));
+            ImGui::PushStyleColor(ImGuiCol_Button, IM_COL32(255, 255, 255, 255));
+            ImGui::PushStyleColor(ImGuiCol_ButtonHovered, IM_COL32(128, 128, 128, 255));
+            if (ImGui::SmallButton("home"))
+            {
+                ImGuiManagerBus::Broadcast(&IImGuiManager::ToggleThroughImGuiVisibleState);
+            }
+            ImGui::PopStyleColor(3);
             ImGui::EndMainMenuBar();
         }
 
diff --git a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYEntityOutliner.cpp b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYEntityOutliner.cpp
index aca52af238..57502296ae 100644
--- a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYEntityOutliner.cpp
+++ b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYEntityOutliner.cpp
@@ -590,7 +590,7 @@ namespace ImGui
                 if (ImGui::SmallButton(targetLabel.c_str()))
                 {
                     // Send EBUS event out to Target an Entity. Up to game code to implement.
-                    ImGuiEntityOutlinerNotifcationBus::Broadcast(&IImGuiEntityOutlinerNotifcations::OnImGuiEntityOutlinerTarget, node->m_entityId);
+                    ImGuiEntityOutlinerNotificationBus::Broadcast(&IImGuiEntityOutlinerNotifications::OnImGuiEntityOutlinerTarget, node->m_entityId);
                 }
             }
 
diff --git a/Gems/LmbrCentral/Code/Platform/Mac/lrelease_mac.cmake b/Gems/LmbrCentral/Code/Platform/Mac/lrelease_mac.cmake
index af355b0a51..34f67ccedd 100644
--- a/Gems/LmbrCentral/Code/Platform/Mac/lrelease_mac.cmake
+++ b/Gems/LmbrCentral/Code/Platform/Mac/lrelease_mac.cmake
@@ -5,6 +5,15 @@
 #
 #
 
+add_custom_command(TARGET LmbrCentral.Editor POST_BUILD
+    COMMAND "${CMAKE_COMMAND}" -P "${LY_ROOT_FOLDER}/cmake/Platform/Mac/RPathChange.cmake"
+            "$<TARGET_FILE_DIR:LmbrCentral.Editor>/lrelease"
+            @executable_path/../Frameworks
+            @executable_path
+    COMMENT "Patching lrelease..."
+    VERBATIM
+)
+
 set(lrelease_files
     ${QT_LRELEASE_EXECUTABLE}
 )
diff --git a/Gems/NvCloth/Code/Platform/Android/PAL_android.cmake b/Gems/NvCloth/Code/Platform/Android/PAL_android.cmake
index 77e8a42871..ffaa3f828f 100644
--- a/Gems/NvCloth/Code/Platform/Android/PAL_android.cmake
+++ b/Gems/NvCloth/Code/Platform/Android/PAL_android.cmake
@@ -5,6 +5,6 @@
 #
 #
 
-ly_associate_package(PACKAGE_NAME NvCloth-1.1.6-rev2-multiplatform TARGETS NvCloth PACKAGE_HASH 535d927782fa5d3086c5f813c46392ee3c294fc117dcd87b055d469c3f034356)
+ly_associate_package(PACKAGE_NAME NvCloth-v1.1.6-4-gd243404-pr58-rev1-android TARGETS NvCloth PACKAGE_HASH 01eb0bc7fae91bb088a7d4c0f9555743a2c442f7b823a89072eacad361a20b42)
 
 set(PAL_TRAIT_NVCLOTH_USE_STUB FALSE)
diff --git a/Gems/NvCloth/Code/Platform/Linux/PAL_linux.cmake b/Gems/NvCloth/Code/Platform/Linux/PAL_linux.cmake
index 77e8a42871..eaf3d92b1c 100644
--- a/Gems/NvCloth/Code/Platform/Linux/PAL_linux.cmake
+++ b/Gems/NvCloth/Code/Platform/Linux/PAL_linux.cmake
@@ -5,6 +5,6 @@
 #
 #
 
-ly_associate_package(PACKAGE_NAME NvCloth-1.1.6-rev2-multiplatform TARGETS NvCloth PACKAGE_HASH 535d927782fa5d3086c5f813c46392ee3c294fc117dcd87b055d469c3f034356)
+ly_associate_package(PACKAGE_NAME NvCloth-v1.1.6-4-gd243404-pr58-rev1-linux TARGETS NvCloth PACKAGE_HASH c2e469c909fb358105ffe854476e87d9c69626aa16bd0ca0bcd941522adadc6d)
 
 set(PAL_TRAIT_NVCLOTH_USE_STUB FALSE)
diff --git a/Gems/NvCloth/Code/Platform/Mac/PAL_mac.cmake b/Gems/NvCloth/Code/Platform/Mac/PAL_mac.cmake
index 77e8a42871..1e856fa1c2 100644
--- a/Gems/NvCloth/Code/Platform/Mac/PAL_mac.cmake
+++ b/Gems/NvCloth/Code/Platform/Mac/PAL_mac.cmake
@@ -5,6 +5,6 @@
 #
 #
 
-ly_associate_package(PACKAGE_NAME NvCloth-1.1.6-rev2-multiplatform TARGETS NvCloth PACKAGE_HASH 535d927782fa5d3086c5f813c46392ee3c294fc117dcd87b055d469c3f034356)
+ly_associate_package(PACKAGE_NAME NvCloth-v1.1.6-4-gd243404-pr58-rev1-mac TARGETS NvCloth PACKAGE_HASH 9156548da6fc35f89b592306cc512257042159e3c9c2ce5f483d8d0701b63716)
 
 set(PAL_TRAIT_NVCLOTH_USE_STUB FALSE)
diff --git a/Gems/NvCloth/Code/Platform/Windows/PAL_windows.cmake b/Gems/NvCloth/Code/Platform/Windows/PAL_windows.cmake
index afedeb2df8..1e8ba72eb8 100644
--- a/Gems/NvCloth/Code/Platform/Windows/PAL_windows.cmake
+++ b/Gems/NvCloth/Code/Platform/Windows/PAL_windows.cmake
@@ -7,4 +7,4 @@
 
 set(PAL_TRAIT_NVCLOTH_USE_STUB FALSE)
 
-ly_associate_package(PACKAGE_NAME NvCloth-1.1.6-rev2-multiplatform TARGETS NvCloth PACKAGE_HASH 535d927782fa5d3086c5f813c46392ee3c294fc117dcd87b055d469c3f034356)
+ly_associate_package(PACKAGE_NAME NvCloth-v1.1.6-4-gd243404-pr58-rev1-windows TARGETS NvCloth PACKAGE_HASH 8f7b3d151db93fcd511afcbcb3a34884eec47fb511c90c8f2c770ac602150010)
diff --git a/Gems/NvCloth/Code/Platform/iOS/PAL_ios.cmake b/Gems/NvCloth/Code/Platform/iOS/PAL_ios.cmake
index 77e8a42871..fa099bfd3e 100644
--- a/Gems/NvCloth/Code/Platform/iOS/PAL_ios.cmake
+++ b/Gems/NvCloth/Code/Platform/iOS/PAL_ios.cmake
@@ -5,6 +5,6 @@
 #
 #
 
-ly_associate_package(PACKAGE_NAME NvCloth-1.1.6-rev2-multiplatform TARGETS NvCloth PACKAGE_HASH 535d927782fa5d3086c5f813c46392ee3c294fc117dcd87b055d469c3f034356)
+ly_associate_package(PACKAGE_NAME NvCloth-v1.1.6-4-gd243404-pr58-rev1-ios TARGETS NvCloth PACKAGE_HASH 62e17ed51da9a3452b7397a4e1f64aca79e8f4c70181a75aeb6ca596c6692971)
 
 set(PAL_TRAIT_NVCLOTH_USE_STUB FALSE)
diff --git a/Gems/PhysX/Code/CMakeLists.txt b/Gems/PhysX/Code/CMakeLists.txt
index 21f9172055..9b867a7652 100644
--- a/Gems/PhysX/Code/CMakeLists.txt
+++ b/Gems/PhysX/Code/CMakeLists.txt
@@ -74,9 +74,6 @@ ly_create_alias(NAME PhysX.Servers NAMESPACE Gem TARGETS Gem::PhysX)
 
 if(PAL_TRAIT_BUILD_HOST_TOOLS)
 
-     ly_associate_package(PACKAGE_NAME poly2tri-0.3.3-rev2-multiplatform TARGETS poly2tri PACKAGE_HASH 04092d06716f59b936b61906eaf3647db23b685d81d8b66131eb53e0aeaa1a38) 
-     ly_associate_package(PACKAGE_NAME v-hacd-2.0-rev1-multiplatform     TARGETS v-hacd   PACKAGE_HASH 5c71aef19cc9787d018d64eec076e9f51ea5a3e0dc6b6e22e57c898f6cc4afe3)
-
     ly_add_target(
         NAME PhysX.Editor.Static STATIC
         NAMESPACE Gem
diff --git a/Gems/PhysX/Code/Source/Platform/Linux/PAL_linux.cmake b/Gems/PhysX/Code/Source/Platform/Linux/PAL_linux.cmake
index 9033ea99c2..492d0957c7 100644
--- a/Gems/PhysX/Code/Source/Platform/Linux/PAL_linux.cmake
+++ b/Gems/PhysX/Code/Source/Platform/Linux/PAL_linux.cmake
@@ -6,3 +6,8 @@
 #
 
 set(PAL_TRAIT_PHYSX_SUPPORTED TRUE)
+
+if(PAL_TRAIT_BUILD_HOST_TOOLS)
+     ly_associate_package(PACKAGE_NAME poly2tri-7f0487a-rev1-linux TARGETS poly2tri PACKAGE_HASH b16eef8f0bc469de0e3056d28d7484cf42659667e39b68b239f0d3a4cbb533d0) 
+     ly_associate_package(PACKAGE_NAME v-hacd-2.3-1a49edf-rev1-linux TARGETS v-hacd PACKAGE_HASH 777bed3c7805a63446ddfea51c505b35398744f9245fa7ddc58e6a25d034e682)
+endif()
diff --git a/Gems/PhysX/Code/Source/Platform/Mac/PAL_mac.cmake b/Gems/PhysX/Code/Source/Platform/Mac/PAL_mac.cmake
index 9033ea99c2..88c3808ed9 100644
--- a/Gems/PhysX/Code/Source/Platform/Mac/PAL_mac.cmake
+++ b/Gems/PhysX/Code/Source/Platform/Mac/PAL_mac.cmake
@@ -6,3 +6,8 @@
 #
 
 set(PAL_TRAIT_PHYSX_SUPPORTED TRUE)
+
+if(PAL_TRAIT_BUILD_HOST_TOOLS)
+     ly_associate_package(PACKAGE_NAME poly2tri-7f0487a-rev1-mac TARGETS poly2tri PACKAGE_HASH 23e49e6b06d79327985d17b40bff20ab202519c283a842378f5f1791c1bf8dbc) 
+     ly_associate_package(PACKAGE_NAME v-hacd-2.3-1a49edf-rev1-mac TARGETS v-hacd PACKAGE_HASH c1de9fadb2c0db42416a1bd5fe3423401c6f41b58409bc652064b5ad23667c09)
+endif()
diff --git a/Gems/PhysX/Code/Source/Platform/Windows/PAL_windows.cmake b/Gems/PhysX/Code/Source/Platform/Windows/PAL_windows.cmake
index 9033ea99c2..cc671f7014 100644
--- a/Gems/PhysX/Code/Source/Platform/Windows/PAL_windows.cmake
+++ b/Gems/PhysX/Code/Source/Platform/Windows/PAL_windows.cmake
@@ -6,3 +6,8 @@
 #
 
 set(PAL_TRAIT_PHYSX_SUPPORTED TRUE)
+
+if(PAL_TRAIT_BUILD_HOST_TOOLS)
+     ly_associate_package(PACKAGE_NAME poly2tri-7f0487a-rev1-windows TARGETS poly2tri PACKAGE_HASH 5fea2bf294e5130e0654fbfa39f192e6369f3853901dde90bb9b3f3a11edcb1e) 
+     ly_associate_package(PACKAGE_NAME v-hacd-2.3-1a49edf-rev1-windows TARGETS v-hacd PACKAGE_HASH c5826ec28aedc3b5931ddf655d055395872cd3e75cd829f5745a2e607deb7468)
+endif()
diff --git a/Gems/ScriptCanvas/Code/Asset/EditorAssetConversionBus.h b/Gems/ScriptCanvas/Code/Asset/EditorAssetConversionBus.h
index 8e53db20b0..26badc528d 100644
--- a/Gems/ScriptCanvas/Code/Asset/EditorAssetConversionBus.h
+++ b/Gems/ScriptCanvas/Code/Asset/EditorAssetConversionBus.h
@@ -19,7 +19,6 @@ namespace AZ
 
 namespace ScriptCanvas
 {
-    class ScriptCanvasFunctionAsset;
     class RuntimeAsset;
     class SubgraphInterfaceAsset;
 }
@@ -27,7 +26,6 @@ namespace ScriptCanvas
 namespace ScriptCanvasEditor
 {
     class ScriptCanvasAsset;
-    class ScriptCanvasFunctionAsset;
 
     class EditorAssetConversionBusTraits
         : public AZ::EBusTraits
@@ -36,10 +34,8 @@ namespace ScriptCanvasEditor
         static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
       
         virtual AZ::Data::Asset<ScriptCanvasEditor::ScriptCanvasAsset> LoadAsset(AZStd::string_view graphPath) = 0;
-        virtual AZ::Data::Asset<ScriptCanvasEditor::ScriptCanvasFunctionAsset> LoadFunctionAsset(AZStd::string_view graphPath) = 0;
         virtual AZ::Outcome<ScriptCanvas::Translation::LuaAssetResult, AZStd::string> CreateLuaAsset(const AZ::Data::Asset<ScriptCanvasEditor::ScriptCanvasAsset>& editAsset, AZStd::string_view graphPathForRawLuaFile) = 0;
         virtual AZ::Outcome<AZ::Data::Asset<ScriptCanvas::RuntimeAsset>, AZStd::string> CreateRuntimeAsset(const AZ::Data::Asset<ScriptCanvasEditor::ScriptCanvasAsset>& editAsset) = 0;
-        virtual AZ::Outcome<AZ::Data::Asset<ScriptCanvas::SubgraphInterfaceAsset>, AZStd::string> CreateFunctionRuntimeAsset(const AZ::Data::Asset<ScriptCanvasEditor::ScriptCanvasFunctionAsset>& editAsset) = 0;
     };
 
     using EditorAssetConversionBus = AZ::EBus<EditorAssetConversionBusTraits>;
diff --git a/Gems/ScriptCanvas/Code/Asset/EditorAssetSystemComponent.cpp b/Gems/ScriptCanvas/Code/Asset/EditorAssetSystemComponent.cpp
index 4b6b7227a4..2bc3a91a96 100644
--- a/Gems/ScriptCanvas/Code/Asset/EditorAssetSystemComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Asset/EditorAssetSystemComponent.cpp
@@ -28,9 +28,7 @@ AZ_PUSH_DISABLE_WARNING(4251 4800 4244, "-Wunknown-warning-option")
 #include <ScriptCanvas/Components/EditorGraphVariableManagerComponent.h>
 AZ_POP_DISABLE_WARNING
 
-#include <ScriptCanvas/Asset/Functions/ScriptCanvasFunctionAsset.h>
-#include <ScriptCanvas/Assets/Functions/ScriptCanvasFunctionAssetHandler.h>
-#include <ScriptCanvas/Asset/Functions/RuntimeFunctionAssetHandler.h>
+#include <ScriptCanvas/Asset/SubgraphInterfaceAssetHandler.h>
 
 namespace ScriptCanvasEditor
 {
@@ -60,16 +58,6 @@ namespace ScriptCanvasEditor
         required.push_back(AZ_CRC("ScriptCanvasService", 0x41fd58f3));
     }
 
-    ScriptCanvas::Grammar::Context* EditorAssetSystemComponent::GetGrammarContext()
-    {
-        return &m_grammarContext;
-    }
-
-    ScriptCanvas::Translation::Context* EditorAssetSystemComponent::GetTranslationContext()
-    {
-        return &m_translationContext;
-    }
-
     void EditorAssetSystemComponent::Init()
     {
     }
@@ -77,21 +65,14 @@ namespace ScriptCanvasEditor
     void EditorAssetSystemComponent::Activate()
     {
         m_editorAssetRegistry.Register<ScriptCanvasAsset, ScriptCanvasAssetHandler, ScriptCanvasAssetDescription>();
-        m_editorAssetRegistry.Register<ScriptCanvasEditor::ScriptCanvasFunctionAsset, ScriptCanvasFunctionAssetHandler, ScriptCanvasEditor::ScriptCanvasFunctionDescription>();
         m_editorAssetRegistry.Register<ScriptCanvas::SubgraphInterfaceAsset, ScriptCanvas::SubgraphInterfaceAssetHandler, ScriptCanvas::SubgraphInterfaceAssetDescription>();
 
         AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler::BusConnect();
         EditorAssetConversionBus::Handler::BusConnect();
-
-        ScriptCanvas::Translation::RequestBus::Handler::BusConnect();
-        ScriptCanvas::Grammar::RequestBus::Handler::BusConnect();
     }
 
     void EditorAssetSystemComponent::Deactivate()
     {
-        ScriptCanvas::Translation::RequestBus::Handler::BusDisconnect();
-        ScriptCanvas::Grammar::RequestBus::Handler::BusDisconnect();
-
         EditorAssetConversionBus::Handler::BusDisconnect();
         AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler::BusDisconnect();
         m_editorAssetRegistry.Unregister();
@@ -131,30 +112,11 @@ namespace ScriptCanvasEditor
         }
     }
 
-    AZ::Data::Asset<ScriptCanvasEditor::ScriptCanvasFunctionAsset> EditorAssetSystemComponent::LoadFunctionAsset(AZStd::string_view graphPath)
-    {
-        auto outcome = ScriptCanvasBuilder::LoadEditorFunctionAsset(graphPath);
-
-        if (outcome.IsSuccess())
-        {
-            return outcome.GetValue();
-        }
-        else
-        {
-            return {};
-        }
-    }
-
     AZ::Outcome<AZ::Data::Asset<ScriptCanvas::RuntimeAsset>, AZStd::string> EditorAssetSystemComponent::CreateRuntimeAsset(const AZ::Data::Asset<ScriptCanvasEditor::ScriptCanvasAsset>& editAsset)
     {
         return ScriptCanvasBuilder::CreateRuntimeAsset(editAsset);
     }
 
-    AZ::Outcome<AZ::Data::Asset<ScriptCanvas::SubgraphInterfaceAsset>, AZStd::string> EditorAssetSystemComponent::CreateFunctionRuntimeAsset(const AZ::Data::Asset<ScriptCanvasEditor::ScriptCanvasFunctionAsset>& editAsset)
-    {
-        return ScriptCanvasBuilder::CreateRuntimeFunctionAsset(editAsset);
-    }
-
     AZ::Outcome<ScriptCanvas::Translation::LuaAssetResult, AZStd::string> EditorAssetSystemComponent::CreateLuaAsset(const AZ::Data::Asset<ScriptCanvasEditor::ScriptCanvasAsset>& editAsset, AZStd::string_view graphPathForRawLuaFile)
     {
         return ScriptCanvasBuilder::CreateLuaAsset(editAsset->GetScriptCanvasEntity(), editAsset->GetId(), graphPathForRawLuaFile);
diff --git a/Gems/ScriptCanvas/Code/Asset/EditorAssetSystemComponent.h b/Gems/ScriptCanvas/Code/Asset/EditorAssetSystemComponent.h
index 0a8bf830af..84b10ff17c 100644
--- a/Gems/ScriptCanvas/Code/Asset/EditorAssetSystemComponent.h
+++ b/Gems/ScriptCanvas/Code/Asset/EditorAssetSystemComponent.h
@@ -12,23 +12,15 @@
 #include "EditorAssetConversionBus.h"
 #include <AzToolsFramework/AssetBrowser/AssetBrowserBus.h>
 #include <ScriptCanvas/Asset/AssetRegistry.h>
-
-#include <ScriptCanvas/Grammar/GrammarContext.h>
-#include <ScriptCanvas/Grammar/GrammarContextBus.h>
-#include <ScriptCanvas/Translation/TranslationContext.h>
-#include <ScriptCanvas/Translation/TranslationContextBus.h>
 #include <ScriptCanvas/Translation/Translation.h>
 
 namespace ScriptCanvasEditor
 {
     class ScriptCanvasAsset;
-    class ScriptCanvasFunctionAsset;
 
     class EditorAssetSystemComponent
         : public AZ::Component
         , public EditorAssetConversionBus::Handler
-        , public ScriptCanvas::Grammar::RequestBus::Handler
-        , public ScriptCanvas::Translation::RequestBus::Handler
         , private AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler
     {
     public:
@@ -57,26 +49,14 @@ namespace ScriptCanvasEditor
         //////////////////////////////////////////////////////////////////////////
         // EditorAssetConversionBus::Handler...
         AZ::Data::Asset<ScriptCanvasEditor::ScriptCanvasAsset> LoadAsset(AZStd::string_view graphPath) override;
-        AZ::Data::Asset<ScriptCanvasEditor::ScriptCanvasFunctionAsset> LoadFunctionAsset(AZStd::string_view graphPath) override;
         AZ::Outcome<AZ::Data::Asset<ScriptCanvas::RuntimeAsset>, AZStd::string> CreateRuntimeAsset(const AZ::Data::Asset<ScriptCanvasEditor::ScriptCanvasAsset>& editAsset) override;
-        AZ::Outcome<AZ::Data::Asset<ScriptCanvas::SubgraphInterfaceAsset>, AZStd::string> CreateFunctionRuntimeAsset(const AZ::Data::Asset<ScriptCanvasEditor::ScriptCanvasFunctionAsset>& editAsset) override;
         AZ::Outcome<ScriptCanvas::Translation::LuaAssetResult, AZStd::string> CreateLuaAsset(const AZ::Data::Asset<ScriptCanvasEditor::ScriptCanvasAsset>& editAsset, AZStd::string_view graphPathForRawLuaFile) override;
         //////////////////////////////////////////////////////////////////////////
         
-        // ScriptCanvas::Grammar::RequestBus::Handler...
-        ScriptCanvas::Grammar::Context* GetGrammarContext() override;
-        
-        // ScriptCanvas::Translation::RequestBus::Handler...
-        ScriptCanvas::Translation::Context* GetTranslationContext() override;
-
-
         ScriptCanvas::AssetRegistry& GetAssetRegistry();
 
     private:
-        ScriptCanvas::AssetRegistry m_editorAssetRegistry;
-        ScriptCanvas::Translation::Context m_translationContext;
-        ScriptCanvas::Grammar::Context m_grammarContext;
-    
+        ScriptCanvas::AssetRegistry m_editorAssetRegistry;    
         EditorAssetSystemComponent(const EditorAssetSystemComponent&) = delete;
     };
 }
diff --git a/Gems/ScriptCanvas/Code/Asset/RuntimeAssetSystemComponent.cpp b/Gems/ScriptCanvas/Code/Asset/RuntimeAssetSystemComponent.cpp
index e993b21b26..d8fe9e91ca 100644
--- a/Gems/ScriptCanvas/Code/Asset/RuntimeAssetSystemComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Asset/RuntimeAssetSystemComponent.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
+ *
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
@@ -11,7 +11,7 @@
 #include <ScriptCanvas/Asset/RuntimeAsset.h>
 #include <ScriptCanvas/Asset/RuntimeAssetHandler.h>
 #include <Asset/RuntimeAssetSystemComponent.h>
-#include <Asset/Functions/RuntimeFunctionAssetHandler.h>
+#include <Asset/SubgraphInterfaceAssetHandler.h>
 
 namespace ScriptCanvas
 {
diff --git a/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderComponent.cpp b/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderComponent.cpp
index c3e5b03041..b37d5c1da4 100644
--- a/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderComponent.cpp
@@ -5,19 +5,16 @@
  *
  */
 
-#include <precompiled.h>
-
 #include <AssetBuilderSDK/AssetBuilderBusses.h>
 #include <AzCore/std/containers/map.h>
 #include <AzToolsFramework/ToolsComponents/ToolsAssetCatalogBus.h>
 #include <Builder/ScriptCanvasBuilder.h>
 #include <Builder/ScriptCanvasBuilderComponent.h>
 #include <Builder/ScriptCanvasBuilderWorker.h>
-#include <ScriptCanvas/Asset/Functions/RuntimeFunctionAssetHandler.h>
-#include <ScriptCanvas/Asset/Functions/ScriptCanvasFunctionAsset.h>
 #include <ScriptCanvas/Asset/RuntimeAssetHandler.h>
-#include <ScriptCanvas/Assets/Functions/ScriptCanvasFunctionAssetHandler.h>
+#include <ScriptCanvas/Asset/SubgraphInterfaceAssetHandler.h>
 #include <ScriptCanvas/Assets/ScriptCanvasAsset.h>
+#include <ScriptCanvas/Assets/ScriptCanvasAssetHandler.h>
 #include <ScriptCanvas/Utils/BehaviorContextUtils.h>
 
 namespace ScriptCanvasBuilder
@@ -50,7 +47,6 @@ namespace ScriptCanvasBuilder
     SharedHandlers HandleAssetTypes()
     {
         SharedHandlers handlers;
-        handlers.m_editorFunctionAssetHandler = RegisterHandler<ScriptCanvasEditor::ScriptCanvasFunctionAsset, ScriptCanvasEditor::ScriptCanvasFunctionAssetHandler>("scriptcanvas_fn", false);
         handlers.m_editorAssetHandler = RegisterHandler<ScriptCanvasEditor::ScriptCanvasAsset, ScriptCanvasEditor::ScriptCanvasAssetHandler>("scriptcanvas", false);
         handlers.m_subgraphInterfaceHandler = RegisterHandler<ScriptCanvas::SubgraphInterfaceAsset, ScriptCanvas::SubgraphInterfaceAssetHandler>("scriptcanvas_fn_compiled", true);
         handlers.m_runtimeAssetHandler = RegisterHandler<ScriptCanvas::RuntimeAsset, JobDependencyVerificationHandler>("scriptcanvas_compiled", true);
@@ -105,61 +101,18 @@ namespace ScriptCanvasBuilder
             AzToolsFramework::ToolsAssetSystemBus::Broadcast(&AzToolsFramework::ToolsAssetSystemRequests::RegisterSourceAssetType, azrtti_typeid<ScriptCanvasEditor::ScriptCanvasAsset>(), ScriptCanvasEditor::ScriptCanvasAsset::Description::GetFileFilter<ScriptCanvasEditor::ScriptCanvasAsset>());
         }
 
-        {
-            AssetBuilderSDK::AssetBuilderDesc builderDescriptor;
-            builderDescriptor.m_name = "Script Canvas Function Builder";
-            builderDescriptor.m_patterns.push_back(AssetBuilderSDK::AssetBuilderPattern("*.scriptcanvas_fn", AssetBuilderSDK::AssetBuilderPattern::PatternType::Wildcard));
-            builderDescriptor.m_busId = ScriptCanvasBuilder::FunctionWorker::GetUUID();
-            builderDescriptor.m_createJobFunction = AZStd::bind(&FunctionWorker::CreateJobs, &m_scriptCanvasFunctionBuilder, AZStd::placeholders::_1, AZStd::placeholders::_2);
-            builderDescriptor.m_processJobFunction = AZStd::bind(&FunctionWorker::ProcessJob, &m_scriptCanvasFunctionBuilder, AZStd::placeholders::_1, AZStd::placeholders::_2);
-            // changing the version number invalidates all assets and will rebuild everything.
-            builderDescriptor.m_version = m_scriptCanvasFunctionBuilder.GetVersionNumber();
-            // changing the analysis fingerprint just invalidates analysis (ie, not the assets themselves)
-            // which will cause the "CreateJobs" function to be called, for each asset, even if the
-            // source file has not changed, but won't actually do the jobs unless the source file has changed
-            // or the fingerprint of the individual job is different.
-            builderDescriptor.m_analysisFingerprint = m_scriptCanvasFunctionBuilder.GetFingerprintString();
-            builderDescriptor.AddFlags(AssetBuilderSDK::AssetBuilderDesc::BF_DeleteLastKnownGoodProductOnFailure, s_scriptCanvasProcessJobKey);
-            builderDescriptor.m_productsToKeepOnFailure[s_scriptCanvasProcessJobKey] = { AZ_CRC("SubgraphInterface", 0xdfe6dc72) };
-            AssetBuilderSDK::AssetBuilderBus::Broadcast(&AssetBuilderSDK::AssetBuilderBus::Handler::RegisterBuilderInformation, builderDescriptor);
-            ScriptCanvas::Grammar::RequestBus::Handler::BusConnect();
-            AzToolsFramework::ToolsAssetSystemBus::Broadcast(&AzToolsFramework::ToolsAssetSystemRequests::RegisterSourceAssetType, azrtti_typeid<ScriptCanvasEditor::ScriptCanvasFunctionAsset>(), ScriptCanvasEditor::ScriptCanvasFunctionAsset::Description::GetFileFilter<ScriptCanvasEditor::ScriptCanvasFunctionAsset>());
-        }
-
         m_sharedHandlers = HandleAssetTypes();
         AssetHandlers workerHandlers(m_sharedHandlers);
         m_scriptCanvasBuilder.Activate(workerHandlers);
-        m_scriptCanvasFunctionBuilder.Activate(workerHandlers);
-
-        ScriptCanvas::Translation::RequestBus::Handler::BusConnect();
-        ScriptCanvas::Grammar::RequestBus::Handler::BusConnect();
     }
 
     void PluginComponent::Deactivate()
     {
         // Finish all queued work
         AZ::Data::AssetBus::ExecuteQueuedEvents();
-        
         AzToolsFramework::ToolsAssetSystemBus::Broadcast(&AzToolsFramework::ToolsAssetSystemRequests::UnregisterSourceAssetType, azrtti_typeid<ScriptCanvasEditor::ScriptCanvasAsset>());
-        AzToolsFramework::ToolsAssetSystemBus::Broadcast(&AzToolsFramework::ToolsAssetSystemRequests::UnregisterSourceAssetType, azrtti_typeid<ScriptCanvasEditor::ScriptCanvasFunctionAsset>());
-
         m_scriptCanvasBuilder.BusDisconnect();
-        m_scriptCanvasFunctionBuilder.BusDisconnect();
-
         m_sharedHandlers.DeleteOwnedHandlers();
-
-        ScriptCanvas::Translation::RequestBus::Handler::BusDisconnect();
-        ScriptCanvas::Grammar::RequestBus::Handler::BusDisconnect();
-    }
-
-    ScriptCanvas::Grammar::Context* PluginComponent::GetGrammarContext()
-    {
-        return &m_grammarContext;
-    }
-
-    ScriptCanvas::Translation::Context* PluginComponent::GetTranslationContext()
-    {
-        return &m_translationContext;
     }
 
     void PluginComponent::Reflect(AZ::ReflectContext* context)
diff --git a/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderComponent.h b/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderComponent.h
index bd6a09433a..ff904d195a 100644
--- a/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderComponent.h
+++ b/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderComponent.h
@@ -12,18 +12,11 @@
 #include <AssetBuilderSDK/AssetBuilderSDK.h>
 #include "ScriptCanvasBuilderWorker.h"
 
-#include <ScriptCanvas/Grammar/GrammarContext.h>
-#include <ScriptCanvas/Grammar/GrammarContextBus.h>
-#include <ScriptCanvas/Translation/TranslationContext.h>
-#include <ScriptCanvas/Translation/TranslationContextBus.h>
-
 namespace ScriptCanvasBuilder
 {
     //! ScriptCanvasBuilder is responsible for turning editor ScriptCanvas Assets into runtime script canvas assets
     class PluginComponent
         : public AZ::Component
-        , public ScriptCanvas::Grammar::RequestBus::Handler
-        , public ScriptCanvas::Translation::RequestBus::Handler
     {
     public:
         AZ_COMPONENT(PluginComponent, "{F8286B21-E751-4745-8BC4-512F190215FF}")
@@ -42,20 +35,9 @@ namespace ScriptCanvasBuilder
         void Deactivate() override;
         //////////////////////////////////////////////////////////////////////////
 
-        // ScriptCanvas::Grammar::RequestBus::Handler
-        ScriptCanvas::Grammar::Context* GetGrammarContext() override;
-
-        // ScriptCanvas::Translation::RequestBus::Handler
-        ScriptCanvas::Translation::Context* GetTranslationContext() override;
-
     private:
         PluginComponent(const PluginComponent&) = delete;
-
         SharedHandlers m_sharedHandlers;
-
         Worker m_scriptCanvasBuilder;
-        FunctionWorker m_scriptCanvasFunctionBuilder;
-        ScriptCanvas::Translation::Context m_translationContext;
-        ScriptCanvas::Grammar::Context m_grammarContext;
     };
 }
diff --git a/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.cpp b/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.cpp
index 6b163a5027..b9d1dd5a7c 100644
--- a/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.cpp
+++ b/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.cpp
@@ -8,7 +8,6 @@
 #include "precompiled.h"
 
 #include <Asset/AssetDescription.h>
-#include <Asset/Functions/ScriptCanvasFunctionAsset.h>
 #include <AssetBuilderSDK/SerializationDependencies.h>
 #include <AzCore/Asset/AssetManager.h>
 #include <AzCore/IO/FileIO.h>
@@ -18,9 +17,8 @@
 #include <AzFramework/Script/ScriptComponent.h>
 #include <AzFramework/StringFunc/StringFunc.h>
 
-#include <ScriptCanvas/Asset/Functions/RuntimeFunctionAssetHandler.h>
+#include <ScriptCanvas/Asset/SubgraphInterfaceAssetHandler.h>
 #include <ScriptCanvas/Asset/RuntimeAssetHandler.h>
-#include <ScriptCanvas/Assets/Functions/ScriptCanvasFunctionAssetHandler.h>
 #include <ScriptCanvas/Assets/ScriptCanvasAssetHandler.h>
 #include <ScriptCanvas/Components/EditorGraph.h>
 #include <ScriptCanvas/Components/EditorGraphVariableManagerComponent.h>
diff --git a/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.h b/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.h
index fa6ed17a3c..ae87a0bd20 100644
--- a/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.h
+++ b/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.h
@@ -36,8 +36,8 @@ namespace ScriptCanvasEditor
 {
     class Graph;
     class ScriptCanvasAsset;
-    class ScriptCanvasFunctionAsset;
 }
+
 namespace ScriptCanvasBuilder
 {
     constexpr const char* s_scriptCanvasBuilder = "ScriptCanvasBuilder";
@@ -122,8 +122,6 @@ namespace ScriptCanvasBuilder
 
     AZ::Outcome<AZ::Data::Asset<ScriptCanvas::RuntimeAsset>, AZStd::string> CreateRuntimeAsset(const AZ::Data::Asset<ScriptCanvasEditor::ScriptCanvasAsset>& asset);
 
-    AZ::Outcome<AZ::Data::Asset<ScriptCanvas::SubgraphInterfaceAsset>, AZStd::string> CreateRuntimeFunctionAsset(const AZ::Data::Asset<ScriptCanvasEditor::ScriptCanvasFunctionAsset>& asset);
-
     AZ::Outcome<ScriptCanvas::GraphData, AZStd::string> CompileGraphData(AZ::Entity* scriptCanvasEntity);
 
     AZ::Outcome<ScriptCanvas::VariableData, AZStd::string> CompileVariableData(AZ::Entity* scriptCanvasEntity);
@@ -134,8 +132,6 @@ namespace ScriptCanvasBuilder
 
     AZ::Outcome<AZ::Data::Asset<ScriptCanvasEditor::ScriptCanvasAsset>, AZStd::string> LoadEditorAsset(AZStd::string_view graphPath, AZ::Data::AssetId assetId, AZ::Data::AssetFilterCB assetFilterCB = {});
 
-    AZ::Outcome<AZ::Data::Asset<ScriptCanvasEditor::ScriptCanvasFunctionAsset>, AZStd::string> LoadEditorFunctionAsset(AZStd::string_view graphPath);
-
     AZ::Outcome<ScriptCanvas::Grammar::AbstractCodeModelConstPtr, AZStd::string> ParseGraph(AZ::Entity& buildEntity, AZStd::string_view graphPath);
 
     AZ::Outcome<void, AZStd::string> ProcessTranslationJob(ProcessTranslationJobInput& input);
@@ -179,37 +175,4 @@ namespace ScriptCanvasBuilder
         // cached on first time query
         mutable AZStd::string m_fingerprintString;
     };
-
-    class FunctionWorker
-        : public AssetBuilderSDK::AssetBuilderCommandBus::Handler
-    {
-    public:
-        static AZ::Uuid GetUUID();
-
-        FunctionWorker() = default;
-        FunctionWorker(const FunctionWorker&) = delete;
-
-        void Activate(const AssetHandlers& handlers);
-
-        //! Asset Builder Callback Functions
-        void CreateJobs(const AssetBuilderSDK::CreateJobsRequest& request, AssetBuilderSDK::CreateJobsResponse& response) const;
-
-        const char* GetFingerprintString() const;
-
-        int GetVersionNumber() const;
-
-        void ProcessJob(const AssetBuilderSDK::ProcessJobRequest& request, AssetBuilderSDK::ProcessJobResponse& response) const;
-
-        void ShutDown() override {};
-
-    private:
-        AZ::Data::AssetHandler* m_editorAssetHandler = nullptr;
-        AZ::Data::AssetHandler* m_runtimeAssetHandler = nullptr;
-        AZ::Data::AssetHandler* m_subgraphInterfaceHandler = nullptr;
-
-        mutable AZStd::vector<AZ::Data::Asset<AZ::Data::AssetData>> m_sourceDependencies;
-
-        // cached on first time query
-        mutable AZStd::string m_fingerprintString;
-    };
 }
diff --git a/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorkerUtility.cpp b/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorkerUtility.cpp
index 94f09b4b9a..7f6269a698 100644
--- a/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorkerUtility.cpp
+++ b/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorkerUtility.cpp
@@ -8,7 +8,6 @@
 #include "precompiled.h"
 
 #include <Asset/AssetDescription.h>
-#include <Asset/Functions/ScriptCanvasFunctionAsset.h>
 #include <AssetBuilderSDK/SerializationDependencies.h>
 #include <AzCore/Asset/AssetManager.h>
 #include <AzCore/IO/FileIO.h>
@@ -18,10 +17,9 @@
 #include <AzFramework/Script/ScriptComponent.h>
 #include <AzFramework/StringFunc/StringFunc.h>
 #include <Builder/ScriptCanvasBuilderWorker.h>
-#include <ScriptCanvas/Asset/Functions/RuntimeFunctionAssetHandler.h>
+#include <ScriptCanvas/Asset/SubgraphInterfaceAssetHandler.h>
 #include <ScriptCanvas/Asset/RuntimeAsset.h>
 #include <ScriptCanvas/Asset/RuntimeAssetHandler.h>
-#include <ScriptCanvas/Assets/Functions/ScriptCanvasFunctionAssetHandler.h>
 #include <ScriptCanvas/Assets/ScriptCanvasAssetHandler.h>
 #include <ScriptCanvas/Components/EditorGraph.h>
 #include <ScriptCanvas/Components/EditorGraphVariableManagerComponent.h>
@@ -160,18 +158,6 @@ namespace ScriptCanvasBuilder
         return AZ::Success(runtimeAsset);
     }
 
-    AZ::Outcome<AZ::Data::Asset<ScriptCanvas::SubgraphInterfaceAsset>, AZStd::string> CreateRuntimeFunctionAsset(const AZ::Data::Asset<ScriptCanvasEditor::ScriptCanvasFunctionAsset>& editAsset)
-    {
-        // Flush asset manager events to ensure no asset references are held by closures queued on Ebuses.
-        AZ::Data::AssetManager::Instance().DispatchEvents();
-
-        auto runtimeAssetId = editAsset.GetId();
-        runtimeAssetId.m_subId = AZ_CRC("SubgraphInterface", 0xdfe6dc72);
-        AZ::Data::Asset<ScriptCanvas::SubgraphInterfaceAsset> runtimeAsset;
-        runtimeAsset.Create(runtimeAssetId);
-        return AZ::Success(runtimeAsset);
-    }
-
     AZ::Outcome<ScriptCanvas::GraphData, AZStd::string> CompileGraphData(AZ::Entity* scriptCanvasEntity)
     {
         typedef AZStd::pair< ScriptCanvas::Node*, AZ::Entity* > NodeEntityPair;
@@ -452,48 +438,6 @@ namespace ScriptCanvasBuilder
         return AZ::Success(asset);
     }
 
-    AZ::Outcome<AZ::Data::Asset<ScriptCanvasEditor::ScriptCanvasFunctionAsset>, AZStd::string> LoadEditorFunctionAsset(AZStd::string_view filePath)
-    {
-        AZStd::shared_ptr<AZ::Data::AssetDataStream> assetDataStream = AZStd::make_shared<AZ::Data::AssetDataStream>();
-
-        // Read the asset into a memory buffer, then hand ownership of the buffer to assetDataStream
-        {
-            AZ::IO::FileIOStream stream(filePath.data(), AZ::IO::OpenMode::ModeRead);
-            if (!AZ::IO::RetryOpenStream(stream))
-            {
-                return AZ::Failure(AZStd::string::format("File failed to open: %s", filePath.data()));
-            }
-            AZStd::vector<AZ::u8> fileBuffer(stream.GetLength());
-            size_t bytesRead = stream.Read(fileBuffer.size(), fileBuffer.data());
-            if (bytesRead != stream.GetLength())
-            {
-                return AZ::Failure(AZStd::string::format("File failed to open: %s", filePath.data()));
-            }
-
-            assetDataStream->Open(AZStd::move(fileBuffer));
-        }
-
-        AZ::IO::FileIOStream ioStream;
-        if (!ioStream.Open(filePath.data(), AZ::IO::OpenMode::ModeRead))
-        {
-            return AZ::Failure(AZStd::string::format("File failed to open: %s", filePath.data()));
-        }
-
-        ScriptCanvasEditor::ScriptCanvasFunctionAssetHandler editorAssetHandler;
-
-        AZ::SerializeContext* context{};
-        AZ::ComponentApplicationBus::BroadcastResult(context, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
-        AZ::Data::Asset<ScriptCanvasEditor::ScriptCanvasFunctionAsset> asset;
-        asset.Create(AZ::Data::AssetId(AZ::Uuid::CreateRandom()));
-
-        if (editorAssetHandler.LoadAssetData(asset, assetDataStream, AZ::Data::AssetFilterCB{}) != AZ::Data::AssetHandler::LoadResult::LoadComplete)
-        {
-            return AZ::Failure(AZStd::string::format("Failed to load ScriptCavas Function asset: %s", filePath.data()));
-        }
-
-        return AZ::Success(asset);
-    }
-
     ScriptCanvasEditor::Graph* PrepareSourceGraph(AZ::Entity* const buildEntity)
     {
         auto sourceGraph = AZ::EntityUtils::FindFirstDerivedComponent<ScriptCanvasEditor::Graph>(buildEntity);
diff --git a/Gems/ScriptCanvas/Code/Builder/ScriptCanvasFunctionBuilderWorker.cpp b/Gems/ScriptCanvas/Code/Builder/ScriptCanvasFunctionBuilderWorker.cpp
deleted file mode 100644
index 5ff5069141..0000000000
--- a/Gems/ScriptCanvas/Code/Builder/ScriptCanvasFunctionBuilderWorker.cpp
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "precompiled.h"
-
-#include "platform.h"
-#include <Asset/AssetDescription.h>
-#include <Asset/Functions/ScriptCanvasFunctionAsset.h>
-#include <AssetBuilderSDK/SerializationDependencies.h>
-#include <AzCore/Asset/AssetManager.h>
-#include <AzCore/IO/FileIO.h>
-#include <AzCore/IO/IOUtils.h>
-#include <AzCore/Math/Uuid.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/std/string/conversions.h>
-#include <AzFramework/Script/ScriptComponent.h>
-#include <AzFramework/StringFunc/StringFunc.h>
-#include <Builder/ScriptCanvasBuilderWorker.h>
-#include <ScriptCanvas/Asset/Functions/RuntimeFunctionAssetHandler.h>
-#include <ScriptCanvas/Asset/RuntimeAssetHandler.h>
-#include <ScriptCanvas/Assets/Functions/ScriptCanvasFunctionAssetHandler.h>
-#include <ScriptCanvas/Assets/ScriptCanvasAssetHandler.h>
-#include <ScriptCanvas/Components/EditorGraph.h>
-#include <ScriptCanvas/Components/EditorGraphVariableManagerComponent.h>
-#include <ScriptCanvas/Core/Connection.h>
-#include <ScriptCanvas/Core/Node.h>
-#include <ScriptCanvas/Grammar/AbstractCodeModel.h>
-#include <ScriptCanvas/Results/ErrorText.h>
-#include <ScriptCanvas/Utils/BehaviorContextUtils.h>
-
-namespace ScriptCanvasBuilder
-{
-    void FunctionWorker::Activate(const AssetHandlers& handlers)
-    {
-        m_editorAssetHandler = handlers.m_editorFunctionAssetHandler;
-        m_runtimeAssetHandler = handlers.m_runtimeAssetHandler;
-        m_subgraphInterfaceHandler = handlers.m_subgraphInterfaceHandler;
-    }
-
-    void FunctionWorker::CreateJobs(const AssetBuilderSDK::CreateJobsRequest& request, AssetBuilderSDK::CreateJobsResponse& response) const
-    {
-        AZ_TracePrintf(s_scriptCanvasBuilder, "Start Creating Job");
-        AZStd::string fullPath;
-        AzFramework::StringFunc::Path::ConstructFull(request.m_watchFolder.data(), request.m_sourceFile.data(), fullPath, false);
-        AzFramework::StringFunc::Path::Normalize(fullPath);
-
-        if (!m_editorAssetHandler)
-        {
-            AZ_Error(s_scriptCanvasBuilder, false, R"(CreateJobs for %s failed because the ScriptCanvas Editor Asset handler is missing.)", fullPath.data());
-        }
-
-        AZStd::shared_ptr<AZ::Data::AssetDataStream> assetDataStream = AZStd::make_shared<AZ::Data::AssetDataStream>();
-
-        // Read the asset into a memory buffer, then hand ownership of the buffer to assetDataStream
-        {
-            AZ::IO::FileIOStream stream(fullPath.c_str(), AZ::IO::OpenMode::ModeRead);
-            if (!AZ::IO::RetryOpenStream(stream))
-            {
-                AZ_Warning(s_scriptCanvasBuilder, false, "CreateJobs for \"%s\" failed because the source file could not be opened.", fullPath.data());
-                return;
-            }
-            AZStd::vector<AZ::u8> fileBuffer(stream.GetLength());
-            size_t bytesRead = stream.Read(fileBuffer.size(), fileBuffer.data());
-            if (bytesRead != stream.GetLength())
-            {
-                AZ_Warning(s_scriptCanvasBuilder, false, "CreateJobs for \"%s\" failed because the source file could not be read.", fullPath.data());
-                return;
-            }
-
-            assetDataStream->Open(AZStd::move(fileBuffer));
-        }
-
-        m_sourceDependencies.clear();
-
-        auto assetFilter = [&response, this](const AZ::Data::AssetFilterInfo& filterInfo)
-        {
-            if (filterInfo.m_assetType == azrtti_typeid<ScriptCanvasEditor::ScriptCanvasAsset>() ||
-                filterInfo.m_assetType == azrtti_typeid<ScriptCanvasEditor::ScriptCanvasFunctionAsset>() ||
-                filterInfo.m_assetType == azrtti_typeid<ScriptEvents::ScriptEventsAsset>() ||
-                filterInfo.m_assetType == azrtti_typeid<ScriptCanvas::SubgraphInterfaceAsset>()) // this required, since nodes reference this, rather than the editor asset
-            {
-                AssetBuilderSDK::SourceFileDependency dependency;
-                dependency.m_sourceFileDependencyUUID = filterInfo.m_assetId.m_guid;
-
-                response.m_sourceFileDependencyList.push_back(dependency);
-            }
-
-            // Asset filter always returns false to prevent parsing dependencies, but makes note of the script canvas dependencies
-            return false;
-        };
-
-        AZ::Data::Asset<ScriptCanvasEditor::ScriptCanvasFunctionAsset> asset;
-        asset.Create(AZ::Data::AssetId(AZ::Uuid::CreateRandom()));
-        ScriptCanvasEditor::ScriptCanvasFunctionAssetHandler* functionAssetHandler = azrtti_cast<ScriptCanvasEditor::ScriptCanvasFunctionAssetHandler*>(m_editorAssetHandler);
-        if (functionAssetHandler->LoadAssetData(asset, assetDataStream, assetFilter) != AZ::Data::AssetHandler::LoadResult::LoadComplete)
-        {
-            AZ_Warning(s_scriptCanvasBuilder, false, "CreateJobs for \"%s\" failed because the asset data could not be loaded from the file", fullPath.data());
-            return;
-        }
-
-        // Flush asset database events to ensure no asset references are held by closures queued on Ebuses.
-        AZ::Data::AssetManager::Instance().DispatchEvents();
-
-        auto* scriptCanvasEntity = asset.Get()->GetScriptCanvasEntity();
-        auto* sourceGraph = AZ::EntityUtils::FindFirstDerivedComponent<ScriptCanvasEditor::Graph>(scriptCanvasEntity);
-        AZ_Assert(sourceGraph, "Graph component is missing from entity.");
-        size_t fingerprint = 0;
-        const AZStd::set<AZ::Entity*> sortedEntities(sourceGraph->GetGraphData()->m_nodes.begin(), sourceGraph->GetGraphData()->m_nodes.end());
-        for (auto& nodeEntity : sortedEntities)
-        {
-            if (auto nodeComponent = AZ::EntityUtils::FindFirstDerivedComponent<ScriptCanvas::Node>(nodeEntity))
-            {
-                AZStd::hash_combine(fingerprint, nodeComponent->GenerateFingerprint());
-            }
-        }
-
-#if defined(FUNCTION_LEGACY_SUPPORT_ENABLED)
-        for (const AssetBuilderSDK::PlatformInfo& info : request.m_enabledPlatforms)
-        {
-            if (info.HasTag("tools"))
-            {
-                AssetBuilderSDK::JobDescriptor copyDescriptor;
-                copyDescriptor.m_priority = 2;
-                copyDescriptor.m_critical = true;
-                copyDescriptor.m_jobKey = s_scriptCanvasCopyJobKey;
-                copyDescriptor.SetPlatformIdentifier(info.m_identifier.c_str());
-                copyDescriptor.m_additionalFingerprintInfo = AZStd::string(GetFingerprintString()).append("|").append(AZStd::to_string(static_cast<AZ::u64>(fingerprint)));
-                response.m_createJobOutputs.push_back(copyDescriptor);
-        }
-
-            AssetBuilderSDK::JobDescriptor jobDescriptor;
-            jobDescriptor.m_priority = 2;
-            jobDescriptor.m_critical = true;
-            jobDescriptor.m_jobKey = s_scriptCanvasProcessJobKey;
-            jobDescriptor.SetPlatformIdentifier(info.m_identifier.c_str());
-            jobDescriptor.m_additionalFingerprintInfo = AZStd::string(GetFingerprintString()).append("|").append(AZStd::to_string(static_cast<AZ::u64>(fingerprint)));
-            // Function process job needs to wait until its dependency asset job finished
-            for (const auto& sourceDependency : response.m_sourceFileDependencyList)
-            {
-                AssetBuilderSDK::JobDependency jobDep(s_scriptCanvasBuilder, info.m_identifier.c_str(), AssetBuilderSDK::JobDependencyType::OrderOnce, sourceDependency);
-                jobDescriptor.m_jobDependencyList.emplace_back(jobDep);
-            }
-            response.m_createJobOutputs.push_back(jobDescriptor);
-        }
-#endif
-
-        response.m_result = AssetBuilderSDK::CreateJobsResultCode::Success;
-        AZ_TracePrintf(s_scriptCanvasBuilder, "Finish Creating Job");
-    }
-
-    
-
-    const char* FunctionWorker::GetFingerprintString() const
-    {
-        if (m_fingerprintString.empty())
-        {
-            // compute it the first time
-            const AZStd::string runtimeAssetTypeId = azrtti_typeid<ScriptCanvas::SubgraphInterfaceAsset>().ToString<AZStd::string>();
-            m_fingerprintString = AZStd::string::format("%i%s", GetVersionNumber(), runtimeAssetTypeId.c_str());
-        }
-        return m_fingerprintString.c_str();
-    }
-
-    int FunctionWorker::GetVersionNumber() const
-    {
-        return GetBuilderVersion();
-    }
-
-    AZ::Uuid FunctionWorker::GetUUID()
-    {
-        return AZ::Uuid::CreateString("{7227E0E1-4113-456A-877B-B2276ACB292B}");
-    }
-
-
-    void FunctionWorker::ProcessJob(const AssetBuilderSDK::ProcessJobRequest& request, AssetBuilderSDK::ProcessJobResponse& response) const
-    {
-        AZ_TracePrintf(s_scriptCanvasBuilder, "Start Processing Job");
-        // A runtime script canvas component is generated, which creates a .scriptcanvas_compiled file
-        AZStd::string fullPath;
-        AZStd::string fileNameOnly;
-        AzFramework::StringFunc::Path::GetFullFileName(request.m_sourceFile.c_str(), fileNameOnly);
-        fullPath = request.m_fullPath.c_str();
-        AzFramework::StringFunc::Path::Normalize(fullPath);
-
-        bool pathFound = false;
-        AZStd::string relativePath;
-        AzToolsFramework::AssetSystemRequestBus::BroadcastResult
-            ( pathFound
-            , &AzToolsFramework::AssetSystem::AssetSystemRequest::GetRelativeProductPathFromFullSourceOrProductPath
-            , request.m_fullPath.c_str(), relativePath);
-
-        if (!pathFound)
-        {
-            AZ_Error(s_scriptCanvasBuilder, false, "Failed to get engine relative path from %s", request.m_fullPath.c_str());
-            return;
-        }
-
-        if (!m_editorAssetHandler)
-        {
-            AZ_Error(s_scriptCanvasBuilder, false, R"(Exporting of .scriptcanvas for "%s" file failed as no editor asset handler was registered for script canvas. The ScriptCanvas Gem might not be enabled.)", fullPath.data());
-            return;
-        }
-
-        if (!m_runtimeAssetHandler)
-        {
-            AZ_Error(s_scriptCanvasBuilder, false, R"(Exporting of .scriptcanvas for "%s" file failed as no runtime asset handler was registered for script canvas.)", fullPath.data());
-            return;
-        }
-
-        AZStd::shared_ptr<AZ::Data::AssetDataStream> assetDataStream = AZStd::make_shared<AZ::Data::AssetDataStream>();
-
-        // Read the asset into a memory buffer, then hand ownership of the buffer to assetDataStream
-        {
-            AZ::IO::FileIOStream stream(fullPath.data(), AZ::IO::OpenMode::ModeRead);
-            if (!AZ::IO::RetryOpenStream(stream))
-            {
-                AZ_Warning(s_scriptCanvasBuilder, false, "Exporting of .scriptcanvas for \"%s\" failed because the source file could not be opened.", fullPath.c_str());
-                return;
-            }
-            AZStd::vector<AZ::u8> fileBuffer(stream.GetLength());
-            size_t bytesRead = stream.Read(fileBuffer.size(), fileBuffer.data());
-            if (bytesRead != stream.GetLength())
-            {
-                AZ_Warning(s_scriptCanvasBuilder, false, "Exporting of .scriptcanvas for \"%s\" failed because the source file could not be opened.", fullPath.c_str());
-                return;
-            }
-
-            assetDataStream->Open(AZStd::move(fileBuffer));
-        }
-
-        AZ::SerializeContext* context{};
-        AZ::ComponentApplicationBus::BroadcastResult(context, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
-
-        AZ::Data::Asset<ScriptCanvasEditor::ScriptCanvasFunctionAsset> asset;
-        asset.Create(request.m_sourceFileUUID);
-        ScriptCanvasEditor::ScriptCanvasFunctionAssetHandler* functionAssetHandler = azrtti_cast<ScriptCanvasEditor::ScriptCanvasFunctionAssetHandler*>(m_editorAssetHandler);
-        if (functionAssetHandler->LoadAssetData(asset, assetDataStream, nullptr) != AZ::Data::AssetHandler::LoadResult::LoadComplete)
-        {
-            AZ_Error(s_scriptCanvasBuilder, false, R"(Loading of ScriptCanvas asset for source file "%s" has failed)", fullPath.data());
-            return;
-        }
-
-        // Flush asset manager events to ensure no asset references are held by closures queued on Ebuses.
-        AZ::Data::AssetManager::Instance().DispatchEvents();
-
-        AZStd::string runtimeScriptCanvasOutputPath;
-        AzFramework::StringFunc::Path::Join(request.m_tempDirPath.c_str(), fileNameOnly.c_str(), runtimeScriptCanvasOutputPath, true, true);
-        AzFramework::StringFunc::Path::ReplaceExtension(runtimeScriptCanvasOutputPath, ScriptCanvas::SubgraphInterfaceAsset::GetFileExtension());
-
-        if (request.m_jobDescription.m_jobKey == s_scriptCanvasCopyJobKey)
-        {
-            // ScriptCanvas Editor Asset Copy job
-            // The SubID is zero as this represents the main asset
-            AssetBuilderSDK::JobProduct jobProduct;
-            jobProduct.m_productFileName = fullPath;
-            jobProduct.m_productAssetType = azrtti_typeid<ScriptCanvasEditor::ScriptCanvasFunctionAsset>();
-            jobProduct.m_productSubID = 0;
-            jobProduct.m_dependenciesHandled = true;
-            response.m_outputProducts.push_back(AZStd::move(jobProduct));
-            response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Success;
-        }
-        else
-        {
-            // force load all dependencies into memory
-            for (auto& dependency : m_sourceDependencies)
-            {
-                AZ::Data::AssetManager::Instance().GetAsset(dependency.GetId(), dependency.GetType(), AZ::Data::AssetLoadBehavior::PreLoad);
-            }
-
-            AZ::Entity* buildEntity = asset.Get()->GetScriptCanvasEntity();
-
-            ProcessTranslationJobInput input;
-            input.assetID = AZ::Data::AssetId(request.m_sourceFileUUID, AZ_CRC("RuntimeData", 0x163310ae));
-            input.request = &request;
-            input.response = &response;
-            input.runtimeScriptCanvasOutputPath = runtimeScriptCanvasOutputPath;
-            input.assetHandler = m_runtimeAssetHandler;
-            input.buildEntity = buildEntity;
-            input.fullPath = fullPath;
-            input.fileNameOnly = fileNameOnly;
-            input.namespacePath = relativePath;
-            input.saveRawLua = true;
-
-            auto translationOutcome = ProcessTranslationJob(input);
-            if (translationOutcome.IsSuccess())
-            {
-                AzFramework::StringFunc::Path::ReplaceExtension(input.runtimeScriptCanvasOutputPath, ScriptCanvas::RuntimeAsset::GetFileExtension());
-                auto saveRuntimAssetOutcome = SaveRuntimeAsset(input, input.runtimeDataOut);
-                if (saveRuntimAssetOutcome.IsSuccess())
-                {
-                    // \todo this file is only required on PC editor builds, cull it in packaging, here or wherever appropriate
-                    AzFramework::StringFunc::Path::StripExtension(fileNameOnly);
-
-                    ScriptCanvas::SubgraphInterfaceData functionInterface;
-                    functionInterface.m_name = fileNameOnly;
-                    functionInterface.m_interface = AZStd::move(input.interfaceOut);
-
-                    // save function interface
-                    input.assetHandler = m_subgraphInterfaceHandler;
-
-                    AzFramework::StringFunc::Path::ReplaceExtension(input.runtimeScriptCanvasOutputPath, ScriptCanvas::SubgraphInterfaceAsset::GetFileExtension());
-                    auto saveInterfaceOutcome = SaveSubgraphInterface(input, functionInterface);
-                    if (saveInterfaceOutcome.IsSuccess())
-                    {
-                        response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Success;
-                    }
-                    else
-                    {
-                        AZ_Error(s_scriptCanvasBuilder, false, saveInterfaceOutcome.GetError().data());
-                    }
-                }
-                else
-                {
-                    AZ_Error(s_scriptCanvasBuilder, false, saveRuntimAssetOutcome.GetError().data());
-                }
-            }
-            else if (AzFramework::StringFunc::Find(translationOutcome.GetError().data(), ScriptCanvas::ParseErrors::SourceUpdateRequired) != AZStd::string::npos)
-            {
-                AZ_Warning(s_scriptCanvasBuilder, false, ScriptCanvas::ParseErrors::SourceUpdateRequired);
-                response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Success;
-            }
-            else if (AzFramework::StringFunc::Find(fileNameOnly, s_unitTestParseErrorPrefix) != AZStd::string::npos)
-            {
-                response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Success;
-            }
-            else
-            {
-                AZ_Warning(s_scriptCanvasBuilder, false, translationOutcome.GetError().data());
-            }
-        }
-
-        AZ_TracePrintf(s_scriptCanvasBuilder, "Finish Processing Job");
-    }
-}
diff --git a/Gems/ScriptCanvas/Code/Editor/Assets/Functions/ScriptCanvasFunctionAssetHandler.cpp b/Gems/ScriptCanvas/Code/Editor/Assets/Functions/ScriptCanvasFunctionAssetHandler.cpp
deleted file mode 100644
index 9f50f32cf5..0000000000
--- a/Gems/ScriptCanvas/Code/Editor/Assets/Functions/ScriptCanvasFunctionAssetHandler.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "precompiled.h"
-
-#include <ScriptCanvas/Assets/Functions/ScriptCanvasFunctionAssetHandler.h>
-
-#include <ScriptCanvas/Asset/RuntimeAsset.h>
-#include <ScriptCanvas/Bus/ScriptCanvasBus.h>
-#include <Core/ScriptCanvasBus.h>
-#include <ScriptCanvas/Components/EditorGraph.h>
-#include <ScriptCanvas/Components/EditorScriptCanvasComponent.h>
-#include <ScriptCanvas/Components/EditorGraphVariableManagerComponent.h>
-
-#include <GraphCanvas/GraphCanvasBus.h>
-
-#include <AzCore/IO/GenericStreams.h>
-#include <AzCore/IO/FileIO.h>
-#include <AzCore/Serialization/Utils.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/Component/ComponentApplicationBus.h>
-#include <AzCore/Component/Entity.h>
-#include <AzCore/std/string/string_view.h>
-
-#include <AzFramework/StringFunc/StringFunc.h>
-#include <AzToolsFramework/API/EditorAssetSystemAPI.h>
-#include <ScriptCanvas/Asset/Functions/ScriptCanvasFunctionAsset.h>
-
-namespace ScriptCanvasEditor
-{
-    ScriptCanvasFunctionAssetHandler::ScriptCanvasFunctionAssetHandler(AZ::SerializeContext* context)
-        : ScriptCanvasAssetHandler(context)
-    {
-        AZ::AssetTypeInfoBus::MultiHandler::BusConnect(azrtti_typeid<ScriptCanvasEditor::ScriptCanvasFunctionAsset>());
-    }
-
-    ScriptCanvasFunctionAssetHandler::~ScriptCanvasFunctionAssetHandler()
-    {
-        AZ::AssetTypeInfoBus::MultiHandler::BusDisconnect();
-    }
-
-    AZ::Data::AssetPtr ScriptCanvasFunctionAssetHandler::CreateAsset(const AZ::Data::AssetId& id, const AZ::Data::AssetType& type)
-    {
-        AZ_UNUSED(type);
-
-        ScriptCanvasEditor::ScriptCanvasFunctionAsset* assetData = aznew ScriptCanvasEditor::ScriptCanvasFunctionAsset(id);
-
-        AZ::Entity* scriptCanvasEntity = aznew AZ::Entity(ScriptCanvas::AssetDescription::GetEntityName<ScriptCanvasEditor::ScriptCanvasFunctionAsset>());
-        SystemRequestBus::Broadcast(&SystemRequests::CreateEditorComponentsOnEntity, scriptCanvasEntity, azrtti_typeid<ScriptCanvas::SubgraphInterfaceAsset>());
-        assetData->m_cachedComponent = scriptCanvasEntity->CreateComponent<ScriptCanvasEditor::ScriptCanvasFunctionDataComponent>();
-
-        assetData->SetScriptCanvasEntity(scriptCanvasEntity);
-
-        return assetData;
-    }
-
-    AZ::Data::AssetHandler::LoadResult ScriptCanvasFunctionAssetHandler::LoadAssetData(
-        const AZ::Data::Asset<AZ::Data::AssetData>& asset,
-        AZStd::shared_ptr<AZ::Data::AssetDataStream> stream,
-        const AZ::Data::AssetFilterCB& assetLoadFilterCB)
-    {
-        ScriptCanvasEditor::ScriptCanvasFunctionAsset* scriptCanvasAsset = asset.GetAs<ScriptCanvasEditor::ScriptCanvasFunctionAsset>();
-        AZ_Assert(m_serializeContext, "ScriptCanvasFunctionAssetHandler needs to be initialized with a SerializeContext");
-
-        if (scriptCanvasAsset)
-        {
-            stream->Seek(0U, AZ::IO::GenericStream::ST_SEEK_BEGIN);
-
-            bool loadSuccess = AZ::Utils::LoadObjectFromStreamInPlace(*stream, scriptCanvasAsset->GetScriptCanvasData(), m_serializeContext, AZ::ObjectStream::FilterDescriptor(assetLoadFilterCB, AZ::ObjectStream::FILTERFLAG_IGNORE_UNKNOWN_CLASSES));
-            if (loadSuccess)
-            {
-                scriptCanvasAsset->m_cachedComponent = scriptCanvasAsset->GetScriptCanvasData().GetScriptCanvasEntity()->FindComponent<ScriptCanvasEditor::ScriptCanvasFunctionDataComponent>();
-            }
-
-            return loadSuccess ? AZ::Data::AssetHandler::LoadResult::LoadComplete : AZ::Data::AssetHandler::LoadResult::Error;
-        }
-        return AZ::Data::AssetHandler::LoadResult::Error;
-    }
-
-    bool ScriptCanvasFunctionAssetHandler::SaveAssetData(const AZ::Data::Asset<AZ::Data::AssetData>& asset, AZ::IO::GenericStream* stream)
-    {
-        return SaveAssetData(asset.GetAs<ScriptCanvasEditor::ScriptCanvasFunctionAsset>(), stream);
-    }
-
-    bool ScriptCanvasFunctionAssetHandler::SaveAssetData(const ScriptCanvasEditor::ScriptCanvasFunctionAsset* assetData, AZ::IO::GenericStream* stream)
-    {
-        return SaveAssetData(assetData, stream, AZ::DataStream::ST_XML);
-    }
-
-    bool ScriptCanvasFunctionAssetHandler::SaveAssetData(const ScriptCanvasEditor::ScriptCanvasFunctionAsset* assetData, AZ::IO::GenericStream* stream, AZ::DataStream::StreamType streamType)
-    {
-        if (assetData && m_serializeContext)
-        {
-            AZStd::vector<char> byteBuffer;
-            AZ::IO::ByteContainerStream<decltype(byteBuffer)> byteStream(&byteBuffer);
-            AZ::ObjectStream* objStream = AZ::ObjectStream::Create(&byteStream, *m_serializeContext, streamType);
-
-            const ScriptCanvas::ScriptCanvasData& functionData = assetData->GetScriptCanvasData();
-            bool assetSaved = objStream->WriteClass(&functionData);
-            objStream->Finalize();
-            assetSaved = stream->Write(byteBuffer.size(), byteBuffer.data()) == byteBuffer.size() && assetSaved;
-            return assetSaved;
-        }
-
-        return false;
-    }
-
-    AZ::Data::AssetType ScriptCanvasFunctionAssetHandler::GetAssetType() const
-    {
-        return ScriptCanvasFunctionAssetHandler::GetAssetTypeStatic();
-    }
-
-    const char* ScriptCanvasFunctionAssetHandler::GetAssetTypeDisplayName() const
-    {
-        return ScriptCanvas::AssetDescription::GetAssetTypeDisplayName<ScriptCanvasEditor::ScriptCanvasFunctionAsset>();
-    }
-
-    bool ScriptCanvasFunctionAssetHandler::CanCreateComponent([[maybe_unused]] const AZ::Data::AssetId& assetId) const
-    {
-        return false;
-    }
-
-    void ScriptCanvasFunctionAssetHandler::GetAssetTypeExtensions(AZStd::vector<AZStd::string>& extensions)
-    {
-        const AZ::Uuid& assetType = *AZ::AssetTypeInfoBus::GetCurrentBusId();
-        if (assetType == AZ::AzTypeInfo<ScriptCanvasEditor::ScriptCanvasFunctionAsset>::Uuid())
-        {
-            extensions.push_back(ScriptCanvas::AssetDescription::GetExtension<ScriptCanvasEditor::ScriptCanvasFunctionAsset>());
-        }
-    }
-
-    void ScriptCanvasFunctionAssetHandler::GetHandledAssetTypes(AZStd::vector<AZ::Data::AssetType>& assetTypes)
-    {
-        assetTypes.push_back(AZ::AzTypeInfo<ScriptCanvasEditor::ScriptCanvasFunctionAsset>::Uuid());
-    }
-
-
-    AZ::Data::AssetType ScriptCanvasFunctionAssetHandler::GetAssetTypeStatic()
-    {
-        return azrtti_typeid<ScriptCanvasEditor::ScriptCanvasFunctionAsset>();
-    }
-
-    const char* ScriptCanvasFunctionAssetHandler::GetGroup() const
-    {
-        return ScriptCanvas::AssetDescription::GetGroup<ScriptCanvasEditor::ScriptCanvasFunctionAsset>();
-    }
-
-    const char* ScriptCanvasFunctionAssetHandler::GetBrowserIcon() const
-    {
-        return ScriptCanvas::AssetDescription::GetIconPath<ScriptCanvasEditor::ScriptCanvasFunctionAsset>();
-    }
-
-}
diff --git a/Gems/ScriptCanvas/Code/Editor/Assets/Functions/ScriptCanvasFunctionAssetHolder.cpp b/Gems/ScriptCanvas/Code/Editor/Assets/Functions/ScriptCanvasFunctionAssetHolder.cpp
deleted file mode 100644
index a3559f0123..0000000000
--- a/Gems/ScriptCanvas/Code/Editor/Assets/Functions/ScriptCanvasFunctionAssetHolder.cpp
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "precompiled.h"
-
-#include <LyViewPaneNames.h>
-
-#include <Editor/Assets/Functions/ScriptCanvasFunctionAssetHolder.h>
-
-#include <ScriptCanvas/Asset/AssetRegistry.h>
-#include <ScriptCanvas/Assets/ScriptCanvasAsset.h>
-#include <ScriptCanvas/Assets/ScriptCanvasAssetHandler.h>
-#include <ScriptCanvas/Bus/EditorScriptCanvasBus.h>
-#include <ScriptCanvas/Bus/RequestBus.h>
-#include <ScriptCanvas/Bus/ScriptCanvasBus.h>
-#include <ScriptCanvas/Core/ScriptCanvasBus.h>
-
-#include <AzCore/Serialization/EditContext.h>
-#include <AzCore/Component/ComponentApplicationBus.h>
-#include <AzCore/Serialization/IdUtils.h>
-#include <AzCore/Asset/AssetManager.h>
-
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-
-namespace ScriptCanvasEditor
-{
-    //=========================================================================
-    void ScriptCanvasFunctionAssetHolder::Reflect(AZ::ReflectContext* context)
-    {
-        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
-        {
-            serializeContext->Class<ScriptCanvasFunctionAssetHolder>()
-                ->Version(1)
-                ->Field("m_asset", &ScriptCanvasFunctionAssetHolder::m_scriptCanvasAssetId)
-                ;
-
-            if (AZ::EditContext* editContext = serializeContext->GetEditContext())
-            {
-                editContext->Class<ScriptCanvasFunctionAssetHolder>("Script Canvas", "Script Canvas Function Asset Holder")
-                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &ScriptCanvasFunctionAssetHolder::m_scriptCanvasAssetId, "Script Canvas Function Asset", "Script Canvas asset associated with this component")
-                    ->Attribute(AZ::Edit::Attributes::ChangeNotify, &ScriptCanvasFunctionAssetHolder::OnScriptChanged)
-                    ->Attribute("EditButton", "Editor/Icons/PropertyEditor/open_in.png")
-                    ->Attribute("EditDescription", "Open in Script Canvas Editor")
-                    ->Attribute("EditCallback", &ScriptCanvasFunctionAssetHolder::LaunchScriptCanvasEditor)
-                    ;
-            }
-        }
-    }
-
-    ScriptCanvasFunctionAssetHolder::ScriptCanvasFunctionAssetHolder(AZ::Data::AssetId assetId, const ScriptChangedCB& scriptChangedCB)
-        : m_scriptCanvasAssetId(assetId)
-        , m_scriptNotifyCallback(scriptChangedCB)
-    {
-    }
-
-    ScriptCanvasFunctionAssetHolder::~ScriptCanvasFunctionAssetHolder()
-    {
-        AZ::Data::AssetBus::Handler::BusDisconnect();
-    }
-
-    void ScriptCanvasFunctionAssetHolder::Init(AZ::EntityId ownerId)
-    {
-        m_ownerId = ownerId;
-
-        if (m_scriptCanvasAssetId.IsValid())
-        {
-            AZ::Data::AssetBus::Handler::BusDisconnect();
-            AZ::Data::AssetBus::Handler::BusConnect(m_scriptCanvasAssetId);
-        }
-    }
-
-    void ScriptCanvasFunctionAssetHolder::LaunchScriptCanvasEditor(const AZ::Data::AssetId&, const AZ::Data::AssetType&) const
-    {
-        OpenEditor();
-    }
-
-    void ScriptCanvasFunctionAssetHolder::OpenEditor() const
-    {
-        AzToolsFramework::OpenViewPane(LyViewPane::ScriptCanvas);
-
-        AZ::Outcome<int, AZStd::string> openOutcome = AZ::Failure(AZStd::string());
-
-        if (m_scriptCanvasAssetId.IsValid())
-        {
-            GeneralRequestBus::BroadcastResult(openOutcome, &GeneralRequests::OpenScriptCanvasAsset, m_scriptCanvasAssetId, -1);
-
-            if (!openOutcome)
-            {
-                AZ_Warning("Script Canvas", openOutcome, "%s", openOutcome.GetError().data());
-            }
-        }
-        else if (m_ownerId.IsValid())
-        {
-            AzToolsFramework::EntityIdList selectedEntityIds;
-            AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(selectedEntityIds, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
-
-            // Going to bypass the multiple selected entities flow for right now.
-            if (selectedEntityIds.size() == 1)
-            {
-                GeneralRequestBus::Broadcast(&GeneralRequests::CreateScriptCanvasAssetFor, m_ownerId);
-            }
-        }        
-    }
-
-    AZ::EntityId ScriptCanvasFunctionAssetHolder::GetGraphId() const
-    {
-        AZ::EntityId graphId;
-        if (m_scriptCanvasAsset.IsReady())
-        {
-            ScriptCanvas::SystemRequestBus::BroadcastResult(graphId, &ScriptCanvas::SystemRequests::FindGraphId, m_scriptCanvasAsset.Get()->GetScriptCanvasEntity());
-        }
-        return graphId;
-    }
-
-    void ScriptCanvasFunctionAssetHolder::SetScriptChangedCB(const ScriptChangedCB& scriptChangedCB)
-    {
-        m_scriptNotifyCallback = scriptChangedCB;
-    }
-
-    void ScriptCanvasFunctionAssetHolder::Load(bool loadBlocking)
-    {
-        if (!m_scriptCanvasAsset.IsReady())
-        {
-            AZ::Data::AssetInfo assetInfo;
-            AZ::Data::AssetCatalogRequestBus::BroadcastResult(assetInfo, &AZ::Data::AssetCatalogRequests::GetAssetInfoById, m_scriptCanvasAsset.GetId());
-            if (assetInfo.m_assetId.IsValid())
-            {
-                const AZ::Data::AssetType assetTypeId = azrtti_typeid<ScriptCanvasAsset>();
-                auto& assetManager = AZ::Data::AssetManager::Instance();
-                m_scriptCanvasAsset = assetManager.GetAsset(m_scriptCanvasAsset.GetId(), azrtti_typeid<ScriptCanvasAsset>(), true, nullptr, loadBlocking);
-            }
-        }
-    }
-
-    AZ::u32 ScriptCanvasFunctionAssetHolder::OnScriptChanged()
-    {
-        SetAsset(m_scriptCanvasAsset.GetId());
-        Load(false);
-
-        if (m_scriptNotifyCallback)
-        {
-            m_scriptNotifyCallback(m_scriptCanvasAsset);
-        }
-        return AZ::Edit::PropertyRefreshLevels::EntireTree;
-    }
-
-    void ScriptCanvasFunctionAssetHolder::OnAssetReady(AZ::Data::Asset<AZ::Data::AssetData> asset)
-    {
-        SetAsset(asset.GetId());
-        EditorScriptCanvasAssetNotificationBus::Event(m_scriptCanvasAsset.GetId(), &EditorScriptCanvasAssetNotifications::OnScriptCanvasAssetReady, m_scriptCanvasAsset);
-    }
-
-    void ScriptCanvasFunctionAssetHolder::OnAssetReloaded(AZ::Data::Asset<AZ::Data::AssetData> asset)
-    {
-        SetAsset(asset.GetId());
-        EditorScriptCanvasAssetNotificationBus::Event(m_scriptCanvasAsset.GetId(), &EditorScriptCanvasAssetNotifications::OnScriptCanvasAssetReloaded, m_scriptCanvasAsset);
-    }
-
-    void ScriptCanvasFunctionAssetHolder::OnAssetUnloaded(const AZ::Data::AssetId assetId, const AZ::Data::AssetType)
-    {
-        EditorScriptCanvasAssetNotificationBus::Event(assetId, &EditorScriptCanvasAssetNotifications::OnScriptCanvasAssetUnloaded, assetId);
-    }
-
-    void ScriptCanvasFunctionAssetHolder::OnAssetSaved(AZ::Data::Asset<AZ::Data::AssetData> asset, bool isSuccessful)
-    {
-        SetAsset(asset.GetId());
-        auto currentBusId = AZ::Data::AssetBus::GetCurrentBusId();
-        if (currentBusId)
-        {
-            EditorScriptCanvasAssetNotificationBus::Event(*currentBusId, &EditorScriptCanvasAssetNotifications::OnScriptCanvasAssetSaved, asset.GetId());
-        }
-    }
-
-    void ScriptCanvasFunctionAssetHolder::SetAsset(AZ::Data::AssetId assetId)
-    {
-        m_scriptCanvasAssetId = assetId;
-
-        if (!AZ::Data::AssetBus::Handler::BusIsConnectedId(m_scriptCanvasAssetId))
-        {
-            AZ::Data::AssetBus::Handler::BusDisconnect();
-            if (m_scriptCanvasAssetId.IsValid())
-            {
-                AZ::Data::AssetBus::Handler::BusConnect(m_scriptCanvasAssetId);
-            }
-        }
-    }
-
-    //AZ::Data::Asset<ScriptCanvasAsset> ScriptCanvasFunctionAssetHolder::GetAsset() const
-    //{
-    //    return m_scriptCanvasAsset;
-    //}
-
-    AZ::Data::AssetId ScriptCanvasFunctionAssetHolder::GetAssetId() const
-    {
-        return m_scriptCanvasAssetId;
-    }
-}
diff --git a/Gems/ScriptCanvas/Code/Editor/Assets/Functions/ScriptCanvasFunctionAssetHolder.h b/Gems/ScriptCanvas/Code/Editor/Assets/Functions/ScriptCanvasFunctionAssetHolder.h
deleted file mode 100644
index 1cde981e0d..0000000000
--- a/Gems/ScriptCanvas/Code/Editor/Assets/Functions/ScriptCanvasFunctionAssetHolder.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/Component/EntityId.h>
-#include <AzCore/Asset/AssetCommon.h>
-
-namespace ScriptCanvas
-{
-    class ScriptCanvasFunctionAsset;
-}
-
-namespace ScriptCanvasEditor
-{
-    class ScriptCanvasFunctionAsset;
-
-    /*! ScriptCanvasAssetHolder
-    Wraps a ScriptCanvasAsset reference and registers for the individual AssetBus events
-    for saving, loading and unloading the asset.
-    The ScriptCanvasAsset Holder contains functionality for activating the ScriptCanvasEntity stored on the reference asset
-    as well as attempting to open the ScriptCanvasAsset within the ScriptCanvas Editor.
-    It also provides the EditContext reflection for opening the asset in the ScriptCanvas Editor via a button
-    */
-    class ScriptCanvasFunctionAssetHolder
-        : private AZ::Data::AssetBus::Handler
-    {
-    public:
-        AZ_RTTI(ScriptCanvasFunctionAssetHolder, "{21693AFA-5664-4AAE-9213-8B944A398BA1}");
-        AZ_CLASS_ALLOCATOR(ScriptCanvasFunctionAssetHolder, AZ::SystemAllocator, 0);
-
-        using ScriptChangedCB = AZStd::function<void(const AZ::Data::Asset<ScriptCanvasAsset>&)>;
-
-        ScriptCanvasFunctionAssetHolder() = default;
-        ScriptCanvasFunctionAssetHolder(AZ::Data::AssetId assetId, const ScriptChangedCB& = {});
-        ~ScriptCanvasFunctionAssetHolder() override;
-        
-        static void Reflect(AZ::ReflectContext* context);
-        void Init(AZ::EntityId ownerId = AZ::EntityId());
-
-        void SetAsset(AZ::Data::AssetId assetId);
-        AZ::Data::AssetId GetAssetId() const;
-
-        AZ::EntityId GetGraphId() const;
-
-        void LaunchScriptCanvasEditor(const AZ::Data::AssetId&, const AZ::Data::AssetType&) const;
-        void OpenEditor() const;
-
-        void SetScriptChangedCB(const ScriptChangedCB&);
-        void Load(bool loadBlocking = false);
-
-    protected:
-
-        //=====================================================================
-        // AZ::Data::AssetBus
-        void OnAssetReady(AZ::Data::Asset<AZ::Data::AssetData> asset) override;
-        void OnAssetReloaded(AZ::Data::Asset<AZ::Data::AssetData> asset) override;
-        void OnAssetUnloaded(const AZ::Data::AssetId assetId, const AZ::Data::AssetType assetType) override;
-        void OnAssetSaved(AZ::Data::Asset<AZ::Data::AssetData> asset, bool isSuccessful) override;
-        //=====================================================================
-
-        //! Reloads the Script From the AssetData if it has changed
-        AZ::u32 OnScriptChanged();
-        AZ::Data::AssetId m_scriptCanvasAssetId;
-        AZ::Data::Asset<ScriptCanvas::ScriptCanvasFunctionAsset> m_scriptCanvasAsset;
-
-        AZ::EntityId m_ownerId; // Id of Entity which stores this AssetHolder object
-        ScriptChangedCB m_scriptNotifyCallback;
-    };
-
-}
diff --git a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHelpers.cpp b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHelpers.cpp
index 247a38f58a..6eae2ff603 100644
--- a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHelpers.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHelpers.cpp
@@ -8,7 +8,6 @@
 #include <Editor/Assets/ScriptCanvasAssetHelpers.h>
 
 #include <ScriptCanvas/Assets/ScriptCanvasAsset.h>
-#include <ScriptCanvas/Asset/Functions/ScriptCanvasFunctionAsset.h>
 #include <ScriptCanvas/Bus/EditorScriptCanvasBus.h>
 
 namespace ScriptCanvasEditor
@@ -149,37 +148,13 @@ namespace ScriptCanvasEditor
 
         }
 
-        bool IsValidSourceFile(const AZStd::string& filePath, ScriptCanvas::ScriptCanvasId scriptCanvasId)
+        bool IsValidSourceFile(const AZStd::string& filePath, [[maybe_unused]] ScriptCanvas::ScriptCanvasId scriptCanvasId)
         {
-            bool isValidSourceFile = true;
-
-            if (scriptCanvasId.IsValid())
+            ScriptCanvasAssetDescription assetDescription;
+            return AZ::StringFunc::EndsWith(filePath, assetDescription.GetExtensionImpl(), false);
             {
-                bool isRuntimeGraph = false;
-                EditorGraphRequestBus::EventResult(isRuntimeGraph, scriptCanvasId, &EditorGraphRequests::IsRuntimeGraph);
-
-                if (isRuntimeGraph)
-                {
-                    ScriptCanvasAssetDescription assetDescription;
-
-                    if (!AZ::StringFunc::EndsWith(filePath, assetDescription.GetExtensionImpl(), false))
-                    {
-                        isValidSourceFile = false;
-                    }
-                }
-                // Assume it's a function for now
-                else
-                {
-                    ScriptCanvasEditor::ScriptCanvasFunctionDescription assetDescription;
-
-                    if (!AZ::StringFunc::EndsWith(filePath, assetDescription.GetExtensionImpl(), false))
-                    {
-                        isValidSourceFile = false;
-                    }
-                }
+                return true;
             }
-
-            return isValidSourceFile;
         }
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetInstance.cpp b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetInstance.cpp
deleted file mode 100644
index 30f2ecdb64..0000000000
--- a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetInstance.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "precompiled.h"
-
-#include <AzCore/Component/Entity.h>
-#include <AzCore/Serialization/IdUtils.h>
-#include <Editor/Assets/ScriptCanvasAssetInstance.h>
-
-namespace ScriptCanvasEditor
-{
-    ScriptCanvasAssetInstance::~ScriptCanvasAssetInstance()
-    {
-    }
-
-    void ScriptCanvasAssetInstance::Reflect(AZ::ReflectContext* context)
-    {
-        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
-        {
-            serializeContext->Class<ScriptCanvasAssetInstance>()
-                // TODO: This results in more data being saved per instance, but is needed to make Id remapping transparent.
-                // Allow a way to enumerate the elements for Id Remapping, while disallowing serialization
-                ->Field("m_data", &ScriptCanvasAssetInstance::m_scriptCanvasData) 
-                ->Field("m_assetRef", &ScriptCanvasAssetInstance::m_assetRef)
-                ->Field("m_entityInstanceMap", &ScriptCanvasAssetInstance::m_baseToInstanceMap)
-                ->Field("m_dataFlags", &ScriptCanvasAssetInstance::m_entityToDataFlags)
-                ->Field("m_dataPatch", &ScriptCanvasAssetInstance::m_dataPatch)
-                ;
-        }
-    }
-
-    ScriptCanvasAssetReference& ScriptCanvasAssetInstance::GetReference()
-    {
-        return m_assetRef;
-    }
-
-    const ScriptCanvasAssetReference& ScriptCanvasAssetInstance::GetReference() const
-    {
-        return m_assetRef;
-    }
-
-    ScriptCanvas::ScriptCanvasData& ScriptCanvasAssetInstance::GetScriptCanvasData()
-    {
-        return m_scriptCanvasData;
-    }
-
-    const ScriptCanvas::ScriptCanvasData& ScriptCanvasAssetInstance::GetScriptCanvasData() const
-    {
-        return m_scriptCanvasData;
-    }
-
-    void ScriptCanvasAssetInstance::ComputeDataPatch()
-    {
-        if (!m_assetRef.GetAsset().IsReady())
-        {
-            return;
-        }
-
-        ScriptCanvas::ScriptCanvasData& baseData = m_assetRef.GetAsset().Get()->GetScriptCanvasData();
-
-        AZ::SerializeContext* serializeContext{};
-        AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationRequests::GetSerializeContext);
-
-        decltype(m_baseToInstanceMap) entityIdReverseLookUp;
-        for (const auto& baseToInstancePair : m_baseToInstanceMap)
-        {
-            entityIdReverseLookUp.emplace(baseToInstancePair.second, baseToInstancePair.first);
-        }
-
-        // remap entity ids to the "original"
-        AZ::IdUtils::Remapper<AZ::EntityId>::ReplaceIdsAndIdRefs(&m_scriptCanvasData, [&entityIdReverseLookUp](AZ::EntityId sourceId, [[maybe_unused]] bool isEntityId, const AZ::IdUtils::Remapper<AZ::EntityId>::IdGenerator&) -> AZ::EntityId
-        {
-            auto findIt = entityIdReverseLookUp.find(sourceId);
-            return findIt != entityIdReverseLookUp.end() ? findIt->second : sourceId;
-        }, serializeContext);
-
-        // compute the delta (what we changed from the base slice)
-        m_dataPatch.Create(&baseData, &m_scriptCanvasData, AZ::DataPatch::FlagsMap(), GetDataFlagsForPatching(), serializeContext);
-
-        // remap entity ids back to the "instance onces"
-        AZ::IdUtils::Remapper<AZ::EntityId>::ReplaceIdsAndIdRefs(&m_scriptCanvasData, [this](AZ::EntityId sourceId, [[maybe_unused]] bool isEntityId, const AZ::IdUtils::Remapper<AZ::EntityId>::IdGenerator&) -> AZ::EntityId {
-            auto findIt = m_baseToInstanceMap.find(sourceId);
-            return findIt != m_baseToInstanceMap.end() ? findIt->second : sourceId;
-        }, serializeContext);
-
-    }
-
-    void ScriptCanvasAssetInstance::ApplyDataPatch()
-    {
-        if (!m_assetRef.GetAsset().IsReady())
-        {
-            return;
-        }
-
-        ScriptCanvas::ScriptCanvasData& baseData = m_assetRef.GetAsset().Get()->GetScriptCanvasData();
-
-        AZ::SerializeContext* serializeContext{};
-        AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationRequests::GetSerializeContext);
-        // An empty map indicates its a fresh instance (i.e. has never be instantiated and then serialized).
-        if (m_baseToInstanceMap.empty())
-        {
-            // Generate new Ids and populate the map.
-            AZ_Assert(!m_dataPatch.IsValid(), "Data patch is valid for scene slice instance, but base scene to instantiated scene Id map is not!");
-            serializeContext->CloneObjectInplace(m_scriptCanvasData, &baseData);
-            AZ::IdUtils::Remapper<AZ::EntityId>::GenerateNewIdsAndFixRefs(&m_scriptCanvasData, m_baseToInstanceMap);
-        }
-        else
-        {
-            // Clone entities while applying any data patches.
-            AZ_Assert(m_dataPatch.IsValid(), "Data patch is not valid for existing scene slice instance!");
-            ScriptCanvas::ScriptCanvasData* patchedSceneData = m_dataPatch.Apply(&baseData, serializeContext);
-
-            // Remap Ids & references.
-            AZ::IdUtils::Remapper<AZ::EntityId>::GenerateNewIdsAndFixRefs(patchedSceneData, m_baseToInstanceMap);
-            serializeContext->CloneObjectInplace(m_scriptCanvasData, patchedSceneData);
-        }
-    }
-
-    AZ::DataPatch::FlagsMap ScriptCanvasAssetInstance::GetDataFlagsForPatching() const
-    {
-        // Collect all entities' data flags
-        AZ::DataPatch::FlagsMap dataFlags;
-
-        for (auto& baseIdInstanceIdPair : m_baseToInstanceMap)
-        {
-            // Make the addressing relative to InstantiatedContainer (m_dataFlags stores flags relative to the individual entity)
-            AZ::DataPatch::AddressType addressPrefix;
-            addressPrefix.push_back(AZ_CRC("Entities", 0x50ec64e5));
-            addressPrefix.push_back(static_cast<AZ::u64>(baseIdInstanceIdPair.first));
-
-            auto findIt = m_entityToDataFlags.find(baseIdInstanceIdPair.second);
-            if (findIt != m_entityToDataFlags.end())
-            {
-                for (auto& addressDataFlagsPair : findIt->second)
-                {
-                    const AZ::DataPatch::AddressType& originalAddress = addressDataFlagsPair.first;
-
-                    AZ::DataPatch::AddressType prefixedAddress;
-                    prefixedAddress.reserve(addressPrefix.size() + originalAddress.size());
-                    prefixedAddress.insert(prefixedAddress.end(), addressPrefix.begin(), addressPrefix.end());
-                    prefixedAddress.insert(prefixedAddress.end(), originalAddress.begin(), originalAddress.end());
-
-                    dataFlags.emplace(AZStd::move(prefixedAddress), addressDataFlagsPair.second);
-                }
-            }
-        }
-
-        return dataFlags;
-    }
-}
diff --git a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetInstance.h b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetInstance.h
deleted file mode 100644
index 5e86636d90..0000000000
--- a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetInstance.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-#include <ScriptCanvas/Assets/ScriptCanvasAsset.h>
-#include <Editor/Assets/ScriptCanvasAssetReference.h>
-
-namespace ScriptCanvasEditor
-{
-    class ScriptCanvasAssetInstance
-    {
-    public:
-        AZ_TYPE_INFO(ScriptCanvasAssetInstance, "{96B16AAB-DB63-4D32-9FC9-7A5DE440B0B7}");
-        AZ_CLASS_ALLOCATOR(ScriptCanvasAssetInstance, AZ::SystemAllocator, 0);
-
-        ScriptCanvasAssetInstance() = default;
-        ~ScriptCanvasAssetInstance();
-        static void Reflect(AZ::ReflectContext* context);
-
-        const AZStd::unordered_map<AZ::EntityId, AZ::EntityId>& GetBaseToInstanceMap() const { return m_baseToInstanceMap; }
-        ScriptCanvasAssetReference& GetReference();
-        const ScriptCanvasAssetReference& GetReference() const;
-
-        ScriptCanvas::ScriptCanvasData& GetScriptCanvasData();
-        const ScriptCanvas::ScriptCanvasData& GetScriptCanvasData() const;
-
-        void ComputeDataPatch();
-        void ApplyDataPatch();
-
-    private:
-        ScriptCanvasAssetInstance(const ScriptCanvasAssetInstance&) = delete;
-        AZ::DataPatch::FlagsMap GetDataFlagsForPatching() const;
-
-        ScriptCanvas::ScriptCanvasData m_scriptCanvasData;
-        ScriptCanvasAssetReference m_assetRef;
-        AZStd::unordered_map<AZ::EntityId, AZ::EntityId> m_baseToInstanceMap;
-        AZStd::unordered_map<AZ::EntityId, AZ::DataPatch::FlagsMap> m_entityToDataFlags;
-
-        AZ::DataPatch m_dataPatch;
-        bool m_canApplyPatch;
-    };
-}
diff --git a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetReference.cpp b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetReference.cpp
deleted file mode 100644
index e4d620ba57..0000000000
--- a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetReference.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "precompiled.h"
-
-#include <AzCore/Serialization/IdUtils.h>
-#include <Editor/Assets/ScriptCanvasAssetReference.h>
-#include <Editor/Assets/ScriptCanvasAssetReferenceContainer.h>
-
-namespace ScriptCanvasEditor
-{
-    void ScriptCanvasAssetReference::Reflect(AZ::ReflectContext* context)
-    {
-        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
-        {
-            serializeContext->Class<ScriptCanvasAssetReference>()
-                ->DataContainer<ScriptCanvasAssetReferenceContainer>()
-                ;
-        }
-    }
-
-    ScriptCanvasAssetReference::ScriptCanvasAssetReference(AZ::Data::Asset<ScriptCanvasAsset> sliceAsset, bool storeInObjectStream)
-    {
-        SetAsset(sliceAsset);
-        SetAssetDataStoredInternally(storeInObjectStream);
-    }
-
-    void ScriptCanvasAssetReference::SetAsset(AZ::Data::Asset<ScriptCanvasAsset> sliceAsset)
-    {
-        m_asset = sliceAsset;
-    }
-
-    const AZ::Data::Asset<ScriptCanvasAsset>& ScriptCanvasAssetReference::GetAsset() const
-    {
-        return m_asset;
-    }
-
-    AZ::Data::Asset<ScriptCanvasAsset>& ScriptCanvasAssetReference::GetAsset()
-    {
-        return m_asset;
-    }
-
-    void ScriptCanvasAssetReference::SetAssetDataStoredInternally(bool storeInObjectStream)
-    {
-        m_storeInObjectStream = storeInObjectStream;
-    }
-
-    bool ScriptCanvasAssetReference::GetAssetDataStoredInternally() const
-    {
-        return m_storeInObjectStream;
-    }
-
-}
diff --git a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetReference.h b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetReference.h
deleted file mode 100644
index 526296b1c1..0000000000
--- a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetReference.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-#include <AzCore/Serialization/DataPatch.h>
-#include <AzCore/Asset/AssetCommon.h>
-
-namespace ScriptCanvas
-{
-    class ScriptCanvasData;
-}
-
-namespace ScriptCanvasEditor
-{
-    class ScriptCanvasAsset;
-
-    class ScriptCanvasAssetReference
-    {
-    public:
-        AZ_TYPE_INFO(ScriptCanvasAssetReference, "{C1B24507-887C-4E20-A259-BFEEDD7EDF9D}");
-        AZ_CLASS_ALLOCATOR(ScriptCanvasAssetReference, AZ::SystemAllocator, 0);
-
-        ScriptCanvasAssetReference() = default;
-        ScriptCanvasAssetReference(AZ::Data::Asset<ScriptCanvasAsset> scriptCanvasAsset, bool storeInObjectStream = false);
-        static void Reflect(AZ::ReflectContext* context);
-
-        /*!
-        \param scriptCanvasAsset asset reference to store
-        \param storeInObjectStream bool which determines if the asset data will serialized out as part of the ObjectStream when serializing
-        */
-        void SetAsset(AZ::Data::Asset<ScriptCanvasAsset> scriptCanvasAsset);
-        const AZ::Data::Asset<ScriptCanvasAsset>& GetAsset() const;
-        AZ::Data::Asset<ScriptCanvasAsset>& GetAsset();
-
-        /*!
-        \param storeInObjectStream bool which determines if the asset data will serialized out as part of the ObjectStream when serializing
-        */
-        void SetAssetDataStoredInternally(bool storeInObjectStream);
-
-        /*!
-        Indicates if this scriptCanvas reference contains an asset whose data is stored internally in this class.
-        \return true if the asset is asset data is serialize as part of this class object stream
-        */
-        bool GetAssetDataStoredInternally() const;
-
-    private:
-        bool m_storeInObjectStream = false; ///< If true the asset data is stored in the object stream with this class
-        AZ::Data::Asset<ScriptCanvasAsset> m_asset;
-        friend class ScriptCanvasAssetReferenceContainer;
-    };
-}
-
-namespace AZStd
-{
-    template<>
-    struct hash<ScriptCanvasEditor::ScriptCanvasAssetReference>
-    {
-        using argument_type = ScriptCanvasEditor::ScriptCanvasAssetReference;
-        using result_type = AZStd::size_t;
-        AZ_FORCE_INLINE size_t operator()(const argument_type& key) const
-        {
-            AZStd::hash<AZ::Data::AssetId> hasher;
-            return hasher(key.GetAsset().GetId());
-        }
-    };
-}
diff --git a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetReferenceContainer.h b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetReferenceContainer.h
deleted file mode 100644
index efff707234..0000000000
--- a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetReferenceContainer.h
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/Asset/AssetManager.h>
-#include <ScriptCanvas/Assets/ScriptCanvasAsset.h>
-#include <Editor/Assets/ScriptCanvasAssetReference.h>
-
-namespace ScriptCanvasEditor
-{
-    class ScriptCanvasAssetReferenceContainer
-        : public AZ::SerializeContext::IDataContainer
-    {
-    public:
-        ScriptCanvasAssetReferenceContainer()
-        {
-            m_storeInObjectStreamElement.m_name = "m_storeInObjectStream";
-            m_storeInObjectStreamElement.m_nameCrc = AZ_CRC("m_storeInObjectStream", 0xf5a45371);
-            m_storeInObjectStreamElement.m_typeId = azrtti_typeid<bool>();
-            m_storeInObjectStreamElement.m_offset = 0;
-            m_storeInObjectStreamElement.m_dataSize = sizeof(bool);
-            m_storeInObjectStreamElement.m_azRtti = nullptr;
-            m_storeInObjectStreamElement.m_genericClassInfo = AZ::SerializeGenericTypeInfo<bool>::GetGenericInfo();
-            m_storeInObjectStreamElement.m_editData = nullptr;
-            m_storeInObjectStreamElement.m_flags = 0;
-
-            m_assetElement.m_name = "m_asset";
-            m_assetElement.m_nameCrc = AZ_CRC("m_asset", 0x4e58e538);
-            m_assetElement.m_typeId = AZ::SerializeGenericTypeInfo<AZ::Data::Asset<ScriptCanvasAsset>>::GetClassTypeId();
-            m_assetElement.m_offset = m_storeInObjectStreamElement.m_dataSize;
-            m_assetElement.m_dataSize = sizeof(AZ::Data::Asset<ScriptCanvasAsset>);
-            m_assetElement.m_azRtti = AZ::GetRttiHelper<AZ::Data::Asset<ScriptCanvasAsset>>();
-            m_assetElement.m_genericClassInfo = AZ::SerializeGenericTypeInfo<AZ::Data::Asset<ScriptCanvasAsset>>::GetGenericInfo();
-            m_assetElement.m_editData = nullptr;
-            m_assetElement.m_flags = 0;
-            
-            m_baseDataElement.m_name = "m_scriptCanvasData";
-            m_baseDataElement.m_nameCrc = AZ_CRC("m_scriptCanvasData", 0x78a93f93);
-            m_baseDataElement.m_typeId = AZ::SerializeGenericTypeInfo<ScriptCanvas::ScriptCanvasData>::GetClassTypeId();
-            m_baseDataElement.m_offset = m_assetElement.m_offset + m_assetElement.m_dataSize;
-            m_baseDataElement.m_dataSize = sizeof(ScriptCanvas::ScriptCanvasData);
-            m_baseDataElement.m_azRtti = AZ::GetRttiHelper<ScriptCanvas::ScriptCanvasData>();
-            m_baseDataElement.m_genericClassInfo = AZ::SerializeGenericTypeInfo<ScriptCanvas::ScriptCanvasData>::GetGenericInfo();
-            m_baseDataElement.m_editData = nullptr;
-            m_baseDataElement.m_flags = 0;
-        }
-        /// Null if element with this name can't be found.
-        const AZ::SerializeContext::ClassElement* GetElement(AZ::u32 elementNameCrc) const override
-        {
-            if (m_storeInObjectStreamElement.m_nameCrc == elementNameCrc)
-            {
-                return &m_storeInObjectStreamElement;
-            }
-            if (m_assetElement.m_nameCrc == elementNameCrc)
-            {
-                return &m_assetElement;
-            }
-            if (m_baseDataElement.m_nameCrc == elementNameCrc)
-            {
-                return &m_baseDataElement;
-            }
-
-            return nullptr;
-        }
-
-        bool GetElement(AZ::SerializeContext::ClassElement& classElement, const AZ::SerializeContext::DataElement& dataElement) const override
-        {
-            if (m_storeInObjectStreamElement.m_nameCrc == dataElement.m_nameCrc)
-            {
-                classElement = m_storeInObjectStreamElement;
-                return true;
-            }
-            if (m_assetElement.m_nameCrc == dataElement.m_nameCrc)
-            {
-                classElement = m_assetElement;
-                return true;
-            }
-            if (m_baseDataElement.m_nameCrc == dataElement.m_nameCrc)
-            {
-                classElement = m_baseDataElement;
-                return true;
-            }
-            return false;
-        }
-
-        /// Enumerate elements in the array.
-        void EnumElements(void* instance, const ElementCB& cb) override
-        {
-            auto assetRef = reinterpret_cast<ScriptCanvasAssetReference*>(instance);
-
-            if (!cb(&assetRef->m_storeInObjectStream, m_storeInObjectStreamElement.m_typeId, m_storeInObjectStreamElement.m_genericClassInfo ? m_storeInObjectStreamElement.m_genericClassInfo->GetClassData() : nullptr, &m_storeInObjectStreamElement))
-            {
-                return;
-            }
-
-            if (!cb(&assetRef->m_asset, m_assetElement.m_typeId, m_assetElement.m_genericClassInfo ? m_assetElement.m_genericClassInfo->GetClassData() : nullptr, &m_assetElement))
-            {
-                return;
-            }
-
-            if (assetRef->m_storeInObjectStream && assetRef->m_asset.Get())
-            {
-                cb(&assetRef->m_asset.Get()->GetScriptCanvasData(), m_baseDataElement.m_typeId, m_baseDataElement.m_genericClassInfo ? m_baseDataElement.m_genericClassInfo->GetClassData() : nullptr, &m_baseDataElement);
-            }
-        }
-
-        void EnumTypes(const ElementTypeCB& cb) override
-        {
-            cb(m_storeInObjectStreamElement.m_typeId, &m_storeInObjectStreamElement);
-            cb(m_assetElement.m_typeId, &m_assetElement);
-            cb(m_baseDataElement.m_typeId, &m_baseDataElement);
-        }
-
-        /// Return number of elements in the container.
-        size_t  Size(void* instance) const override
-        {
-            auto assetRef = reinterpret_cast<ScriptCanvasAssetReference*>(instance);
-            return assetRef->m_storeInObjectStream && assetRef->m_asset.Get() ? m_numClassElements : m_numClassElements - 1;
-        }
-
-        /// Returns the capacity of the container. Returns 0 for objects without fixed capacity.
-        size_t Capacity(void*) const override
-        {
-            return m_numClassElements;
-        }
-
-        /// Returns true if elements pointers don't change on add/remove. If false you MUST enumerate all elements.
-        bool    IsStableElements() const override { return true; }
-
-        /// Returns true if the container is fixed size, otherwise false.
-        bool    IsFixedSize() const override { return false; }
-
-        /// Returns if the container is fixed capacity, otherwise false
-        bool    IsFixedCapacity() const override { return true; }
-
-        /// Returns true if the container is a smart pointer.
-        bool    IsSmartPointer() const override { return false; }
-
-        /// Returns true if elements can be retrieved by index.
-        bool    CanAccessElementsByIndex() const override { return false; }
-
-        /// Reserve element
-        void* ReserveElement(void* instance, const AZ::SerializeContext::ClassElement* classElement) override
-        {
-            auto assetRef = reinterpret_cast<ScriptCanvasAssetReference*>(instance);
-            if (classElement->m_nameCrc == m_storeInObjectStreamElement.m_nameCrc)
-            {
-                return &assetRef->m_storeInObjectStream;
-            }
-            if (classElement->m_nameCrc == m_assetElement.m_nameCrc)
-            {
-                if (assetRef->m_storeInObjectStream)
-                {
-                    assetRef->m_asset.SetFlags(static_cast<AZ::u8>(AZ::Data::AssetLoadBehavior::NoLoad));
-                }
-                return &assetRef->m_asset;
-            }
-            if (assetRef->m_storeInObjectStream && classElement->m_nameCrc == m_baseDataElement.m_nameCrc)
-            {
-                auto* scriptCanvasAsset = aznew ScriptCanvasAsset(assetRef->m_asset.GetId(), AZ::Data::AssetData::AssetStatus::Ready);
-                assetRef->m_asset = { scriptCanvasAsset, AZ::Data::AssetLoadBehavior::Default };
-                return &assetRef->m_asset.Get()->GetScriptCanvasData();
-            }
-
-            return instance;
-        }
-
-        /// Get an element's address by its index (called before the element is loaded).
-        void* GetElementByIndex(void*, const AZ::SerializeContext::ClassElement*, size_t) override
-        {
-            return nullptr;
-        }
-
-        /// Store element
-        void StoreElement(void* instance, void* element) override
-        {
-            auto assetRef = reinterpret_cast<ScriptCanvasAssetReference*>(instance);
-            if (assetRef->m_storeInObjectStream && assetRef->m_asset.Get() && element == &assetRef->m_asset.Get()->GetScriptCanvasData())
-            {
-                auto existingAsset = AZ::Data::AssetManager::Instance().FindAsset<ScriptCanvasAsset>(assetRef->m_asset.GetId(), assetRef->m_asset.GetAutoLoadBehavior());
-                if (existingAsset.IsReady())
-                {
-                    assetRef->m_asset = existingAsset;
-                }
-            }
-        }
-
-        /// Remove element in the container.
-        bool RemoveElement(void* instance, const void* element, AZ::SerializeContext* deletePointerDataContext) override
-        {
-            if (deletePointerDataContext)
-            {
-                auto assetRef = reinterpret_cast<ScriptCanvasAssetReference*>(instance);
-                if (&assetRef->m_storeInObjectStream == element)
-                {
-                    DeletePointerData(deletePointerDataContext, &m_storeInObjectStreamElement, &assetRef->m_storeInObjectStream);
-                }
-                else if (&assetRef->m_asset == element)
-                {
-                    DeletePointerData(deletePointerDataContext, &m_assetElement, &assetRef->m_asset);
-                }
-            }
-            return false;
-        }
-
-        /// Remove elements (removed array of elements) regardless if the container is Stable or not (IsStableElements)
-        size_t RemoveElements(void* instance, const void** elements, size_t numElements, AZ::SerializeContext* deletePointerDataContext) override
-        {
-            if (deletePointerDataContext)
-            {
-                for (size_t i = 0; i < numElements; ++i)
-                {
-                    RemoveElement(instance, elements[i], deletePointerDataContext);
-                }
-            }
-            return 0;
-        }
-
-        /// Clear elements in the instance.
-        void ClearElements(void*, AZ::SerializeContext*) override
-        {
-        }
-
-        AZ::SerializeContext::ClassElement m_storeInObjectStreamElement;
-        AZ::SerializeContext::ClassElement m_assetElement;
-        AZ::SerializeContext::ClassElement m_baseDataElement;
-        const size_t m_numClassElements = 3;
-    };
-}
diff --git a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTracker.cpp b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTracker.cpp
index 4979f5e0e8..24d9aa5ba7 100644
--- a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTracker.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTracker.cpp
@@ -22,7 +22,6 @@
 #include <Editor/Assets/ScriptCanvasMemoryAsset.h>
 
 #include <ScriptCanvas/Assets/ScriptCanvasAsset.h>
-#include <ScriptCanvas/Asset/Functions/ScriptCanvasFunctionAsset.h>
 
 #include <ScriptCanvas/Assets/ScriptCanvasAssetHandler.h>
 #include <ScriptCanvas/Core/ScriptCanvasBus.h>
diff --git a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasMemoryAsset.cpp b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasMemoryAsset.cpp
index 3304ad7987..c973034fa1 100644
--- a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasMemoryAsset.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasMemoryAsset.cpp
@@ -80,11 +80,6 @@ namespace ScriptCanvasEditor
             AZ::Data::Asset<ScriptCanvasAsset> newAsset = Clone<ScriptCanvasAsset>();
             memoryAsset.m_inMemoryAsset = newAsset;
         }
-        else if (m_assetType == azrtti_typeid<ScriptCanvasEditor::ScriptCanvasFunctionAsset>())
-        {
-            AZ::Data::Asset<ScriptCanvasEditor::ScriptCanvasFunctionAsset> newAsset = Clone<ScriptCanvasEditor::ScriptCanvasFunctionAsset>();
-            memoryAsset.m_inMemoryAsset = newAsset;
-        }
         else
         {
             AZ_Assert(false, "Unsupported Script Canvas Asset Type");
@@ -107,10 +102,6 @@ namespace ScriptCanvasEditor
         {
             asset = assetHandler->CreateAsset(assetId, azrtti_typeid<ScriptCanvasAsset>());
         }
-        else if (assetType == azrtti_typeid<ScriptCanvasEditor::ScriptCanvasFunctionAsset>())
-        {
-            asset = assetHandler->CreateAsset(assetId, azrtti_typeid<ScriptCanvasEditor::ScriptCanvasFunctionAsset>());
-        }
 
         m_inMemoryAsset = AZ::Data::Asset<AssetType>(asset, AZ::Data::AssetLoadBehavior::PreLoad);
 
@@ -155,8 +146,6 @@ namespace ScriptCanvasEditor
         streamInfo.m_streamFlags = AZ::IO::OpenMode::ModeWrite;
         streamInfo.m_streamName = m_saveAsPath;
 
-        ScriptCanvasEditor::ScriptCanvasDataRequestBus::Event(GetScriptCanvasId(), &ScriptCanvasEditor::ScriptCanvasDataRequests::SetPrettyName, GetTabName().c_str());
-
         if (!streamInfo.IsValid())
         {
             return;
@@ -223,10 +212,6 @@ namespace ScriptCanvasEditor
         {
             m_inMemoryAsset = AZ::Data::AssetManager::Instance().GetAsset<ScriptCanvasAsset>(assetId, AZ::Data::AssetLoadBehavior::Default);
         }
-        else if (assetInfo.m_assetType == azrtti_typeid<ScriptCanvasEditor::ScriptCanvasFunctionAsset>())
-        {
-            m_inMemoryAsset = AZ::Data::AssetManager::Instance().GetAsset<ScriptCanvasEditor::ScriptCanvasFunctionAsset>(assetId, AZ::Data::AssetLoadBehavior::Default);
-        }
 
         if (m_inMemoryAsset)
         {
@@ -290,15 +275,8 @@ namespace ScriptCanvasEditor
             return;
         }
 
-        if (m_assetType == azrtti_typeid<ScriptCanvasEditor::ScriptCanvasFunctionAsset>())
-        {
-            editorGraph->MarkFunctionGraph();
-        }
-
         m_scriptCanvasId = editorGraph->GetScriptCanvasId();
 
-        ScriptCanvasEditor::ScriptCanvasDataRequestBus::Event(m_scriptCanvasId, &ScriptCanvasEditor::ScriptCanvasDataRequests::SetPrettyName, GetTabName().c_str());
-
         EditorGraphNotificationBus::Handler::BusDisconnect();
         EditorGraphNotificationBus::Handler::BusConnect(m_scriptCanvasId);
 
@@ -538,10 +516,6 @@ namespace ScriptCanvasEditor
         {
             return CloneAssetData<ScriptCanvasAsset>(newAssetId);
         }
-        else if (m_assetType == azrtti_typeid<ScriptCanvasEditor::ScriptCanvasFunctionAsset>())
-        {
-            return CloneAssetData<ScriptCanvasEditor::ScriptCanvasFunctionAsset>(newAssetId);
-        }
 
         AZ_Assert(false, "The provides asset type is not supported as a valid Script Canvas memory asset");
         return AZ::Data::Asset<AZ::Data::AssetData>();
diff --git a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasMemoryAsset.h b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasMemoryAsset.h
index 8f44a7f4b8..4449bcb62a 100644
--- a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasMemoryAsset.h
+++ b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasMemoryAsset.h
@@ -21,7 +21,6 @@
 #include <Editor/Assets/ScriptCanvasAssetTrackerDefinitions.h>
 
 #include <ScriptCanvas/Asset/ScriptCanvasAssetBase.h>
-#include <ScriptCanvas/Asset/Functions/ScriptCanvasFunctionAsset.h>
 #include <ScriptCanvas/Assets/ScriptCanvasAssetHandler.h>
 
 #include <ScriptCanvas/Bus/ScriptCanvasBus.h>
diff --git a/Gems/ScriptCanvas/Code/Editor/Components/EditorGraph.cpp b/Gems/ScriptCanvas/Code/Editor/Components/EditorGraph.cpp
index f1b4af88d8..8078ef7a78 100644
--- a/Gems/ScriptCanvas/Code/Editor/Components/EditorGraph.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Components/EditorGraph.cpp
@@ -38,9 +38,6 @@ AZ_POP_DISABLE_WARNING
 #include <ScriptCanvas/Libraries/Core/EBusEventHandler.h>
 #include <ScriptCanvas/Libraries/Core/FunctionDefinitionNode.h>
 #include <Editor/Include/ScriptCanvas/GraphCanvas/MappingBus.h>
-
-#include <Core/PureData.h>
-
 #include <Editor/Include/ScriptCanvas/GraphCanvas/NodeDescriptorBus.h>
 #include <Editor/Nodes/NodeCreateUtils.h>
 #include <Editor/Nodes/NodeDisplayUtils.h>
@@ -63,7 +60,6 @@ AZ_POP_DISABLE_WARNING
 #include <Editor/GraphCanvas/PropertyInterfaces/ScriptCanvasEnumComboBoxPropertyDataInterface.h>
 #include <Editor/GraphCanvas/PropertyInterfaces/ScriptCanvasStringPropertyDataInterface.h>
 
-#include <Editor/Nodes/ScriptCanvasAssetNode.h>
 #include <Editor/Translation/TranslationHelper.h>
 #include <Editor/View/Dialogs/SettingsDialog.h>
 #include <Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.h>
@@ -1087,66 +1083,6 @@ namespace ScriptCanvasEditor
         return CanCreateConnectionBetween(scSourceEndpoint, scTargetEndpoint).IsSuccess();
     }
 
-    GraphCanvas::ConnectionValidationTooltip Graph::GetConnectionValidityTooltip(const GraphCanvas::Endpoint& sourcePoint, const GraphCanvas::Endpoint& targetPoint) const
-    {
-        ScriptCanvas::Endpoint scSourceEndpoint = ConvertToScriptCanvasEndpoint(sourcePoint);
-        ScriptCanvas::Endpoint scTargetEndpoint = ConvertToScriptCanvasEndpoint(targetPoint);
-
-        AZ::Outcome<void, AZStd::string> connectionResult = CanCreateConnectionBetween(scSourceEndpoint, scTargetEndpoint);
-
-        GraphCanvas::ConnectionValidationTooltip validationTooltip;
-
-        validationTooltip.m_isValid = connectionResult.IsSuccess();
-
-        if (!connectionResult)
-        {
-            validationTooltip.m_failureReason = connectionResult.GetError();
-        }
-
-        return validationTooltip;
-    }
-
-    bool Graph::IsValidVariableAssignment(const AZ::EntityId& variableId, const GraphCanvas::Endpoint& targetPoint) const
-    {
-        AZStd::any* userData = nullptr;
-        GraphCanvas::NodeRequestBus::EventResult(userData, variableId, &GraphCanvas::NodeRequests::GetUserData);
-        AZ::EntityId variableNodeId = (userData && userData->is<AZ::EntityId>()) ? *AZStd::any_cast<AZ::EntityId>(userData) : AZ::EntityId();
-
-        ScriptCanvas::SlotId variableSlotId;
-        ScriptCanvas::NodeRequestBus::EventResult(variableSlotId, variableNodeId, &ScriptCanvas::NodeRequests::GetSlotId, ScriptCanvas::PureData::k_getThis);
-
-        ScriptCanvas::Endpoint variableSourceEndpoint(variableNodeId, variableSlotId);
-        ScriptCanvas::Endpoint targetEndpoint = ConvertToScriptCanvasEndpoint(targetPoint);
-
-        return CanCreateConnectionBetween(variableSourceEndpoint, targetEndpoint).IsSuccess();
-    }
-
-    GraphCanvas::ConnectionValidationTooltip Graph::GetVariableAssignmentValidityTooltip(const AZ::EntityId& variableId, const GraphCanvas::Endpoint& targetPoint) const
-    {
-        AZStd::any* userData = nullptr;
-        GraphCanvas::NodeRequestBus::EventResult(userData, variableId, &GraphCanvas::NodeRequests::GetUserData);
-        AZ::EntityId variableNodeId = (userData && userData->is<AZ::EntityId>()) ? *AZStd::any_cast<AZ::EntityId>(userData) : AZ::EntityId();
-
-        ScriptCanvas::SlotId variableSlotId;
-        ScriptCanvas::NodeRequestBus::EventResult(variableSlotId, variableNodeId, &ScriptCanvas::NodeRequests::GetSlotId, ScriptCanvas::PureData::k_getThis);
-
-        ScriptCanvas::Endpoint variableSourceEndpoint(variableNodeId, variableSlotId);
-        ScriptCanvas::Endpoint targetEndpoint = ConvertToScriptCanvasEndpoint(targetPoint);
-
-        AZ::Outcome<void, AZStd::string> connectionResult = CanCreateConnectionBetween(variableSourceEndpoint, targetEndpoint);
-
-        GraphCanvas::ConnectionValidationTooltip validationTooltip;
-
-        validationTooltip.m_isValid = connectionResult.IsSuccess();
-
-        if (!connectionResult)
-        {
-            validationTooltip.m_failureReason = connectionResult.GetError();
-        }
-
-        return  validationTooltip;
-    }
-
     AZStd::string Graph::GetDataTypeString(const AZ::Uuid& typeId)
     {
         return TranslationHelper::GetSafeTypeName(ScriptCanvas::Data::FromAZType(typeId));
@@ -3190,16 +3126,6 @@ namespace ScriptCanvasEditor
         }
     }
 
-    bool Graph::IsRuntimeGraph() const
-    {
-        return GetAssetType() == azrtti_typeid<ScriptCanvas::RuntimeAsset>();
-    }
-
-    bool Graph::IsFunctionGraph() const
-    {
-        return GetAssetType() == azrtti_typeid<ScriptCanvas::SubgraphInterfaceAsset>();
-    }
-
     bool Graph::CanExposeEndpoint(const GraphCanvas::Endpoint& endpoint)
     {
         bool isEnabled = false;
diff --git a/Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasGraphUtilities.inl b/Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasGraphUtilities.inl
index 0eb3c3a719..96febf8553 100644
--- a/Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasGraphUtilities.inl
+++ b/Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasGraphUtilities.inl
@@ -14,7 +14,6 @@
 #include <AzCore/Script/ScriptContext.h>
 #include <AzFramework/API/ApplicationAPI.h>
 #include <Editor/Framework/ScriptCanvasReporter.h>
-#include <ScriptCanvas/Asset/Functions/ScriptCanvasFunctionAsset.h>
 #include <ScriptCanvas/Asset/RuntimeAsset.h>
 #include <ScriptCanvas/Asset/RuntimeAssetHandler.h>
 #include <ScriptCanvas/Assets/ScriptCanvasAsset.h>
diff --git a/Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasTraceUtilities.h b/Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasTraceUtilities.h
index 381e7c78ea..2ca5c0857f 100644
--- a/Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasTraceUtilities.h
+++ b/Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasTraceUtilities.h
@@ -20,10 +20,8 @@
 #include <ScriptCanvas/Core/ScriptCanvasBus.h>
 #include <ScriptCanvas/Data/Data.h>
 #include <ScriptCanvas/Libraries/Comparison/Comparison.h>
-#include <ScriptCanvas/Libraries/Core/BehaviorContextObjectNode.h>
 #include <ScriptCanvas/Libraries/Core/BinaryOperator.h>
 #include <ScriptCanvas/Libraries/Core/CoreNodes.h>
-#include <ScriptCanvas/Libraries/Entity/EntityRef.h>
 #include <ScriptCanvas/Libraries/Libraries.h>
 #include <ScriptCanvas/Libraries/Logic/Logic.h>
 #include <ScriptCanvas/Libraries/Math/Math.h>
@@ -44,17 +42,6 @@ namespace ScriptCanvasEditor
 {
     class ScriptCanvasAsset;
 
-    struct LoadTestFunctionResult
-    {
-        AZStd::string_view m_graphPath;
-        AZStd::unique_ptr<AZ::Entity> m_entity;
-        ScriptCanvas::RuntimeComponent* m_runtimeComponent = nullptr;
-        bool m_nativeFunctionFound = false;
-        AZ::Data::Asset<ScriptCanvasEditor::ScriptCanvasFunctionAsset> m_editorAsset;
-        AZ::Data::Asset<ScriptCanvas::SubgraphInterfaceAsset> m_runtimeAsset;
-        AZ::Data::Asset<AZ::ScriptAsset> m_scriptAsset;
-    };
-
     struct LoadTestGraphResult
     {
         AZStd::string_view m_graphPath;
diff --git a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EntityRefNodeDescriptorComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EntityRefNodeDescriptorComponent.cpp
deleted file mode 100644
index d49b776963..0000000000
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EntityRefNodeDescriptorComponent.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "precompiled.h"
-
-#include <GraphCanvas/Components/Nodes/NodeTitleBus.h>
-
-#include "EntityRefNodeDescriptorComponent.h"
-
-#include "ScriptCanvas/Core/Datum.h"
-#include "ScriptCanvas/Core/PureData.h"
-#include "ScriptCanvas/Core/Slot.h"
-
-namespace ScriptCanvasEditor
-{
-    /////////////////////////////////////
-    // EntityRefNodeDescriptorComponent
-    /////////////////////////////////////
-
-    void EntityRefNodeDescriptorComponent::Reflect(AZ::ReflectContext* reflectContext)
-    {
-        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(reflectContext);
-        if (serializeContext)
-        {
-            serializeContext->Class<EntityRefNodeDescriptorComponent, NodeDescriptorComponent>()
-                ->Version(1)
-            ;
-        }
-    }
-
-    EntityRefNodeDescriptorComponent::EntityRefNodeDescriptorComponent()
-        : NodeDescriptorComponent(NodeDescriptorType::EntityRef)
-    {
-    }
-
-    void EntityRefNodeDescriptorComponent::OnEntityNameChanged([[maybe_unused]] const AZStd::string& name)
-    {
-        UpdateNodeTitle();
-    }   
-
-    void EntityRefNodeDescriptorComponent::OnSlotInputChanged(const ScriptCanvas::SlotId& slotId)
-    {
-        if (slotId == m_endpoint.GetSlotId())
-        {
-            AZ::EntityBus::Handler::BusDisconnect();
-
-            AZ::EntityId referencedId = GetReferencedEntityId();
-
-            if (referencedId.IsValid())
-            {
-                AZ::EntityBus::Handler::BusConnect(referencedId);
-            }
-
-            UpdateNodeTitle();
-        }
-    }
-
-    void EntityRefNodeDescriptorComponent::OnAddedToGraphCanvasGraph([[maybe_unused]] const GraphCanvas::GraphId& sceneId, const AZ::EntityId& scriptCanvasNodeId)
-    {
-        ScriptCanvas::SlotId scriptCanvasSlotId;
-        ScriptCanvas::NodeRequestBus::EventResult(scriptCanvasSlotId, scriptCanvasNodeId, &ScriptCanvas::NodeRequests::GetSlotId, ScriptCanvas::PureData::k_setThis);
-
-        m_endpoint = ScriptCanvas::Endpoint(scriptCanvasNodeId, scriptCanvasSlotId);
-
-        if (m_endpoint.IsValid())
-        {
-            AZ::EntityId referencedId = GetReferencedEntityId();
-
-            if (referencedId.IsValid())
-            {
-                AZ::EntityBus::Handler::BusConnect(referencedId);
-            }
-        }
-
-        UpdateNodeTitle();
-    }
-
-    AZ::EntityId EntityRefNodeDescriptorComponent::GetReferencedEntityId() const
-    {
-        AZ::EntityId retVal;
-
-        const ScriptCanvas::Datum* object = nullptr;
-        ScriptCanvas::NodeRequestBus::EventResult(object, m_endpoint.GetNodeId(), &ScriptCanvas::NodeRequests::FindDatum, m_endpoint.GetSlotId());
-
-        if (object && object->IS_A<AZ::EntityId>())
-        {
-            retVal = (*object->GetAs<AZ::EntityId>());
-        }
-
-        return retVal;
-    }    
-    
-    void EntityRefNodeDescriptorComponent::UpdateNodeTitle()
-    {
-        bool needsTitle = true;
-        
-        if (m_endpoint.IsValid())
-        {
-            AZ::EntityId referencedId = GetReferencedEntityId();
-
-            AZStd::string entityName;
-            AZ::ComponentApplicationBus::BroadcastResult(entityName, &AZ::ComponentApplicationRequests::GetEntityName, referencedId);
-                    
-            if (!entityName.empty())
-            {
-                needsTitle = false;
-                GraphCanvas::NodeTitleRequestBus::Event(GetEntityId(), &GraphCanvas::NodeTitleRequests::SetTitle, entityName.c_str());
-            }
-            else if (referencedId.IsValid())
-            {
-                needsTitle = false;
-                GraphCanvas::NodeTitleRequestBus::Event(GetEntityId(), &GraphCanvas::NodeTitleRequests::SetTitle, referencedId.ToString().c_str());
-            }
-        }
-        
-        if (needsTitle)
-        {
-            GraphCanvas::NodeTitleRequestBus::Event(GetEntityId(), &GraphCanvas::NodeTitleRequests::SetTitle, "<None>");
-        }
-
-        GraphCanvas::NodeTitleRequestBus::Event(GetEntityId(), &GraphCanvas::NodeTitleRequests::SetSubTitle, "EntityRef");
-    }
-}
diff --git a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EntityRefNodeDescriptorComponent.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EntityRefNodeDescriptorComponent.h
deleted file mode 100644
index af8b55a69d..0000000000
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EntityRefNodeDescriptorComponent.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <GraphCanvas/Components/Nodes/NodeBus.h>
-
-#include <AzCore/Component/EntityBus.h>
-
-#include "Editor/GraphCanvas/Components/NodeDescriptors/NodeDescriptorComponent.h"
-
-#include "ScriptCanvas/Core/NodeBus.h"
-#include "ScriptCanvas/Core/Endpoint.h"
-
-namespace ScriptCanvasEditor
-{
-    class EntityRefNodeDescriptorComponent
-        : public NodeDescriptorComponent
-        , public AZ::EntityBus::Handler        
-    {
-    public:
-        AZ_COMPONENT(EntityRefNodeDescriptorComponent, "{887AE9AC-C793-4FE5-BAE2-AF6A7F70A374}", NodeDescriptorComponent);
-        static void Reflect(AZ::ReflectContext* reflectContext);
-        
-        EntityRefNodeDescriptorComponent();
-        ~EntityRefNodeDescriptorComponent() = default;
-
-        // AZ::EntityBus
-        void OnEntityNameChanged(const AZStd::string& name) override;
-        ////
-        
-        // ScriptCanvas::NodeNotificationsBus
-        void OnSlotInputChanged(const ScriptCanvas::SlotId& slotId) override;
-        ////
-
-    private:
-
-        void OnAddedToGraphCanvasGraph(const GraphCanvas::GraphId& graphId, const AZ::EntityId& scriptCanvasNodeId) override;
-
-        AZ::EntityId GetReferencedEntityId() const;
-        void UpdateNodeTitle();
-        
-        ScriptCanvas::Endpoint m_endpoint;
-    };
-}
diff --git a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/FunctionNodeDescriptorComponent.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/FunctionNodeDescriptorComponent.h
index d121762c93..68782be5cd 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/FunctionNodeDescriptorComponent.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/FunctionNodeDescriptorComponent.h
@@ -10,8 +10,6 @@
 #include <GraphCanvas/Components/VisualBus.h>
 
 #include <Editor/GraphCanvas/Components/NodeDescriptors/NodeDescriptorComponent.h>
-
-#include <ScriptCanvas/Asset/Functions/ScriptCanvasFunctionAsset.h>
 #include <ScriptCanvas/Bus/RequestBus.h>
 #include <ScriptCanvas/Bus/EditorScriptCanvasBus.h>
 
diff --git a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/Functions/ScriptCanvasFunctionAssetHandler.h b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/Functions/ScriptCanvasFunctionAssetHandler.h
deleted file mode 100644
index f9953aba99..0000000000
--- a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/Functions/ScriptCanvasFunctionAssetHandler.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/Asset/AssetManager.h>
-#include <AzCore/Asset/AssetTypeInfoBus.h>
-#include <AzCore/Serialization/ObjectStream.h>
-#include <ScriptCanvas/Asset/AssetDescription.h>
-#include <ScriptCanvas/Assets/ScriptCanvasAsset.h>
-#include <ScriptCanvas/Assets/ScriptCanvasAssetHandler.h>
-
-namespace AZ
-{
-    class SerializeContext;
-}
-
-namespace ScriptCanvasEditor
-{
-    class ScriptCanvasFunctionAsset;
-
-    /**
-    * Manages editor Script Canvas graph assets.
-    */
-    class ScriptCanvasFunctionAssetHandler
-        : public ScriptCanvasAssetHandler
-    {
-    public:
-        AZ_CLASS_ALLOCATOR(ScriptCanvasFunctionAssetHandler, AZ::SystemAllocator, 0);
-        AZ_RTTI(ScriptCanvasFunctionAssetHandler, "{CE1EB0B7-D8DA-4B9B-858B-A34DF5092BC2}", ScriptCanvasAssetHandler);
-
-        ScriptCanvasFunctionAssetHandler(AZ::SerializeContext* context = nullptr);
-        ~ScriptCanvasFunctionAssetHandler();
-
-        AZ::Data::AssetPtr CreateAsset(const AZ::Data::AssetId& id, const AZ::Data::AssetType& type) override;
-        AZ::Data::AssetHandler::LoadResult LoadAssetData(
-            const AZ::Data::Asset<AZ::Data::AssetData>& asset,
-            AZStd::shared_ptr<AZ::Data::AssetDataStream> stream,
-            const AZ::Data::AssetFilterCB& assetLoadFilterCB) override;
-        bool SaveAssetData(const AZ::Data::Asset<AZ::Data::AssetData>& asset, AZ::IO::GenericStream* stream) override;
-
-        bool SaveAssetData(const ScriptCanvasEditor::ScriptCanvasFunctionAsset* assetData, AZ::IO::GenericStream* stream);
-
-        bool SaveAssetData(const ScriptCanvasEditor::ScriptCanvasFunctionAsset* assetData, AZ::IO::GenericStream* stream, AZ::DataStream::StreamType streamType);
-
-        // Called by asset database on registration.
-        void GetAssetTypeExtensions(AZStd::vector<AZStd::string>& extensions) override;
-        void GetHandledAssetTypes(AZStd::vector<AZ::Data::AssetType>& assetTypes) override;
-
-        // Provides editor with information about script canvas graph assets.
-        AZ::Data::AssetType GetAssetType() const override;
-        const char* GetAssetTypeDisplayName() const override;
-
-        bool CanCreateComponent(const AZ::Data::AssetId& assetId) const override;
-
-        const char* GetGroup() const override;
-        const char* GetBrowserIcon() const override;
-
-        static AZ::Data::AssetType GetAssetTypeStatic();
-
-        ScriptCanvasEditor::ScriptCanvasFunctionAsset* m_scriptCanvasAsset;
-
-    };
-}
diff --git a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/EditorScriptCanvasBus.h b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/EditorScriptCanvasBus.h
index d9b2be8035..27477b4127 100644
--- a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/EditorScriptCanvasBus.h
+++ b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/EditorScriptCanvasBus.h
@@ -154,10 +154,6 @@ namespace ScriptCanvasEditor
         virtual bool ConvertReferenceToVariableNode(const GraphCanvas::Endpoint& endpoint) = 0;
 
         virtual void QueueVersionUpdate(const AZ::EntityId& graphCanvasNodeId) = 0;
-
-        virtual bool IsRuntimeGraph() const = 0;
-        virtual bool IsFunctionGraph() const = 0;
-
         virtual bool CanExposeEndpoint(const GraphCanvas::Endpoint& endpoint) = 0;
 
         virtual ScriptCanvas::Endpoint ConvertToScriptCanvasEndpoint(const GraphCanvas::Endpoint& endpoinnt) const = 0;
diff --git a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorGraph.h b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorGraph.h
index a32333e5ce..60e1649620 100644
--- a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorGraph.h
+++ b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorGraph.h
@@ -110,12 +110,12 @@ namespace ScriptCanvasEditor
             , m_graphCanvasSaveVersion(GraphCanvas::EntitySaveDataContainer::CurrentVersion)
             , m_upgradeSM(this)
         {}
-        
+
         ~Graph() override;
 
         void Activate() override;
         void Deactivate() override;
-        
+
         static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
         {
             ScriptCanvas::Graph::GetProvidedServices(provided);
@@ -160,10 +160,6 @@ namespace ScriptCanvasEditor
         bool CreateConnection(const GraphCanvas::ConnectionId& connectionId, const GraphCanvas::Endpoint& sourcePoint, const GraphCanvas::Endpoint& targetPoint) override;
 
         bool IsValidConnection(const GraphCanvas::Endpoint& sourcePoint, const GraphCanvas::Endpoint& targetPoint) const override;
-        GraphCanvas::ConnectionValidationTooltip GetConnectionValidityTooltip(const GraphCanvas::Endpoint& sourcePoint, const GraphCanvas::Endpoint& targetPoint) const override;
-
-        bool IsValidVariableAssignment(const AZ::EntityId& variableId, const GraphCanvas::Endpoint& targetPoint) const override;
-        GraphCanvas::ConnectionValidationTooltip GetVariableAssignmentValidityTooltip(const AZ::EntityId& variableId, const GraphCanvas::Endpoint& targetPoint) const override;
 
         AZStd::string GetDataTypeString(const AZ::Uuid& typeId) override;
 
@@ -192,7 +188,7 @@ namespace ScriptCanvasEditor
         GraphCanvas::CanHandleMimeEventOutcome CanHandleValueMimeEvent(const GraphCanvas::Endpoint& endpoint, const QMimeData* mimeData) override;
         bool HandleValueMimeEvent(const GraphCanvas::Endpoint& endpoint, const QMimeData* mimeData) override;
 
-        GraphCanvas::SlotId RequestExtension(const GraphCanvas::NodeId& nodeId, const GraphCanvas::ExtenderId& extenderId, GraphModelRequests::ExtensionRequestReason ) override;
+        GraphCanvas::SlotId RequestExtension(const GraphCanvas::NodeId& nodeId, const GraphCanvas::ExtenderId& extenderId, GraphModelRequests::ExtensionRequestReason) override;
         void ExtensionCancelled(const GraphCanvas::NodeId& nodeId, const GraphCanvas::ExtenderId& extenderId) override;
         void FinalizeExtension(const GraphCanvas::NodeId& nodeId, const GraphCanvas::ExtenderId& extenderId) override;
 
@@ -216,7 +212,7 @@ namespace ScriptCanvasEditor
         void PostCreationEvent() override;
         void OnPasteBegin() override;
         void OnPasteEnd() override;
-        
+
         void OnViewRegistered() override;
         /////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -262,7 +258,7 @@ namespace ScriptCanvasEditor
 
         AZStd::vector<NodeIdPair> GetNodesOfType(const ScriptCanvas::NodeTypeIdentifier&) override;
         AZStd::vector<NodeIdPair> GetVariableNodes(const ScriptCanvas::VariableId&) override;
-        
+
         void RemoveUnusedVariables() override;
 
         bool CanConvertVariableNodeToReference(const GraphCanvas::NodeId& nodeId) override;
@@ -270,12 +266,9 @@ namespace ScriptCanvasEditor
         bool ConvertReferenceToVariableNode(const GraphCanvas::Endpoint& endpoint) override;
 
         void QueueVersionUpdate(const AZ::EntityId& graphCanvasNodeId) override;
-        
-        bool IsRuntimeGraph() const override;
-        bool IsFunctionGraph() const override;
 
         bool CanExposeEndpoint(const GraphCanvas::Endpoint& endpoint) override;
-        
+
         ScriptCanvas::Endpoint ConvertToScriptCanvasEndpoint(const GraphCanvas::Endpoint& endpoint) const override;
         GraphCanvas::Endpoint ConvertToGraphCanvasEndpoint(const ScriptCanvas::Endpoint& endpoint) const override;
         ////
@@ -333,8 +326,8 @@ namespace ScriptCanvasEditor
         Graph(const Graph&) = delete;
 
         void DisplayUpdateToast();
-        
-        AZ::EntityId          ConvertToScriptCanvasNodeId(const GraphCanvas::NodeId& nodeId) const;        
+
+        AZ::EntityId          ConvertToScriptCanvasNodeId(const GraphCanvas::NodeId& nodeId) const;
 
         GraphCanvas::NodePropertyDisplay* CreateDisplayPropertyForSlot(const AZ::EntityId& scriptCanvasNodeId, const ScriptCanvas::SlotId& scriptCanvasSlotId) const;
 
@@ -370,10 +363,10 @@ namespace ScriptCanvasEditor
         AZ::EntityId m_wrapperNodeDropTarget;
 
         VariableComboBoxDataModel m_variableDataModel;
-        
+
         WrappedNodeGroupingMap m_wrappedNodeGroupings;
         AZStd::vector< AZ::EntityId > m_lastGraphCanvasCreationGroup;
-        
+
         AZ::Entity* m_graphCanvasSceneEntity;
 
         GraphCanvas::EntitySaveDataContainer::VersionInformation m_graphCanvasSaveVersion;
diff --git a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/GraphCanvas/NodeDescriptorBus.h b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/GraphCanvas/NodeDescriptorBus.h
index 6822576482..a0b0cea549 100644
--- a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/GraphCanvas/NodeDescriptorBus.h
+++ b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/GraphCanvas/NodeDescriptorBus.h
@@ -37,7 +37,7 @@ namespace ScriptCanvasEditor
         EBusHandler,
         EBusHandlerEvent,
         EBusSender,
-        EntityRef,
+        _deprecated_,
         VariableNode,
         SetVariable,
         GetVariable,
diff --git a/Gems/ScriptCanvas/Code/Editor/Nodes/EditorLibrary.cpp b/Gems/ScriptCanvas/Code/Editor/Nodes/EditorLibrary.cpp
deleted file mode 100644
index fcdc7b2780..0000000000
--- a/Gems/ScriptCanvas/Code/Editor/Nodes/EditorLibrary.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "precompiled.h"
-
-#include <AzCore/Serialization/EditContext.h>
-
-#include <Editor/Nodes/EditorLibrary.h>
-#include <Editor/Nodes/ScriptCanvasAssetNode.h>
-
-
-namespace ScriptCanvasEditor
-{
-    namespace Library
-    {
-        void Editor::Reflect(AZ::ReflectContext* reflection)
-        {
-            AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(reflection);
-            if (serializeContext)
-            {
-                serializeContext->Class<Editor, LibraryDefinition>()
-                    ->Version(1)
-                    ;
-
-                AZ::EditContext* editContext = serializeContext->GetEditContext();
-                if (editContext)
-                {
-                    editContext->Class<Editor>("Editor", "")
-                        ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/All.png")
-                        ;
-                }
-            }
-        }
-
-        void Editor::InitNodeRegistry(ScriptCanvas::NodeRegistry& nodeRegistry)
-        {
-            ScriptCanvas::Library::AddNodeToRegistry<Editor, ScriptCanvasAssetNode>(nodeRegistry);
-        }
-
-        AZStd::vector<AZ::ComponentDescriptor*> Editor::GetComponentDescriptors()
-        {
-            return AZStd::vector<AZ::ComponentDescriptor*>({
-                ScriptCanvasAssetNode::CreateDescriptor(),
-            });
-        }
-    }
-
-    AZStd::vector<AZ::ComponentDescriptor*> GetLibraryDescriptors()
-    {
-        return Library::Editor::GetComponentDescriptors();
-    }
-}
diff --git a/Gems/ScriptCanvas/Code/Editor/Nodes/EditorLibrary.h b/Gems/ScriptCanvas/Code/Editor/Nodes/EditorLibrary.h
deleted file mode 100644
index 4ea81a869a..0000000000
--- a/Gems/ScriptCanvas/Code/Editor/Nodes/EditorLibrary.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <ScriptCanvas/Libraries/Libraries.h>
-
-namespace AZ
-{
-    class ReflectContext;
-    class ComponentDescriptor;
-}
-
-namespace ScriptCanvasEditor
-{
-    namespace Library
-    {
-        struct Editor : public ScriptCanvas::Library::LibraryDefinition
-        {
-            AZ_RTTI(Editor, "{59697735-4B64-4DC5-8380-02B2999FFCFE}", ScriptCanvas::Library::LibraryDefinition);
-
-            static void Reflect(AZ::ReflectContext*);
-            static void InitNodeRegistry(ScriptCanvas::NodeRegistry& nodeRegistry);
-            static AZStd::vector<AZ::ComponentDescriptor*> GetComponentDescriptors();
-        };
-    }
-
-    AZStd::vector<AZ::ComponentDescriptor*> GetLibraryDescriptors();
-}
diff --git a/Gems/ScriptCanvas/Code/Editor/Nodes/NodeCreateUtils.cpp b/Gems/ScriptCanvas/Code/Editor/Nodes/NodeCreateUtils.cpp
index a7282f85b0..0b2d0de958 100644
--- a/Gems/ScriptCanvas/Code/Editor/Nodes/NodeCreateUtils.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Nodes/NodeCreateUtils.cpp
@@ -26,7 +26,6 @@
 #include <ScriptCanvas/Libraries/Core/ReceiveScriptEvent.h>
 #include <ScriptCanvas/Libraries/Core/SendScriptEvent.h>
 #include <ScriptCanvas/Libraries/Core/SetVariable.h>
-#include <ScriptCanvas/Libraries/Entity/EntityRef.h>
 
 namespace ScriptCanvasEditor::Nodes
 {
@@ -132,36 +131,6 @@ namespace ScriptCanvasEditor::Nodes
         return AZStd::make_pair(node, nodeIdPair);
     }
 
-    NodeIdPair CreateEntityNode(const AZ::EntityId& sourceId, const ScriptCanvas::ScriptCanvasId& scriptCanvasId)
-    {
-        AZ_PROFILE_TIMER("ScriptCanvas", __FUNCTION__);
-        NodeIdPair nodeIdPair;
-
-        ScriptCanvas::Node* node = nullptr;
-        AZ::Entity* scriptCanvasEntity{ aznew AZ::Entity };
-        scriptCanvasEntity->Init();
-        nodeIdPair.m_scriptCanvasId = scriptCanvasEntity->GetId();
-        ScriptCanvas::SystemRequestBus::BroadcastResult(node, &ScriptCanvas::SystemRequests::CreateNodeOnEntity, scriptCanvasEntity->GetId(), scriptCanvasId, ScriptCanvas::Nodes::Entity::EntityRef::RTTI_Type());
-
-        auto* entityNode = azrtti_cast<ScriptCanvas::Nodes::Entity::EntityRef*>(node);
-        entityNode->SetEntityRef(sourceId);
-
-        // Set the name
-        AZ::Entity* sourceEntity = nullptr;
-        AZ::ComponentApplicationBus::BroadcastResult(sourceEntity, &AZ::ComponentApplicationRequests::FindEntity, sourceId);
-        if (sourceEntity)
-        {
-            scriptCanvasEntity->SetName(AZStd::string::format("SC-EntityRef(%s)", sourceEntity->GetName().data()));
-        }
-
-        AZ::EntityId graphCanvasGraphId;
-        EditorGraphRequestBus::EventResult(graphCanvasGraphId, scriptCanvasId, &EditorGraphRequests::GetGraphCanvasGraphId);
-
-        nodeIdPair.m_graphCanvasId = DisplayEntityNode(graphCanvasGraphId, entityNode);
-
-        return nodeIdPair;
-    }
-
     NodeIdPair CreateObjectMethodNode(AZStd::string_view className, AZStd::string_view methodName, const ScriptCanvas::ScriptCanvasId& scriptCanvasId, ScriptCanvas::PropertyStatus propertyStatus)
     {
         AZ_PROFILE_TIMER("ScriptCanvas", __FUNCTION__);
diff --git a/Gems/ScriptCanvas/Code/Editor/Nodes/NodeCreateUtils.h b/Gems/ScriptCanvas/Code/Editor/Nodes/NodeCreateUtils.h
index c24b48a289..a3a9a4cc1e 100644
--- a/Gems/ScriptCanvas/Code/Editor/Nodes/NodeCreateUtils.h
+++ b/Gems/ScriptCanvas/Code/Editor/Nodes/NodeCreateUtils.h
@@ -28,7 +28,6 @@ namespace ScriptCanvasEditor::Nodes
     // Specific create methods which will also handle displaying the node.
     AZStd::pair<ScriptCanvas::Node*, NodeIdPair> CreateAndGetNode(const AZ::Uuid& classData, const ScriptCanvas::ScriptCanvasId& scriptCanvasId, const StyleConfiguration& styleConfiguration, AZStd::function<void(ScriptCanvas::Node*)> = nullptr);
     NodeIdPair CreateNode(const AZ::Uuid& classData, const ScriptCanvas::ScriptCanvasId& scriptCanvasId, const StyleConfiguration& styleConfiguration);
-    NodeIdPair CreateEntityNode(const AZ::EntityId& sourceId, const ScriptCanvas::ScriptCanvasId& scriptCanvasId);
     NodeIdPair CreateObjectMethodNode(AZStd::string_view className, AZStd::string_view methodName, const ScriptCanvas::ScriptCanvasId& scriptCanvasId, ScriptCanvas::PropertyStatus propertyStatus);
     NodeIdPair CreateObjectMethodOverloadNode(AZStd::string_view className, AZStd::string_view methodName, const ScriptCanvas::ScriptCanvasId& scriptCanvasGraphId);
     NodeIdPair CreateGlobalMethodNode(AZStd::string_view methodName, const ScriptCanvas::ScriptCanvasId& scriptCanvasId);
diff --git a/Gems/ScriptCanvas/Code/Editor/Nodes/NodeDisplayUtils.cpp b/Gems/ScriptCanvas/Code/Editor/Nodes/NodeDisplayUtils.cpp
index ba87796161..691cfe3698 100644
--- a/Gems/ScriptCanvas/Code/Editor/Nodes/NodeDisplayUtils.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Nodes/NodeDisplayUtils.cpp
@@ -18,7 +18,6 @@
 #include <GraphCanvas/Components/NodeDescriptors/EBusHandlerEventNodeDescriptorComponent.h>
 #include <GraphCanvas/Components/NodeDescriptors/EBusHandlerNodeDescriptorComponent.h>
 #include <GraphCanvas/Components/NodeDescriptors/EBusSenderNodeDescriptorComponent.h>
-#include <GraphCanvas/Components/NodeDescriptors/EntityRefNodeDescriptorComponent.h>
 #include <GraphCanvas/Components/NodeDescriptors/FunctionNodeDescriptorComponent.h>
 #include <GraphCanvas/Components/NodeDescriptors/GetVariableNodeDescriptorComponent.h>
 #include <GraphCanvas/Components/NodeDescriptors/NodelingDescriptorComponent.h>
@@ -44,8 +43,6 @@
 #include <ScriptCanvas/Libraries/Core/Method.h>
 #include <ScriptCanvas/Libraries/Core/SendScriptEvent.h>
 #include <ScriptCanvas/Libraries/Core/SetVariable.h>
-#include <ScriptCanvas/Libraries/Entity/EntityRef.h>
-
 
 namespace ScriptCanvasEditor::Nodes::SlotDisplayHelper
 {
@@ -231,57 +228,6 @@ namespace ScriptCanvasEditor::Nodes
         return DisplayGeneralScriptCanvasNode(graphCanvasGraphId, node, nodeConfiguration);
     }
 
-    AZ::EntityId DisplayEntityNode(AZ::EntityId, const ScriptCanvas::Nodes::Entity::EntityRef* entityNode)
-    {
-        AZ::EntityId graphCanvasNodeId;
-
-        AZ::Entity* graphCanvasEntity = nullptr;
-        GraphCanvas::GraphCanvasRequestBus::BroadcastResult(graphCanvasEntity, &GraphCanvas::GraphCanvasRequests::CreateGeneralNode, ".entity");
-        AZ_Assert(graphCanvasEntity, "Unable to create GraphCanvas Bus Node");
-
-        graphCanvasNodeId = graphCanvasEntity->GetId();
-
-        // Add the icon component
-        graphCanvasEntity->CreateComponent<IconComponent>(ScriptCanvas::Nodes::Entity::EntityRef::RTTI_Type());
-        graphCanvasEntity->CreateComponent<EntityRefNodeDescriptorComponent>();
-        graphCanvasEntity->CreateComponent<SlotMappingComponent>(entityNode->GetEntityId());
-        graphCanvasEntity->CreateComponent<SceneMemberMappingComponent>(entityNode->GetEntityId());
-
-        graphCanvasEntity->Init();
-        graphCanvasEntity->Activate();
-
-        // Set the user data on the GraphCanvas node to be the EntityId of the ScriptCanvas node
-        AZStd::any* graphCanvasUserData = nullptr;
-        GraphCanvas::NodeRequestBus::EventResult(graphCanvasUserData, graphCanvasNodeId, &GraphCanvas::NodeRequests::GetUserData);
-        if (graphCanvasUserData)
-        {
-            *graphCanvasUserData = entityNode->GetEntityId();
-        }
-
-        // Create the GraphCanvas slots
-        for (const auto& slot : entityNode->GetSlots())
-        {
-            if (slot.GetDescriptor() == ScriptCanvas::SlotDescriptors::DataOut() && slot.IsVisible())
-            {
-                DisplayScriptCanvasSlot(graphCanvasNodeId, slot);
-            }
-        }
-
-        AZ::Entity* sourceEntity = nullptr;
-        AZ::ComponentApplicationBus::BroadcastResult(sourceEntity, &AZ::ComponentApplicationRequests::FindEntity, entityNode->GetEntityRef());
-
-        if (sourceEntity)
-        {
-            graphCanvasEntity->SetName(AZStd::string::format("GC-EntityRef(%s)", sourceEntity->GetName().data()));
-        }
-        else
-        {
-            graphCanvasEntity->SetName(AZStd::string::format("GC-EntityRef(%s)", entityNode->GetEntityRef().ToString().c_str()));
-        }
-
-        return graphCanvasNodeId;
-    }
-
     static void ConfigureGeneralScriptCanvasEntity(const ScriptCanvas::Node* node, AZ::Entity* graphCanvasEntity, const GraphCanvas::SlotGroup& slotGroup = GraphCanvas::SlotGroups::Invalid)
     {
         if (node->RequiresDynamicSlotOrdering())
@@ -1145,10 +1091,6 @@ namespace ScriptCanvasEditor::Nodes
         {
             graphCanvasNodeId = DisplayAzEventHandlerNode(graphCanvasGraphId, azEventHandlerNode);
         }
-        else if (azrtti_istypeof<ScriptCanvas::Nodes::Entity::EntityRef>(node))
-        {
-            graphCanvasNodeId = DisplayEntityNode(graphCanvasGraphId, static_cast<const ScriptCanvas::Nodes::Entity::EntityRef*>(node));
-        }
         else if (azrtti_istypeof<ScriptCanvas::Nodes::Core::ReceiveScriptEvent>(node))
         {
             graphCanvasNodeId = DisplayScriptEventWrapperNode(graphCanvasGraphId, static_cast<const ScriptCanvas::Nodes::Core::ReceiveScriptEvent*>(node));
diff --git a/Gems/ScriptCanvas/Code/Editor/Nodes/NodeDisplayUtils.h b/Gems/ScriptCanvas/Code/Editor/Nodes/NodeDisplayUtils.h
index 2ac38d86ed..3befb20846 100644
--- a/Gems/ScriptCanvas/Code/Editor/Nodes/NodeDisplayUtils.h
+++ b/Gems/ScriptCanvas/Code/Editor/Nodes/NodeDisplayUtils.h
@@ -30,10 +30,6 @@ namespace ScriptCanvas::Nodes::Core
     class SetVariableNode;
     class SendScriptEvent;
 }
-namespace ScriptCanvas::Nodes::Entity
-{
-    class EntityRef;
-}
 namespace ScriptEvents
 {
     class Method;
@@ -45,7 +41,6 @@ namespace ScriptCanvasEditor::Nodes
     AZ::EntityId DisplayScriptCanvasNode(AZ::EntityId graphCanvasGraphId, const ScriptCanvas::Node* node);
 
     // Core Node
-    AZ::EntityId DisplayEntityNode(AZ::EntityId graphCanvasGraphId, const ScriptCanvas::Nodes::Entity::EntityRef* entityNode);
     AZ::EntityId DisplayEbusEventNode(AZ::EntityId graphCanvasGraphId, const AZStd::string& busName, const AZStd::string& eventName, const ScriptCanvas::EBusEventId& eventId);
     AZ::EntityId DisplayEbusWrapperNode(AZ::EntityId graphCanvasGraphId, const ScriptCanvas::Nodes::Core::EBusEventHandler* busNode);
     AZ::EntityId DisplayGetVariableNode(AZ::EntityId graphCanvasGraphId, const ScriptCanvas::Nodes::Core::GetVariableNode* variableNode);
diff --git a/Gems/ScriptCanvas/Code/Editor/Nodes/NodeUtils.cpp b/Gems/ScriptCanvas/Code/Editor/Nodes/NodeUtils.cpp
index a0d79f28a3..b3feb37671 100644
--- a/Gems/ScriptCanvas/Code/Editor/Nodes/NodeUtils.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Nodes/NodeUtils.cpp
@@ -11,26 +11,10 @@
 #include <GraphCanvas/Components/Slots/SlotBus.h>
 #include <GraphCanvas/Components/DynamicOrderingDynamicSlotComponent.h>
 
-#include <ScriptCanvas/Core/PureData.h>
 #include <ScriptCanvas/Core/NodeBus.h>
 
 namespace
 {
-    void CopyTranslationKeyedNameToDatumLabel(ScriptCanvas::PureData* node,
-                                                const GraphCanvas::TranslationKeyedString& name)
-    {
-        ScriptCanvas::SlotId slotId = node->GetSlotId(ScriptCanvas::PureData::k_setThis);
-        if (!slotId.IsValid())
-        {
-            return;
-        }
-
-        ScriptCanvas::ModifiableDatumView datumView;
-        node->FindModifiableDatumView(slotId, datumView);
-
-        datumView.RelabelDatum(name.GetDisplayString());
-    }
-
     ScriptCanvas::ConnectionType ToScriptCanvasConnectionType(GraphCanvas::ConnectionType connectionType)
     {
         ScriptCanvas::ConnectionType scriptCanvasConnectionType = ScriptCanvas::ConnectionType::Unknown;
diff --git a/Gems/ScriptCanvas/Code/Editor/Nodes/ScriptCanvasAssetNode.cpp b/Gems/ScriptCanvas/Code/Editor/Nodes/ScriptCanvasAssetNode.cpp
deleted file mode 100644
index 3bc1f1b033..0000000000
--- a/Gems/ScriptCanvas/Code/Editor/Nodes/ScriptCanvasAssetNode.cpp
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "precompiled.h"
-#include <Editor/Nodes/ScriptCanvasAssetNode.h>
-
-#include <ScriptCanvas/Core/Graph.h>
-#include <Editor/Assets/ScriptCanvasAssetTrackerBus.h>
-
-namespace ScriptCanvasEditor
-{
-    /**
-    * \note when we reflecting we can check if the class is inheriting from IEventHandler
-    * and use the this->events.
-    */
-    class ScriptCanvasAssetNodeEventHandler
-        : public AZ::SerializeContext::IEventHandler
-    {
-        void OnReadBegin(void* classPtr)
-        {
-            auto* scriptCanvasAssetNode = reinterpret_cast<ScriptCanvasAssetNode*>(classPtr);
-            scriptCanvasAssetNode->ComputeDataPatch();
-        }
-    };
-
-    void ScriptCanvasAssetNode::Reflect(AZ::ReflectContext* context)
-    {
-        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
-        if (!serializeContext)
-        {
-            return;
-        }
-
-        serializeContext->Class<ScriptCanvasAssetNode, ScriptCanvas::Node>()
-            ->Version(0)
-            ->EventHandler<ScriptCanvasAssetNodeEventHandler>()
-            ->Field("m_assetInstance", &ScriptCanvasAssetNode::m_scriptCanvasAssetInstance)
-            ;
-
-        if (AZ::EditContext* editContext = serializeContext->GetEditContext())
-        {
-            editContext->Class<ScriptCanvasAssetNode>("ScriptCanvas Asset", "Script Canvas Asset Node which contains a reference to another ScriptCanvas graph")
-                ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Placeholder.png")
-                ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::List)
-                ;
-        }
-    }
-
-    ScriptCanvasAssetNode::ScriptCanvasAssetNode(const AZ::Data::Asset<ScriptCanvasAsset>& scriptCanvasAsset, bool storeAssetDataInternally)
-    {
-        SetAssetDataStoredInternally(storeAssetDataInternally);
-        SetAsset(scriptCanvasAsset);
-    }
-
-    ScriptCanvasAssetNode::~ScriptCanvasAssetNode()
-    {
-    }
-
-    void ScriptCanvasAssetNode::OnInputSignal(const ScriptCanvas::SlotId&)
-    {
-
-    }
-
-    void ScriptCanvasAssetNode::OnInit()
-    {
-        if (GetAsset().GetId().IsValid())
-        {
-            AZ::Data::AssetBus::Handler::BusConnect(GetAsset().GetId());
-            AZ::Entity* scriptCanvasEntity = GetScriptCanvasEntity();
-            if (scriptCanvasEntity)
-            {
-                if (scriptCanvasEntity->GetState() == AZ::Entity::State::Constructed)
-                {
-                    scriptCanvasEntity->Init();
-                }
-                if (scriptCanvasEntity->GetState() == AZ::Entity::State::Init)
-                {
-                    scriptCanvasEntity->Activate();
-                }
-            }
-        }
-    }
-
-    bool ScriptCanvasAssetNode::GetAssetDataStoredInternally() const
-    {
-        return m_scriptCanvasAssetInstance.GetReference().GetAssetDataStoredInternally();
-    }
-
-    void ScriptCanvasAssetNode::SetAssetDataStoredInternally(bool storeInObjectStream)
-    {
-        m_scriptCanvasAssetInstance.GetReference().SetAssetDataStoredInternally(storeInObjectStream);
-    }
-
-    ScriptCanvas::ScriptCanvasData& ScriptCanvasAssetNode::GetScriptCanvasData()
-    {
-        return m_scriptCanvasAssetInstance.GetScriptCanvasData();
-    }
-
-    const ScriptCanvas::ScriptCanvasData& ScriptCanvasAssetNode::GetScriptCanvasData() const
-    {
-        return m_scriptCanvasAssetInstance.GetScriptCanvasData();
-    }
-
-    AZ::Entity* ScriptCanvasAssetNode::GetScriptCanvasEntity() const
-    {
-        return GetScriptCanvasData().GetScriptCanvasEntity();
-    }
-
-    AZ::Data::Asset<ScriptCanvasAsset>& ScriptCanvasAssetNode::GetAsset()
-    {
-        return m_scriptCanvasAssetInstance.GetReference().GetAsset();
-    }
-
-    const AZ::Data::Asset<ScriptCanvasAsset>& ScriptCanvasAssetNode::GetAsset() const
-    {
-        return m_scriptCanvasAssetInstance.GetReference().GetAsset();
-    }
-
-    void ScriptCanvasAssetNode::SetAsset(const AZ::Data::Asset<ScriptCanvasAsset>& scriptCanvasAsset)
-    {
-        m_scriptCanvasAssetInstance.GetReference().SetAsset(scriptCanvasAsset);
-        if (scriptCanvasAsset.GetId().IsValid())
-        {
-            auto onAssetReady = [](ScriptCanvasMemoryAsset&) {};
-            AssetTrackerRequestBus::Broadcast(&AssetTrackerRequests::Load, scriptCanvasAsset.GetId(), azrtti_typeid<ScriptCanvasAsset>(), onAssetReady);
-
-            AZ::Data::AssetBus::Handler::BusConnect(scriptCanvasAsset.GetId());
-            ApplyDataPatch();
-        }
-    }
-
-    void ScriptCanvasAssetNode::OnAssetReloaded(AZ::Data::Asset<AZ::Data::AssetData> asset)
-    {
-        SetAsset(asset);
-        if (!GetAsset().IsReady())
-        {
-            AZ_Error("Script Canvas", false, "Reloaded graph with id %s is not valid", asset.GetId().ToString<AZStd::string>().data());
-            return;
-        }
-
-        // Update data patches against the old version of the asset.
-        ApplyDataPatch();
-    }
-
-    void ScriptCanvasAssetNode::OnAssetUnloaded(const AZ::Data::AssetId assetId, const AZ::Data::AssetType)
-    {
-        AZ::Data::AssetBus::Handler::BusDisconnect(assetId);
-    }
-
-    void ScriptCanvasAssetNode::ComputeDataPatch()
-    {
-        m_scriptCanvasAssetInstance.ComputeDataPatch();
-    }
-
-    void ScriptCanvasAssetNode::ApplyDataPatch()
-    {
-        m_scriptCanvasAssetInstance.ApplyDataPatch();
-    }
-
-    bool ScriptCanvasAssetNode::Visit(const VisitCB& preVisitCB, const VisitCB & postVisitCB)
-    {
-        AZStd::unordered_set<AZ::Data::AssetId> visitedGraphs;
-        return Visit(preVisitCB, postVisitCB, visitedGraphs);
-    }
-
-    bool ScriptCanvasAssetNode::Visit(const VisitCB& preVisitCB, const VisitCB & postVisitCB, AZStd::unordered_set<AZ::Data::AssetId>& visitedGraphs)
-    {
-        const AZ::Data::AssetId& visitedAssetId = GetAsset().GetId();
-        if (visitedGraphs.count(visitedAssetId) > 0)
-        {
-            AZ_Error("Script Canvas", false, "The Script Canvas Asset %s has already been visited, processing will stop", visitedAssetId.ToString<AZStd::string>().data());
-            return false;
-        }
-
-        if (!preVisitCB || preVisitCB(*this))
-        {
-            auto graph = GetScriptCanvasEntity() ? AZ::EntityUtils::FindFirstDerivedComponent<ScriptCanvas::Graph>(GetScriptCanvasEntity()) : nullptr;
-            if (graph)
-            {
-                for (AZ::Entity* nodeEntity : graph->GetNodeEntities())
-                {
-                    if (auto childAssetNode = AZ::EntityUtils::FindFirstDerivedComponent<ScriptCanvasAssetNode>(nodeEntity))
-                    {
-                        // Visit ScriptCanvasAssetNodes that are in the asset referenced by @assetNode
-                        if (!childAssetNode->Visit(preVisitCB, postVisitCB, visitedGraphs))
-                        {
-                            break;
-                        }
-
-                    }
-                }
-            }
-        }
-
-        // Visit siblings ScriptCanvasAssetNodes
-        bool visitSiblings = !postVisitCB || postVisitCB(*this);
-        visitedGraphs.insert(visitedAssetId);
-        return visitSiblings;
-    }
-}
diff --git a/Gems/ScriptCanvas/Code/Editor/Nodes/ScriptCanvasAssetNode.h b/Gems/ScriptCanvas/Code/Editor/Nodes/ScriptCanvasAssetNode.h
deleted file mode 100644
index 8d3a5bf3d8..0000000000
--- a/Gems/ScriptCanvas/Code/Editor/Nodes/ScriptCanvasAssetNode.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/Component/Component.h>
-
-#include <ScriptCanvas/Core/Node.h>
-#include <ScriptCanvas/Bus/GraphBus.h>
-#include <ScriptCanvas/Assets/ScriptCanvasAsset.h>
-#include <Editor/Assets/ScriptCanvasAssetInstance.h>
-
-namespace ScriptCanvasEditor
-{
-    //! A group of entities in a scene
-    class ScriptCanvasAssetNode
-        : public ScriptCanvas::Node
-        , protected AZ::Data::AssetBus::Handler
-    {
-    public:
-        AZ_COMPONENT(ScriptCanvasAssetNode, "{65A34956-B6ED-4EB2-966C-5BC844F7B05E}", ScriptCanvas::Node);
-
-        static void Reflect(AZ::ReflectContext* context);
-
-        ScriptCanvasAssetNode() = default;
-        ScriptCanvasAssetNode(const AZ::Data::Asset<ScriptCanvasAsset>& scriptCanvasAsset, bool storeAssetDataInternally);
-        ~ScriptCanvasAssetNode() override;
-
-        // AZ::Component
-        static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
-        {
-            provided.push_back(AZ_CRC("ScriptCanvas_AssetService", 0x17a357ae));
-        }
-
-        static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
-        {
-            incompatible.push_back(AZ_CRC("ScriptCanvas_AssetService", 0x17a357ae));
-        }
-
-        static void GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent)
-        {
-            (void)dependent;
-        }
-
-        static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
-        {
-            (void)required;
-        }
-        ////
-
-        void OnInit() override;
-
-        // Retrieves the asset associated with this node
-        AZ::Data::Asset<ScriptCanvasAsset>& GetAsset();
-        const AZ::Data::Asset<ScriptCanvasAsset>& GetAsset() const;
-        // Sets the asset associated with this node
-        void SetAsset(const AZ::Data::Asset<ScriptCanvasAsset>& scriptCanvasAsset);
-
-        bool GetAssetDataStoredInternally() const;
-        void SetAssetDataStoredInternally(bool storeInObjectStream);
-
-        ScriptCanvas::ScriptCanvasData& GetScriptCanvasData();
-        const ScriptCanvas::ScriptCanvasData& GetScriptCanvasData() const;
-
-        AZ::Entity* GetScriptCanvasEntity() const;
-
-        using VisitCB = AZStd::function<bool(ScriptCanvasAssetNode& scriptCanvasAssetNode)>;
-        bool Visit(const VisitCB& preVisitCB, const VisitCB & postVisitCB);
-        bool Visit(const VisitCB& preVisitCB, const VisitCB & postVisitCB, AZStd::unordered_set<AZ::Data::AssetId>& visitedGraphs);
-        ////
-
-    protected:
-        void OnInputSignal(const ScriptCanvas::SlotId&) override;
-        // AssetBus::Handler
-        void OnAssetReloaded(AZ::Data::Asset<AZ::Data::AssetData> asset) override;
-        void OnAssetUnloaded(const AZ::Data::AssetId assetId, const AZ::Data::AssetType) override;
-        ////
-
-        friend class ScriptCanvasAssetNodeEventHandler;
-        void ComputeDataPatch();
-        void ApplyDataPatch();
-
-    private:
-        ScriptCanvasAssetNode(const ScriptCanvasAssetNode&) = delete;
-        //! References to the Script Canvas asset used by this component
-        ScriptCanvasAssetInstance m_scriptCanvasAssetInstance;
-    };
-}
diff --git a/Gems/ScriptCanvas/Code/Editor/ReflectComponent.cpp b/Gems/ScriptCanvas/Code/Editor/ReflectComponent.cpp
index a90e3a9fd5..435aa27331 100644
--- a/Gems/ScriptCanvas/Code/Editor/ReflectComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/ReflectComponent.cpp
@@ -13,10 +13,6 @@
 #include <AzCore/Serialization/EditContext.h>
 
 #include <Editor/Assets/ScriptCanvasAssetHolder.h>
-#include <Editor/Assets/ScriptCanvasAssetReference.h>
-#include <Editor/Assets/ScriptCanvasAssetInstance.h>
-
-#include <Editor/Nodes/EditorLibrary.h>
 
 #include <Editor/View/Dialogs/SettingsDialog.h>
 #include <Editor/View/Widgets/LoggingPanel/LiveWindowSession/LiveLoggingWindowSession.h>
@@ -36,12 +32,9 @@ namespace ScriptCanvasEditor
     void ReflectComponent::Reflect(AZ::ReflectContext* context)
     {
         ScriptCanvas::ScriptCanvasData::Reflect(context);
-        ScriptCanvasAssetReference::Reflect(context);
-        ScriptCanvasAssetInstance::Reflect(context);
         ScriptCanvasAssetHolder::Reflect(context);
         EditorSettings::EditorWorkspace::Reflect(context);        
         EditorSettings::ScriptCanvasEditorSettings::Reflect(context);        
-        Library::Editor::Reflect(context);
         LiveLoggingUserSettings::Reflect(context);
         UndoData::Reflect(context);
 
@@ -59,7 +52,6 @@ namespace ScriptCanvasEditor
         CreateEBusHandlerMimeEvent::Reflect(context);
         CreateEBusHandlerEventMimeEvent::Reflect(context);
         CreateEBusSenderMimeEvent::Reflect(context);
-        CreateEntityRefNodeMimeEvent::Reflect(context);
         CreateGetVariableNodeMimeEvent::Reflect(context);
         CreateSetVariableNodeMimeEvent::Reflect(context);
         CreateVariableChangedNodeMimeEvent::Reflect(context);
diff --git a/Gems/ScriptCanvas/Code/Editor/ScriptCanvasEditorGem.cpp b/Gems/ScriptCanvas/Code/Editor/ScriptCanvasEditorGem.cpp
index 7a9d917c52..588e1cf1d0 100644
--- a/Gems/ScriptCanvas/Code/Editor/ScriptCanvasEditorGem.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/ScriptCanvasEditorGem.cpp
@@ -35,7 +35,6 @@
 #include <Editor/Model/EntityMimeDataHandler.h>
 
 #include <Libraries/Libraries.h>
-#include <Editor/Nodes/EditorLibrary.h>
 
 #include <ScriptCanvas/Components/EditorGraph.h>
 #include <ScriptCanvas/Components/EditorGraphVariableManagerComponent.h>
@@ -53,7 +52,6 @@
 #include <Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventReceiverNodeDescriptorComponent.h>
 #include <Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventSenderNodeDescriptorComponent.h>
 #include <Editor/GraphCanvas/Components/NodeDescriptors/EBusSenderNodeDescriptorComponent.h>
-#include <Editor/GraphCanvas/Components/NodeDescriptors/EntityRefNodeDescriptorComponent.h>
 #include <Editor/GraphCanvas/Components/NodeDescriptors/GetVariableNodeDescriptorComponent.h>
 #include <Editor/GraphCanvas/Components/NodeDescriptors/NodeDescriptorComponent.h>
 #include <Editor/GraphCanvas/Components/NodeDescriptors/NodelingDescriptorComponent.h>
@@ -108,7 +106,6 @@ namespace ScriptCanvas
             ScriptCanvasEditor::ScriptEventReceiverNodeDescriptorComponent::CreateDescriptor(),
             ScriptCanvasEditor::ScriptEventSenderNodeDescriptorComponent::CreateDescriptor(),
             ScriptCanvasEditor::EBusSenderNodeDescriptorComponent::CreateDescriptor(),
-            ScriptCanvasEditor::EntityRefNodeDescriptorComponent::CreateDescriptor(),
             ScriptCanvasEditor::VariableNodeDescriptorComponent::CreateDescriptor(),
             ScriptCanvasEditor::GetVariableNodeDescriptorComponent::CreateDescriptor(),
             ScriptCanvasEditor::SetVariableNodeDescriptorComponent::CreateDescriptor(),
@@ -117,10 +114,6 @@ namespace ScriptCanvas
             ScriptCanvasEditor::FunctionDefinitionNodeDescriptorComponent::CreateDescriptor(),
             ScriptCanvasEditor::NodelingDescriptorComponent::CreateDescriptor()
             });
-
-        auto libraryDescriptors = ScriptCanvasEditor::GetLibraryDescriptors();
-        m_descriptors.insert(m_descriptors.end(), libraryDescriptors.begin(), libraryDescriptors.end());
-        ScriptCanvasEditor::Library::Editor::InitNodeRegistry(GetNodeRegistry().Get());
     }
 
     AZ::ComponentTypeList ScriptCanvasModule::GetRequiredSystemComponents() const
diff --git a/Gems/ScriptCanvas/Code/Editor/SystemComponent.cpp b/Gems/ScriptCanvas/Code/Editor/SystemComponent.cpp
index 6ab9c9b640..a451787ede 100644
--- a/Gems/ScriptCanvas/Code/Editor/SystemComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/SystemComponent.cpp
@@ -47,8 +47,6 @@
 #include <AzFramework/IO/FileOperations.h>
 #include <AzCore/Serialization/Utils.h>
 
-#include <ScriptCanvas/Asset/Functions/ScriptCanvasFunctionAsset.h>
-
 namespace ScriptCanvasEditor
 {
     static const size_t cs_jobThreads = 1;
@@ -332,12 +330,6 @@ namespace ScriptCanvasEditor
             isScriptCanvasAsset = true;
         }
 
-        ScriptCanvasFunctionDescription scriptCanvasFunctionAssetDescription;
-        if (!isScriptCanvasAsset && AZStd::wildcard_match(AZStd::string::format("*%s", scriptCanvasFunctionAssetDescription.GetExtensionImpl()).c_str(), fullSourceFileName))
-        {
-            isScriptCanvasAsset = true;
-        }
-
         if (isScriptCanvasAsset)
         {
             auto scriptCanvasEditorCallback = [this]([[maybe_unused]] const char* fullSourceFileNameInCall, const AZ::Uuid& sourceUUIDInCall)
@@ -412,7 +404,7 @@ namespace ScriptCanvasEditor
             nullptr,
             [this](const AZ::Data::AssetId, const AZ::Data::AssetInfo& assetInfo) {
 
-                if (assetInfo.m_assetType == azrtti_typeid<ScriptCanvasAsset>() || assetInfo.m_assetType == azrtti_typeid<ScriptCanvasFunctionAsset>())
+                if (assetInfo.m_assetType == azrtti_typeid<ScriptCanvasAsset>())
                 {
                     AddAssetToUpgrade(assetInfo);
                 }
@@ -456,11 +448,7 @@ namespace ScriptCanvasEditor
 
         if (query == m_assetsToConvert.end())
         {
-            if (assetInfo.m_assetType == azrtti_typeid<ScriptCanvasFunctionAsset>())
-            {
-                m_assetsToConvert.push_front(assetInfo);
-            }
-            else if (assetInfo.m_assetType == azrtti_typeid<ScriptCanvasAsset>())
+            if (assetInfo.m_assetType == azrtti_typeid<ScriptCanvasAsset>())
             {
                 m_assetsToConvert.push_back(assetInfo);
             }
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/FunctionNodePaletteTreeItemTypes.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/FunctionNodePaletteTreeItemTypes.h
index 26b2eb27d6..8ae511934c 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/FunctionNodePaletteTreeItemTypes.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/FunctionNodePaletteTreeItemTypes.h
@@ -15,9 +15,6 @@
 
 #include <ScriptCanvas/Bus/NodeIdPair.h>
 #include <ScriptCanvas/Bus/RequestBus.h>
-
-#include <ScriptCanvas/Asset/Functions/ScriptCanvasFunctionAsset.h>
-
 #include <Editor/View/Widgets/NodePalette/CreateNodeMimeEvent.h>
 
 #include <ScriptCanvas/GraphCanvas/NodeDescriptorBus.h>
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp
index 787d881318..0dada0f7aa 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp
@@ -23,7 +23,6 @@
 #include <Editor/Settings.h>
 #include <Editor/Translation/TranslationHelper.h>
 
-#include <ScriptCanvas/Core/PureData.h>
 #include <ScriptCanvas/Data/DataRegistry.h>
 #include <ScriptCanvas/Libraries/Libraries.h>
 #include <ScriptCanvas/Libraries/Core/GetVariable.h>
@@ -342,12 +341,6 @@ namespace
                     continue;
                 }
 
-                // Detect primitive types os we avoid making nodes out of them.
-                // Or anything that is 'pure data' and should be populated through a different mechanism.
-                if (nodeClassData->m_azRtti && nodeClassData->m_azRtti->IsTypeOf<ScriptCanvas::PureData>())
-                {
-                    continue;
-                }
                 // Skip over some of our more dynamic nodes that we want to populate using different means
                 else if (nodeClassData->m_azRtti && nodeClassData->m_azRtti->IsTypeOf<ScriptCanvas::Nodes::Core::GetVariableNode>())
                 {
@@ -1323,56 +1316,6 @@ namespace ScriptCanvasEditor
         return identifiers;
     }
 
-    AZStd::vector<ScriptCanvas::NodeTypeIdentifier> NodePaletteModel::RegisterFunctionInformation(ScriptCanvasFunctionAsset* functionAsset)
-    {
-        const AZ::Data::AssetId& assetId = functionAsset->GetId();
-
-        FunctionNodeModelInformation* modelInformation = aznew FunctionNodeModelInformation();
-
-        modelInformation->m_functionAssetId = assetId;
-        modelInformation->m_titlePaletteOverride = "FunctionNodeTitlePalette";
-        modelInformation->m_nodeIdentifier = ScriptCanvas::NodeUtils::ConstructFunctionNodeIdentifier(assetId);
-
-        // Temporary until I drive data from the function asset itself
-        AZStd::string rootPath;
-        AZ::Data::AssetInfo assetInfo = AssetHelpers::GetAssetInfo(assetId, rootPath);
-        AZStd::string absolutePath;
-
-        AzFramework::StringFunc::Path::Join(rootPath.c_str(), assetInfo.m_relativePath.c_str(), absolutePath);
-
-        AZStd::string category = "User Functions";
-        AZStd::string relativePath;
-
-        if (AzFramework::StringFunc::Path::GetFolderPath(assetInfo.m_relativePath.c_str(), relativePath))
-        {
-            AZStd::to_lower(relativePath.begin(), relativePath.end());
-
-            const AZStd::string root = "scriptcanvas/functions/";
-            if (relativePath.starts_with(root))
-            {
-                relativePath = relativePath.substr(root.size(), relativePath.size() - root.size());
-            }
-
-            category.append("/");
-            category.append(relativePath);
-        }
-
-        modelInformation->m_categoryPath = category;
-
-        AzFramework::StringFunc::Path::Normalize(absolutePath);
-        
-        AzFramework::StringFunc::Path::GetFileName(absolutePath.c_str(), modelInformation->m_displayName);
-        ////
-
-        m_registeredNodes.emplace(AZStd::make_pair(modelInformation->m_nodeIdentifier, modelInformation));
-        m_assetMapping.insert(AZStd::make_pair(assetId, modelInformation->m_nodeIdentifier));
-
-        AZStd::vector<ScriptCanvas::NodeTypeIdentifier> nodeTypeIdentifiers;
-        nodeTypeIdentifiers.push_back(modelInformation->m_nodeIdentifier);
-
-        return nodeTypeIdentifiers;
-    }
-
     void NodePaletteModel::RegisterCategoryInformation(const AZStd::string& category, const CategoryInformation& categoryInformation)
     {
         auto categoryIter = m_categoryInformation.find(category);
@@ -1559,24 +1502,6 @@ namespace ScriptCanvasEditor
                         AZ_TracePrintf("NodePaletteModel", "Could not refresh node palette properly, the asset failed to load correctly.");
                     }
                 }
-                else if (productEntry->GetAssetType() == azrtti_typeid<ScriptCanvasFunctionAsset>())
-                {
-                    const AZ::Data::AssetId& assetId = productEntry->GetAssetId();
-
-                    auto functionAsset = AZ::Data::AssetManager::Instance().GetAsset(assetId, azrtti_typeid<ScriptCanvasFunctionAsset>(), AZ::Data::AssetLoadBehavior::PreLoad);
-                    functionAsset.BlockUntilLoadComplete();
-
-                    if (functionAsset.IsReady())
-                    {
-                        ScriptCanvasFunctionAsset* data = functionAsset.GetAs<ScriptCanvasFunctionAsset>();
-
-                        return RegisterFunctionInformation(data);
-                    }
-                    else
-                    {
-                        AZ_TracePrintf("NodePaletteModel", "Could not refresh node palette properly, the asset failed to load correctly.");
-                    }
-                }
             }
         }
 
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.h
index 2286e8e453..03da4cea27 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.h
@@ -22,7 +22,6 @@
 
 #include <Editor/View/Widgets/NodePalette/NodePaletteModelBus.h>
 
-#include <ScriptCanvas/Asset/Functions/ScriptCanvasFunctionAsset.h>
 #include <ScriptCanvas/Asset/RuntimeAsset.h>
 #include <ScriptCanvas/Core/Core.h>
 
@@ -87,7 +86,6 @@ namespace ScriptCanvasEditor
 
         // Asset Based Registrations
         AZStd::vector<ScriptCanvas::NodeTypeIdentifier> RegisterScriptEvent(ScriptEvents::ScriptEventsAsset* scriptEventAsset);
-        AZStd::vector<ScriptCanvas::NodeTypeIdentifier> RegisterFunctionInformation(ScriptCanvasFunctionAsset* functionAsset);
 
         void RegisterCategoryInformation(const AZStd::string& category, const CategoryInformation& categoryInformation);
         const CategoryInformation* FindCategoryInformation(const AZStd::string& categoryStyle) const;
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/SpecializedNodePaletteTreeItemTypes.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/SpecializedNodePaletteTreeItemTypes.cpp
index f0290eef10..0f97741060 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/SpecializedNodePaletteTreeItemTypes.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/SpecializedNodePaletteTreeItemTypes.cpp
@@ -24,51 +24,9 @@
 #include "Editor/GraphCanvas/GraphCanvasEditorNotificationBusId.h"
 
 #include <Core/Attributes.h>
-#include <Libraries/Entity/EntityRef.h>
 
 namespace ScriptCanvasEditor
 {
-    /////////////////////////////////
-    // CreateEntityRefNodeMimeEvent
-    /////////////////////////////////
-
-    void CreateEntityRefNodeMimeEvent::Reflect(AZ::ReflectContext* reflectContext)
-    {
-        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(reflectContext);
-
-        if (serializeContext)
-        {
-            serializeContext->Class<CreateEntityRefNodeMimeEvent, GraphCanvas::GraphCanvasMimeEvent>()
-                ->Version(0)
-                ->Field("EntityId", &CreateEntityRefNodeMimeEvent::m_entityId)
-                ;
-        }
-    }
-
-    CreateEntityRefNodeMimeEvent::CreateEntityRefNodeMimeEvent(const AZ::EntityId& entityId)
-        : m_entityId(entityId)
-    {
-    }
-
-    ScriptCanvasEditor::NodeIdPair CreateEntityRefNodeMimeEvent::CreateNode(const ScriptCanvas::ScriptCanvasId& scriptCanvasId) const
-    {
-        return Nodes::CreateEntityNode(m_entityId, scriptCanvasId);
-    }
-
-    /////////////////////////////////
-    // EntityRefNodePaletteTreeItem
-    /////////////////////////////////
-
-    EntityRefNodePaletteTreeItem::EntityRefNodePaletteTreeItem(AZStd::string_view nodeName, [[maybe_unused]] const QString& iconPath)
-        : DraggableNodePaletteTreeItem(nodeName, ScriptCanvasEditor::AssetEditorId)
-    {
-    }
-
-    GraphCanvas::GraphCanvasMimeEvent* EntityRefNodePaletteTreeItem::CreateMimeEvent() const
-    {
-        return aznew CreateEntityRefNodeMimeEvent();
-    }
-
     ///////////////////////////////
     // CreateCommentNodeMimeEvent
     ///////////////////////////////
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/SpecializedNodePaletteTreeItemTypes.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/SpecializedNodePaletteTreeItemTypes.h
index 5f623e4c56..bf02a3455d 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/SpecializedNodePaletteTreeItemTypes.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/SpecializedNodePaletteTreeItemTypes.h
@@ -11,39 +11,6 @@
 
 namespace ScriptCanvasEditor
 {
-    // <EntityRefNode>
-    class CreateEntityRefNodeMimeEvent
-        : public CreateNodeMimeEvent
-    {
-    public:
-        AZ_RTTI(CreateEntityRefNodeMimeEvent, "{20CD5AF5-216E-4A41-9630-191C2803899B}", CreateNodeMimeEvent);
-        AZ_CLASS_ALLOCATOR(CreateEntityRefNodeMimeEvent, AZ::SystemAllocator, 0);
-
-        static void Reflect(AZ::ReflectContext* reflectContext);
-
-        CreateEntityRefNodeMimeEvent() = default;
-        CreateEntityRefNodeMimeEvent(const AZ::EntityId& entityId);
-        ~CreateEntityRefNodeMimeEvent() = default;
-
-    protected:
-        ScriptCanvasEditor::NodeIdPair CreateNode(const ScriptCanvas::ScriptCanvasId& scriptCanvasId) const override;
-
-    private:
-        AZ::EntityId m_entityId;
-    };
-
-    class EntityRefNodePaletteTreeItem
-        : public GraphCanvas::DraggableNodePaletteTreeItem
-    {
-    public:
-        AZ_CLASS_ALLOCATOR(EntityRefNodePaletteTreeItem, AZ::SystemAllocator, 0);
-        EntityRefNodePaletteTreeItem(AZStd::string_view nodeName, const QString& iconPath);
-        ~EntityRefNodePaletteTreeItem() = default;
-
-        GraphCanvas::GraphCanvasMimeEvent* CreateMimeEvent() const override;
-    };
-    // </EntityRefNode>    
-    
     // <CommentNode>
     class CreateCommentNodeMimeEvent
         : public SpecializedCreateNodeMimeEvent
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/VariableNodePaletteTreeItemTypes.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/VariableNodePaletteTreeItemTypes.cpp
index 3c37de8386..054158bcde 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/VariableNodePaletteTreeItemTypes.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/VariableNodePaletteTreeItemTypes.cpp
@@ -30,8 +30,6 @@
 #include "Editor/Include/ScriptCanvas/GraphCanvas/NodeDescriptorBus.h"
 
 #include <Core/Attributes.h>
-#include <Libraries/Core/Assign.h>
-#include <Libraries/Core/BehaviorContextObjectNode.h>
 #include <Libraries/Core/Method.h>
 
 #include <Editor/GraphCanvas/GraphCanvasEditorNotificationBusId.h>
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp
index cfe719114f..3afa9100d0 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp
@@ -60,7 +60,6 @@
 #include <ScriptCanvas/Libraries/Core/GetVariable.h>
 #include <ScriptCanvas/Libraries/Core/Method.h>
 #include <ScriptCanvas/Libraries/Core/SetVariable.h>
-#include <ScriptCanvas/Libraries/Entity/EntityRef.h>
 #include <ScriptCanvas/Libraries/Libraries.h>
 #include <ScriptCanvas/Utils/NodeUtils.h>
 #include <ScriptEvents/ScriptEventsAsset.h>
@@ -224,7 +223,7 @@ namespace ScriptCanvasEditor
 
         void ScriptCanvasRootPaletteTreeItem::SetActiveScriptCanvasId(const ScriptCanvas::ScriptCanvasId& scriptCanvasId)
         {
-            ScriptCanvas::RuntimeRequestBus::EventResult(m_previousAssetId, scriptCanvasId, &ScriptCanvas::RuntimeRequests::GetAssetId);
+            ScriptCanvas::GraphRequestBus::EventResult(m_previousAssetId, scriptCanvasId, &ScriptCanvas::GraphRequests::GetAssetId);
 
             for (auto functionTreePair : m_globalFunctionTreeItems)
             {
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/StatisticsDialog/ScriptCanvasStatisticsDialog.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/StatisticsDialog/ScriptCanvasStatisticsDialog.cpp
index caa39d4ca4..7aa03224e4 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/StatisticsDialog/ScriptCanvasStatisticsDialog.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/StatisticsDialog/ScriptCanvasStatisticsDialog.cpp
@@ -16,7 +16,6 @@
 #include <Editor/GraphCanvas/GraphCanvasEditorNotificationBusId.h>
 
 #include <ScriptCanvas/Assets/ScriptCanvasAsset.h>
-#include <ScriptCanvas/Asset/Functions/ScriptCanvasFunctionAsset.h>
 #include <ScriptCanvas/Bus/RequestBus.h>
 
 namespace
@@ -181,8 +180,7 @@ namespace ScriptCanvasEditor
     {
         AZ::Data::AssetInfo assetInfo;
         AZ::Data::AssetCatalogRequestBus::BroadcastResult(assetInfo, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetInfoById, assetId);
-        if (assetInfo.m_assetType == azrtti_typeid<ScriptCanvasAsset>()
-            || assetInfo.m_assetType == azrtti_typeid<ScriptCanvasEditor::ScriptCanvasFunctionAsset>())
+        if (assetInfo.m_assetType == azrtti_typeid<ScriptCanvasAsset>())
         {
             m_scriptCanvasAssetTreeRoot->RegisterAsset(assetId, assetInfo.m_assetType);
         }
@@ -197,8 +195,7 @@ namespace ScriptCanvasEditor
     {
         AZ::Data::AssetInfo assetInfo;
         AZ::Data::AssetCatalogRequestBus::BroadcastResult(assetInfo, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetInfoById, assetId);
-        if (assetInfo.m_assetType == azrtti_typeid<ScriptCanvasAsset>()
-            || assetInfo.m_assetType == azrtti_typeid<ScriptCanvasEditor::ScriptCanvasFunctionAsset>())
+        if (assetInfo.m_assetType == azrtti_typeid<ScriptCanvasAsset>())
         {
             m_scriptCanvasAssetTreeRoot->RemoveAsset(assetId);
         }
@@ -440,8 +437,7 @@ namespace ScriptCanvasEditor
             {
                 const AzToolsFramework::AssetBrowser::ProductAssetBrowserEntry* productEntry = static_cast<const AzToolsFramework::AssetBrowser::ProductAssetBrowserEntry*>(entry);
 
-                if (productEntry->GetAssetType() == azrtti_typeid<ScriptCanvasAsset>()
-                    || productEntry->GetAssetType() == azrtti_typeid<ScriptCanvasEditor::ScriptCanvasFunctionAsset>())
+                if (productEntry->GetAssetType() == azrtti_typeid<ScriptCanvasAsset>())
                 {
                     const AZ::Data::AssetId& assetId = productEntry->GetAssetId();
 
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/GraphVariablesTableView.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/GraphVariablesTableView.cpp
index b6062423ee..95e782c137 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/GraphVariablesTableView.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/GraphVariablesTableView.cpp
@@ -31,7 +31,6 @@
 #include <Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.h>
 #include <Editor/View/Widgets/NodePalette/VariableNodePaletteTreeItemTypes.h>
 #include <ScriptCanvas/Asset/RuntimeAsset.h>
-#include <ScriptCanvas/Execution/RuntimeBus.h>
 #include <ScriptCanvas/Bus/RequestBus.h>
 #include <ScriptCanvas/Bus/EditorScriptCanvasBus.h>
 
@@ -722,7 +721,7 @@ namespace ScriptCanvasEditor
         ScriptCanvas::GraphVariableManagerNotificationBus::Handler::BusDisconnect();
 
         m_assetType = AZ::Data::AssetType::CreateNull();
-        ScriptCanvas::RuntimeRequestBus::EventResult(m_assetType, scriptCanvasId, &ScriptCanvas::RuntimeRequests::GetAssetType);
+        ScriptCanvas::GraphRequestBus::EventResult(m_assetType, scriptCanvasId, &ScriptCanvas::GraphRequests::GetAssetType);
 
         m_scriptCanvasId = scriptCanvasId;
 
@@ -1054,9 +1053,6 @@ namespace ScriptCanvasEditor
         AZ::SerializeContext* serializeContext = AZ::EntityUtils::GetApplicationSerializeContext();
         AZ::Utils::LoadObjectFromBufferInPlace(byteArray.constData(), static_cast<AZStd::size_t>(byteArray.size()), copiedVariableData, serializeContext);
 
-        bool isRuntimeGraph = false;
-        EditorGraphRequestBus::EventResult(isRuntimeGraph, scriptCanvasId, &EditorGraphRequests::IsRuntimeGraph);
-
         ScriptCanvas::GraphVariableManagerRequests* requests = ScriptCanvas::GraphVariableManagerRequestBus::FindFirstHandler(scriptCanvasId);
 
         if (requests == nullptr)
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/SlotTypeSelectorWidget.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/SlotTypeSelectorWidget.cpp
index 2d23b942df..f98c896f69 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/SlotTypeSelectorWidget.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/SlotTypeSelectorWidget.cpp
@@ -50,7 +50,6 @@
 
 #include <ScriptCanvas/Core/NodeBus.h>
 #include <ScriptCanvas/Data/DataRegistry.h>
-#include <ScriptCanvas/Execution/RuntimeBus.h>
 #include <ScriptCanvas/GraphCanvas/NodeDescriptorBus.h>
 #include <ScriptCanvas/Asset/RuntimeAsset.h>
 
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariableDockWidget.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariableDockWidget.cpp
index d88c16ba24..a6ae834f3e 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariableDockWidget.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariableDockWidget.cpp
@@ -50,7 +50,6 @@
 
 #include <ScriptCanvas/Core/NodeBus.h>
 #include <ScriptCanvas/Data/DataRegistry.h>
-#include <ScriptCanvas/Execution/RuntimeBus.h>
 #include <ScriptCanvas/GraphCanvas/NodeDescriptorBus.h>
 #include <ScriptCanvas/Asset/RuntimeAsset.h>
 
@@ -757,9 +756,9 @@ namespace ScriptCanvasEditor
 
         AZStd::vector<AZ::EntityId> selection;
 
-        ScriptCanvas::RuntimeRequests* runtimeRequests = ScriptCanvas::RuntimeRequestBus::FindFirstHandler(m_scriptCanvasId);
+        auto owningGraph = ScriptCanvas::GraphRequestBus::FindFirstHandler(m_scriptCanvasId);
 
-        if (runtimeRequests == nullptr)
+        if (owningGraph == nullptr)
         {
             return;
         }
@@ -770,7 +769,7 @@ namespace ScriptCanvasEditor
 
             if (propertiesComponent)
             {
-                ScriptCanvas::GraphVariable* graphVariable = runtimeRequests->FindVariableById(varId);;
+                ScriptCanvas::GraphVariable* graphVariable = owningGraph->FindVariableById(varId);;
                 propertiesComponent->SetVariable(graphVariable);
 
                 selection.push_back(propertiesComponent->GetEntityId());
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp b/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp
index fcbd1a1680..7c6c161246 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp
@@ -150,8 +150,6 @@
 
 #include <ScriptCanvas/Asset/AssetDescription.h>
 #include <ScriptCanvas/Components/EditorScriptCanvasComponent.h>
-#include <ScriptCanvas/Assets/Functions/ScriptCanvasFunctionAssetHandler.h>
-#include <ScriptCanvas/Asset/Functions/ScriptCanvasFunctionAsset.h>
 #include <ScriptCanvas/Assets/ScriptCanvasAsset.h>
 
 #include <Editor/QtMetaTypes.h>
@@ -264,14 +262,7 @@ namespace ScriptCanvasEditor
 
                             if (editorRequests)
                             {
-                                if (editorRequests->IsFunctionGraph())
-                                {
-                                    assetSaveData.m_assetType = azrtti_typeid<ScriptCanvasFunctionAsset>();
-                                }
-                                else
-                                {
-                                    assetSaveData.m_assetType = azrtti_typeid<ScriptCanvasAsset>();
-                                }
+                                assetSaveData.m_assetType = azrtti_typeid<ScriptCanvasAsset>();
                             }
 
                             activeAssets.push_back(assetSaveData);
@@ -1303,8 +1294,7 @@ namespace ScriptCanvasEditor
             return AZ::Failure(AZStd::string("Unknown AssetId"));
         }
 
-        if (assetInfo.m_assetType != azrtti_typeid<ScriptCanvasAsset>() && 
-            assetInfo.m_assetType != azrtti_typeid<ScriptCanvasFunctionAsset>())
+        if (assetInfo.m_assetType != azrtti_typeid<ScriptCanvasAsset>())
         {
             return AZ::Failure(AZStd::string("Invalid AssetId provided, it's not a Script Canvas supported type"));
         }
@@ -3680,10 +3670,6 @@ namespace ScriptCanvasEditor
             {
                 buttonEnabled = false;
             }
-            else
-            {
-                EditorGraphRequestBus::EventResult(buttonEnabled, GetActiveScriptCanvasId(), &EditorGraphRequests::IsRuntimeGraph);
-            }
 
             m_assignToSelectedEntity->setEnabled(buttonEnabled);
         }
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Windows/ScriptCanvasContextMenus.cpp b/Gems/ScriptCanvas/Code/Editor/View/Windows/ScriptCanvasContextMenus.cpp
index 95386c7e55..716c498b56 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/ScriptCanvasContextMenus.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/ScriptCanvasContextMenus.cpp
@@ -55,59 +55,6 @@
 
 namespace ScriptCanvasEditor
 {
-    //////////////////////////////
-    // AddSelectedEntitiesAction
-    //////////////////////////////
-
-    AddSelectedEntitiesAction::AddSelectedEntitiesAction(QObject* parent)
-        : GraphCanvas::ContextMenuAction("", parent)
-    {
-    }
-
-    GraphCanvas::ActionGroupId AddSelectedEntitiesAction::GetActionGroupId() const
-    {
-        return AZ_CRC("EntityActionGroup", 0x17e16dfe);
-    }
-
-    void AddSelectedEntitiesAction::RefreshAction(const GraphCanvas::GraphId&, const AZ::EntityId&)
-    {
-        AzToolsFramework::EntityIdList selectedEntities;
-        AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(selectedEntities, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
-
-        setEnabled(!selectedEntities.empty());
-
-        if (selectedEntities.size() <= 1)
-        {
-            setText("Reference selected entity");
-        }
-        else
-        {
-            setText("Reference selected entities");
-        }
-    }
-
-    GraphCanvas::ContextMenuAction::SceneReaction AddSelectedEntitiesAction::TriggerAction(const AZ::EntityId& graphCanvasGraphId, const AZ::Vector2& scenePos)
-    {
-        AzToolsFramework::EntityIdList selectedEntities;
-        AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(selectedEntities, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
-
-        ScriptCanvas::ScriptCanvasId scriptCanvasId;
-        GeneralRequestBus::BroadcastResult(scriptCanvasId, &GeneralRequests::GetScriptCanvasId, graphCanvasGraphId);
-
-        GraphCanvas::SceneRequestBus::Event(graphCanvasGraphId, &GraphCanvas::SceneRequests::ClearSelection);
-
-        AZ::Vector2 addPosition = scenePos;
-
-        for (const AZ::EntityId& id : selectedEntities)
-        {
-            NodeIdPair nodePair = Nodes::CreateEntityNode(id, scriptCanvasId);
-            GraphCanvas::SceneRequestBus::Event(graphCanvasGraphId, &GraphCanvas::SceneRequests::AddNode, nodePair.m_graphCanvasId, addPosition, false);
-            addPosition += AZ::Vector2(20, 20);
-        }
-
-        return GraphCanvas::ContextMenuAction::SceneReaction::PostUndo;
-    }
-
     ////////////////////////////
     // EndpointSelectionAction
     ////////////////////////////
@@ -860,12 +807,6 @@ namespace ScriptCanvasEditor
     {
         const bool inContextMenu = true;
         Widget::ScriptCanvasNodePaletteConfig paletteConfig(paletteModel, assetModel, inContextMenu);
-
-        m_addSelectedEntitiesAction = aznew AddSelectedEntitiesAction(this);
-        
-        AddActionGroup(m_addSelectedEntitiesAction->GetActionGroupId());
-        AddMenuAction(m_addSelectedEntitiesAction);
-
         AddNodePaletteMenuAction(paletteConfig);
     }
 
@@ -905,8 +846,6 @@ namespace ScriptCanvasEditor
         m_graphCanvasConstructGroups.SetCommentsEnabled(false);
         m_nodeGroupPresets.SetEnabled(false);
         m_alignmentActionsGroups.SetEnabled(false);
-
-        m_addSelectedEntitiesAction->setEnabled(false);
     }
 
     //////////////////////////
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Windows/ScriptCanvasContextMenus.h b/Gems/ScriptCanvas/Code/Editor/View/Windows/ScriptCanvasContextMenus.h
index 01029e0be1..116f9f4ced 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/ScriptCanvasContextMenus.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/ScriptCanvasContextMenus.h
@@ -32,22 +32,6 @@ namespace ScriptCanvasEditor
     // CustomActions
     //////////////////
 
-    class AddSelectedEntitiesAction
-        : public GraphCanvas::ContextMenuAction
-    {
-        Q_OBJECT
-    public:
-        AZ_CLASS_ALLOCATOR(AddSelectedEntitiesAction, AZ::SystemAllocator, 0);
-
-        AddSelectedEntitiesAction(QObject* parent);
-        virtual ~AddSelectedEntitiesAction() = default;
-
-        GraphCanvas::ActionGroupId GetActionGroupId() const override;
-
-        void RefreshAction(const GraphCanvas::GraphId& graphCanvasGraphId, const AZ::EntityId& targetId) override;
-        SceneReaction TriggerAction(const GraphCanvas::GraphId& graphCanvasGraphId, const AZ::Vector2& scenePos) override;
-    };
-
     class EndpointSelectionAction
         : public QAction
     {
@@ -217,8 +201,6 @@ namespace ScriptCanvasEditor
     protected:
 
         AZ::EntityId                      m_sourceSlotId;
-
-        AddSelectedEntitiesAction* m_addSelectedEntitiesAction;
     };
 
     class ConnectionContextMenu
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/UpgradeHelper.cpp b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/UpgradeHelper.cpp
index e35435f5dd..382f2a6784 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/UpgradeHelper.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/UpgradeHelper.cpp
@@ -16,8 +16,6 @@
 
 #include "UpgradeHelper.h"
 
-#include <Asset/Functions/ScriptCanvasFunctionAsset.h>
-
 #include <AzCore/Component/ComponentApplicationBus.h>
 #include <AzCore/Component/TickBus.h>
 #include <AzCore/IO/SystemFile.h>
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/UpgradeTool.cpp b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/UpgradeTool.cpp
index 02fb5b567d..c3ccd3105c 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/UpgradeTool.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/UpgradeTool.cpp
@@ -12,8 +12,6 @@
 
 #include "UpgradeTool.h"
 
-#include <Asset/Functions/ScriptCanvasFunctionAsset.h>
-
 #include <AzCore/Component/ComponentApplicationBus.h>
 #include <AzCore/Component/TickBus.h>
 #include <AzCore/IO/SystemFile.h>
@@ -284,10 +282,6 @@ namespace ScriptCanvasEditor
                     {
                         tmpFilesaved = AZ::Utils::SaveObjectToStream<ScriptCanvas::ScriptCanvasData>(fileStream, AZ::DataStream::ST_XML, &asset.GetAs<ScriptCanvasAsset>()->GetScriptCanvasData());
                     }
-                    else if (asset.GetType() == azrtti_typeid<ScriptCanvasFunctionAsset>())
-                    {
-                        tmpFilesaved = AZ::Utils::SaveObjectToStream<ScriptCanvas::ScriptCanvasData>(fileStream, AZ::DataStream::ST_XML, &asset.GetAs<ScriptCanvasFunctionAsset>()->GetScriptCanvasData());
-                    }
 
                     fileStream.Close();
                 }
@@ -708,10 +702,6 @@ namespace ScriptCanvasEditor
         {
             scriptCanvasEntity = UpgradeGraph<ScriptCanvasAsset>(asset, this);
         }
-        else if (asset.GetType() == azrtti_typeid<ScriptCanvasFunctionAsset>())
-        {
-            scriptCanvasEntity = UpgradeGraph<ScriptCanvasFunctionAsset>(asset, this);
-        }
 
         if (!scriptCanvasEntity)
         {
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.cpp b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.cpp
index 9ec399f616..4bee3ab351 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.cpp
@@ -16,8 +16,6 @@
 
 #include "VersionExplorer.h"
 
-#include <Asset/Functions/ScriptCanvasFunctionAsset.h>
-
 #include <AzCore/Asset/AssetManagerBus.h>
 #include <AzCore/Component/ComponentApplicationBus.h>
 #include <AzCore/Component/TickBus.h>
@@ -323,10 +321,6 @@ namespace ScriptCanvasEditor
         {
             m_scriptCanvasEntity = UpgradeGraphProcess<ScriptCanvasAsset>(asset, this);
         }
-        else if (asset.GetType() == azrtti_typeid<ScriptCanvasFunctionAsset>())
-        {
-            m_scriptCanvasEntity = UpgradeGraphProcess<ScriptCanvasFunctionAsset>(asset, this);
-        }
 
         if (!m_scriptCanvasEntity)
         {
@@ -358,10 +352,6 @@ namespace ScriptCanvasEditor
                 {
                     tmpFilesaved = AZ::Utils::SaveObjectToStream<ScriptCanvas::ScriptCanvasData>(fileStream, AZ::DataStream::ST_XML, &asset.GetAs<ScriptCanvasAsset>()->GetScriptCanvasData());
                 }
-                else if (asset.GetType() == azrtti_typeid<ScriptCanvasFunctionAsset>())
-                {
-                    tmpFilesaved = AZ::Utils::SaveObjectToStream<ScriptCanvas::ScriptCanvasData>(fileStream, AZ::DataStream::ST_XML, &asset.GetAs<ScriptCanvasFunctionAsset>()->GetScriptCanvasData());
-                }
 
                 fileStream.Close();
             }
@@ -647,17 +637,6 @@ namespace ScriptCanvasEditor
             scriptCanvasEntity = scriptCanvasAsset->GetScriptCanvasEntity();
             AZ_Assert(scriptCanvasEntity, "The Script Canvas asset must have a valid entity");
         }
-        else if (asset.GetType() == azrtti_typeid<ScriptCanvasFunctionAsset>())
-        {
-            ScriptCanvasFunctionAsset* scriptCanvasAsset = asset.GetAs<ScriptCanvasFunctionAsset>();
-            if (!scriptCanvasAsset)
-            {
-                return;
-            }
-
-            scriptCanvasEntity = scriptCanvasAsset->GetScriptCanvasEntity();
-            AZ_Assert(scriptCanvasEntity, "The Script Canvas asset must have a valid entity");
-        }
 
         auto graphComponent = scriptCanvasEntity->FindComponent<ScriptCanvasEditor::Graph>();
         AZ_Assert(graphComponent, "The Script Canvas entity must have a Graph component");
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/Functions/ScriptCanvasFunctionAsset.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/Functions/ScriptCanvasFunctionAsset.h
deleted file mode 100644
index 58c99e719e..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/Functions/ScriptCanvasFunctionAsset.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/Asset/AssetCommon.h>
-#include <ScriptCanvas/Asset/AssetDescription.h>
-#include <ScriptCanvas/Asset/ScriptCanvasAssetBase.h>
-
-#include <AzCore/std/containers/vector.h>
-
-namespace AZ
-{
-    class Entity;
-}
-
-namespace ScriptCanvasEditor
-{
-    class ScriptCanvasFunctionAsset;
-    class Graph;
-
-    class ScriptCanvasFunctionDescription : public ScriptCanvas::AssetDescription
-    {
-    public:
-
-        AZ_TYPE_INFO(ScriptCanvasFunctionDescription, "{B53569F6-8408-40FC-9A72-ED873BEF162E}");
-
-        ScriptCanvasFunctionDescription()
-            : AssetDescription(
-                azrtti_typeid<ScriptCanvasEditor::ScriptCanvasFunctionAsset>(),
-                "Script Canvas Function",
-                "Script Canvas Function Graph Asset",
-                "@devassets@/scriptcanvas/functions",
-                ".scriptcanvas_fn",
-                "Script Canvas Function",
-                "Untitled-Function-%i",
-                "Script Canvas Function Files (*.scriptcanvas_fn)",
-                "Script Canvas Function",
-                "Script Canvas Function",
-                "Icons/ScriptCanvas/Viewport/ScriptCanvas_Function.png",
-                AZ::Color(0.192f, 0.149f, 0.392f, 1.0f),
-                true
-                )
-        {}
-    };
-
-    // TODO-LS: move these to their own file
-    class ScriptCanvasDataRequests : public AZ::ComponentBus
-    {
-    public:
-
-        virtual void SetPrettyName(const char* name) = 0;
-        virtual AZStd::string GetPrettyName() = 0;
-    };
-
-    using ScriptCanvasDataRequestBus = AZ::EBus<ScriptCanvasDataRequests>;
-
-
-    class ScriptCanvasFunctionDataComponent
-        : public AZ::Component
-        , ScriptCanvasDataRequestBus::MultiHandler
-    {
-    public:
-        AZ_COMPONENT(ScriptCanvasFunctionDataComponent, "{440BB6DC-4E70-4304-A926-252925F77433}");
-
-        void Activate() override
-        {
-            AZ::EntityId entityId = GetEntityId();
-            ScriptCanvasDataRequestBus::MultiHandler::BusConnect(entityId);
-        }
-
-        void Deactivate() override
-        {
-            ScriptCanvasDataRequestBus::MultiHandler::BusDisconnect();
-
-            AZ::EntityId entityId = GetEntityId();
-        }
-
-        void SetPrettyName(const char* name) override
-        {
-            m_assetPrettyName = name;
-        }
-
-        AZStd::string GetPrettyName() override
-        {
-            return m_assetPrettyName;
-        }
-
-        static void Reflect(AZ::ReflectContext* reflectContext)
-        {
-            if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(reflectContext))
-            {
-                serializeContext->Class<ScriptCanvasFunctionDataComponent, AZ::Component>()
-                    ->Version(2)
-                    ->Field("m_assetPrettyName", &ScriptCanvasFunctionDataComponent::m_assetPrettyName)
-                    ->Field("m_version", &ScriptCanvasFunctionDataComponent::m_functionDataComponentVersion)
-                    ;
-            }
-        }
-
-        size_t m_functionDataComponentVersion = 0;
-        AZStd::string m_assetPrettyName;
-    };
-
-    class ScriptCanvasFunctionAsset
-        : public ScriptCanvas::ScriptCanvasAssetBase
-    {
-    public:
-        AZ_RTTI(ScriptCanvasFunctionAsset, "{ED078D3C-938D-41F8-A5F6-CC04311ECF4F}", ScriptCanvasAssetBase);
-        AZ_CLASS_ALLOCATOR(ScriptCanvasFunctionAsset, AZ::SystemAllocator, 0);
-
-        ScriptCanvasFunctionAsset(const AZ::Data::AssetId& assetId = AZ::Data::AssetId(AZ::Uuid::CreateRandom()), AZ::Data::AssetData::AssetStatus status = AZ::Data::AssetData::AssetStatus::NotLoaded)
-            : ScriptCanvasAssetBase(assetId, status)
-        {
-            m_data = aznew ScriptCanvas::ScriptCanvasData();
-        }
-
-        ~ScriptCanvasFunctionAsset() override
-        {}
-
-        ScriptCanvas::AssetDescription GetAssetDescription() const override
-        {
-            return ScriptCanvasFunctionDescription();
-        }
-
-        using Description = ScriptCanvasFunctionDescription;
-
-        ScriptCanvasFunctionDataComponent* m_cachedComponent = nullptr;
-
-        ScriptCanvasFunctionDataComponent* GetFunctionData()
-        {
-            if (m_cachedComponent == nullptr)
-            {
-                m_cachedComponent = GetScriptCanvasEntity()->FindComponent<ScriptCanvasFunctionDataComponent>();
-            }
-
-            return m_cachedComponent;
-        }
-    };
-
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/Functions/RuntimeFunctionAssetHandler.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/SubgraphInterfaceAssetHandler.cpp
similarity index 98%
rename from Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/Functions/RuntimeFunctionAssetHandler.cpp
rename to Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/SubgraphInterfaceAssetHandler.cpp
index 2f20fbbabb..66d01691a8 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/Functions/RuntimeFunctionAssetHandler.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/SubgraphInterfaceAssetHandler.cpp
@@ -7,7 +7,6 @@
 
 #include <ScriptCanvas/Core/Graph.h>
 #include <ScriptCanvas/Asset/RuntimeAsset.h>
-#include <ScriptCanvas/Asset/Functions/RuntimeFunctionAssetHandler.h>
 #include <ScriptCanvas/Execution/RuntimeComponent.h>
 
 #include <ScriptCanvas/Core/ScriptCanvasBus.h>
@@ -19,6 +18,7 @@
 #include <AzCore/Component/ComponentApplicationBus.h>
 #include <AzCore/Component/Entity.h>
 
+#include <ScriptCanvas/Asset/SubgraphInterfaceAssetHandler.h>
 
 namespace ScriptCanvas
 {
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/Functions/RuntimeFunctionAssetHandler.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/SubgraphInterfaceAssetHandler.h
similarity index 100%
rename from Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/Functions/RuntimeFunctionAssetHandler.h
rename to Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/SubgraphInterfaceAssetHandler.h
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Connection.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Connection.cpp
index 2a2c055416..d97a208064 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Connection.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Connection.cpp
@@ -168,7 +168,12 @@ namespace ScriptCanvas
     {
         if (nodeId == m_sourceEndpoint.GetNodeId() || nodeId == m_targetEndpoint.GetNodeId())
         {
-            GraphRequestBus::Event(*GraphNotificationBus::GetCurrentBusId(), &GraphRequests::DisconnectById, GetEntityId());
+            Slot* sourceSlot{};
+            NodeRequestBus::EventResult(sourceSlot, m_sourceEndpoint.GetNodeId(), &NodeRequests::GetSlot, m_sourceEndpoint.GetSlotId());
+            if (sourceSlot)
+            {
+                GraphRequestBus::Event(sourceSlot->GetNode()->GetOwningScriptCanvasId(), &GraphRequests::DisconnectById, GetEntityId());
+            }
         }
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Connection.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Connection.h
index 1a1c47794b..79a73b6f19 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Connection.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Connection.h
@@ -60,8 +60,6 @@ namespace ScriptCanvas
         // GraphNotificationBus
         void OnNodeRemoved(const ID& nodeId) override;
 
-        void UpdateConnectionStatus(NodeUpdateSlotReport& report);
-
     protected:
         //-------------------------------------------------------------------------
         static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts.h
index 8e2a748f0f..77ec030fec 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts.h
@@ -11,7 +11,6 @@
 #include "Contracts/DisallowReentrantExecutionContract.h"
 #include "Contracts/DisplayGroupConnectedSlotLimitContract.h"
 #include "Contracts/DynamicTypeContract.h"
-#include "Contracts/ExclusivePureDataContract.h"
 #include "Contracts/IsReferenceTypeContract.h"
 #include "Contracts/MathOperatorContract.h"
 #include "Contracts/MethodOverloadContract.h"
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/ExclusivePureDataContract.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/ExclusivePureDataContract.cpp
deleted file mode 100644
index b546a4364d..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/ExclusivePureDataContract.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ExclusivePureDataContract.h"
-#include <ScriptCanvas/Core/ContractBus.h>
-#include <ScriptCanvas/Core/GraphBus.h>
-#include <ScriptCanvas/Core/NodeBus.h>
-#include <ScriptCanvas/Core/Endpoint.h>
-#include <ScriptCanvas/Core/Slot.h>
-
-namespace ScriptCanvas
-{
-    AZ::Outcome<void, AZStd::string> ExclusivePureDataContract::HasNoPureDataConnection(const Slot& dataInputSlot) const
-    {
-        bool isOnPureDataThread(true);
-        NodeRequestBus::EventResult(isOnPureDataThread, dataInputSlot.GetNodeId(), &NodeRequests::IsOnPureDataThread, dataInputSlot.GetId());
-
-        if (!isOnPureDataThread)
-        {
-            return AZ::Success();
-        }
-        
-        return AZ::Failure(AZStd::string("There is already a pure data input into this slot"));
-    }
-
-    AZ::Outcome<void, AZStd::string> ExclusivePureDataContract::OnEvaluate(const Slot& sourceSlot, const Slot& targetSlot) const
-    {
-        if (sourceSlot.GetDescriptor().CanConnectTo(targetSlot.GetDescriptor()))
-        {
-            if (sourceSlot.GetDescriptor().IsInput())
-            {
-                return HasNoPureDataConnection(sourceSlot);
-            }
-            else if (targetSlot.GetDescriptor().IsInput())
-            {
-                return HasNoPureDataConnection(targetSlot);
-            }
-        }
-
-        return AZ::Failure(AZStd::string("invalid data connection attempted"));
-    }
-
-    void ExclusivePureDataContract::Reflect(AZ::ReflectContext* reflection)
-    {
-        if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(reflection))
-        {
-            serializeContext->Class<ExclusivePureDataContract, Contract>()
-                ->Version(0)
-                ;
-        }
-    }
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/ExclusivePureDataContract.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/ExclusivePureDataContract.h
deleted file mode 100644
index 5e5865fb06..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/ExclusivePureDataContract.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <ScriptCanvas/Core/Contract.h>
-
-namespace ScriptCanvas
-{
-    class ExclusivePureDataContract
-        : public Contract
-    {
-    public:
-        AZ_CLASS_ALLOCATOR(ExclusivePureDataContract, AZ::SystemAllocator, 0);
-        AZ_RTTI(ExclusivePureDataContract, "{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}", Contract);
-
-        // no multiple literals, variables, defaults, gets, or any other new form of data that can be routed without getting pushed by execution
-        ~ExclusivePureDataContract() override = default;
-
-        static void Reflect(AZ::ReflectContext* reflection);
-
-    protected:
-        AZ::Outcome<void, AZStd::string> OnEvaluate(const Slot& sourceSlot, const Slot& targetSlot) const override;
-
-        AZ::Outcome<void, AZStd::string> HasNoPureDataConnection(const Slot& dataInputSlot) const;
-    };
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Graph.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Graph.cpp
index c2245e92ee..d4eb1cd515 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Graph.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Graph.cpp
@@ -12,40 +12,32 @@
 #include <AzCore/Serialization/IdUtils.h>
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/Utils.h>
-
 #include <AzFramework/Entity/EntityContextBus.h>
-
-#include <ScriptCanvas/Asset/Functions/ScriptCanvasFunctionAsset.h>
 #include <ScriptCanvas/Asset/RuntimeAsset.h>
-
 #include <ScriptCanvas/Core/Connection.h>
 #include <ScriptCanvas/Core/Core.h>
 #include <ScriptCanvas/Core/Datum.h>
 #include <ScriptCanvas/Core/Graph.h>
 #include <ScriptCanvas/Core/Node.h>
-#include <ScriptCanvas/Core/PureData.h>
 #include <ScriptCanvas/Data/BehaviorContextObject.h>
-#include <ScriptCanvas/Grammar/AbstractCodeModel.h>
-
-#include <ScriptCanvas/Debugger/ValidationEvents/DataValidation/DataValidationIds.h>
+#include <ScriptCanvas/Data/PropertyTraits.h>
+#include <ScriptCanvas/Debugger/StatusBus.h>
 #include <ScriptCanvas/Debugger/ValidationEvents/DataValidation/DataValidationEvents.h>
-#include <ScriptCanvas/Debugger/ValidationEvents/ExecutionValidation/ExecutionValidationIds.h>
+#include <ScriptCanvas/Debugger/ValidationEvents/DataValidation/DataValidationIds.h>
 #include <ScriptCanvas/Debugger/ValidationEvents/ExecutionValidation/ExecutionValidationEvents.h>
-
-#include <ScriptCanvas/Libraries/Core/UnaryOperator.h>
+#include <ScriptCanvas/Debugger/ValidationEvents/ExecutionValidation/ExecutionValidationIds.h>
+#include <ScriptCanvas/Grammar/AbstractCodeModel.h>
 #include <ScriptCanvas/Libraries/Core/BinaryOperator.h>
 #include <ScriptCanvas/Libraries/Core/EBusEventHandler.h>
-#include <ScriptCanvas/Libraries/Core/ErrorHandler.h>
 #include <ScriptCanvas/Libraries/Core/FunctionDefinitionNode.h>
 #include <ScriptCanvas/Libraries/Core/Method.h>
-#include <ScriptCanvas/Libraries/Core/Start.h>
-#include <ScriptCanvas/Libraries/Core/SendScriptEvent.h>
 #include <ScriptCanvas/Libraries/Core/ReceiveScriptEvent.h>
 #include <ScriptCanvas/Libraries/Core/ScriptEventBase.h>
-
+#include <ScriptCanvas/Libraries/Core/SendScriptEvent.h>
+#include <ScriptCanvas/Libraries/Core/Start.h>
+#include <ScriptCanvas/Libraries/Core/UnaryOperator.h>
 #include <ScriptCanvas/Profiler/Driller.h>
 #include <ScriptCanvas/Translation/Translation.h>
-#include <ScriptCanvas/Debugger/StatusBus.h>
 #include <ScriptCanvas/Variable/VariableBus.h>
 #include <ScriptCanvas/Variable/VariableData.h>
 
@@ -58,6 +50,7 @@ namespace GraphCpp
         MergeScriptAssetDescriptions,
         VariablePanelSymantics,
         AddVersionData,
+        RemoveFunctionGraphMarker,
         // label your version above
         Current
     };
@@ -77,6 +70,11 @@ namespace ScriptCanvas
             componentElementNode.AddElementWithData(context, "m_assetType", azrtti_typeid<RuntimeAsset>());
         }
 
+        if (componentElementNode.GetVersion() < GraphCpp::GraphVersion::RemoveFunctionGraphMarker)
+        {
+            componentElementNode.RemoveElementByName(AZ_CRC_CE("isFunctionGraph"));
+        }
+
         return true;
     }
 
@@ -107,18 +105,15 @@ namespace ScriptCanvas
         Nodes::ComparisonExpression::Reflect(context);
         Datum::Reflect(context);
         BehaviorContextObjectPtrReflect(context);
-
         GraphData::Reflect(context);
 
-        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
-        if (serializeContext)
+        if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
         {
             serializeContext->Class<Graph, AZ::Component>()
                 ->Version(GraphCpp::GraphVersion::Current, &GraphComponentVersionConverter)
                 ->Field("m_graphData", &Graph::m_graphData)
                 ->Field("executionMode", &Graph::m_executionMode)
                 ->Field("m_assetType", &Graph::m_assetType)
-                ->Field("isFunctionGraph", &Graph::m_isFunctionGraph)
                 ->Field("versionData", &Graph::m_versionData)
                 ;
         }
@@ -128,8 +123,6 @@ namespace ScriptCanvas
     {
         const auto& scriptCanvasId = GetScriptCanvasId();
         GraphRequestBus::Handler::BusConnect(scriptCanvasId);
-        RuntimeRequestBus::Handler::BusConnect(scriptCanvasId);
-
         ValidationRequestBus::Handler::BusConnect(scriptCanvasId);
 
         for (auto& nodeEntity : m_graphData.m_nodes)
@@ -148,6 +141,7 @@ namespace ScriptCanvas
         }
 
         m_graphData.BuildEndpointMap();
+
         for (auto& connectionEntity : m_graphData.m_connections)
         {
             if (connectionEntity)
@@ -159,21 +153,6 @@ namespace ScriptCanvas
         StatusRequestBus::Handler::BusConnect(scriptCanvasId);
     }
 
-    bool Graph::IsFunctionGraph() const
-    {
-        if (m_isFunctionGraph)
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-    void Graph::MarkFunctionGraph()
-    {
-        m_isFunctionGraph = true;
-    }
-
     void Graph::MarkVersion()
     {
         m_versionData.MarkLatest();
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Graph.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Graph.h
index e54704e95e..bdd71a73f8 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Graph.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Graph.h
@@ -19,7 +19,6 @@
 #include <ScriptCanvas/Debugger/Bus.h>
 #include <ScriptCanvas/Execution/ErrorBus.h>
 #include <ScriptCanvas/Execution/ExecutionContext.h>
-#include <ScriptCanvas/Execution/RuntimeBus.h>
 #include <ScriptCanvas/Debugger/StatusBus.h>
 
 #include <ScriptCanvas/Debugger/ValidationEvents/ValidationEvent.h>
@@ -35,7 +34,6 @@ namespace ScriptCanvas
     class Graph
         : public AZ::Component
         , protected GraphRequestBus::Handler
-        , protected RuntimeRequestBus::Handler
         , protected StatusRequestBus::Handler
         , private AZ::EntityBus::Handler
         , private ValidationRequestBus::Handler
@@ -112,9 +110,6 @@ namespace ScriptCanvas
 
         Graph* GetGraph() { return this; }
 
-        bool IsFunctionGraph() const;
-        void MarkFunctionGraph();
-
         GraphData* GetGraphData() override { return &m_graphData; }
         const GraphData* GetGraphDataConst() const override { return &m_graphData; }
         const VariableData* GetVariableDataConst() const { return const_cast<Graph*>(this)->GetVariableData(); }
@@ -174,14 +169,12 @@ namespace ScriptCanvas
 
         void RefreshConnectionValidity(bool warnOnRemoval = false);
 
-        //// RuntimeRequestBus::Handler
         AZ::Data::AssetId GetAssetId() const override { return AZ::Data::AssetId(); }
         GraphIdentifier GetGraphIdentifier() const override { return GraphIdentifier(GetAssetId(), 0); }
         AZStd::string GetAssetName() const override { return "";  }
         AZ::EntityId GetRuntimeEntityId() const override { return GetEntity() ? GetEntityId() : AZ::EntityId(); }
 
         VariableId FindAssetVariableIdByRuntimeVariableId(VariableId runtimeId) const override { return runtimeId; }
-        VariableId FindRuntimeVariableIdByAssetVariableId(VariableId assetId) const override { return assetId; }
         AZ::EntityId FindAssetNodeIdByRuntimeNodeId(AZ::EntityId editorNode) const override { return editorNode; }
         AZ::EntityId FindRuntimeNodeIdByAssetNodeId(AZ::EntityId runtimeNode) const override { return runtimeNode; }
         
@@ -190,8 +183,8 @@ namespace ScriptCanvas
         const GraphVariableMapping* GetVariables() const override;
         GraphVariable* FindVariable(AZStd::string_view propName) override;
         GraphVariable* FindVariableById(const VariableId& variableId) override;
-        Data::Type GetVariableType(const VariableId& variableId) const override;
-        AZStd::string_view GetVariableName(const VariableId& variableId) const override;
+        Data::Type GetVariableType(const VariableId& variableId) const;
+        AZStd::string_view GetVariableName(const VariableId& variableId) const;
 
         bool IsGraphObserved() const override;
         void SetIsGraphObserved(bool isObserved) override;
@@ -208,7 +201,6 @@ namespace ScriptCanvas
         AZ::Data::AssetType m_assetType;
 
     private:
-        bool m_isFunctionGraph = false;
         ScriptCanvasId m_scriptCanvasId;
         ExecutionMode m_executionMode = ExecutionMode::Interpreted;
         VersionData m_versionData;
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/GraphBus.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/GraphBus.h
index c85c76e54e..111ee7f339 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/GraphBus.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/GraphBus.h
@@ -11,6 +11,7 @@
 #include "Endpoint.h"
 
 #include <ScriptCanvas/Variable/VariableCore.h>
+#include <ScriptCanvas/Variable/GraphVariable.h>
 
 #include <AzCore/EBus/EBus.h>
 #include <AzCore/std/containers/vector.h>
@@ -23,6 +24,8 @@ namespace ScriptCanvas
     class Graph;
     class Slot;
 
+    using EndpointMapConstIterator = AZStd::unordered_multimap<Endpoint, Endpoint>::const_iterator;
+
     //! These are public graph requests
     class GraphRequests : public AZ::EBusTraits
     {
@@ -51,7 +54,7 @@ namespace ScriptCanvas
         virtual bool FindConnection(AZ::Entity*& connectionEntity, const Endpoint& firstEndpoint, const Endpoint& otherEndpoint) const = 0;
 
         virtual Slot* FindSlot(const Endpoint& endpoint) const = 0;
-        
+
         //! Retrieves the Entity this Graph component is located on
         //! NOTE: There can be multiple Graph components on the same entity so calling FindComponent may not not return this GraphComponent
         virtual AZ::Entity* GetGraphEntity() const = 0;
@@ -59,7 +62,7 @@ namespace ScriptCanvas
         //! Retrieves the Graph Component directly using the BusId
         virtual Graph* GetGraph() = 0;
 
-        virtual bool Connect(const AZ::EntityId& sourceNodeId, const SlotId& sourceSlot, const AZ::EntityId& targetNodeId,const SlotId& targetSlot) = 0;
+        virtual bool Connect(const AZ::EntityId& sourceNodeId, const SlotId& sourceSlot, const AZ::EntityId& targetNodeId, const SlotId& targetSlot) = 0;
         virtual bool Disconnect(const AZ::EntityId& sourceNodeId, const SlotId& sourceSlot, const AZ::EntityId& targetNodeId, const SlotId& targetSlot) = 0;
 
         virtual bool ConnectByEndpoint(const Endpoint& sourceEndpoint, const Endpoint& targetEndpoint) = 0;
@@ -88,7 +91,7 @@ namespace ScriptCanvas
         virtual bool AddItem(AZ::Entity* itemEntity) = 0;
         //! Remove item if it is on the graph
         virtual bool RemoveItem(AZ::Entity* itemEntity) = 0;
-        
+
         //! Retrieves a pointer the GraphData structure stored on the graph
         virtual GraphData* GetGraphData() = 0;
         virtual const GraphData* GetGraphDataConst() const = 0;
@@ -104,8 +107,49 @@ namespace ScriptCanvas
 
         virtual void SetIsGraphObserved(bool observed) = 0;
         virtual bool IsGraphObserved() const = 0;
-    };
 
+        virtual VariableId FindAssetVariableIdByRuntimeVariableId(VariableId runtimeId) const = 0;
+
+        virtual AZ::EntityId FindAssetNodeIdByRuntimeNodeId(AZ::EntityId editorNode) const = 0;
+
+        virtual AZ::Data::AssetId GetAssetId() const = 0;
+
+        virtual GraphIdentifier GetGraphIdentifier() const = 0;
+
+        virtual AZStd::string GetAssetName() const = 0;
+
+        //! Looks up the nodeId within the bus handler
+        virtual Node* FindNode(AZ::EntityId nodeId) const = 0;
+
+        virtual AZ::EntityId FindRuntimeNodeIdByAssetNodeId(AZ::EntityId runtimeNode) const = 0;
+
+        //! Returns the entity id of the execution component
+        virtual AZ::EntityId GetRuntimeEntityId() const = 0;
+
+        virtual AZStd::pair< EndpointMapConstIterator, EndpointMapConstIterator > GetConnectedEndpointIterators(const Endpoint& endpoint) const = 0;
+
+        //! Returns whether the given endpoint has any connections
+        virtual bool IsEndpointConnected(const Endpoint& endpoint) const = 0;
+
+        //! Retrieves VariableData structure which manages variable data for the execution component
+        virtual VariableData* GetVariableData() = 0;
+        virtual const VariableData* GetVariableDataConst() const = 0;
+
+        //! Retrieves a map of variable id to variable name and variable datums pair
+        virtual const GraphVariableMapping* GetVariables() const = 0;
+
+        //! Searches for a variable with the specified name
+        //! returns pointer to the first variable with the specified name or nullptr
+        virtual GraphVariable* FindVariable(AZStd::string_view varName) = 0;
+
+        //! Searches for a variable by VariableId
+        //! returns a pair of <variable datum pointer, variable name> with the supplied id
+        //! The variable datum pointer is non-null if the variable has been found
+        virtual GraphVariable* FindVariableById(const VariableId& variableId) = 0;
+
+        virtual AZ::Data::AssetType GetAssetType() const = 0;
+
+    };
     using GraphRequestBus = AZ::EBus<GraphRequests>;
 
     class GraphNotifications : public AZ::EBusTraits
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/ModifiableDatumView.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/ModifiableDatumView.h
index 7786a1a136..a079a2932f 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/ModifiableDatumView.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/ModifiableDatumView.h
@@ -29,8 +29,7 @@ namespace ScriptCanvas
 
         friend class Node;
         friend class GraphVariable;
-        friend class PureData;
-
+        
     public:
         AZ_CLASS_ALLOCATOR(ModifiableDatumView, AZ::SystemAllocator, 0);
 
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NativeDatumNode.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NativeDatumNode.h
deleted file mode 100644
index 70c30198d5..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NativeDatumNode.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <Data/Data.h>
-#include <ScriptCanvas/Core/Node.h>
-#include <ScriptCanvas/Core/PureData.h>
-#include <AzCore/std/typetraits/function_traits.h>
-
-namespace ScriptCanvas
-{
-    namespace Nodes
-    {
-        template<typename t_Node, typename t_Datum>
-        class NativeDatumNode
-            : public PureData
-        {
-        public:
-            using t_ThisType = NativeDatumNode<t_Node, t_Datum>;
-
-            AZ_RTTI(((NativeDatumNode<t_Node, t_Datum>), "{B7D8D8D6-B2F1-481A-A712-B07D1C19555F}", t_Node, t_Datum), PureData, AZ::Component);
-            AZ_COMPONENT_INTRUSIVE_DESCRIPTOR_TYPE(NativeDatumNode);
-            AZ_COMPONENT_BASE(NativeDatumNode, PureData);
-
-            static void Reflect(AZ::ReflectContext* reflection) 
-            {
-                if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(reflection))
-                {
-                    serializeContext->Class<t_ThisType, PureData>()
-                        ->Version(0)
-                        ;
-
-                    if (AZ::EditContext* editContext = serializeContext->GetEditContext())
-                    {
-                        editContext->Class<t_ThisType>("NativeDatumNode", "")
-                            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                            ;
-                    }
-                }
-            }
-
-            ~NativeDatumNode() override = default;
-
-        protected:
-            virtual void ConfigureSetters()
-            {
-                Data::SetterContainer setterWrappers = Data::ExplodeToSetters(Data::FromAZType(Data::Traits<t_Datum>::GetAZType()));
-                for (const auto& setterWrapperPair : setterWrappers)
-                {
-                    SlotId setterSlotId;
-                    const Data::SetterWrapper& setterWrapper = setterWrapperPair.second;
-                    const AZStd::string argName = AZStd::string::format("%s: %s", Data::GetName(setterWrapper.m_propertyType).data(), setterWrapper.m_propertyName.data());
-                    AZStd::string_view argumentTooltip;
-                    // Add the slot if it doesn't exist
-                    setterSlotId = FindSlotIdForDescriptor(argName, SlotDescriptors::DataIn());
-
-                    if (!setterSlotId.IsValid())
-                    {
-                        DataSlotConfiguration slotConfiguration;
-
-                        slotConfiguration.m_name = argName;
-                        slotConfiguration.m_toolTip = argumentTooltip;
-                        slotConfiguration.SetType(setterWrapper.m_propertyType);
-                        slotConfiguration.SetConnectionType(ConnectionType::Input);
-
-                        setterSlotId = AddSlot(slotConfiguration);
-                    }
-
-                    if (setterSlotId.IsValid())
-                    {
-                        m_propertyAccount.m_getterSetterIdPairs[setterWrapperPair.first].second = setterSlotId;
-                        m_propertyAccount.m_settersByInputSlot.emplace(setterSlotId, setterWrapperPair.second);
-                    }
-                }
-            }
-
-            virtual void ConfigureGetters()
-            {
-                Data::GetterContainer getterWrappers = Data::ExplodeToGetters(Data::FromAZType(Data::Traits<t_Datum>::GetAZType()));
-                for (const auto& getterWrapperPair : getterWrappers)
-                {
-                    SlotId getterSlotId;
-
-                    const Data::GetterWrapper& getterWrapper = getterWrapperPair.second;
-                    const AZStd::string resultSlotName(AZStd::string::format("%s: %s", getterWrapper.m_propertyName.data(), Data::GetName(getterWrapper.m_propertyType).data()));
-                    // Add the slot if it doesn't exist
-
-                    getterSlotId = FindSlotIdForDescriptor(resultSlotName, SlotDescriptors::DataOut());
-
-                    if (!getterSlotId.IsValid())
-                    {
-                        DataSlotConfiguration slotConfiguration;
-
-                        slotConfiguration.m_name = resultSlotName;
-                        slotConfiguration.SetType(getterWrapper.m_propertyType);
-                        slotConfiguration.SetConnectionType(ConnectionType::Output);                        
-
-                        getterSlotId = AddSlot(slotConfiguration);
-                    }
-
-                    if (getterSlotId.IsValid())
-                    {
-                        m_propertyAccount.m_getterSetterIdPairs[getterWrapperPair.first].first = getterSlotId;
-                        m_propertyAccount.m_gettersByInputSlot.emplace(getterSlotId, getterWrapperPair.second);
-                    }
-                }
-            }
-
-            virtual void ConfigureProperties()
-            {
-                if (IsConfigured())
-                {
-                    return;
-                }
-
-                ConfigureGetters();
-                ConfigureSetters();
-                m_configured = true;
-            }
-
-            void OnInit() override
-            {
-                AddInputAndOutputTypeSlot(Data::FromAZType<t_Datum>());
-                ConfigureProperties();
-            }
-        };
-    }
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Node.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Node.cpp
index f0faf324c1..3f9c5cc8a4 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Node.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Node.cpp
@@ -19,19 +19,15 @@
 #include <ScriptCanvas/Core/Attributes.h>
 #include <ScriptCanvas/Core/Contract.h>
 #include <ScriptCanvas/Core/Contracts/ConnectionLimitContract.h>
-#include <ScriptCanvas/Core/Contracts/ExclusivePureDataContract.h>
 #include <ScriptCanvas/Core/Contracts/DynamicTypeContract.h>
 #include <ScriptCanvas/Core/GraphBus.h>
 #include <ScriptCanvas/Core/NodeableNode.h>
-#include <ScriptCanvas/Core/PureData.h>
 #include <ScriptCanvas/Data/DataRegistry.h>
 #include <ScriptCanvas/Libraries/Core/EBusEventHandler.h>
 #include <ScriptCanvas/Variable/VariableBus.h>
 #include <ScriptCanvas/Debugger/API.h>
 #include <ScriptCanvas/Utils/NodeUtils.h>
 #include <ScriptCanvas/Grammar/Primitives.h>
-#include <ScriptCanvas/Grammar/GrammarContext.h>
-#include <ScriptCanvas/Grammar/GrammarContextBus.h>
 #include <ScriptCanvas/Debugger/ValidationEvents/DataValidation/DataValidationEvents.h>
 
 // Version Conversion includes
@@ -48,9 +44,7 @@ namespace NodeCpp
 
         // add your named version above
         Current,
-    };
-    
-
+    }; 
 }
 
 namespace ScriptCanvas
@@ -397,7 +391,6 @@ namespace ScriptCanvas
     void Node::Reflect(AZ::ReflectContext* context)
     {
         Slot::Reflect(context);
-        ExclusivePureDataContract::Reflect(context);
         Nodes::NodeableNode::Reflect(context);
 
         // Version Conversion Reflection
@@ -492,23 +485,16 @@ namespace ScriptCanvas
 
     void Node::Activate()
     {
-        SignalBus::Handler::BusConnect(GetEntityId());
-
-        SetRuntimeBus(RuntimeRequestBus::FindFirstHandler(m_scriptCanvasId));
-        AZ_Assert(m_runtimeBus, "Invalid m_executionUniqueId given for RuntimeRequestBus");
-
+        m_graphRequestBus = GraphRequestBus::FindFirstHandler(m_scriptCanvasId);
+        AZ_Assert(m_graphRequestBus, "Invalid m_executionUniqueId given for RuntimeRequestBus");
         OnActivate();
-
         MarkDefaultableInput();
     }
 
     void Node::Deactivate()
     {
         OnDeactivate();
-
-        SignalBus::Handler::BusDisconnect();
-
-        SetRuntimeBus(RuntimeRequestBus::FindFirstHandler(m_scriptCanvasId));
+        m_graphRequestBus = GraphRequestBus::FindFirstHandler(m_scriptCanvasId);
     }
 
     void Node::PostActivate()
@@ -730,26 +716,11 @@ namespace ScriptCanvas
                 // for each output slot...
                 // for each connected node...
                 // remove the ability to default it...
-                // ...and until a more viable solution is available, variable get input in another node must be exclusive   
-
+                
                 EndpointsResolved connections = GetConnectedNodes(inputSlot);
                 if (!connections.empty())
                 {
-                    bool isConnectedToPureData = false;
-
-                    for (auto& nodePtrSlotId : connections)
-                    {
-                        if (azrtti_cast<const PureData*>(nodePtrSlotId.first))
-                        {
-                            isConnectedToPureData = true;
-                            break;
-                        }
-                    }
-
-                    if (!isConnectedToPureData)
-                    {
-                        m_possiblyStaleInput.insert(slotId);
-                    }
+                    m_possiblyStaleInput.insert(slotId);
                 }
             }
         }
@@ -757,7 +728,7 @@ namespace ScriptCanvas
 
     bool Node::IsInEventHandlingScope(const ID& possibleEventHandler) const
     {
-        Node* node = m_runtimeBus->FindNode(possibleEventHandler);
+        Node* node = m_graphRequestBus->FindNode(possibleEventHandler);
 
         if (auto eventHandler = azrtti_cast<ScriptCanvas::Nodes::Core::EBusEventHandler*>(node))
         {
@@ -804,9 +775,7 @@ namespace ScriptCanvas
     bool Node::IsTargetInDataFlowPath(const Node* targetNode) const
     {
         AZStd::unordered_set<ID> path;
-        return azrtti_cast<const PureData*>(this)
-            || azrtti_cast<const PureData*>(targetNode)
-            || (targetNode && IsTargetInDataFlowPath(targetNode->GetEntityId(), path));
+        return (targetNode && IsTargetInDataFlowPath(targetNode->GetEntityId(), path));
     }
 
     bool Node::IsTargetInDataFlowPath(const ID& targetNodeId, AZStd::unordered_set<ID>& path) const
@@ -866,7 +835,7 @@ namespace ScriptCanvas
 
     GraphVariable* Node::FindGraphVariable(const VariableId& variableId) const
     {
-        return m_runtimeBus->FindVariableById(variableId);      
+        return m_graphRequestBus->FindVariableById(variableId);      
     }
 
     void Node::OnSlotConvertedToValue(const SlotId& slotId)
@@ -1620,24 +1589,6 @@ namespace ScriptCanvas
         NodeNotificationsBus::Event(GetEntityId(), &NodeNotifications::OnSlotDisplayTypeChanged, slotId, dataType);
     }
 
-    void Node::SignalInput(const SlotId& slotId)
-    {
-        AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::ScriptCanvas);
-        SC_EXECUTION_TRACE_SIGNAL_INPUT((*this), (InputSignal(CreateNodeInputSignal(slotId))));
-
-        {
-            AZ_PROFILE_SCOPE_DYNAMIC(AZ::Debug::ProfileCategory::ScriptCanvas, "ScriptCanvas::%s::SignalInput", GetNodeName().c_str());
-            OnInputSignal(slotId);
-        }
-
-    }
-
-    void Node::SignalOutput(const SlotId& slotId, ExecuteMode mode)
-    {
-        AZ_UNUSED(slotId);
-        AZ_UNUSED(mode);
-    }
-
     AZ::Outcome<void, AZStd::string> Node::SlotAcceptsType(const SlotId& slotID, const Data::Type& type) const
     {
         if (auto slot = GetSlot(slotID))
@@ -1936,7 +1887,7 @@ namespace ScriptCanvas
             if (slot.GetDescriptor() == slotDescriptor
                 && (allowLatentSlots || !slot.IsLatent()))
             {
-                AZStd::vector<Endpoint> connectedEndpoints = m_runtimeBus->GetConnectedEndpoints(Endpoint{ GetEntityId(), slot.GetId() });
+                AZStd::vector<Endpoint> connectedEndpoints = m_graphRequestBus->GetConnectedEndpoints(Endpoint{ GetEntityId(), slot.GetId() });
                 endpoints.insert(endpoints.end(), connectedEndpoints.begin(), connectedEndpoints.end());
             }
         }
@@ -2361,9 +2312,7 @@ namespace ScriptCanvas
     void Node::SetOwningScriptCanvasId(ScriptCanvasId scriptCanvasId)
     {
         m_scriptCanvasId = scriptCanvasId;
-
-        SetRuntimeBus(RuntimeRequestBus::FindFirstHandler(m_scriptCanvasId));
-
+        m_graphRequestBus = GraphRequestBus::FindFirstHandler(m_scriptCanvasId);
         OnGraphSet();
     }
 
@@ -2384,6 +2333,11 @@ namespace ScriptCanvas
         }
     }
 
+    bool Node::CanAcceptNullInput([[maybe_unused]] const Slot& executionSlot, [[maybe_unused]] const Slot& inputSlot) const
+    {
+        return true;
+    }
+
     void Node::CollectVariableReferences(AZStd::unordered_set< ScriptCanvas::VariableId >& variableIds) const
     {
         for (const Slot& slot : m_slots)
@@ -2448,7 +2402,7 @@ namespace ScriptCanvas
 
     AZ::EntityId Node::GetGraphEntityId() const
     {
-        return m_runtimeBus->GetRuntimeEntityId();
+        return m_graphRequestBus->GetRuntimeEntityId();
     }
 
     NodePtrConstList Node::FindConnectedNodesByDescriptor(const SlotDescriptor& slotDescriptor, bool followLatentConnections) const
@@ -2459,7 +2413,7 @@ namespace ScriptCanvas
 
         for (const auto& endpoint : GetAllEndpointsByDescriptor(slotDescriptor, followLatentConnections))
         {
-            Node* connectedNode = m_runtimeBus->FindNode(endpoint.GetNodeId());
+            Node* connectedNode = m_graphRequestBus->FindNode(endpoint.GetNodeId());
             
             if (connectedNode)
             {
@@ -2478,7 +2432,7 @@ namespace ScriptCanvas
 
         for (const auto& endpoint : GetAllEndpointsByDescriptor(slotDescriptor, followLatentConnections))
         {
-            Node* connectedNode = m_runtimeBus->FindNode(endpoint.GetNodeId());
+            Node* connectedNode = m_graphRequestBus->FindNode(endpoint.GetNodeId());
             
             if (connectedNode)
             {
@@ -2491,7 +2445,7 @@ namespace ScriptCanvas
 
     AZ::Data::AssetId Node::GetGraphAssetId() const
     {
-        return m_runtimeBus->GetAssetId();
+        return m_graphRequestBus->GetAssetId();
     }
 
     AZStd::string Node::GetGraphAssetName() const
@@ -2504,7 +2458,7 @@ namespace ScriptCanvas
 
     GraphIdentifier Node::GetGraphIdentifier() const
     {
-        return m_runtimeBus->GetGraphIdentifier();
+        return m_graphRequestBus->GetGraphIdentifier();
     }
 
     bool Node::IsSanityCheckRequired() const
@@ -2674,7 +2628,7 @@ namespace ScriptCanvas
                 return;
             }
 
-            auto node = m_runtimeBus->FindNode(endpoint.GetNodeId());
+            auto node = m_graphRequestBus->FindNode(endpoint.GetNodeId());
 
             if (node)
             {
@@ -2862,7 +2816,7 @@ namespace ScriptCanvas
     bool Node::IsConnected(const Slot& slot) const
     {
         AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::ScriptCanvas, "ScriptCanvas::Node::IsConnected");
-        return slot.IsVariableReference() || m_runtimeBus->IsEndpointConnected(slot.GetEndpoint());
+        return slot.IsVariableReference() || m_graphRequestBus->IsEndpointConnected(slot.GetEndpoint());
     }
 
     bool Node::IsConnected(const SlotId& slotId) const
@@ -2902,7 +2856,7 @@ namespace ScriptCanvas
 
     bool Node::IsActivated() const
     {
-        return m_runtimeBus;
+        return m_graphRequestBus;
     }
     
     EndpointsResolved Node::GetConnectedNodes(const Slot& slot) const
@@ -2911,17 +2865,17 @@ namespace ScriptCanvas
 
         EndpointsResolved connectedNodes;
 
-        auto endpointIters = m_runtimeBus->GetConnectedEndpointIterators(Endpoint{ GetEntityId(), slot.GetId() });
+        auto endpointIters = m_graphRequestBus->GetConnectedEndpointIterators(Endpoint{ GetEntityId(), slot.GetId() });
 
         for (auto endpointIter = endpointIters.first; endpointIter != endpointIters.second; ++endpointIter)
         {
             const Endpoint& endpoint = endpointIter->second;
-            auto node = m_runtimeBus->FindNode(endpoint.GetNodeId());
+            auto node = m_graphRequestBus->FindNode(endpoint.GetNodeId());
 
             if (node == nullptr)
             {                
-                AZStd::string assetName = m_runtimeBus->GetAssetName();
-                AZ::EntityId assetNodeId = m_runtimeBus->FindAssetNodeIdByRuntimeNodeId(endpoint.GetNodeId());
+                AZStd::string assetName = m_graphRequestBus->GetAssetName();
+                AZ::EntityId assetNodeId = m_graphRequestBus->FindAssetNodeIdByRuntimeNodeId(endpoint.GetNodeId());
                 AZ_Warning("Script Canvas", false, "Unable to find node with id (id: %s) in the graph '%s'. Most likely the node was serialized with a type that is no longer reflected",
                     assetNodeId.ToString().data(), assetName.data());
 
@@ -2935,8 +2889,8 @@ namespace ScriptCanvas
             auto endpointSlot = node->GetSlot(endpoint.GetSlotId());
             if (!endpointSlot)
             {
-                AZStd::string assetName = m_runtimeBus->GetAssetName();
-                AZ::EntityId assetNodeId = m_runtimeBus->FindAssetNodeIdByRuntimeNodeId(endpoint.GetNodeId());
+                AZStd::string assetName = m_graphRequestBus->GetAssetName();
+                AZ::EntityId assetNodeId = m_graphRequestBus->FindAssetNodeIdByRuntimeNodeId(endpoint.GetNodeId());
                 AZ_Warning("Script Canvas", false, "Endpoint was missing slot. id (id: %s) in the graph '%s'.",
                     assetNodeId.ToString().data(), assetName.data());
 
@@ -2959,18 +2913,18 @@ namespace ScriptCanvas
 
     void Node::ModConnectedNodes(const Slot& slot, AZStd::vector<AZStd::pair<Node*, const SlotId>>& connectedNodes) const
     {
-        auto endpointIters = m_runtimeBus->GetConnectedEndpointIterators(Endpoint{ GetEntityId(), slot.GetId() });
+        auto endpointIters = m_graphRequestBus->GetConnectedEndpointIterators(Endpoint{ GetEntityId(), slot.GetId() });
 
         for (auto endpointIter = endpointIters.first; endpointIter != endpointIters.second; ++endpointIter)
         {
             const Endpoint& endpoint = endpointIter->second;
 
-            auto node = m_runtimeBus->FindNode(endpoint.GetNodeId());
+            auto node = m_graphRequestBus->FindNode(endpoint.GetNodeId());
 
             if (node == nullptr)
             {
-                AZStd::string assetName = m_runtimeBus->GetAssetName();
-                AZ::EntityId assetNodeId = m_runtimeBus->FindAssetNodeIdByRuntimeNodeId(endpoint.GetNodeId());
+                AZStd::string assetName = m_graphRequestBus->GetAssetName();
+                AZ::EntityId assetNodeId = m_graphRequestBus->FindAssetNodeIdByRuntimeNodeId(endpoint.GetNodeId());
 
                 AZ_Error("Script Canvas", false, "Unable to find node with id (id: %s) in the graph '%s'. Most likely the node was serialized with a type that is no longer reflected",
                     assetNodeId.ToString().data(), assetName.data());
@@ -2983,41 +2937,7 @@ namespace ScriptCanvas
 
     bool Node::HasConnectedNodes(const Slot& slot) const
     {
-        return m_runtimeBus->IsEndpointConnected(Endpoint{ GetEntityId(), slot.GetId() });
-    }
-
-    void Node::OnInputChanged(Node& node, const Datum& input, const SlotId& slotID)
-    {
-        AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::ScriptCanvas);
-        node.OnInputChanged(input, slotID);
-    }
-
-    void Node::PushOutput(const Datum& output, const Slot& slot) const
-    {
-        AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::ScriptCanvas);
-
-        if (slot.IsVariableReference())
-        {
-            GraphVariable* variable = slot.GetVariable();
-
-            if (variable)
-            {
-                ModifiableDatumView datumView;
-                variable->ConfigureDatumView(datumView);
-
-                datumView.AssignToDatum(output);
-            }
-        }
-        else
-            {
-            auto endpointIters = m_runtimeBus->GetConnectedEndpointIterators(Endpoint{ GetEntityId(), slot.GetId() });
-
-            for (auto endpointIter = endpointIters.first; endpointIter != endpointIters.second; ++endpointIter)
-            {
-                Node* node = m_runtimeBus->FindNode(endpointIter->second.GetNodeId());
-                node->SetInput(output, endpointIter->second.GetSlotId());
-            }
-        }
+        return m_graphRequestBus->IsEndpointConnected(Endpoint{ GetEntityId(), slot.GetId() });
     }
 
     void Node::ForEachConnectedNode(const Slot& slot, AZStd::function<void(Node&, const SlotId&)> callable) const
@@ -3032,47 +2952,6 @@ namespace ScriptCanvas
         }
     }
 
-    void Node::SetInput(const Datum& newInput, const SlotId& slotId)
-    {
-        AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::ScriptCanvas);
-
-        ModifiableDatumView datumView;
-        FindModifiableDatumView(slotId, datumView);
-
-        if (datumView.IsValid())
-            {
-            datumView.AssignToDatum(newInput);
-            OnInputChanged((*datumView.GetDatum()), slotId);
-        }
-    }
-
-    void Node::SetInput(Datum&& newInput, const SlotId& slotId)
-    {
-        AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::ScriptCanvas);
-
-        ModifiableDatumView datumView;
-        FindModifiableDatumView(slotId, datumView);
-
-        if (datumView.IsValid())
-        {
-            datumView.AssignToDatum(newInput);
-            OnInputChanged((*datumView.GetDatum()), slotId);
-        }
-    }
-
-    void Node::SetInput(Node& node, const SlotId& id, const Datum& input)
-    {
-        AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::ScriptCanvas);
-        node.SetInput(input, id);
-    }
-
-    void Node::SetInput(Node& node, const SlotId& id, Datum&& input)
-    {
-        AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::ScriptCanvas, "ScriptCanvas::Node::SetInput");
-
-        node.SetInput(AZStd::move(input), id);
-    }
-
     AZStd::string Node::GetDebugName() const
     {
         if (GetEntityId().IsValid())
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Node.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Node.h
index 74707916f3..614494883a 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Node.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Node.h
@@ -22,12 +22,10 @@
 #include <ScriptCanvas/Core/ExecutionNotificationsBus.h>
 #include <ScriptCanvas/Core/GraphBus.h>
 #include <ScriptCanvas/Core/NodeBus.h>
-#include <ScriptCanvas/Core/SignalBus.h>
 #include <ScriptCanvas/Core/Slot.h>
 #include <ScriptCanvas/Debugger/StatusBus.h>
 #include <ScriptCanvas/Execution/ErrorBus.h>
 #include <ScriptCanvas/Execution/ExecutionBus.h>
-#include <ScriptCanvas/Execution/RuntimeBus.h>
 #include <ScriptCanvas/Variable/GraphVariable.h>
 #include <ScriptCanvas/Grammar/Primitives.h>
 #include <ScriptCanvas/Debugger/ValidationEvents/ValidationEvent.h>
@@ -400,7 +398,6 @@ namespace ScriptCanvas
     class Node
         : public AZ::Component
         , public DatumNotificationBus::Handler
-        , private SignalBus::Handler
         , public NodeRequestBus::Handler
         , public EndpointNotificationBus::MultiHandler
     {
@@ -482,7 +479,10 @@ namespace ScriptCanvas
         Node(const Node&); // Needed just for DLL linkage. Does not perform a copy
         Node& operator=(const Node&); // Needed just for DLL linkage. Does not perform a copy        
 
+        virtual bool CanAcceptNullInput(const Slot& executionSlot, const Slot& inputSlot) const;
+
         virtual void CollectVariableReferences(AZStd::unordered_set< ScriptCanvas::VariableId >& variableIds) const;
+
         virtual bool ContainsReferencesToVariables(const AZStd::unordered_set< ScriptCanvas::VariableId >& variableIds) const;        
 
         Graph* GetGraph() const;
@@ -542,7 +542,6 @@ namespace ScriptCanvas
         AZStd::vector<AZStd::pair<const Node*, SlotId>> FindConnectedNodesAndSlotsByDescriptor(const SlotDescriptor& slotType, bool followLatentConnections = false) const;
         
         AZStd::vector<const Slot*> GetSlotsByType(CombinedSlotType slotType) const;
-        AZStd::vector<Endpoint> GetConnectedEndpoints(SlotId outSlot) const;
 
         bool IsConnected(const Slot& slot) const;
         bool IsConnected(const SlotId& slotId) const;
@@ -845,10 +844,6 @@ namespace ScriptCanvas
 
         void SignalSlotsReordered();
 
-        static void OnInputChanged(Node& node, const Datum& input, const SlotId& slotID);
-        static void SetInput(Node& node, const SlotId& id, const Datum& input);
-        static void SetInput(Node& node, const SlotId& id, Datum&& input);
-
         // Will ignore any references and return the Datum that the slot represents.
         void ModifyUnderlyingSlotDatum(const SlotId& id, ModifiableDatumView& datumView);
 
@@ -892,7 +887,6 @@ protected:
         void Configure();
 
     protected:
-
         TransientSlotIdentifier ConstructTransientIdentifier(const Slot& slot) const;
 
         DatumVector GatherDatumsForDescriptor(SlotDescriptor descriptor) const;
@@ -900,7 +894,6 @@ protected:
         SlotDataMap CreateInputMap() const;
         SlotDataMap CreateOutputMap() const;
 
-
         Signal CreateNodeInputSignal(const SlotId& slotId) const;
         Signal CreateNodeOutputSignal(const SlotId& slotId) const;
 
@@ -954,6 +947,7 @@ protected:
 
         //! This is a used by CodeGen to configure slots just prior to OnInit.
         virtual void ConfigureSlots() {}
+
         //! Entity level initialization, perform any resource allocation here that should be available throughout the node's existence.
         virtual void OnInit() {}
 
@@ -968,13 +962,11 @@ protected:
 
         //! Entity level activation, perform entity lifetime setup here, i.e. connect to EBuses
         virtual void OnActivate() {}
+
         //! Entity level deactivation, perform any entity lifetime release here, i.e disconnect from EBuses
         virtual void OnDeactivate() {}
         
         virtual void OnPostActivate() {}
-        //! Any node that is not pure data will perform its operation assuming that all input has been pushed and is reasonably valid
-        // perform your derived nodes work in OnInputSignal(const SlotId&)
-        virtual void OnInputSignal(const SlotId& /*slot*/) {}
 
         //! Signal sent once the OwningScriptCanvasId is set.
         virtual void OnGraphSet() {}
@@ -1000,25 +992,9 @@ protected:
         void ModConnectedNodes(const Slot& slot, AZStd::vector<AZStd::pair<Node*, const SlotId>>&) const;
         bool HasConnectedNodes(const Slot& slot) const;
 
-        virtual void OnInputChanged(const Datum& /*input*/, const SlotId& /*slotID*/) {}
-
-        //////////////////////////////////////////////////////////////////////////
-        //! The body of the node's execution, implement the node's work here.
-        void PushOutput(const Datum& output, const Slot& slot) const;
         void SetOwningScriptCanvasId(ScriptCanvasId scriptCanvasId);
         void SetGraphEntityId(AZ::EntityId graphEntityId);
 
-        // on activate, simple expressions need to push this data
-        virtual void SetInput(const Datum& input, const SlotId& id);
-        virtual void SetInput(Datum&& input, const SlotId& id);
-
-        //! Any node that is not pure data will perform its operation assuming that all input has been pushed and is reasonably valid
-        // perform your derived nodes work in OnInputSignal(const SlotId&)
-        void SignalInput(const SlotId& slot) override final;
-
-        //! This must be called manually to send execution out of a specific slot
-        void SignalOutput(const SlotId& slot, ExecuteMode mode = ExecuteMode::Normal) override final;
-
         bool SlotExists(AZStd::string_view name, const SlotDescriptor& slotDescriptor) const;
 
         bool IsTargetInDataFlowPath(const ID& targetNodeId, AZStd::unordered_set<ID>& path) const;
@@ -1027,10 +1003,6 @@ protected:
 
         void PopulateNodeType();
 
-        void SetRuntimeBus(RuntimeRequests* runtimeBus) { m_runtimeBus = runtimeBus; }
-        RuntimeRequests* GetRuntimeBus() const { return m_runtimeBus; }
-
-
         GraphScopedNodeId GetScopedNodeId() const { return GraphScopedNodeId(GetOwningScriptCanvasId(), GetEntityId()); }
         
     private:
@@ -1070,102 +1042,17 @@ protected:
         AZStd::vector< VisualExtensionSlotConfiguration > m_visualExtensions;
 
         // Cache pointer to the owning Graph
-        RuntimeRequests* m_runtimeBus = nullptr;
+        GraphRequests* m_graphRequestBus = nullptr;
         
         ScriptCanvas::SlotId m_removingSlot;
 
     public:
-        template<typename t_Value>
-        const t_Value* GetInput_UNIT_TEST(AZStd::string_view slotName)
-        {
-            return GetInput_UNIT_TEST<t_Value>(GetSlotId(slotName));
-        }
-
-        template<typename t_Value>
-        t_Value* ModInput_UNIT_TEST(AZStd::string_view slotName)
-        {
-            return ModInput_UNIT_TEST<t_Value>(GetSlotId(slotName));
-        }
-
-        template<typename t_Value>
-        const t_Value* GetInput_UNIT_TEST(const SlotId& slotId)
-        {
-            const Datum* input = FindDatum(slotId);
-            return input ? input->GetAs<t_Value>() : nullptr;
-        }
-
-        template<typename t_Value>
-        t_Value* ModInput_UNIT_TEST(const SlotId& slotId)
-        {
-            auto slotIter = m_slotIdIteratorCache.find(slotId);
-
-            if (slotIter != m_slotIdIteratorCache.end())
-            {
-                Slot* slot = &(*slotIter->second.m_slotIterator);
-
-                if (slot->IsVariableReference())
-                {
-                    AZ_Assert(false, "Variable references are not supported in Unit Test methods.");
-                }
-                else
-                {
-                    return slotIter->second.GetDatumIter()->ModAs<t_Value>();
-                }
-            }
-
-            return nullptr;
-        }
-
-        const Datum* GetInput_UNIT_TEST(AZStd::string_view slotName)
-        {
-            return GetInput_UNIT_TEST(GetSlotId(slotName));
-        }
-
-        const Datum* GetInput_UNIT_TEST(const SlotId& slotId)
-        {
-            return FindDatum(slotId);
-        }
-
-        // initializes the node input to the value passed in, not a pointer to it
-        template<typename t_Value>
-        void SetInput_UNIT_TEST(AZStd::string_view slotName, const t_Value& value)
-        {
-            SetInput_UNIT_TEST<t_Value>(GetSlotId(slotName), value);
-        }
-
-        template<typename t_Value>
-        void SetInput_UNIT_TEST(const SlotId& slotId, const t_Value& value)
-        {
-            SetInput(Datum(value), slotId);
-        }
-
-        void SetInput_UNIT_TEST(AZStd::string_view slotName, const Datum& value)
-        {
-            SetInput_UNIT_TEST(GetSlotId(slotName), value);
-        }
-
-        void SetInput_UNIT_TEST(AZStd::string_view slotName, Datum&& value)
-        {
-            SetInput_UNIT_TEST(GetSlotId(slotName), AZStd::move(value));
-        }
-
-        void SetInput_UNIT_TEST(const SlotId& slotId, Datum&& value)
-        {
-            SetInput(AZStd::move(value), slotId);
-        }
-
         template<typename t_Func, t_Func, typename, size_t>
         friend struct Internal::MultipleOutputHelper;
 
         template<typename ResultType, typename t_Traits, typename>
         friend struct Internal::OutputSlotHelper;
 
-        template<typename ResultType, typename t_Traits, typename>
-        friend struct Internal::PushOutputHelper;
-
-        template<typename ResultType, typename ResultIndexSequence, typename t_Func, t_Func function, typename t_Traits>
-        friend struct Internal::CallHelper;
-
         template<size_t... inputDatumIndices>
         friend struct SetDefaultValuesByIndex;
     };
@@ -1238,104 +1125,6 @@ protected:
             }
         };
 
-        template<typename ResultType, typename t_Traits, typename = AZStd::void_t<>>
-        struct PushOutputHelper
-        {
-            template<size_t... Is>
-            static void PushOutput(Node& node, ResultType&& result, AZStd::index_sequence<Is...>)
-            {
-                // protect against changes to the function that generated the node
-                if (auto slot = node.GetSlotByIndex(t_Traits::s_resultsSlotIndicesStart))
-                {
-                    node.PushOutput(Datum(AZStd::forward<ResultType>(result)), *slot);
-                }
-            }
-        };
-
-        template<typename t_Traits>
-        struct PushOutputHelper<void, t_Traits, void>
-        {
-            template<size_t... Is> static void PushOutput(Node& node, AZStd::ignore_t result, AZStd::index_sequence<Is...>) {}
-        };
-
-        template<typename ResultType, typename t_Traits>
-        struct PushOutputHelper<ResultType, t_Traits, AZStd::enable_if_t<IsTupleLike<ResultType>::value>>
-        {
-            template<size_t t_Index>
-            static void PushOutputFold(Node& node, ResultType&& tupleResult)
-            {
-                // protect against changes to the function that generated the node
-                if (auto slot = node.GetSlotByIndex(t_Traits::s_resultsSlotIndicesStart + t_Index))
-                {
-                    node.PushOutput(Datum(AZStd::get<t_Index>(AZStd::forward<ResultType>(tupleResult))), *slot);
-                }
-            }
-
-            template<size_t... Is>
-            static void PushOutput(Node& node, ResultType&& tupleResult, AZStd::index_sequence<Is...>)
-            {
-                (PushOutputFold<Is>(node, AZStd::forward<ResultType>(tupleResult)), ...);
-            }
-        };
-
-        template<typename ResultType, typename ResultIndexSequence, typename t_Func, t_Func function, typename t_Traits>
-        struct CallHelper
-        {
-            // protect against changes to the function that generated the node
-            template<typename... t_Args, size_t... Indices>
-            static bool IsIndexSafe(Node& node, const AZStd::index_sequence<Indices...>&)
-            {
-                return (true && ... && (node.FindDatumByIndex(Indices) != nullptr && node.FindDatumByIndex(Indices)->GetAs<AZStd::decay_t<t_Args>>() != nullptr));
-            }
-
-            template<typename... t_Args, size_t... ArgIndices>
-            static void Call(Node& node, AZStd::Internal::pack_traits_arg_sequence<t_Args...>, [[maybe_unused]] AZStd::index_sequence<ArgIndices...> sequence)
-            {
-#if !defined(_RELEASE)
-                if (IsIndexSafe<t_Args...>(node, sequence))
-                {
-                    PushOutputHelper<ResultType, t_Traits>::PushOutput(node, AZStd::invoke(function, *node.FindDatumByIndex(ArgIndices)->GetAs<AZStd::decay_t<t_Args>>()...), ResultIndexSequence());
-                }
-                else
-                {
-                    SCRIPTCANVAS_REPORT_ERROR((node), "Generic function Node (%s) could not be executed, due to missing slot for source definition."
-                        "this is likely due to changing the function signature. See serialization log for potential errors & warnings.", node.GetNodeName().c_str());    
-                }
-#else
-                PushOutputHelper<ResultType, t_Traits>::PushOutput(node, AZStd::invoke(function, *node.FindDatumByIndex(ArgIndices)->GetAs<AZStd::decay_t<t_Args>>()...), ResultIndexSequence());
-#endif//!defined(_RELEASE)
-            }
-        };
-
-        template<typename ResultIndexSequence, typename t_Func, t_Func function, typename t_Traits>
-        struct CallHelper<void, ResultIndexSequence, t_Func, function, t_Traits>
-        {
-            // protect against changes to the function that generated the node
-            template<typename... t_Args, size_t... Indices>
-            static bool IsIndexSafe(Node& node, const AZStd::index_sequence<Indices...>&)
-            {
-                return true && (... && (node.FindDatumByIndex(Indices) != nullptr && node.FindDatumByIndex(Indices)->GetAs<AZStd::decay_t<t_Args>>() != nullptr));
-            }
-
-            template<typename... t_Args, size_t... ArgIndices>
-            static void Call(Node& node, AZStd::Internal::pack_traits_arg_sequence<t_Args...>, [[maybe_unused]] AZStd::index_sequence<ArgIndices...> sequence)
-            {
-#if !defined(_RELEASE)
-                if (IsIndexSafe<t_Args...>(node, sequence))
-                {
-                    AZStd::invoke(function, *node.FindDatumByIndex(ArgIndices)->GetAs<AZStd::decay_t<t_Args>>()...);
-                }
-                else
-                {
-                    SCRIPTCANVAS_REPORT_ERROR((node), "Generic function Node (%s) could not be executed, due to missing slot for source definition."
-                        "this is likely due to changing the function signature. See serialization log for potential errors & warnings.", node.GetNodeName().c_str());
-                }
-#else
-                AZStd::invoke(function, *node.FindDatumByIndex(ArgIndices)->GetAs<AZStd::decay_t<t_Args>>()...);
-#endif//!defined(_RELEASE)
-            }
-        };
-
         template<typename t_Func, t_Func function, typename t_Traits, size_t NumOutputs>
         struct MultipleOutputHelper
         {
@@ -1346,11 +1135,6 @@ protected:
             {
                 OutputSlotHelper<ResultType, t_Traits>::AddOutputSlot(node, ResultIndexSequence());
             }
-
-            static void Call(Node& node)
-            {
-                CallHelper<ResultType, ResultIndexSequence, t_Func, function, t_Traits>::Call(node, typename AZStd::function_traits<t_Func>::arg_sequence{}, AZStd::make_index_sequence<AZStd::function_traits<t_Func>::arity>{});
-            }
         };
 
         template<typename t_Func, t_Func function, typename t_Traits, typename t_Result, typename = AZStd::void_t<>>
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeFunctionGeneric.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeFunctionGeneric.h
index 95fc23c5d5..e3e0c1a7a3 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeFunctionGeneric.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeFunctionGeneric.h
@@ -248,8 +248,6 @@ namespace ScriptCanvas
             return AZ::Success(scope);
         }
 
-        
-
     protected:
 
         template<typename ArgType, size_t Index>
@@ -298,13 +296,6 @@ namespace ScriptCanvas
             MultipleOutputInvoker<t_Func, function, t_Traits>::Add(*this);
         }
 
-        void OnInputSignal(const SlotId&) override
-        {
-            MultipleOutputInvoker<t_Func, function, t_Traits>::Call(*this);
-            SignalOutput(GetSlotId("Out"));
-        }
-
-
         static bool VersionConverter(AZ::SerializeContext& serializeContext, AZ::SerializeContext::DataElementNode& rootElement);
         static bool ConvertOldNodeGeneric(AZ::SerializeContext& serializeContext, AZ::SerializeContext::DataElementNode& rootElement);
 
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Nodeable.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Nodeable.cpp
index f3d6070ac6..01b754506c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Nodeable.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Nodeable.cpp
@@ -9,8 +9,6 @@
 
 #include <AzCore/Serialization/SerializeContext.h>
 #include <ScriptCanvas/Core/SubgraphInterface.h>
-#include <ScriptCanvas/Grammar/GrammarContext.h>
-#include <ScriptCanvas/Grammar/GrammarContextBus.h>
 
 namespace NodeableOutCpp
 {
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeableNode.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeableNode.cpp
index 5ec40d8e5f..db0cf8e589 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeableNode.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeableNode.cpp
@@ -12,8 +12,6 @@
 #include <AzCore/Serialization/Utils.h>
 #include <AzCore/Serialization/IdUtils.h>
 #include <ScriptCanvas/Core/Attributes.h>
-#include <ScriptCanvas/Grammar/GrammarContext.h>
-#include <ScriptCanvas/Grammar/GrammarContextBus.h>
 #include <ScriptCanvas/Libraries/Core/Method.h>
 #include <ScriptCanvas/Libraries/Core/MethodUtility.h>
 
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeableNodeOverloaded.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeableNodeOverloaded.cpp
index c9e2e3acc6..882804de36 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeableNodeOverloaded.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeableNodeOverloaded.cpp
@@ -12,8 +12,6 @@
 #include <AzCore/Serialization/Utils.h>
 #include <AzCore/Serialization/IdUtils.h>
 #include <ScriptCanvas/Core/Attributes.h>
-#include <ScriptCanvas/Grammar/GrammarContext.h>
-#include <ScriptCanvas/Grammar/GrammarContextBus.h>
 #include <ScriptCanvas/Libraries/Core/Method.h>
 #include <ScriptCanvas/Libraries/Core/MethodUtility.h>
 
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/PureData.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/PureData.cpp
deleted file mode 100644
index 44d087e8a5..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/PureData.cpp
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "PureData.h"
-
-namespace ScriptCanvas
-{
-    const char* PureData::k_getThis("Get");
-    const char* PureData::k_setThis("Set");
-
-    PureData::~PureData()
-    {
-
-    }
-    
-    const AZStd::unordered_map<AZStd::string, AZStd::pair<SlotId, SlotId>>& PureData::GetPropertyNameSlotMap() const
-    {
-        return m_propertyAccount.m_getterSetterIdPairs;
-    }
-
-    void PureData::AddInputAndOutputTypeSlot(const Data::Type& type, const void* source)
-    {
-        {
-            DataSlotConfiguration slotConfiguration;
-
-            slotConfiguration.m_name = k_setThis;
-            slotConfiguration.SetConnectionType(ConnectionType::Input);
-            slotConfiguration.ConfigureDatum(AZStd::move(Datum(type, Datum::eOriginality::Original, source, AZ::Uuid::CreateNull())));
-
-            AddSlot(slotConfiguration);
-        }
-
-        {
-            DataSlotConfiguration slotConfiguration;
-
-            slotConfiguration.m_name = k_getThis;
-            slotConfiguration.SetConnectionType(ConnectionType::Output);            
-            slotConfiguration.SetType(type);
-
-            AddSlot(slotConfiguration);
-        }
-    }
-
-    void PureData::AddInputTypeAndOutputTypeSlot(const Data::Type& type)
-    {
-        {
-            DataSlotConfiguration slotConfiguration;
-
-            slotConfiguration.m_name = k_setThis;
-            slotConfiguration.SetConnectionType(ConnectionType::Input);
-            slotConfiguration.SetType(type);
-
-            AddSlot(slotConfiguration);
-        }
-
-        {
-            DataSlotConfiguration slotConfiguration;
-
-            slotConfiguration.m_name = k_getThis;
-            slotConfiguration.SetConnectionType(ConnectionType::Output);
-            slotConfiguration.SetType(type);
-
-            AddSlot(slotConfiguration);
-        }
-    }
-
-    void PureData::OnActivate()
-    {
-        PushThis();
-
-        for (const auto& propertySlotIdsPair : m_propertyAccount.m_getterSetterIdPairs)
-        {
-            const SlotId& getterSlotId = propertySlotIdsPair.second.first;
-            CallGetter(getterSlotId);
-        }
-    }
-
-    void PureData::OnInputChanged(const Datum& input, [[maybe_unused]] const SlotId& id) 
-    {
-        if (IsActivated())
-        {
-            OnOutputChanged(input);
-        }
-    }
-
-    AZStd::string_view PureData::GetInputDataName() const
-    {
-        return k_setThis;
-    }
-
-    AZStd::string_view PureData::GetOutputDataName() const
-    {
-        return k_getThis;
-    }
-
-    void PureData::CallGetter(const SlotId& getterSlotId)
-    {
-        auto getterFuncIt = m_propertyAccount.m_gettersByInputSlot.find(getterSlotId);
-        Slot* getterSlot = GetSlot(getterSlotId);
-        if (getterSlot && getterFuncIt != m_propertyAccount.m_gettersByInputSlot.end())
-        {
-            AZStd::vector<AZStd::pair<Node*, const SlotId>> outputNodes(ModConnectedNodes(*getterSlot));
-
-            if (!outputNodes.empty())
-            {
-                auto getterOutcome = getterFuncIt->second.m_getterFunction((*FindDatum(GetSlotId(k_setThis))));
-                if (!getterOutcome)
-                {
-                    SCRIPTCANVAS_REPORT_ERROR((*this), getterOutcome.GetError().data());
-                    return;
-                }
-
-
-                for (auto& nodePtrSlot : outputNodes)
-                {
-                    if (nodePtrSlot.first)
-                    {
-                        Node::SetInput(*nodePtrSlot.first, nodePtrSlot.second, getterOutcome.GetValue());
-                    }
-                }
-            }
-        }
-    }
-
-    void PureData::SetInput(const Datum& input, const SlotId& id)
-    {
-        if (id == FindSlotIdForDescriptor(GetInputDataName(), SlotDescriptors::DataIn()))
-        {
-            // push this value, as usual
-            Node::SetInput(input, id);
-
-            // now, call every getter, as every property has (presumably) been changed
-            for (const auto& propertyNameSlotIdsPair : m_propertyAccount.m_getterSetterIdPairs)
-            {
-                const SlotId& getterSlotId = propertyNameSlotIdsPair.second.first;
-                CallGetter(getterSlotId);
-            }
-        }
-        else
-        {
-            SetProperty(input, id);
-        }
-    }
-
-    void PureData::SetInput(Datum&& input, const SlotId& id)
-    {
-        if (id == FindSlotIdForDescriptor(GetInputDataName(), SlotDescriptors::DataIn()))
-        {
-            // push this value, as usual
-            Node::SetInput(AZStd::move(input), id);
-
-            if (IsActivated())
-            {
-                // now, call every getter, as every property has (presumably) been changed
-                for (const auto& propertyNameSlotIdsPair : m_propertyAccount.m_getterSetterIdPairs)
-                {
-                    const SlotId& getterSlotId = propertyNameSlotIdsPair.second.first;
-                    CallGetter(getterSlotId);
-                }
-            }
-        }
-        else
-        {
-            SetProperty(AZStd::move(input), id);
-        }
-    }
-
-    void PureData::SetProperty(const Datum& input, const SlotId& setterId)
-    {
-        auto methodBySlotIter = m_propertyAccount.m_settersByInputSlot.find(setterId);
-        if (methodBySlotIter == m_propertyAccount.m_settersByInputSlot.end())
-        {
-            AZ_Error("Script Canvas", false, "BehaviorContextObject SlotId %s did not route to a setter", setterId.m_id.ToString<AZStd::string>().data());
-            return;
-        }
-        if (!methodBySlotIter->second.m_setterFunction)
-        {
-            AZ_Error("Script Canvas", false, "BehaviorContextObject setter is not invocable for SlotId %s is nullptr", setterId.m_id.ToString<AZStd::string>().data());
-            return;
-        }
-
-        ModifiableDatumView datumView;
-        FindModifiableDatumView(GetSlotId(k_setThis), datumView);
-
-        Datum* datum = datumView.ModifyDatum();
-
-        auto setterOutcome = methodBySlotIter->second.m_setterFunction((*datum), input);
-
-        if (!setterOutcome)
-        {
-            SCRIPTCANVAS_REPORT_ERROR((*this), setterOutcome.TakeError().data());
-            return;
-        }
-
-        datumView.SignalModification();
-
-        PushThis();
-
-        auto getterSetterIt = m_propertyAccount.m_getterSetterIdPairs.find(methodBySlotIter->second.m_propertyName);
-
-        if (getterSetterIt != m_propertyAccount.m_getterSetterIdPairs.end())
-        {
-            CallGetter(getterSetterIt->second.first);
-        }
-    }
-
-
-    void PureData::Reflect(AZ::ReflectContext* reflectContext)
-    {
-        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(reflectContext);
-        if (serializeContext)
-        {
-            serializeContext->Class<PureData, Node>()
-                ->Version(0)
-                ;
-
-            AZ::EditContext* editContext = serializeContext->GetEditContext();
-            if (editContext)
-            {
-                editContext->Class<PureData>("PureData", "")
-                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                    ;
-            }
-        }
-    }
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/PureData.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/PureData.h
deleted file mode 100644
index 01c52d7378..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/PureData.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <ScriptCanvas/Core/Node.h>
-#include <ScriptCanvas/Core/Graph.h>
-#include <ScriptCanvas/Core/Datum.h>
-#include <ScriptCanvas/Data/PropertyTraits.h>
-
-namespace AZ
-{
-    class BehaviorClass;
-    struct BehaviorValueParameter;
-    class ReflectContext;
-}
-
-namespace ScriptCanvas
-{
-    struct PropertyAccount
-    {
-        AZStd::unordered_map<SlotId, Data::GetterWrapper> m_gettersByInputSlot;
-        AZStd::unordered_map<SlotId, Data::SetterWrapper> m_settersByInputSlot;
-        // The first slot id of the pair is the Getter SlotId, the second slot id of the pair is the Setter SlotID
-        AZStd::unordered_map<AZStd::string, AZStd::pair<SlotId, SlotId>> m_getterSetterIdPairs;
-    };
-
-    class PureData
-        : public Node
-    {
-    public:
-        AZ_COMPONENT(PureData, "{8B80FF54-0786-4FEE-B4A3-12907EBF8B75}", Node);
-
-        static void Reflect(AZ::ReflectContext* reflectContext);
-        static const char* k_getThis;
-        static const char* k_setThis;
-
-        const AZStd::unordered_map<AZStd::string, AZStd::pair<SlotId, SlotId>>& GetPropertyNameSlotMap() const;
-
-        AZ_INLINE AZ::Outcome<DependencyReport, void> GetDependencies() const override { return AZ::Success(DependencyReport{}); }
-
-        ~PureData() override;
-
-    protected:
-        void AddInputAndOutputTypeSlot(const Data::Type& type, const void* defaultValue = nullptr);
-        template<typename DatumType>
-        void AddDefaultInputAndOutputTypeSlot(DatumType&& defaultValue);
-        void AddInputTypeAndOutputTypeSlot(const Data::Type& type);
-
-        bool IsDeprecated() const override { return true; }
-
-        void OnActivate() override;
-        void OnInputChanged(const Datum& input, const SlotId& id) override;
-        void MarkDefaultableInput() override {}
-
-        AZ_INLINE void OnOutputChanged(const Datum& output) const
-        { 
-            Slot* slot = GetSlotByName(GetOutputDataName());
-            if (slot)
-            {
-                OnOutputChanged(output, (*slot));
-            }
-        }
-        
-        AZ_INLINE void OnOutputChanged(const Datum& output, const Slot& outputSlot) const
-        {
-            PushOutput(output, outputSlot);
-        }
-
-        // push data out
-        AZ_INLINE void PushThis()
-        {
-            auto slotId = GetSlotId(GetInputDataName());
-
-            if (auto setDatum = FindDatum(slotId))
-            {
-                OnInputChanged(*setDatum, slotId);
-            }
-            else
-            {
-                SCRIPTCANVAS_REPORT_ERROR((*this), "No input datum in a PureData class %s. You must push your data manually in OnActivate() if no input is connected!");
-            }
-        }
-
-        AZStd::string_view GetInputDataName() const;
-        AZStd::string_view GetOutputDataName() const;
-
-        void SetInput(const Datum& input, const SlotId& id) override;
-        void SetInput(Datum&& input, const SlotId& id) override;
-        void SetProperty(const Datum& input, const SlotId& id);
-        void CallGetter(const SlotId& getterSlotId);
-        bool IsConfigured() { return m_configured; }
-
-        PropertyAccount m_propertyAccount;
-        bool m_configured = false;
-    };
-
-    template<typename DatumType>
-    void PureData::AddDefaultInputAndOutputTypeSlot(DatumType&& defaultValue)
-    {
-        AddInputDatumSlot(GetInputDataName(), "", Datum::eOriginality::Original, AZStd::forward<DatumType>(defaultValue));
-        AddOutputTypeSlot(GetOutputDataName(), "", Data::FromAZType(azrtti_typeid<AZStd::decay_t<DatumType>>()), OutputStorage::Optional);
-    }
-
-    template<>
-    void PureData::AddDefaultInputAndOutputTypeSlot<Data::Type>(Data::Type&&) = delete;
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SignalBus.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SignalBus.h
deleted file mode 100644
index 1a39c0f4d6..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SignalBus.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include "Core.h"
-
-#include <AzCore/EBus/EBus.h>
-
-namespace ScriptCanvas
-{
-    enum class ExecuteMode
-    {
-        Normal,
-        UntilNodeIsFoundInStack
-    };
-
-    class SignalInterface : public AZ::EBusTraits
-    {
-    public:
-        //////////////////////////////////////////////////////////////////////////
-        // EBusTraits overrides
-        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
-        typedef ID BusIdType;
-        //////////////////////////////////////////////////////////////////////////
-                
-        virtual void SignalInput(const SlotId& slot) = 0;
-        virtual void SignalOutput(const SlotId& slot, ExecuteMode mode = ExecuteMode::Normal) = 0;
-    };
-
-    using SignalBus = AZ::EBus<SignalInterface>;
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Slot.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Slot.cpp
index 5b117dc4a9..204a087ab3 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Slot.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Slot.cpp
@@ -231,12 +231,6 @@ namespace ScriptCanvas
         // Add the slot type contract by default, It is used for filtering input/output slots and flow/data slots
         m_contracts.emplace_back(AZStd::make_unique<SlotTypeContract>());
 
-        // Every DataIn slot has a contract validating that only 1 connection from any PureData node is allowed
-        if (IsData() && IsInput())
-        {
-            AddContract({ []() { return aznew ExclusivePureDataContract(); } });
-        }
-
         for (const auto& contractDesc : slotConfiguration.m_contractDescs)
         {
             AddContract(contractDesc);
@@ -390,15 +384,10 @@ namespace ScriptCanvas
             if (m_variable)
             {
                 VariableNotificationBus::Handler::BusConnect(m_variable->GetGraphScopedId());
-
-                if (IsInput())
-                {
-                    m_node->OnInputChanged((*m_variable->GetDatum()), GetId());
-                }
             }
-            else
+            else if (m_node)
             {
-                SCRIPTCANVAS_REPORT_ERROR((*m_node), "Node (%s) is attempting to execute using an invalid Variable Reference", m_node->GetNodeName().c_str());
+                AZ_Warning("ScriptCanvas", false, "Node (%s) is attempting to initialize an invalid Variable Reference", m_node->GetNodeName().c_str());
             }
         }
     }
@@ -590,11 +579,6 @@ namespace ScriptCanvas
         return m_isLatentSlot;
     }
 
-    void Slot::OnVariableValueChanged()
-    {
-        m_node->OnInputChanged((*m_variable->GetDatum()), GetId());
-    }
-
     void Slot::SetDynamicDataType(DynamicDataType dynamicDataType)
     {
         AZ_Assert(m_dynamicDataType == DynamicDataType::None, "Set Dynamic Data Type is meant to be used for a node wise version conversion step. Not as a run time reconfiguration of a dynamic type.");
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Slot.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Slot.h
index 1eeddb8898..0e5889e4ba 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Slot.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Slot.h
@@ -167,10 +167,6 @@ namespace ScriptCanvas
 
         bool IsLatent() const;
 
-        // VariableNotificationBus
-        void OnVariableValueChanged() override;
-        ////
-
         // Here to allow conversion of the previously untyped any slots into the dynamic type any.
         void SetDynamicDataType(DynamicDataType dynamicDataType);
 
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SubgraphInterface.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SubgraphInterface.h
index 024f3e7483..19ff2e1d65 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SubgraphInterface.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SubgraphInterface.h
@@ -266,16 +266,6 @@ namespace ScriptCanvas
             const In* FindIn(const AZStd::string& inSlotId) const;
             const Out* FindLatentOut(const AZStd::string& latent) const;
             LexicalScope GetLexicalScope(bool isSourcePure) const;
-
-#if defined(FUNCTION_LEGACY_SUPPORT_ENABLED)
-        public:
-            bool IsAllInputOutputShared() const;
-
-            // all input/output are used in every in/out/latent slot?
-            bool m_isAllInputOutputShared = false;
-
-            void MarkAllInputOutputShared();
-#endif
         };
 
         AZStd::string ToString(const In& in, size_t tabs = 0);
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/RuntimeBus.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/RuntimeBus.h
deleted file mode 100644
index eb3956c4e5..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/RuntimeBus.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <ScriptCanvas/Core/Endpoint.h>
-
-#include <AzCore/EBus/EBus.h>
-#include <AzCore/std/containers/unordered_map.h>
-#include <AzCore/std/containers/vector.h>
-#include <AzCore/std/string/string_view.h>
-
-#include <ScriptCanvas/Core/ExecutionNotificationsBus.h>
-#include <ScriptCanvas/Data/Data.h>
-#include <ScriptCanvas/Variable/VariableCore.h>
-
-namespace ScriptCanvas
-{
-    struct GraphData;
-    class GraphVariable;
-    class VariableData;
-    
-    using EndpointMapConstIterator = AZStd::unordered_multimap<Endpoint, Endpoint>::const_iterator;
-
-    //! Runtime Request Bus for interfacing with the runtime execution component
-    class RuntimeRequests : public AZ::EBusTraits
-    {
-    public:
-        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
-        //! BusIdType represents a unique id for the execution component
-        //! Because multiple Script Canvas graphs can execute on the same entity
-        //! this is not an "EntityId" in the sense that it uniquely identifies an entity.
-        using BusIdType = ScriptCanvasId;
-
-        virtual VariableId FindAssetVariableIdByRuntimeVariableId(VariableId runtimeId) const = 0;
-        
-        virtual VariableId FindRuntimeVariableIdByAssetVariableId(VariableId assetId) const = 0;
-
-        virtual AZ::EntityId FindAssetNodeIdByRuntimeNodeId(AZ::EntityId editorNode) const = 0;
-
-        virtual AZ::Data::AssetId GetAssetId() const = 0;
-        virtual GraphIdentifier GetGraphIdentifier() const = 0;
-        virtual AZStd::string GetAssetName() const = 0;
-        
-        //! Looks up the nodeId within the bus handler
-        virtual Node* FindNode(AZ::EntityId nodeId) const = 0;
-        
-        virtual AZ::EntityId FindRuntimeNodeIdByAssetNodeId(AZ::EntityId runtimeNode) const = 0;        
-        
-        //! Returns the entity id of the execution component
-        virtual AZ::EntityId GetRuntimeEntityId() const = 0;
-                
-        //! Returns a container of nodes
-        virtual AZStd::vector<AZ::EntityId> GetNodes() const = 0;
-        //! Returns a container of connections
-        virtual AZStd::vector<AZ::EntityId> GetConnections() const = 0;
-
-        //! Returns a container of all endpoints to which the supplied endpoint is connected point
-        virtual AZStd::vector<Endpoint> GetConnectedEndpoints(const Endpoint& endpoint) const = 0;
-
-        virtual AZStd::pair< EndpointMapConstIterator, EndpointMapConstIterator > GetConnectedEndpointIterators(const Endpoint& endpoint) const = 0;
-
-        //! Returns whether the given endpoint has any connections
-        virtual bool IsEndpointConnected(const Endpoint& endpoint) const = 0;
-
-        //! Retrieves GraphData structure which manages the nodes and connections of an executing graph
-        virtual GraphData* GetGraphData() = 0;
-        virtual const GraphData* GetGraphDataConst() const = 0;
-
-        //! Retrieves VariableData structure which manages variable data for the execution component
-        virtual VariableData* GetVariableData() = 0;
-        virtual const VariableData* GetVariableDataConst() const = 0;
-
-        //! Retrieves a map of variable id to variable name and variable datums pair
-        virtual const GraphVariableMapping* GetVariables() const = 0;
-
-        //! Searches for a variable with the specified name
-        //! returns pointer to the first variable with the specified name or nullptr
-        virtual GraphVariable* FindVariable(AZStd::string_view varName) = 0;
-
-        //! Searches for a variable by VariableId
-        //! returns a pair of <variable datum pointer, variable name> with the supplied id
-        //! The variable datum pointer is non-null if the variable has been found
-        virtual GraphVariable* FindVariableById(const VariableId& variableId) = 0;
-
-        //! Returns the type associated with the specified variable.
-        virtual Data::Type GetVariableType(const VariableId& variableId) const = 0;
-
-        //! Looks up the variable name that the variable data is associated with in the handler of the bus
-        virtual AZStd::string_view GetVariableName(const VariableId& variableId) const = 0;
-
-        virtual bool IsGraphObserved() const = 0;
-        virtual void SetIsGraphObserved(bool isObserved) = 0;
-
-        virtual AZ::Data::AssetType GetAssetType() const = 0;
-    };
-
-    using RuntimeRequestBus = AZ::EBus<RuntimeRequests>;
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/AbstractCodeModel.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/AbstractCodeModel.cpp
index 2ba248bb5e..4ccb462a5d 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/AbstractCodeModel.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/AbstractCodeModel.cpp
@@ -32,7 +32,6 @@
 
 #include "AbstractCodeModel.h"
 #include "ExecutionTraversalListeners.h"
-#include "GrammarContextBus.h"
 #include "ParsingUtilities.h"
 #include "Primitives.h"
 
@@ -670,6 +669,28 @@ namespace ScriptCanvas
             return AddVariable(Datum(type), rawName);
         }
 
+        void AbstractCodeModel::CheckForKnownNullDereference(ExecutionTreeConstPtr execution, const ExecutionInput& input, const Slot& inputSlot)
+        {
+            if (Data::IsValueType(inputSlot.GetDataType())
+            || !execution->GetId().m_node
+            || !execution->GetId().m_slot
+            || (input.m_value && !input.m_value->m_datum.Empty()))
+            {
+                return;
+            }
+
+            if (!input.m_value)
+            {
+                AddError(execution->GetId().m_node->GetEntityId(), nullptr, "Internal Error: CheckForKnownNullDereference called with input with no m_value");
+                return;
+            }
+
+            if (!execution->GetId().m_node->CanAcceptNullInput(*execution->GetId().m_slot, inputSlot))
+            {
+                AddError(execution->GetId().m_node->GetEntityId(), nullptr, ParseErrors::NullInputKnown);
+            }
+        }
+
         void AbstractCodeModel::CheckConversion(ConversionByIndex& conversion, VariableConstPtr source, size_t index, const Data::Type& targetType)
         {
             const Data::Type& sourceType = source->m_datum.GetType();
@@ -698,7 +719,7 @@ namespace ScriptCanvas
         }
 
         AZStd::string AbstractCodeModel::CheckUniqueInterfaceNames
-        (AZStd::string_view candidate
+            ( AZStd::string_view candidate
             , AZStd::string_view defaultName
             , AZStd::unordered_set<AZStd::string>& uniqueNames
             , const AZStd::unordered_set<const ScriptCanvas::Nodes::Core::FunctionDefinitionNode*>& nodelingsOut)
@@ -2248,17 +2269,6 @@ namespace ScriptCanvas
 
             m_subgraphInterface.SetNamespacePath(m_source.m_namespacePath);
 
-#if defined(FUNCTION_LEGACY_SUPPORT_ENABLED)
-            if (m_source.m_graph->IsFunctionGraph())
-            {
-                m_variableScopeMeaning = VariableScopeMeaning_LegacyFunctions::FunctionPrototype;
-                m_subgraphInterface.MarkAllInputOutputShared();
-            }
-            else
-            {
-                m_variableScopeMeaning = VariableScopeMeaning_LegacyFunctions::ValueInitialization;
-            }
-#endif
             // The Order Matters: begin
 
             // add all data to the ACM for easy look up in input/output processing for ACM nodes
@@ -2433,17 +2443,17 @@ namespace ScriptCanvas
 
             ExecutionTreePtr start = OpenScope(nullptr, startNode, nullptr);
             start->SetSymbol(Symbol::FunctionDefinition);
+            m_start = start; // cache the function definition
 
             if (!m_subgraphStartCalls.empty())
             {
-                m_start = start;
-
+                // call OnGraphStart on all the member nodeables first
                 for (auto node : m_subgraphStartCalls)
                 {
                     ExecutionTreePtr childStartCall = CreateChild(start, node, nullptr);
                     childStartCall->SetSymbol(Symbol::FunctionCall);
                     childStartCall->SetName(k_OnGraphStartFunctionName);
-                    childStartCall->MarkStart();
+                    childStartCall->MarkStartCall();
 
                     auto lexicalScopeOutcome = node->GetFunctionCallLexicalScope(nullptr);
 
@@ -2489,11 +2499,13 @@ namespace ScriptCanvas
                 }
             }
 
+            // ExecutionTreePtr start is now either the last child start() call, or the beginning of the function block,
+            // either way, parsing can continue from the ExecutionTreePtr start.
+
             if (!outSlots.empty())
             {
                 start->AddChild({ outSlots[0], {}, nullptr });
-                start->MarkStart();
-
+                
                 ParseExecutionMultipleOutSyntaxSugar(start, outNodes, outSlots);
                 PostParseProcess(start);
                 PostParseErrorDetect(start);
@@ -2501,24 +2513,10 @@ namespace ScriptCanvas
                 if (!IsErrorFree())
                 {
                     start->Clear();
-
-                    if (m_start)
-                    {
-                        m_start->Clear();
-                    }
-
+                    m_start->Clear();
                     AddError(AZ::EntityId{}, nullptr, ScriptCanvas::ParseErrors::StartNodeFailedToParse);
                     return;
                 }
-
-                if (!m_start)
-                {
-                    m_start = start;
-                }
-            }
-            else
-            {
-                // add warning or notification on useless start node?
             }
 
             if (m_start)
@@ -4308,10 +4306,7 @@ namespace ScriptCanvas
 
         void AbstractCodeModel::ParseInputDatum(ExecutionTreePtr execution, const Slot& input)
         {
-            // \todo look for crossed lines in inferred functions, because sometimes, rather than the input
-            // being named of the result of the output that emitted it, it will be the name of the inferred function
-            // parameter ---> make a map of node output to function input names
-            AZ_Assert(execution->GetSymbol() != Symbol::FunctionDefinition, "Function definition input should have been handled already");
+            AZ_Assert(execution->GetSymbol() != Symbol::FunctionDefinition, "Function definition input is not handled in AbstractCodeModel::ParseInputDatum");
 
             auto nodes = execution->GetId().m_node->GetConnectedNodes(input);
             if (nodes.empty())
@@ -4321,17 +4316,6 @@ namespace ScriptCanvas
                     execution->AddInput({ &input, variable, DebugDataSource::FromVariable(input.GetId(), input.GetDataType(), variable->m_sourceVariableId) });
                     CheckConversion(execution->ModConversions(), variable, execution->GetInputCount() - 1, input.GetDataType());
                 }
-                // This concept may never actually be possible
-//                 else if (RequiresCreationFunction(input.GetDataType().GetType()))
-//                 {
-//                     AddError(execution, aznew NotYetImplemented(
-//                         "1: finish input created by name when connected to other nodes" 
-//                         "2: add the name to the scope"
-//                         "3: and check inputs be re-used, common constructors like zero/1, etc"
-//                         "4: read the variable name if it is present instead of creating it"
-//                         "5: check for entity references to self and other member slice variables"
-//                         "6: mark the variable with RequiredCreationFunction()"));
-//                 }
                 else
                 {
                     auto variableDatum = input.FindDatum();
@@ -4368,26 +4352,30 @@ namespace ScriptCanvas
                 }
                 else
                 {
-                    // we don't support this, yet, but visually we could
-                    // we could support both things, technically...auto-generated inputs, and defaults on the non-connected
-                    // execution thread, or whatever makes possible sense
-                    // \todo send enough information to reveal the data path in the editor
-
+                    // This isn't supported visually, yet, but technically, it could be.
+                    // One could connect both latent execution and immediate execution to the same code execution path,
+                    // but only one uses connected output, and the other uses defaults.
+                    // It would require us to change the visualization of the shared path, based on which parent was clicked on in the editor.
                     const auto& targetNode = *execution->GetId().m_node;
                     const auto& targetSlot = input;
 
                     for (auto sourceNodeAndSlot : nodes)
                     {
                         AddError(nullptr, aznew ScopedDataConnectionEvent
-                        (execution->GetNodeId()
+                            ( execution->GetNodeId()
                             , targetNode
                             , targetSlot
                             , *sourceNodeAndSlot.first
                             , *sourceNodeAndSlot.second));
 
                     }
+
+                    return;
                 }
             }
+
+            // Check for known null reads
+            CheckForKnownNullDereference(execution, execution->GetInput(execution->GetInputCount() - 1), input);
         }
 
         bool AbstractCodeModel::ParseInputThisPointer(ExecutionTreePtr execution)
@@ -4439,6 +4427,7 @@ namespace ScriptCanvas
                 if (auto eventHandling = GetEBusEventHandling(node))
                 {
                     auto variable = AZStd::make_shared<Variable>();
+                    variable->m_isMember = true;
                     variable->m_datum = Datum(eventHandling->m_handlerName);
                     execution->MarkInputHasThisPointer();
                     execution->AddInput({ nullptr, variable, DebugDataSource::FromInternal() });
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/AbstractCodeModel.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/AbstractCodeModel.h
index 92de21ff97..45e289739d 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/AbstractCodeModel.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/AbstractCodeModel.h
@@ -207,8 +207,10 @@ namespace ScriptCanvas
 
             bool CheckCreateRoot(const Node& node);
 
+            void CheckForKnownNullDereference(ExecutionTreeConstPtr parent, const ExecutionInput& input, const Slot& inputSlot);
+
             AZStd::string CheckUniqueInterfaceNames
-            (AZStd::string_view candidate
+                ( AZStd::string_view candidate
                 , AZStd::string_view defaultName
                 , AZStd::unordered_set<AZStd::string>& uniqueNames
                 , const AZStd::unordered_set<const ScriptCanvas::Nodes::Core::FunctionDefinitionNode*>& nodelingsOut);
@@ -594,24 +596,6 @@ namespace ScriptCanvas
             void ParseExecutionIfStatementBooleanExpression(ExecutionTreePtr booleanExpressionExecution, AZStd::string executionName, LexicalScope lexicalScope);
 
             void ParseExecutionIfStatementInternalFunction(ExecutionTreePtr internalFunctionExecution);
-
-#if defined(FUNCTION_LEGACY_SUPPORT_ENABLED)
-        public:
-            AZStd::vector<VariablePtr> FindAllVariablesInVariableFlagScope(VariableFlags::Scope scope) const;
-
-            // scrape variables for scope, every Scope::In and InOut 
-            AZStd::vector<VariablePtr> FindSubGraphInputValues() const;
-
-            // scrape variables for scope, every Scope::Out and InOut
-            AZStd::vector<VariablePtr> FindSubGraphOutputValues() const;
-
-            AZStd::vector<VariableConstPtr> GetLocalVariablesUser() const;
-
-            VariableScopeMeaning_LegacyFunctions GetVariableScopeMeaning() const;
-
-        private:
-            VariableScopeMeaning_LegacyFunctions m_variableScopeMeaning = VariableScopeMeaning_LegacyFunctions::ValueInitialization;
-#endif 
         }; // class AbstractCodeModel
 
         template<typename T>
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/ExecutionTraversalListeners.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/ExecutionTraversalListeners.cpp
index 1ac9303082..6ac80de542 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/ExecutionTraversalListeners.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/ExecutionTraversalListeners.cpp
@@ -27,7 +27,6 @@
 #include <ScriptCanvas/Variable/VariableData.h>
 
 #include "ExecutionTraversalListeners.h"
-#include "GrammarContextBus.h"
 #include "ParsingUtilities.h"
 #include "Primitives.h"
 
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/FunctionsLegacySupport.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/FunctionsLegacySupport.cpp
deleted file mode 100644
index 5d16bd7f9c..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/FunctionsLegacySupport.cpp
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "PrimitivesDeclarations.h"
-
-#if defined(FUNCTION_LEGACY_SUPPORT_ENABLED)
-
-#include <AzCore/Asset/AssetManager.h>
-#include <AzCore/std/containers/unordered_map.h>
-#include <AzFramework/StringFunc/StringFunc.h>
-#include <ScriptCanvas/Asset/RuntimeAsset.h>
-#include <ScriptCanvas/Core/Datum.h>
-#include <ScriptCanvas/Core/EBusHandler.h>
-#include <ScriptCanvas/Core/Graph.h>
-#include <ScriptCanvas/Core/GraphData.h>
-#include <ScriptCanvas/Core/ModifiableDatumView.h>
-#include <ScriptCanvas/Core/Nodeable.h>
-#include <ScriptCanvas/Core/NodeableNode.h>
-#include <ScriptCanvas/Core/NodeableNodeOverloaded.h>
-#include <ScriptCanvas/Core/ScriptCanvasBus.h>
-#include <ScriptCanvas/Core/SlotNames.h>
-#include <ScriptCanvas/Core/SubgraphInterfaceUtility.h>
-#include <ScriptCanvas/Debugger/ValidationEvents/DataValidation/ScopedDataConnectionEvent.h>
-#include <ScriptCanvas/Debugger/ValidationEvents/ParsingValidation/ParsingValidations.h>
-#include <ScriptCanvas/Execution/RuntimeComponent.h>
-#include <ScriptCanvas/Grammar/ParsingMetaData.h>
-#include <ScriptCanvas/Libraries/Core/AzEventHandler.h>
-#include <ScriptCanvas/Libraries/Core/EBusEventHandler.h>
-#include <ScriptCanvas/Libraries/Core/FunctionDefinitionNode.h>
-#include <ScriptCanvas/Libraries/Core/ExtractProperty.h>
-#include <ScriptCanvas/Libraries/Core/ForEach.h>
-#include <ScriptCanvas/Libraries/Core/FunctionCallNode.h>
-#include <ScriptCanvas/Libraries/Core/Method.h>
-#include <ScriptCanvas/Libraries/Core/MethodUtility.h>
-#include <ScriptCanvas/Libraries/Core/Start.h>
-#include <ScriptCanvas/Translation/TranslationUtilities.h>
-#include <ScriptCanvas/Utils/VersionConverters.h>
-#include <ScriptCanvas/Variable/GraphVariableManagerComponent.h>
-#include <ScriptCanvas/Variable/VariableBus.h>
-#include <ScriptCanvas/Variable/VariableData.h>
-#include <ScriptEvents/ScriptEventsAsset.h>
-#include <ScriptEvents/ScriptEventsBus.h>
-
-#include "AbstractCodeModel.h"
-#include "FunctionsLegacySupport.h"
-#include "GrammarContextBus.h"
-#include "ParsingUtilities.h"
-#include "Primitives.h"
-
-namespace ScriptCanvas
-{
-    namespace Grammar
-    {
-
-        void AbstractCodeModel::AddAllVariablesPreParse_LegacyFunctions()
-        {
-            // all variables assumed to be NOT persistent - in the live code they are reset when activated
-            // variables with no scope In/Out is assumed to be persistent, this is a mess with tick handlers
-            // warn on any variable attempted to be read before written 
-            AZ_Assert(m_variableScopeMeaning == VariableScopeMeaning_LegacyFunctions::FunctionPrototype, "new graph type added without full support");
-            auto& sourceVariables = m_source.m_variableData->GetVariables();
-
-            AZStd::set<const GraphVariable*, GraphVariable::Comparator> sortedVariables;
-            for (const auto& variablePair : sourceVariables)
-            {
-                sortedVariables.insert(&variablePair.second);
-            }
-
-            for (auto& sourceVariable : sortedVariables)
-            {
-                auto datum = sourceVariable->GetDatum();
-                AZ_Assert(datum != nullptr, "the datum must be valid");
-                AddVariable(*datum, sourceVariable->GetVariableName(), sourceVariable->GetVariableId());
-            }
-        }
-
-        AZStd::vector<VariablePtr> AbstractCodeModel::FindSubGraphInputValues() const
-        {
-            return FindAllVariablesInVariableFlagScope(VariableFlags::Scope::Input);
-        }
-
-        AZStd::vector<VariablePtr> AbstractCodeModel::FindSubGraphOutputValues() const
-        {
-            return FindAllVariablesInVariableFlagScope(VariableFlags::Scope::Output);
-        }
-
-        AZStd::vector<VariablePtr> AbstractCodeModel::FindAllVariablesInVariableFlagScope(VariableFlags::Scope scope) const
-        {
-            AZStd::vector<VariablePtr> variables;
-            auto& sourceVariables = m_source.m_variableData->GetVariables();
-
-            for (auto& variable : m_variables)
-            {
-                if (IsSourceInScope(variable, scope))
-                {
-                    variables.push_back(variable);
-                }
-            }
-
-            // sort by variable id
-            AZStd::sort(variables.begin(), variables.end(), [](const auto& lhs, const auto& rhs) { return lhs->m_sourceVariableId < rhs->m_sourceVariableId; });
-            return variables;
-        }
-
-        AZStd::vector<VariableConstPtr> AbstractCodeModel::GetLocalVariablesUser() const
-        {
-            AZStd::vector<VariableConstPtr> userLocalVariables;
-
-            if (m_variableScopeMeaning == VariableScopeMeaning_LegacyFunctions::FunctionPrototype)
-            {
-                for (auto variable : m_variables)
-                {
-                    if (!variable->m_isMember
-                        && variable->m_sourceVariableId.IsValid()
-                        && !IsSourceInScope(variable, VariableFlags::Scope::Input)
-                        && !IsSourceInScope(variable, VariableFlags::Scope::Output))
-                    {
-                        userLocalVariables.push_back(variable);
-                    }
-                }
-            }
-
-            return userLocalVariables;
-        }
-
-        VariableScopeMeaning_LegacyFunctions AbstractCodeModel::GetVariableScopeMeaning() const
-        {
-            return m_variableScopeMeaning;
-        }
-
-        bool SubgraphInterface::IsAllInputOutputShared() const
-        {
-            return m_isAllInputOutputShared;
-        }
-
-        void SubgraphInterface::MarkAllInputOutputShared()
-        {
-            m_isAllInputOutputShared = true;
-        }
-    } // namespace Grammar
-
-    namespace Nodes
-    {
-        namespace Core
-        {
-            void FunctionCallNode::BuildNodeFromSubgraphInterface
-            (const AZ::Data::Asset<ScriptCanvas::SubgraphInterfaceAsset>& runtimeAsset
-                , const SlotExecution::Map& previousMap)
-            {
-                // build the node here, from the asset topology, take the node/variable ordering from the function runtime data as a suggestion
-                // deal with updates and conversions after
-                const Grammar::SubgraphInterface& subgraphInterface = runtimeAsset.Get()->m_runtimeData.m_interface;
-                m_prettyName = runtimeAsset.Get()->m_runtimeData.m_name;
-
-                if (!subgraphInterface.IsAllInputOutputShared())
-                {
-                    AZ_Error("ScriptCanvas", false, "the current assumption is that there is no way to distinguish between the input/output of different nodelings");
-                    return;
-                }
-
-                // for now, all outputs are shared
-                Grammar::Outputs outputs;
-                bool sharedOutputInitialized = false;
-
-                SlotExecution::Ins slotMapIns;
-                SlotExecution::Outs slotMapLatents;
-
-                int slotOffset = 0;
-
-                // add all ins->outs, in their display groups
-                for (size_t indexIn = 0; indexIn < subgraphInterface.GetInCount(); ++indexIn)
-                {
-                    const Grammar::In& interfaceIn = subgraphInterface.GetIn(indexIn);
-
-                    SlotExecution::In slotMapIn = AddExecutionInSlotFromInterface(interfaceIn, slotOffset++, previousMap.FindInSlotIdBySource(interfaceIn.sourceID));
-                    if (!slotMapIn.slotId.IsValid())
-                    {
-                        AZ_Error("ScriptCanvas", false, "Failed to add Execution In slot from sub graph interface");
-                        return;
-                    }
-                    slotMapIn.inputs = AddDataInputSlotFromInterface(interfaceIn.inputs, interfaceIn.sourceID, interfaceIn.displayName, previousMap, slotOffset);
-                    for (auto& input : slotMapIn.inputs)
-                    {
-                        if (!input.slotId.IsValid())
-                        {
-                            AZ_Error("ScriptCanvas", false, "Failed to add Input slot from sub graph interface");
-                            return;
-                        }
-                    }
-
-                    for (auto& interfaceOut : interfaceIn.outs)
-                    {
-                        SlotExecution::Out slotMapOut = AddExecutionOutSlotFromInterface(interfaceIn, interfaceOut, slotOffset++, previousMap.FindOutSlotIdBySource(interfaceIn.sourceID, interfaceOut.sourceID));
-                        if (!slotMapOut.slotId.IsValid())
-                        {
-                            AZ_Error("ScriptCanvas", false, "Failed to add Execution Out slot from sub graph interface");
-                            return;
-                        }
-                        if (!sharedOutputInitialized)
-                        {
-                            outputs = interfaceOut.outputs;
-                            sharedOutputInitialized = true;
-                        }
-
-                        slotMapIn.outs.push_back(slotMapOut);
-                    }
-
-                    slotMapIns.push_back(slotMapIn);
-                }
-
-                // add all latents in their display groups
-                for (size_t indexLatent = 0; indexLatent < subgraphInterface.GetLatentOutCount(); ++indexLatent)
-                {
-                    const Grammar::Out& interfaceLatent = subgraphInterface.GetLatentOut(indexLatent);
-
-                    SlotExecution::Out slotMapLatentOut = AddExecutionLatentOutSlotFromInterface(interfaceLatent, slotOffset++, previousMap.FindLatentSlotIdBySource(interfaceLatent.sourceID));
-                    if (!slotMapLatentOut.slotId.IsValid())
-                    {
-                        AZ_Error("ScriptCanvas", false, "Failed to add Latent Out slot from sub graph interface");
-                        return;
-                    }
-                    slotMapLatentOut.returnValues.values = AddDataInputSlotFromInterface(interfaceLatent.returnValues, interfaceLatent.sourceID, interfaceLatent.displayName, previousMap, slotOffset);
-                    for (auto& input : slotMapLatentOut.returnValues.values)
-                    {
-                        if (!input.slotId.IsValid())
-                        {
-                            AZ_Error("ScriptCanvas", false, "Failed to add Input slot from sub graph interface");
-                            return;
-                        }
-                    }
-
-                    if (!sharedOutputInitialized)
-                    {
-                        outputs = interfaceLatent.outputs;
-                        sharedOutputInitialized = true;
-                    }
-
-                    slotMapLatents.push_back(slotMapLatentOut);
-                }
-
-                // add all outputs one time, since they are currently all required to be part of all the signatures [\todo must fix] , in a variable display group
-                SlotExecution::Outputs slotMapOutputs = AddDataOutputSlotFromInterface(outputs, "", previousMap, slotOffset);
-                for (auto& output : slotMapOutputs)
-                {
-                    if (!output.slotId.IsValid())
-                    {
-                        AZ_Error("ScriptCanvas", false, "Failed to add Output slot from sub graph interface");
-                        return;
-                    }
-                }
-                if (!subgraphInterface.IsLatent())
-                {
-                    for (auto& slotMapIn : slotMapIns)
-                    {
-                        for (auto& slotMapOut : slotMapIn.outs)
-                        {
-                            slotMapOut.outputs = slotMapOutputs;
-                        }
-                    }
-                }
-                else
-                {
-                    for (auto& slotMapLatent : slotMapLatents)
-                    {
-                        slotMapLatent.outputs = slotMapOutputs;
-                    }
-                }
-
-                // when returning variables: sort variables by source slot id, they are sorted in the slot map, so just take them from the slot map
-                m_slotExecutionMap = AZStd::move(SlotExecution::Map(AZStd::move(slotMapIns), AZStd::move(slotMapLatents)));
-                m_slotExecutionMapSourceInterface = subgraphInterface;
-                m_asset = runtimeAsset;
-                SignalSlotsReordered();
-            }
-        } // namespace Core
-    } // namespace Nodes
-}
-
-#endif
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/FunctionsLegacySupport.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/FunctionsLegacySupport.h
deleted file mode 100644
index 756537fcc7..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/FunctionsLegacySupport.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-namespace ScriptCanvas
-{
-    namespace Grammar
-    {
-        enum class VariableScopeMeaning_LegacyFunctions : AZ::u32
-        {
-            ValueInitialization,
-            FunctionPrototype,
-        };
-    }
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/GrammarContext.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/GrammarContext.cpp
deleted file mode 100644
index b8eb5f5ad5..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/GrammarContext.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "GrammarContext.h"
-
-namespace ScriptCanvas
-{   
-    namespace Grammar
-    {
-        const SubgraphInterfaceSystem& Context::GetExecutionMapSystem() const
-        {
-            return m_executionMapSystem;
-        }
-
-        SubgraphInterfaceSystem& Context::ModExecutionMapSystem()
-        {
-            return m_executionMapSystem;
-        }
-    } 
-
-} 
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/GrammarContext.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/GrammarContext.h
deleted file mode 100644
index 7a9d2eaec9..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/GrammarContext.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/Memory/Memory.h>
-#include <AzCore/Memory/SystemAllocator.h>
-
-#include <ScriptCanvas/Core/SubgraphInterface.h>
-
-namespace ScriptCanvas
-{
-    namespace Grammar
-    {        
-        class Context
-        {
-        public:
-            AZ_CLASS_ALLOCATOR(Context, AZ::SystemAllocator, 0);
-
-            Context() = default;
-            ~Context() = default;
-
-            const SubgraphInterfaceSystem& GetExecutionMapSystem() const;
-            SubgraphInterfaceSystem& ModExecutionMapSystem();
-
-        private:
-            SubgraphInterfaceSystem m_executionMapSystem;
-
-            // put grammatical state globals in here, things that can be useful across several parses of graphs
-        };
-    } 
-
-} 
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/GrammarContextBus.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/GrammarContextBus.h
deleted file mode 100644
index 1630d0b99e..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/GrammarContextBus.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-namespace ScriptCanvas
-{
-    namespace Grammar
-    {        
-        class Context;
-
-        struct RequestTraits : public AZ::EBusTraits
-        {
-            static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-
-            virtual Context* GetGrammarContext() = 0;
-        };
-
-        using RequestBus = AZ::EBus<RequestTraits>;
-
-        struct EventTraits : public AZ::EBusTraits
-        {
-            static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-
-            // add stuff here to speed up parsing across separate graphs
-        };
-
-        using EventBus = AZ::EBus<EventTraits>;
-    } 
-
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/PrimitivesDeclarations.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/PrimitivesDeclarations.h
index 6ff1010509..12f4199bc4 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/PrimitivesDeclarations.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/PrimitivesDeclarations.h
@@ -19,10 +19,6 @@
 #include <AzCore/std/smart_ptr/shared_ptr.h>
 #include <AzCore/std/string/string.h>
 
-#if defined (FUNCTION_LEGACY_SUPPORT_ENABLED)
-#include "FunctionsLegacySupport.h"
-#endif
-
 namespace AZ
 {
     class ReflectContext;
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/PrimitivesExecution.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/PrimitivesExecution.cpp
index 0984440bf4..011dfeda97 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/PrimitivesExecution.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/PrimitivesExecution.cpp
@@ -354,9 +354,9 @@ namespace ScriptCanvas
             return GetRoot()->m_isPure;
         }
 
-        bool ExecutionTree::IsStart() const
+        bool ExecutionTree::IsStartCall() const
         {
-            return m_isStart;
+            return m_isStartCall;
         }
 
         void ExecutionTree::MarkDebugEmptyStatement()
@@ -403,9 +403,9 @@ namespace ScriptCanvas
             root->m_isLatent = true;
         }
 
-        void ExecutionTree::MarkStart()
+        void ExecutionTree::MarkStartCall()
         {
-            m_isStart = true;
+            m_isStartCall = true;
         }
 
         ExecutionChild& ExecutionTree::ModChild(size_t index)
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/PrimitivesExecution.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/PrimitivesExecution.h
index c86f445a68..80d602ad17 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/PrimitivesExecution.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/PrimitivesExecution.h
@@ -199,7 +199,7 @@ namespace ScriptCanvas
 
             bool IsPure() const;
 
-            bool IsStart() const;
+            bool IsStartCall() const;
 
             void MarkDebugEmptyStatement();
 
@@ -215,7 +215,7 @@ namespace ScriptCanvas
 
             void MarkRootLatent();
 
-            void MarkStart();
+            void MarkStartCall();
 
             ExecutionChild& ModChild(size_t index);
 
@@ -286,7 +286,7 @@ namespace ScriptCanvas
 
             bool m_isPure = false;
 
-            bool m_isStart = false;
+            bool m_isStartCall = false;
 
             bool m_hasExplicitUserOutCalls = false;
 
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/BaseTimerNode.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/BaseTimerNode.cpp
index 598671becb..3980fbd044 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/BaseTimerNode.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/BaseTimerNode.cpp
@@ -23,15 +23,6 @@ namespace ScriptCanvas
                 }
             }
             
-            //////////////////
-            // BaseTimerNode
-            //////////////////
-            
-            BaseTimerNode::~BaseTimerNode()
-            {
-                StopTimer();
-            }
-
             void BaseTimerNode::OnInit()
             {
                 AZStd::string slotName = GetTimeSlotName();
@@ -74,11 +65,6 @@ namespace ScriptCanvas
                 AddTimeDataSlot();
             }
             
-            void BaseTimerNode::OnDeactivate()
-            {
-                StopTimer();
-            }
-
             void BaseTimerNode::ConfigureVisualExtensions()
             {
                 {
@@ -103,54 +89,7 @@ namespace ScriptCanvas
 
                 return nullptr;
             }
-            
-            void BaseTimerNode::OnSystemTick()
-            {
-                AZ::SystemTickBus::Handler::BusDisconnect();
-                
-                if (!AZ::TickBus::Handler::BusIsConnected())
-                {
-                    AZ::TickBus::Handler::BusConnect();
-                }
-            }
-               
-            void BaseTimerNode::OnTick(float delta, AZ::ScriptTimePoint)
-            {
-                if (m_timeUnits == TimeUnits::Ticks)
-                {
-                    m_timerCounter += 1;
-                }
-                switch (m_timeUnits)
-                {
-                case TimeUnits::Ticks:
-                    m_timerCounter += 1;
-                    break;
-                case TimeUnits::Milliseconds:
-                case TimeUnits::Seconds:
-                    m_timerCounter += delta;
-                    break;
-                default:
-                    break;
-                }
-
-                while (m_timerCounter > m_timerDuration)
-                {
-                    if (!m_isActive)
-                    {
-                        break;
-                    }
-                    
-                    m_timerCounter -= m_timerDuration;
-                    
-                    OnTimeElapsed();
-                }
-            }
-
-            int BaseTimerNode::GetTickOrder()
-            {
-                return m_tickOrder;
-            }
-            
+                        
             void BaseTimerNode::AddTimeDataSlot()
             {
                 if (!m_timeSlotId.IsValid())
@@ -174,70 +113,6 @@ namespace ScriptCanvas
                 }
             }
                 
-            void BaseTimerNode::StartTimer()
-            {
-                StopTimer();
-                
-                m_isActive = true;
-                
-                const Datum* datum = FindDatum(m_timeSlotId);
-                
-                if (datum)
-                {
-                    const Data::NumberType* timeAmount = datum->GetAs<Data::NumberType>();
-
-                    if (timeAmount)
-                    {
-                        m_timerDuration = (*timeAmount);
-                        m_timerCounter = 0;
-
-                        // Manage the different unit types
-                        if (m_timeUnits == TimeUnits::Ticks)
-                        {
-                            // Remove all of the floating points
-                            m_timerDuration = aznumeric_cast<float>(aznumeric_cast<int>(m_timerDuration));
-                        }
-                        else if (m_timeUnits == TimeUnits::Milliseconds)
-                        {
-                            m_timerDuration /= 1000.0;
-                        }
-                    }
-                }
-
-                if (AZ::TickBus::Handler::BusIsConnected())
-                {
-                    AZ::TickBus::Handler::BusDisconnect();
-                }
-
-                if (AZ::SystemTickBus::Handler::BusIsConnected())
-                {
-                    AZ::SystemTickBus::Handler::BusDisconnect();
-                }
-                
-                if (!AZ::IsClose(m_timerDuration, 0.0, DBL_EPSILON))
-                {
-                    AZ::SystemTickBus::Handler::BusConnect();
-                }
-                else if (AllowInstantResponse())
-                {
-                    while (m_isActive)
-                    {
-                        OnTimeElapsed();
-                    }
-                }
-            }
-            
-            void BaseTimerNode::StopTimer()
-            {
-                m_isActive = false;
-
-                m_timerCounter = 0.0;
-                m_timerDuration = 0.0;
-                
-                AZ::SystemTickBus::Handler::BusDisconnect();
-                AZ::TickBus::Handler::BusDisconnect();
-            }
-
             AZStd::string BaseTimerNode::GetTimeSlotName() const
             {
                 return GetBaseTimeSlotName();
@@ -283,11 +158,7 @@ namespace ScriptCanvas
             {
                 return false;
             }
-            
-            void BaseTimerNode::OnTimeElapsed()
-            {
-            }
-            
+                        
             void BaseTimerNode::ConfigureTimeSlot(DataSlotConfiguration& configuration)
             {
                 AZ_UNUSED(configuration);
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/BaseTimerNode.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/BaseTimerNode.h
index ca4306cb6e..3977807305 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/BaseTimerNode.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/BaseTimerNode.h
@@ -7,10 +7,7 @@
 
 #pragma once
 
-#include <AzCore/Component/TickBus.h>
-
 #include <ScriptCanvas/Core/Node.h>
-
 #include <Include/ScriptCanvas/Internal/Nodes/BaseTimerNode.generated.h>
 
 namespace ScriptCanvas
@@ -23,8 +20,6 @@ namespace ScriptCanvas
             class BaseTimerNode
                 : public Node
                 , public NodePropertyInterfaceListener
-                , public AZ::TickBus::Handler
-                , public AZ::SystemTickBus::Handler
             {
             public:
 
@@ -44,32 +39,16 @@ namespace ScriptCanvas
                     "Seconds"
                 };
                 
-                virtual ~BaseTimerNode();
-
                 // Node...
                 void OnInit() override;
                 void OnConfigured() override;
-                void OnDeactivate() override;
 
                 void ConfigureVisualExtensions() override;
                 NodePropertyInterface* GetPropertyInterface(AZ::Crc32 propertyId) override;
-                ////
-                
-                // SystemTickBus...
-                void OnSystemTick() override;
-                ////
-                
-                // TickBus...
-                void OnTick(float delta, AZ::ScriptTimePoint timePoint) override;
-                int GetTickOrder() override;
-                ////
-                
+                                                
                 // Method that will handle displaying and viewing of the time slot
                 void AddTimeDataSlot();
                 
-                void StartTimer();
-                void StopTimer();
-
                 AZStd::string GetTimeSlotName() const;
 
             protected:
@@ -83,7 +62,6 @@ namespace ScriptCanvas
                 bool IsActive() const;
                 
                 virtual bool AllowInstantResponse() const;
-                virtual void OnTimeElapsed();
 
                 // Store until versioning is complete
                 virtual const char* GetTimeSlotFormat() const { return "Time (%s)";  }
@@ -105,7 +83,7 @@ namespace ScriptCanvas
                 ////
 
                 int m_timeUnits = 0;
-                int m_tickOrder = static_cast<int>(AZ::TICK_DEFAULT);
+                int m_tickOrder = 1000; // from TICK_DEFAULT
                     
                 bool m_isActive = false;
                     
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/ExpressionNodeBase.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/ExpressionNodeBase.cpp
index aef18a9255..c4f8f0edd5 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/ExpressionNodeBase.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/ExpressionNodeBase.cpp
@@ -112,37 +112,6 @@ namespace ScriptCanvas
                 }
             }
 
-            void ExpressionNodeBase::OnInputSignal(const SlotId& slotId)
-            {
-                if (slotId == ExpressionNodeBaseProperty::GetInSlotId(this))
-                {
-                    for (const SlotId& dirtySlotId : m_dirtyInputs)
-                    {
-                        auto variableIter = m_slotToVariableMap.find(dirtySlotId);
-
-                        if (variableIter != m_slotToVariableMap.end())
-                        {
-                            PushVariable(variableIter->second, (*FindDatum(dirtySlotId)));
-                        }
-                    }
-
-                    m_dirtyInputs.clear();
-
-                    if (m_parseError.IsValidExpression() && m_expressionTree.GetTreeSize() != 0)
-                    {
-                        ExpressionEvaluation::ExpressionResult expressionResult;
-                        ExpressionEvaluation::ExpressionEvaluationRequestBus::BroadcastResult(expressionResult, &ExpressionEvaluation::ExpressionEvaluationRequests::Evaluate, m_expressionTree);
-
-                        OnResult(expressionResult);
-                    }
-                }
-            }
-
-            void ExpressionNodeBase::OnInputChanged([[maybe_unused]] const Datum& input, const SlotId& slotId)
-            {
-                m_dirtyInputs.insert(slotId);
-            }
-
             bool ExpressionNodeBase::CanDeleteSlot([[maybe_unused]] const SlotId& slotId) const
             {
                 return m_handlingExtension;
@@ -474,11 +443,6 @@ namespace ScriptCanvas
                 });
             }
 
-            void ExpressionNodeBase::OnResult([[maybe_unused]] const ExpressionEvaluation::ExpressionResult& result)
-            {
-                AZ_Assert(false, "Implementing node must override OnResult.");
-            }
-
             ExpressionEvaluation::ParseOutcome ExpressionNodeBase::ParseExpression([[maybe_unused]] const AZStd::string& formatString)
             {
                 AZ_Assert(false , "Implementing node must override OnResult.");
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/ExpressionNodeBase.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/ExpressionNodeBase.h
index 4f8949ba4b..32886e0cd2 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/ExpressionNodeBase.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/ExpressionNodeBase.h
@@ -37,8 +37,6 @@ namespace ScriptCanvas
                 AZStd::string GetRawFormat() const;
 
                 const AZStd::unordered_map<AZStd::string, SlotId>& GetSlotsByName() const;
-
-                
                                 
             protected:
 
@@ -53,10 +51,6 @@ namespace ScriptCanvas
                 void OnInit() override;  
                 void OnPostActivate() override;
                 void ConfigureVisualExtensions() override;
-
-                void OnInputSignal(const SlotId& slotId) override;
-                void OnInputChanged(const Datum& input, const SlotId& slotId) override;
-
                 bool CanDeleteSlot(const SlotId& slotId) const override;
 
                 SlotId HandleExtension(AZ::Crc32 extensionId) override;
@@ -80,14 +74,11 @@ namespace ScriptCanvas
                 AZ::Crc32 GetPropertyId() const { return AZ_CRC("FormatStringProperty", 0x2c587efa); }
                 
             protected:
-            
-                virtual void OnResult(const ExpressionEvaluation::ExpressionResult& result);
                 virtual ExpressionEvaluation::ParseOutcome ParseExpression(const AZStd::string& formatString);
 
                 virtual AZStd::string GetExpressionSeparator() const;
 
             private:
-
                 void PushVariable(const AZStd::string& variableName, const Datum& datum);
 
                 // NodePropertyInterface...
@@ -110,7 +101,6 @@ namespace ScriptCanvas
                 bool m_isInError = false;
 
                 AZStd::unordered_map<SlotId, AZStd::string> m_slotToVariableMap;
-                AZStd::unordered_set<SlotId> m_dirtyInputs;
                 AZStd::unordered_map<AZStd::string, SlotId> m_slotsByVariables;
 
                 ExpressionEvaluation::ParsingError m_parseError;
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/EqualTo.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/EqualTo.h
index 8d597884ed..1e9a821761 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/EqualTo.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/EqualTo.h
@@ -41,22 +41,6 @@ namespace ScriptCanvas
                         }
                     }
                 }
-
-            protected:
-                Datum Evaluate(const Datum& lhs, const Datum& rhs) override
-                {
-                    ComparisonOutcome result(lhs == rhs);
-                    
-                    if (result.IsSuccess())
-                    {
-                        return Datum(result.GetValue());
-                    }
-                    else
-                    {
-                        SCRIPTCANVAS_REPORT_ERROR((*this), result.GetError().c_str());
-                        return Datum(false);
-                    }
-                }
             };
 
         }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/Greater.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/Greater.h
index baa4762911..d70158ccd1 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/Greater.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/Greater.h
@@ -40,21 +40,6 @@ namespace ScriptCanvas
                         }
                     }
                 }
-
-            protected:
-                Datum Evaluate(const Datum& lhs, const Datum& rhs) override
-                {
-                    ComparisonOutcome result(lhs >  rhs);
-                    if (result.IsSuccess())
-                    {
-                        return Datum(result.GetValue());
-                    }
-                    else
-                    {
-                        SCRIPTCANVAS_REPORT_ERROR((*this), result.GetError().c_str());
-                        return Datum(false);
-                    }
-                }
             };
 
         }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/GreaterEqual.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/GreaterEqual.h
index e9f5c06501..8546956aa6 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/GreaterEqual.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/GreaterEqual.h
@@ -41,21 +41,6 @@ namespace ScriptCanvas
                         }
                     }
                 }
-
-            protected:
-                Datum Evaluate(const Datum& lhs, const Datum& rhs) override
-                {
-                    ComparisonOutcome result(lhs >= rhs);
-                    if (result.IsSuccess())
-                    {
-                        return Datum(result.GetValue());
-                    }
-                    else
-                    {
-                        SCRIPTCANVAS_REPORT_ERROR((*this), result.GetError().c_str());
-                        return Datum(false);
-                    }
-                }
             };
 
         }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/Less.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/Less.h
index b16f447d92..2c54247580 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/Less.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/Less.h
@@ -40,22 +40,6 @@ namespace ScriptCanvas
                         }
                     }
                 }
-
-            protected:
-                Datum Evaluate(const Datum& lhs, const Datum& rhs) override
-                {
-                    ComparisonOutcome result(lhs < rhs);
-                    
-                    if (result.IsSuccess())
-                    {
-                        return Datum(result.GetValue());
-                    }
-                    else
-                    {
-                        SCRIPTCANVAS_REPORT_ERROR((*this), result.GetError().c_str());
-                        return Datum(false);
-                    }
-                }
             };
 
         }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/LessEqual.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/LessEqual.h
index 35364b918f..7f0077588f 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/LessEqual.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/LessEqual.h
@@ -40,22 +40,6 @@ namespace ScriptCanvas
                         }
                     }
                 }
-
-            protected:
-                Datum Evaluate(const Datum& lhs, const Datum& rhs) override
-                {
-                    ComparisonOutcome result(lhs <= rhs);
-                    
-                    if (result.IsSuccess())
-                    {
-                        return Datum(result.GetValue());
-                    }
-                    else
-                    {
-                        SCRIPTCANVAS_REPORT_ERROR((*this), result.GetError().c_str());
-                        return Datum(false);
-                    }
-                }
             };
 
         }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/NotEqualTo.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/NotEqualTo.h
index c11ff1ba05..b3f6158aa2 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/NotEqualTo.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/NotEqualTo.h
@@ -40,22 +40,6 @@ namespace ScriptCanvas
                         }
                     }
                 }
-
-            protected:
-                Datum Evaluate(const Datum& lhs, const Datum& rhs) override
-                {
-                    ComparisonOutcome result(lhs != rhs);
-                    
-                    if (result.IsSuccess())
-                    {
-                        return Datum(result.GetValue());
-                    }
-                    else
-                    {
-                        SCRIPTCANVAS_REPORT_ERROR((*this), result.GetError().c_str());
-                        return Datum(false);
-                    }
-                }
             };
 
         }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Assign.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Assign.cpp
deleted file mode 100644
index 39faae9f0a..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Assign.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "Assign.h"
-
-namespace ScriptCanvas
-{
-    namespace Nodes
-    {
-        namespace Core
-        {
-            void Assign::OnInit()
-            {
-                AddSlot("In", "", SlotType::ExecutionIn);
-                AddSlot("Out", "", SlotType::ExecutionOut);
-                AddInputDatumDynamicTypedSlot("Source");
-                AddSlot("Target", "", SlotType::DataOut);
-            }
-            
-            Data::Type Assign::GetSlotDataType(const SlotId& slotId) const
-            {
-                if (Slot* sourceSlot = GetSlot(GetSlotId("Source")))
-                {
-                    auto inputs = GetConnectedNodes(*sourceSlot);
-                    // contracts should enforce this, but in case it breaks...
-                    if (inputs.size() == 1)
-                    {
-                        auto input = *inputs.begin();
-                        return input.first->GetSlotDataType(input.second);
-                    }
-                    else
-                    {
-                        AZ_Error("ScriptCanvas", (inputs.size() == 0), "Multiple inputs to 'Assign' are forbidden");
-                    }
-                }
-
-                return Data::Type::Invalid();
-            }
-
-            void Assign::OnInputSignal(const SlotId&)
-            {
-                if (auto input = GetDatumByIndex(k_sourceInputIndex))
-                {
-                    PushOutput(*input, *GetSlotByIndex(k_targetSlotIndex));
-                }
-
-                SignalOutput(GetSlotId("Out"));
-            }
-
-            AZStd::Outcome<void, AZStd::string> Assign::SlotAcceptsType(const SlotId& slotID, const Data::Type& type) const 
-            {
-                Slot* sourceSlot = GetSlot(GetSlotId("Source"));
-                Slot* targetSlot = GetSlot(GetSlotId("Target"));
-
-                if (sourceSlot == nullptr
-                    || targetSlot == nullptr)
-                {
-                    return AZ::Failure(AZStd::string("Unable to find all necessary slots on node");)
-                }
-
-                return DynamicSlotAcceptsType(slotID, type, Node::DynamicTypeArity::Single, *targetSlot, AZStd::vector<Slot*>{sourceSlot});
-            }
-
-            void Assign::Reflect(AZ::ReflectContext* reflectContext)
-            {
-                if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(reflectContext))
-                {
-                    serializeContext->Class<Assign, Node>()
-                        ->Version(0)
-                        ;
-
-                    if (AZ::EditContext* editContext = serializeContext->GetEditContext())
-                    {
-                        editContext->Class<Assign>("Assign", "")
-                            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
-                                ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/Placeholder.png")
-                            ;
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Assign.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Assign.h
deleted file mode 100644
index 89d164f3d2..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Assign.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <ScriptCanvas/Core/GraphBus.h>
-#include <ScriptCanvas/Core/Node.h>
-
-namespace ScriptCanvas
-{
-    namespace Nodes
-    {
-        namespace Core
-        {
-            class Assign
-                : public Node
-            {
-            public:
-                AZ_COMPONENT(Assign, "{E734ADCE-D822-4487-9681-5A80D8E4D263}", Node);
-
-                static void Reflect(AZ::ReflectContext* reflectContext);
-
-            protected:
-                static const int k_sourceInputIndex = 0; 
-                static const int k_targetSlotIndex = 3;
-
-                Data::Type GetSlotDataType(const SlotId& slotId) const override;
-                void OnInit() override;
-                void OnInputSignal(const SlotId&) override;
-                AZ::Outcome<void, AZStd::string> SlotAcceptsType(const SlotId&, const Data::Type&) const override;
-                
-            };
-        }
-    }
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/BehaviorContextObjectNode.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/BehaviorContextObjectNode.cpp
deleted file mode 100644
index c4d3b6f302..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/BehaviorContextObjectNode.cpp
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "BehaviorContextObjectNode.h"
-
-#include <AzCore/RTTI/BehaviorContext.h>
-#include <AzCore/std/string/string_view.h>
-#include <ScriptCanvas/Data/PropertyTraits.h>
-
-namespace ScriptCanvas
-{
-    namespace Nodes
-    {
-        namespace Core
-        {
-            namespace Internal
-            {
-                static const AZ::u32 k_thisParamIndex(0);
-                static const AZ::u32 k_setValueParamIndex(1);
-                static const AZ::u32 k_firstFirstPropertyDataSlotIndex(2);
-                static const AZ::u32 k_valueArgumentIndex(1);
-                static const char* k_setThis("Set");
-            }
-
-            AZStd::string BehaviorContextObjectNode::GetDebugName() const
-            {
-                if (auto input = FindDatum(GetSlotId(Internal::k_setThis)))
-                {
-                    return Data::GetName(input->GetType());
-                }
-
-                return "Invalid";
-            }
-
-            void BehaviorContextObjectNode::InitializeObject(const AZ::Uuid& azType)
-            {
-                // \todo this works with basic types, and it probably shouldn't
-                if (auto bcClass = AZ::BehaviorContextHelper::GetClass(azType))
-                {
-                    InitializeObject(*bcClass);
-                }
-                else
-                {
-                    const void* defaultValue = nullptr;
-                    if (Data::IsEntityID(azType))
-                    {
-                        defaultValue = &ScriptCanvas::GraphOwnerId;
-                    }
-                    AddInputAndOutputTypeSlot(Data::FromAZType(azType), defaultValue);
-                }
-            }
-
-            void BehaviorContextObjectNode::InitializeObject(const AZStd::string& classNameString)
-            {
-                if (auto bcClass = AZ::BehaviorContextHelper::GetClass(classNameString))
-                {
-                    InitializeObject(*bcClass);
-                }
-            }
-
-            void BehaviorContextObjectNode::InitializeObject(const AZ::BehaviorClass& behaviorClass)
-            {
-                m_className = behaviorClass.m_name;
-                const void* defaultValue = nullptr;
-                if (Data::IsEntityID(behaviorClass.m_typeId))
-                {
-                    defaultValue = &ScriptCanvas::GraphOwnerId;
-                }
-                AddInputAndOutputTypeSlot(Data::FromAZType(behaviorClass.m_typeId), defaultValue);
-                ConfigureProperties(behaviorClass);
-            }
-
-            void BehaviorContextObjectNode::InitializeObject(const Data::Type& type)
-            {
-                if (auto bcClass = AZ::BehaviorContextHelper::GetClass(type.GetAZType()))
-                {
-                    InitializeObject(*bcClass);
-                }
-            }
-
-            void BehaviorContextObjectNode::ConfigureSetters(const AZ::BehaviorClass& behaviorClass)
-            {
-                Data::SetterContainer setterWrappers = Data::ExplodeToSetters(Data::FromAZType(behaviorClass.m_typeId));
-                for (const auto& setterWrapperPair : setterWrappers)
-                {
-                    SlotId setterSlotId;
-                    auto propertyIt = behaviorClass.m_properties.find(setterWrapperPair.first);
-                    if (propertyIt != behaviorClass.m_properties.end())
-                    {
-                        const Data::SetterWrapper& setterWrapper = setterWrapperPair.second;
-                        const AZStd::string argName = AZStd::string::format("%s: %s", Data::GetName(setterWrapper.m_propertyType).data(), setterWrapper.m_propertyName.data());
-                        const AZStd::string* argumentTooltipPtr = propertyIt->second->m_setter->GetArgumentToolTip(Internal::k_setValueParamIndex);
-                        AZStd::string_view argumentTooltip = argumentTooltipPtr ? AZStd::string_view(*argumentTooltipPtr) : AZStd::string_view{};
-                        
-                        // Add the slot if it doesn't exist
-                        setterSlotId = FindSlotIdForDescriptor(argName, SlotDescriptors::DataIn());
-
-                        if (!setterSlotId.IsValid())
-                        {
-                            DataSlotConfiguration slotConfiguration;
-
-                            slotConfiguration.m_name = argName;
-                            slotConfiguration.m_toolTip = argumentTooltip;
-                            slotConfiguration.SetType(setterWrapper.m_propertyType);
-                            slotConfiguration.SetConnectionType(ConnectionType::Input);
-
-                            setterSlotId = AddSlot(slotConfiguration);
-                        }
-
-                    }
-                    if (setterSlotId.IsValid())
-                    {
-                        m_propertyAccount.m_getterSetterIdPairs[setterWrapperPair.first].second = setterSlotId;
-                        m_propertyAccount.m_settersByInputSlot.emplace(setterSlotId, setterWrapperPair.second);
-                    }
-                }
-            }
-
-            void BehaviorContextObjectNode::ConfigureGetters(const AZ::BehaviorClass& behaviorClass)
-            {
-                Data::GetterContainer getterWrappers = Data::ExplodeToGetters(Data::FromAZType(behaviorClass.m_typeId));
-                for (const auto& getterWrapperPair : getterWrappers)
-                {
-                    SlotId getterSlotId;
-                    auto propertyIt = behaviorClass.m_properties.find(getterWrapperPair.first);
-                    if (propertyIt != behaviorClass.m_properties.end())
-                    {
-                        const Data::GetterWrapper& getterWrapper = getterWrapperPair.second;
-                        const AZStd::string resultSlotName(AZStd::string::format("%s: %s", getterWrapper.m_propertyName.data(), Data::GetName(getterWrapper.m_propertyType).data()));
-
-                        // Add the slot if it doesn't exist
-                        getterSlotId = FindSlotIdForDescriptor(resultSlotName, SlotDescriptors::DataOut());
-
-                        if (!getterSlotId.IsValid())
-                        {
-                            DataSlotConfiguration slotConfiguration;
-
-                            slotConfiguration.m_name = resultSlotName;                            
-                            slotConfiguration.SetType(getterWrapper.m_propertyType);
-                            slotConfiguration.SetConnectionType(ConnectionType::Output);
-
-                            getterSlotId = AddSlot(slotConfiguration);
-                        }
-
-                    }
-                    if (getterSlotId.IsValid())
-                    {
-                        m_propertyAccount.m_getterSetterIdPairs[getterWrapperPair.first].first = getterSlotId;
-                        m_propertyAccount.m_gettersByInputSlot.emplace(getterSlotId, getterWrapperPair.second);
-                    }
-                }
-            }
-
-            void BehaviorContextObjectNode::ConfigureProperties(const AZ::BehaviorClass& behaviorClass)
-            {
-                if (IsConfigured())
-                {
-                    return;
-                }
-
-                ConfigureGetters(behaviorClass);
-                ConfigureSetters(behaviorClass);
-                m_configured = true;
-            }
-
-            void BehaviorContextObjectNode::OnInit()
-            {
-                if (auto input = FindDatum(GetSlotId(k_setThis)))
-                {
-                    if (!input->Empty())
-                    {
-                        AddInputTypeAndOutputTypeSlot(input->GetType());
-                    }
-                }
-            }
-
-            void BehaviorContextObjectNode::OnWriteEnd()
-            {
-                AZStd::lock_guard<AZStd::recursive_mutex> lock(m_mutex);
-
-                auto bcClass = !m_className.empty() ? AZ::BehaviorContextHelper::GetClass(m_className) : nullptr;
-
-                if (bcClass)
-                {
-                    ConfigureProperties(*bcClass);
-                }
-            }
-
-
-            void BehaviorContextObjectNode::Reflect(AZ::ReflectContext* reflectContext)
-            {
-                if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(reflectContext))
-                {
-                    serializeContext->Class<BehaviorContextObjectNode, Node>()
-                        ->Version(1)
-                        ->EventHandler<SerializeContextOnWriteEndHandler<BehaviorContextObjectNode>>()
-                        ->Field("m_className", &BehaviorContextObjectNode::m_className)
-                        ;
-
-                    if (AZ::EditContext* editContext = serializeContext->GetEditContext())
-                    {
-                        editContext->Class<BehaviorContextObjectNode>("BehaviorContextObjectNode", "BehaviorContextObjectNode")
-                            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                            ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::List)
-                            ;
-                    }
-                }
-            }
-
-        } 
-    } 
-} 
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/BehaviorContextObjectNode.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/BehaviorContextObjectNode.h
deleted file mode 100644
index 88680fd0a3..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/BehaviorContextObjectNode.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <ScriptCanvas/Core/Node.h>
-#include <ScriptCanvas/Core/PureData.h>
-#include <ScriptCanvas/Core/Graph.h>
-#include <ScriptCanvas/Core/Datum.h>
-
-namespace AZ
-{
-    class BehaviorClass;
-    struct BehaviorValueParameter;
-    class ReflectContext;
-}
-
-namespace ScriptCanvas
-{
-    namespace Nodes
-    {
-        namespace Core
-        {
-            class BehaviorContextObjectNode
-                : public PureData
-            {
-            public:
-                //\todo move to behavior context
-                enum ParameterCount
-                {
-                    Getter = 1,
-                    Setter = 2,
-                };
-
-                AZ_COMPONENT(BehaviorContextObjectNode, "{4344869D-2543-4FA3-BCD0-B6DB1E815928}", PureData);
-
-                static void Reflect(AZ::ReflectContext* reflectContext);
-
-                BehaviorContextObjectNode() = default;
-
-                ~BehaviorContextObjectNode() override = default;
-
-                AZStd::string GetDebugName() const override;            
-                
-                void InitializeObject(const AZ::Uuid& azType);
-
-                void InitializeObject(const AZStd::string& classNameString);
-                
-                void InitializeObject(const Data::Type& type);
-
-                void OnWriteEnd();
-
-            protected:
-                void InitializeObject(const AZ::BehaviorClass& behaviorClass);
-                void OnInit() override;
-
-                virtual void ConfigureSetters(const AZ::BehaviorClass& behaviorClass);
-                virtual void ConfigureGetters(const AZ::BehaviorClass& behaviorClass);
-                void ConfigureProperties(const AZ::BehaviorClass& behaviorClass);
-                
-            private:                
-                AZStd::recursive_mutex m_mutex; // post-serialization
-                AZStd::string m_className;
-
-                BehaviorContextObjectNode(const BehaviorContextObjectNode&) = delete;
-            };
-        }
-    }
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/BinaryOperator.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/BinaryOperator.cpp
index 7b840862bd..8afb5138e1 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/BinaryOperator.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/BinaryOperator.cpp
@@ -75,20 +75,6 @@ namespace ScriptCanvas
             }
         }
 
-        void ArithmeticExpression::OnInputSignal(const SlotId& slotId)
-        {
-            if (slotId == GetSlotId(k_evaluateName))
-            {
-                const Datum output = Evaluate(*FindDatumByIndex(k_datumIndexLHS), *FindDatumByIndex(k_datumIndexRHS));
-                if (auto slot = GetSlot(GetOutputSlotId()))
-                {
-                    PushOutput(output, *slot);
-                }
-
-                SignalOutput(GetSlotId(k_outName));
-            }
-        }
-
         void ArithmeticExpression::Reflect(AZ::ReflectContext* reflection)
         {
             if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(reflection))
@@ -107,17 +93,6 @@ namespace ScriptCanvas
             }
         }
 
-        Datum BinaryOperator::Evaluate([[maybe_unused]] const Datum& lhs, [[maybe_unused]] const Datum& rhs)
-        {
-            AZ_Assert(false, "Evaluate must be overridden");
-            return Datum();
-        };
-
-        void BinaryOperator::OnInputSignal([[maybe_unused]] const SlotId& slot)
-        {
-            AZ_Assert(false, "OnInputSignal must be overridden");
-        }
-
         void BinaryOperator::OnInit()
         {
             {
@@ -159,28 +134,6 @@ namespace ScriptCanvas
             AZ_Assert(false, "InitializeBooleanExpression must be overridden");
         }
 
-        void BooleanExpression::OnInputSignal(const SlotId& slotId)
-        {
-            if (slotId == GetSlotId(k_evaluateName))
-            {
-                const Datum output = Evaluate(*FindDatumByIndex(k_datumIndexLHS), *FindDatumByIndex(k_datumIndexRHS));
-                if (auto slot = GetSlot(GetOutputSlotId()))
-                {
-                    PushOutput(output, *slot);
-                }
-
-                const bool* result = output.GetAs<bool>();
-                if (result && *result)
-                {
-                    SignalOutput(GetSlotId(k_onTrue));
-                }
-                else
-                {
-                    SignalOutput(GetSlotId(k_onFalse));
-                }
-            }
-        }
-
         void BooleanExpression::OnInit()
         {            
             {
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/BinaryOperator.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/BinaryOperator.h
index 92890b2842..64e59b593d 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/BinaryOperator.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/BinaryOperator.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
+ *
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
@@ -10,7 +10,6 @@
 #include <AzCore/std/typetraits/remove_cv.h>
 #include <AzCore/std/typetraits/function_traits.h>
 #include <ScriptCanvas/Core/Node.h>
-#include <ScriptCanvas/Core/PureData.h>
 #include <ScriptCanvas/Core/Datum.h>
 
 namespace ScriptCanvas
@@ -24,7 +23,7 @@ namespace ScriptCanvas
             AZ_COMPONENT(BinaryOperator, "{5BD0E8C7-9B0A-42F5-9EB0-199E6EC8FA99}", Node);
 
             static void Reflect(AZ::ReflectContext* reflection);
-            
+
             static const char* k_lhsName;
             static const char* k_rhsName;
             static const char* k_resultName;
@@ -34,8 +33,6 @@ namespace ScriptCanvas
             static const char* k_onTrue;
             static const char* k_onFalse;
 
-            
-
         protected:
             ConstSlotsOutcome GetSlotsInExecutionThreadByTypeImpl(const Slot& /*executionSlot*/, CombinedSlotType targetSlotType, const Slot* /*executionChildSlot*/) const override
             {
@@ -48,15 +45,9 @@ namespace ScriptCanvas
 
             void OnInit() override;
 
-            // must be overridden with the binary operations
-            virtual Datum Evaluate(const Datum& lhs, const Datum& rhs);
-
-            // Triggered by the execution signal
-            void OnInputSignal(const SlotId& slot) override;
-
             SlotId GetOutputSlotId() const;
         };
-                
+
         class ArithmeticExpression
             : public BinaryOperator
         {
@@ -66,24 +57,20 @@ namespace ScriptCanvas
             static void Reflect(AZ::ReflectContext* reflection);
 
             bool IsDeprecated() const override { return true; }
-            
+
             void CustomizeReplacementNode(Node* replacementNode, AZStd::unordered_map<SlotId, AZStd::vector<SlotId>>& outSlotIdMap) const override;
 
         protected:
             // adds Number inputs, adds Number output type
             void OnInit() override;
-
-            void OnInputSignal(const SlotId& slot) override;
-
-            
         };
-        
+
         class BooleanExpression
             : public BinaryOperator
         {
         public:
             AZ_COMPONENT(BooleanExpression, "{36C69825-CFF8-4F70-8F3B-1A9227E8BEEA}", BinaryOperator);
-            
+
             static void Reflect(AZ::ReflectContext* reflection);
 
             //////////////////////////////////////////////////////////////////////////
@@ -106,31 +93,27 @@ namespace ScriptCanvas
             //////////////////////////////////////////////////////////////////////////
 
         protected:
-            // initialize boolean expression, adds boolean output type calls 
+            // initialize boolean expression, adds boolean output type calls
             void OnInit() override;
             virtual void InitializeBooleanExpression();
-            void OnInputSignal(const SlotId& slot) override;
-            
         };
 
         // accepts any type, checks for type equality, and then value equality or pointer equality
         class EqualityExpression
-            : public BooleanExpression            
+            : public BooleanExpression
         {
         public:
             AZ_COMPONENT(EqualityExpression, "{78D20EB6-BA07-4071-B646-7C2D68A0A4A6}", BooleanExpression);
-            
+
             static void Reflect(AZ::ReflectContext* reflection);
-            
+
         protected:
             // adds any required input types
             void InitializeBooleanExpression() override;
 
         private:
-
             SlotId                   m_firstSlotId;
             SlotId                   m_secondSlotId;
-
             ScriptCanvas::Data::Type m_displayType;
         };
 
@@ -142,11 +125,10 @@ namespace ScriptCanvas
             AZ_COMPONENT(ComparisonExpression, "{82C50EAD-D3DD-45D2-BFCE-981D95771DC8}", EqualityExpression);
 
             static void Reflect(AZ::ReflectContext* reflection);
-        
+
         protected:
             // adds number types
             void InitializeBooleanExpression() override;
-            
         };
-    } 
-} 
+    }
+}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/CoreNodes.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/CoreNodes.cpp
index f5a9148231..bd86696596 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/CoreNodes.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/CoreNodes.cpp
@@ -99,13 +99,9 @@ namespace ScriptCanvas
         void Core::InitNodeRegistry(NodeRegistry& nodeRegistry)
         {
             using namespace ScriptCanvas::Nodes::Core;
-            AddNodeToRegistry<Core, Error>(nodeRegistry);
-            AddNodeToRegistry<Core, ErrorHandler>(nodeRegistry);
             AddNodeToRegistry<Core, Method>(nodeRegistry);
             AddNodeToRegistry<Core, MethodOverloaded>(nodeRegistry);
-            AddNodeToRegistry<Core, BehaviorContextObjectNode>(nodeRegistry);
             AddNodeToRegistry<Core, Start>(nodeRegistry);            
-            AddNodeToRegistry<Core, ScriptCanvas::Nodes::Core::String>(nodeRegistry);
             AddNodeToRegistry<Core, EBusEventHandler>(nodeRegistry);
             AddNodeToRegistry<Core, AzEventHandler>(nodeRegistry);
             AddNodeToRegistry<Core, ExtractProperty>(nodeRegistry);
@@ -124,13 +120,9 @@ namespace ScriptCanvas
         AZStd::vector<AZ::ComponentDescriptor*> Core::GetComponentDescriptors()
         {
             return AZStd::vector<AZ::ComponentDescriptor*>({
-                ScriptCanvas::Nodes::Core::Error::CreateDescriptor(),
-                ScriptCanvas::Nodes::Core::ErrorHandler::CreateDescriptor(),
                 ScriptCanvas::Nodes::Core::Method::CreateDescriptor(),
                 ScriptCanvas::Nodes::Core::MethodOverloaded::CreateDescriptor(),
-                ScriptCanvas::Nodes::Core::BehaviorContextObjectNode::CreateDescriptor(),
                 ScriptCanvas::Nodes::Core::Start::CreateDescriptor(),                
-                ScriptCanvas::Nodes::Core::String::CreateDescriptor(),
                 ScriptCanvas::Nodes::Core::EBusEventHandler::CreateDescriptor(),
                 ScriptCanvas::Nodes::Core::AzEventHandler::CreateDescriptor(),
                 ScriptCanvas::Nodes::Core::ExtractProperty::CreateDescriptor(),
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/CoreNodes.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/CoreNodes.h
index 2551dfb4b1..f1c921b1ca 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/CoreNodes.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/CoreNodes.h
@@ -10,10 +10,7 @@
 // This header is only meant to include the nodes and should not contain
 // shared code
 
-#include "BehaviorContextObjectNode.h"
 #include "EBusEventHandler.h"
-#include "Error.h"
-#include "ErrorHandler.h"
 #include "ExtractProperty.h"
 #include "FunctionDefinitionNode.h"
 #include "ForEach.h"
@@ -28,4 +25,3 @@
 #include "SendScriptEvent.h"
 #include "SetVariable.h"
 #include "Start.h"
-#include "String.h"
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.cpp
index fb43e41ad8..d28f375707 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.cpp
@@ -9,7 +9,6 @@
 #include <AzCore/RTTI/BehaviorContext.h>
 #include <AzCore/Serialization/Utils.h>
 #include <ScriptCanvas/Core/ScriptCanvasBus.h>
-#include <ScriptCanvas/Execution/RuntimeBus.h>
 #include <ScriptCanvas/Grammar/Primitives.h>
 #include <ScriptCanvas/Grammar/ParsingUtilities.h>
 #include <ScriptCanvas/Libraries/Core/EventHandlerTranslationUtility.h>
@@ -59,16 +58,6 @@ namespace ScriptCanvas
                 SetAutoConnectToGraphOwner(m_autoConnectToGraphOwner);
             }
 
-            void EBusEventHandler::OnPostActivate()
-            {
-                
-            }
-
-            void EBusEventHandler::OnDeactivate()
-            {
-                Disconnect();
-            }
-
             void EBusEventHandler::OnGraphSet()
             {
                 GraphScopedNodeId scopedNodeId(GetOwningScriptCanvasId(), GetEntityId());
@@ -127,14 +116,6 @@ namespace ScriptCanvas
                 }
             }
 
-            void EBusEventHandler::Connect()
-            {
-            }
-
-            void EBusEventHandler::Disconnect()
-            {
-            }
-
             AZ::Outcome<DependencyReport, void> EBusEventHandler::GetDependencies() const
             {
                 return AZ::Success(DependencyReport{});
@@ -149,12 +130,12 @@ namespace ScriptCanvas
             {
                 return IsIDRequired();
             }
-            
+
             bool EBusEventHandler::IsAutoConnected() const
             {
                 return m_autoConnectToGraphOwner;
             }
-            
+
             const Datum* EBusEventHandler::GetHandlerStartAddress() const
             {
                 return FindDatum(GetSlotId(c_busIdName));
@@ -222,7 +203,7 @@ namespace ScriptCanvas
                 {
                     return AZ::Success(entry->m_eventName);
                 }
-                
+
                 return AZ::Failure();
             }
 
@@ -263,7 +244,7 @@ namespace ScriptCanvas
             {
                 return EventHandlerTranslationHelper::GetSlotsInExecutionThreadByType(*this, executionSlot, targetSlotType);
             }
-                
+
             AZStd::vector<SlotId> EBusEventHandler::GetNonEventSlotIds() const
             {
                 AZStd::vector<SlotId> nonEventSlotIds;
@@ -330,7 +311,7 @@ namespace ScriptCanvas
                         return true;
                     }
 
-                    const AZ::BehaviorEBusHandler::BusForwarderEvent& event = m_handler->GetEvents()[eventIndex];                    
+                    const AZ::BehaviorEBusHandler::BusForwarderEvent& event = m_handler->GetEvents()[eventIndex];
 
                     // Compare output type
                     const bool eventHasOutput = !event.m_parameters.empty() && !event.m_parameters.front().m_typeId.IsNull() && event.m_parameters.front().m_typeId != azrtti_typeid<void>();
@@ -470,7 +451,7 @@ namespace ScriptCanvas
                         config.m_name = c_busIdName;
                         config.m_toolTip = busToolTip;
                         config.SetConnectionType(ConnectionType::Input);
-                        
+
                         if (busId == azrtti_typeid<AZ::EntityId>())
                         {
                             config.SetDefaultValue(GraphOwnerId);
@@ -478,7 +459,7 @@ namespace ScriptCanvas
                         else
                         {
                             Data::Type busIdType(AZ::BehaviorContextHelper::IsStringParameter(m_ebus->m_idParam) ? Data::Type::String() : Data::FromAZType(busId));
-                            
+
                             config.ConfigureDatum(AZStd::move(Datum(busIdType, Datum::eOriginality::Original)));
                         }
 
@@ -515,7 +496,6 @@ namespace ScriptCanvas
 
                 const AZ::BehaviorEBusHandler::BusForwarderEvent& event = events[eventIndex];
                 AZ_Assert(!event.m_parameters.empty(), "No parameters in event!");
-                m_handler->InstallGenericHook(events[eventIndex].m_name, &OnEventGenericHook, this);
 
                 if (m_eventMap.find(AZ::Crc32(event.m_name)) != m_eventMap.end())
                 {
@@ -621,137 +601,6 @@ namespace ScriptCanvas
                 }
             }
 
-            void EBusEventHandler::OnEvent(const char* eventName, const int /*eventIndex*/, AZ::BehaviorValueParameter* result, const int numParameters, AZ::BehaviorValueParameter* parameters)
-            {
-                AZ_PROFILE_SCOPE_DYNAMIC(AZ::Debug::ProfileCategory::ScriptCanvas, "EBusEventHandler::OnEvent %s", eventName);
-
-                SCRIPTCANVAS_RETURN_IF_ERROR_STATE((*this));
-
-                auto iter = m_eventMap.find(AZ::Crc32(eventName));
-                if (iter == m_eventMap.end())
-                {
-                    SCRIPTCANVAS_REPORT_ERROR((*this), "Invalid event index in Ebus handler");
-                    return;
-                }
-
-                EBusEventEntry& ebusEventEntry = iter->second;
-
-                if (!ebusEventEntry.m_shouldHandleEvent || ebusEventEntry.m_isHandlingEvent)
-                {
-                    AZ_Warning("ScriptCanvas", !ebusEventEntry.m_isHandlingEvent, "Found situation where in handling event(%s::%s) triggered the same event. Possible infinite loop, not handling second call.", GetEBusName().c_str(), eventName);
-                    return;
-                }
-
-                ebusEventEntry.m_isHandlingEvent = true;
-
-                ebusEventEntry.m_resultEvaluated = !ebusEventEntry.IsExpectingResult();
-
-                AZ_Assert(ebusEventEntry.m_eventName.compare(eventName) == 0, "Wrong event handled by this EBusEventHandler! received %s, expected %s", eventName, ebusEventEntry.m_eventName.c_str());
-                AZ_Assert(numParameters == ebusEventEntry.m_numExpectedArguments, "Wrong number of events passed into EBusEventHandler %s", eventName);
-
-                // route my parameters to the connect nodes input
-                AZ_Assert(ebusEventEntry.m_parameterSlotIds.size() == numParameters, "Node %s-%s Num parameters = %d, but num output slots = %d", m_ebusName.c_str(), ebusEventEntry.m_eventName.c_str(), numParameters, ebusEventEntry.m_parameterSlotIds.size());
-
-                for (int parameterIndex(0); parameterIndex < numParameters; ++parameterIndex)
-                {
-                    const Slot* slot = GetSlot(ebusEventEntry.m_parameterSlotIds[parameterIndex]);
-                    const auto& value = *(parameters + parameterIndex);
-                    const Datum input(value);
-
-                    PushOutput(input, (*slot));
-                }
-
-                // now, this should pass execution off to the nodes that will push their output into this result input
-                SignalOutput(ebusEventEntry.m_eventSlotId, ExecuteMode::UntilNodeIsFoundInStack);
-
-                // route executed nodes output to my input, and my input to the result
-                if (ebusEventEntry.IsExpectingResult())
-                {
-                    if (result)
-                    {
-                        if (const Datum* resultInput = FindDatum(ebusEventEntry.m_resultSlotId))
-                        {
-                            ebusEventEntry.m_resultEvaluated = resultInput->ToBehaviorContext(*result);
-                            AZ_Warning("Script Canvas", ebusEventEntry.m_resultEvaluated, "Script Canvas failed to write a value back to the caller!");
-                        }
-                        else
-                        {
-                            AZ_Warning("Script Canvas", false, "Script Canvas handler expecting a result, but had no ability to return it");
-                        }
-                    }
-                    else
-                    {
-                        AZ_Warning("Script Canvas", false, "Script Canvas handler is expecting a result, but was called without expecting one!");
-                    }
-                }
-                else
-                {
-                    AZ_Warning("Script Canvas", !result, "Script Canvas handler is not expecting a result, but was called expecting one!");
-                }
-
-                // route executed nodes output to my input, and my input to the result
-                AZ_Warning("Script Canvas", (result != nullptr) == ebusEventEntry.IsExpectingResult(), "Node %s-%s mismatch between expecting a result and getting one!", m_ebusName.c_str(), ebusEventEntry.m_eventName.c_str());
-                AZ_Warning("Script Canvas", ebusEventEntry.m_resultEvaluated, "Node %s-%s result not evaluated properly!", m_ebusName.c_str(), ebusEventEntry.m_eventName.c_str());
-
-                ebusEventEntry.m_isHandlingEvent = false;
-            }
-
-            void EBusEventHandler::OnInputSignal(const SlotId& slotId)
-            {
-                SlotId connectSlot = EBusEventHandlerProperty::GetConnectSlotId(this);
-                SlotId disconnectSlot = EBusEventHandlerProperty::GetDisconnectSlotId(this);
-
-                if (connectSlot == slotId)
-                {
-                    if (IsIDRequired())
-                    {
-                        const Datum* busIdDatum = FindDatum(GetSlotId(c_busIdName));
-
-                        if (!busIdDatum || busIdDatum->Empty())
-                        {
-                            SlotId failureSlot = EBusEventHandlerProperty::GetOnFailureSlotId(this);
-                            SignalOutput(failureSlot);
-                            SCRIPTCANVAS_REPORT_ERROR((*this), "In order to connect this node, a valid BusId must be provided.");
-                            return;
-                        }
-                    }
-                    
-                    Disconnect();
-                    Connect();
-
-                    SlotId onConnectSlotId = EBusEventHandlerProperty::GetOnConnectedSlotId(this);
-                    SignalOutput(onConnectSlotId);
-                    return;                    
-                }
-                else if (disconnectSlot == slotId)
-                {
-                    Disconnect();
-
-                    SlotId onDisconnectSlotId = EBusEventHandlerProperty::GetOnDisconnectedSlotId(this);
-                    SignalOutput(onDisconnectSlotId);
-                    return;
-                }
-            }
-
-            void EBusEventHandler::OnInputChanged(const Datum& /*input*/, const SlotId& /*slotId*/)
-            {
-                /*
-                if (GetExecutionType() == ExecutionType::Runtime 
-                    && m_autoConnectToGraphOwner 
-                    && slotId == FindSlotIdForDescriptor(c_busIdName, SlotDescriptors::DataIn()))
-                {
-                    Disconnect();
-                    Connect();
-                }
-                */
-            }
-
-            void EBusEventHandler::OnEventGenericHook(void* userData, const char* eventName, int eventIndex, AZ::BehaviorValueParameter* result, int numParameters, AZ::BehaviorValueParameter* parameters)
-            {
-                EBusEventHandler* handler(reinterpret_cast<EBusEventHandler*>(userData));
-                handler->OnEvent(eventName, eventIndex, result, numParameters, parameters);
-            }
-
             void EBusEventHandler::OnWriteEnd()
             {
                 AZStd::lock_guard<AZStd::recursive_mutex> lock(m_mutex);
@@ -806,7 +655,7 @@ namespace ScriptCanvas
                     return AZStd::find(m_parameterSlotIds.begin(), m_parameterSlotIds.end(), slotId) != m_parameterSlotIds.end();
                 }
             }
-                        
+
             bool EBusEventEntry::EBusEventEntryVersionConverter(AZ::SerializeContext& serializeContext, AZ::SerializeContext::DataElementNode& rootElement)
             {
                 if (rootElement.GetVersion() == 0)
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.h
index 5fad1ecec2..4e4c3f45c4 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.h
@@ -36,7 +36,7 @@ namespace ScriptCanvas
                 static void Reflect(AZ::ReflectContext* context);
 
                 AZ_TYPE_INFO(EBusEventEntry, "{92A20C1B-A54A-4583-97DB-A894377ACE21}");
-                
+
                 AZStd::string m_eventName;
                 EBusEventId m_eventId;
                 SlotId m_eventSlotId;
@@ -44,7 +44,7 @@ namespace ScriptCanvas
                 AZStd::vector<SlotId> m_parameterSlotIds;
                 int m_numExpectedArguments = {};
                 bool m_resultEvaluated = {};
-                
+
                 bool m_shouldHandleEvent = false;
                 bool m_isHandlingEvent = false;
 
@@ -54,7 +54,7 @@ namespace ScriptCanvas
             };
 
             //! Provides a node that represents an EBus handler
-            class EBusEventHandler 
+            class EBusEventHandler
                 : public Node
                 , public EBusHandlerNodeRequestBus::Handler
             {
@@ -68,7 +68,7 @@ namespace ScriptCanvas
                 using Events = AZStd::vector<EBusEventEntry>;
                 using EventMap = AZStd::map<AZ::Crc32, EBusEventEntry>;
 
-                EBusEventHandler() 
+                EBusEventHandler()
                     : m_autoConnectToGraphOwner(true)
                 {}
 
@@ -78,11 +78,8 @@ namespace ScriptCanvas
 
                 void OnInit() override;
                 void OnActivate() override;
-                void OnPostActivate() override;
-                void OnDeactivate() override;
-
                 void OnGraphSet() override;
-                
+
                 void CollectVariableReferences(AZStd::unordered_set< ScriptCanvas::VariableId >& variableIds) const override;
                 bool ContainsReferencesToVariables(const AZStd::unordered_set< ScriptCanvas::VariableId >& variableIds) const override;
 
@@ -98,14 +95,8 @@ namespace ScriptCanvas
 
                 bool IsOutOfDate(const VersionData& graphVersion) const override;
 
-                
-                
                 bool CreateHandler(AZStd::string_view ebusName);
 
-                void Connect();
-                
-                void Disconnect();
-                
                 const EBusEventEntry* FindEventWithSlot(const Slot& slot) const;
 
                 AZ::Outcome<AZStd::string, void> GetFunctionCallName(const Slot* /*slot*/) const override;
@@ -128,7 +119,7 @@ namespace ScriptCanvas
                 AZStd::vector<SlotId> GetNonEventSlotIds() const override;
 
                 AZ::Outcome<DependencyReport, void> GetDependencies() const override;
-                               
+
                 bool IsEventSlotId(const SlotId& slotId) const;
 
                 bool IsEventHandler() const override;
@@ -138,7 +129,7 @@ namespace ScriptCanvas
                 bool IsVariableWriteHandler() const override;
 
                 bool IsValid() const;
-                
+
                 inline bool IsIDRequired() const
                 {
                     return m_ebus && BehaviorContextUtils::GetEBusAddressPolicy(*m_ebus) == AZ::EBusAddressPolicy::ById;
@@ -165,16 +156,10 @@ namespace ScriptCanvas
                 ConstSlotsOutcome GetSlotsInExecutionThreadByTypeImpl(const Slot& executionSlot, CombinedSlotType targetSlotType, const Slot* executionChildSlot) const override;
 
                 inline bool IsConfigured() const { return !m_eventMap.empty(); }
-                
-                void OnEvent(const char* eventName, const int eventIndex, AZ::BehaviorValueParameter* result, const int numParameters, AZ::BehaviorValueParameter* parameters);
-
-                void OnInputSignal(const SlotId&) override;
-                void OnInputChanged(const Datum& input, const SlotId& slotID) override;
 
             private:
 
                 EBusEventHandler(const EBusEventHandler&) = delete;
-                static void OnEventGenericHook(void* userData, const char* eventName, int eventIndex, AZ::BehaviorValueParameter* result, int numParameters, AZ::BehaviorValueParameter* parameters);
 
                 EventMap m_eventMap;
                 AZStd::string m_ebusName;
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Error.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Error.cpp
deleted file mode 100644
index 1da9428e8f..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Error.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "Error.h"
-
-#include <ScriptCanvas/Core/Graph.h>
-#include <ScriptCanvas/Core/Contracts/ContractRTTI.h>
-#include <ScriptCanvas/Core/Contracts/ConnectionLimitContract.h>
-
-namespace ScriptCanvas
-{
-    namespace Nodes
-    {
-        namespace Core
-        {
-            void Error::OnInit()
-            {
-                {
-                    ExecutionSlotConfiguration slotConfiguration("In", ConnectionType::Input);
-                    AddSlot(slotConfiguration);
-                }
-
-                {
-                    DynamicDataSlotConfiguration slotConfiguration;
-
-                    slotConfiguration.m_name = "This";
-                    slotConfiguration.m_dynamicDataType = DynamicDataType::Any;
-                    slotConfiguration.SetConnectionType(ConnectionType::Output);
-
-                    AddSlot(slotConfiguration); // \todo for testing only, we need to ability to arbitrarily connect nodes themeselve to slots (as input to function call or error handling) or directly (as the flow of execution with arrows if easier to read...)
-                }
-
-                {
-                    DataSlotConfiguration slotConfiguration;
-
-                    slotConfiguration.m_name = "Description";
-                    slotConfiguration.SetConnectionType(ConnectionType::Input);
-                    slotConfiguration.ConfigureDatum(AZStd::move(Datum(AZStd::move(Data::Type::String()), Datum::eOriginality::Copy)));
-
-                    AddSlot(slotConfiguration);
-                }
-            }
-
-            void Error::OnInputSignal(const SlotId&)
-            {
-                const Datum* input = FindDatum(GetSlotId("Description"));
-                if (const Data::StringType* desc = input ? input->GetAs<Data::StringType>() : nullptr)
-                {
-                    SCRIPTCANVAS_REPORT_ERROR((*this), desc->data());
-                }
-                else
-                {
-                    // \todo get a more descriptive default error report
-                    SCRIPTCANVAS_REPORT_ERROR((*this), "Undescribed error");
-                }                
-            }
-
-            void Error::Reflect(AZ::ReflectContext* reflectContext)
-            {
-                if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(reflectContext))
-                {
-                    serializeContext->Class<Error, Node>()
-                        ->Version(0)
-                        ;
-
-                    if (AZ::EditContext* editContext = serializeContext->GetEditContext())
-                    {
-                        editContext->Class<Error>("Error", "")
-                            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                ->Attribute(AZ::Edit::Attributes::Category, "Utilities/Debug")
-                                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Error.png")
-                                ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
-                            ;
-                    }
-                }
-            }
-
-        } 
-    } 
-} 
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Error.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Error.h
deleted file mode 100644
index f9c91ad85b..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Error.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <ScriptCanvas/Core/Node.h>
-
-namespace ScriptCanvas
-{
-    namespace Nodes
-    {
-        namespace Core
-        {
-            class Error
-                : public Node
-            {
-            public:
-                AZ_COMPONENT(Error, "{C6928F30-87BA-4FFE-A3C0-B6096C161DD0}", Node);
-                
-                static void Reflect(AZ::ReflectContext* reflection);
-
-                bool IsDeprecated() const override { return true; }
-
-            protected:
-                void OnInit() override;
-                void OnInputSignal(const SlotId&) override;
-            };
-        } 
-    } 
-} 
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ErrorHandler.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ErrorHandler.cpp
deleted file mode 100644
index a53eb18cbb..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ErrorHandler.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ErrorHandler.h"
-
-#include <ScriptCanvas/Core/Contracts/ConnectionLimitContract.h>
-#include <ScriptCanvas/Core/Contracts/ContractRTTI.h>
-#include <ScriptCanvas/Core/PureData.h>
-
-namespace ScriptCanvas
-{
-    namespace Nodes
-    {
-        namespace Core
-        {
-            const char* ErrorHandler::k_sourceName = "Source";
-            
-            void ErrorHandler::OnInit()
-            {
-                {
-                    ExecutionSlotConfiguration slotConfiguration("Out", ConnectionType::Output);
-                    AddSlot(slotConfiguration);
-                }
-                
-                {
-                    DynamicDataSlotConfiguration slotConfiguration;
-
-                    slotConfiguration.m_name = k_sourceName;                    
-                    slotConfiguration.SetConnectionType(ConnectionType::Input);
-
-                    slotConfiguration.m_dynamicDataType = DynamicDataType::Any;
-
-                    // \todo split node abstractions into executable and !executable
-                    AZStd::vector<AZ::Uuid> forbiddenTypes{ azrtti_typeid<PureData>() };
-                    auto func = [forbiddenTypes]() { return aznew ContractRTTI(forbiddenTypes, ContractRTTI::Flags::Exclusive); };
-                    ContractDescriptor descriptor{ AZStd::move(func) };
-
-                    slotConfiguration.m_contractDescs.emplace_back(descriptor);
-
-                    AddSlot(slotConfiguration);
-                }                
-            }
-            
-            AZStd::vector<AZStd::pair<Node*, const SlotId>> ErrorHandler::GetSources() const
-            {
-                return ModConnectedNodes(*GetSlot(GetSlotId(k_sourceName)));
-            }
-
-            void ErrorHandler::Reflect(AZ::ReflectContext* reflectContext)
-            {
-                if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(reflectContext))
-                {
-                    serializeContext->Class<ErrorHandler, Node>()
-                        ->Version(0)
-                        ;
-
-                    if (AZ::EditContext* editContext = serializeContext->GetEditContext())
-                    {
-                        editContext->Class<ErrorHandler>("Error Handler", "")
-                            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                ->Attribute(AZ::Edit::Attributes::Category, "Utilities/Debug")
-                                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/ErrorHandler.png")
-                            ;
-                    }
-                }
-            }
-
-        } 
-    } 
-} 
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ErrorHandler.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ErrorHandler.h
deleted file mode 100644
index 3edd8c7d4b..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ErrorHandler.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <ScriptCanvas/Core/Node.h>
-
-namespace ScriptCanvas
-{
-    namespace Nodes
-    {
-        namespace Core
-        {
-            class ErrorHandler
-                : public Node
-            {
-            public:
-                AZ_COMPONENT(ErrorHandler, "{CF23B5A6-827C-4364-9714-EA99612D6CAE}", Node);
-
-                static void Reflect(AZ::ReflectContext* reflection);
-
-                AZStd::vector<AZStd::pair<Node*, const SlotId>> GetSources() const;
-
-                bool IsDeprecated() const override { return true; }
-
-            protected:
-                static const char* k_sourceName;
-                void OnInit() override;
-            };
-
-        } 
-    } 
-} 
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ExtractProperty.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ExtractProperty.cpp
index c97654c1d8..e2f2627bbc 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ExtractProperty.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ExtractProperty.cpp
@@ -5,8 +5,6 @@
  *
  */
 #include <ScriptCanvas/Libraries/Core/ExtractProperty.h>
-#include <ScriptCanvas/Libraries/Core/BehaviorContextObjectNode.h>
-
 #include <Libraries/Core/MethodUtility.h>
 
 namespace ScriptCanvas
@@ -58,37 +56,12 @@ namespace ScriptCanvas
                     AddPropertySlots(dataType);
                 }
             }
-            
+
             Data::Type ExtractProperty::GetSourceSlotDataType() const
             {
                 return m_dataType;
             }
 
-            void ExtractProperty::OnInputSignal(const SlotId& slotID)
-            {
-                if (slotID == GetSlotId(GetInputSlotName()))
-                {
-                    if (auto input = FindDatum(ExtractPropertyProperty::GetSourceSlotId(this)))
-                    {
-                        for(auto&& propertyAccount : m_propertyAccounts)
-                        {
-                            Slot* propertySlot = GetSlot(propertyAccount.m_propertySlotId);
-                            if (propertySlot && propertyAccount.m_getterFunction)
-                            {
-                                auto outputOutcome = propertyAccount.m_getterFunction(*input);
-                                if (!outputOutcome)
-                                {
-                                    SCRIPTCANVAS_REPORT_ERROR((*this), outputOutcome.TakeError().data());
-                                    return;
-                                }
-                                PushOutput(outputOutcome.TakeValue(), *propertySlot);
-                            }
-                        }
-                    }
-                    SignalOutput(GetSlotId(GetOutputSlotName()));
-                }
-            }
-
             void ExtractProperty::AddPropertySlots(const Data::Type& type)
             {
                 AZStd::unordered_map<AZStd::string, SlotId> versionedInfo;
@@ -108,7 +81,7 @@ namespace ScriptCanvas
             {
                 return AZ::Success(DependencyReport::NativeLibrary(Data::GetName(m_dataType)));
             }
-            
+
             PropertyFields ExtractProperty::GetPropertyFields() const
             {
                 PropertyFields propertyFields;
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ExtractProperty.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ExtractProperty.h
index eb255c8f09..d686ae0e1e 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ExtractProperty.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ExtractProperty.h
@@ -44,17 +44,13 @@ namespace ScriptCanvas
                 bool IsOutOfDate(const VersionData& graphVersion) const override;
                 ////
 
-                
+
 
             protected:
-                bool IsPropertySlot(const SlotId& slotId) const;
-
                 void OnInit() override;
 
                 UpdateResult OnUpdateNode() override;
 
-                void OnInputSignal(const SlotId&) override;
-
                 void OnSlotDisplayTypeChanged(const SlotId& slotId, const Data::Type& dataType) override;
 
                 void AddPropertySlots(const Data::Type& type);
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ForEach.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ForEach.cpp
index 6584f795b8..496b164726 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ForEach.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ForEach.cpp
@@ -6,7 +6,6 @@
  */
 
 #include <ScriptCanvas/Libraries/Core/ForEach.h>
-#include <ScriptCanvas/Libraries/Core/BehaviorContextObjectNode.h>
 #include <ScriptCanvas/Utils/VersionConverters.h>
 
 #include <Libraries/Core/MethodUtility.h>
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionCallNode.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionCallNode.h
index 56b17095a7..99679e53bc 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionCallNode.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionCallNode.h
@@ -10,7 +10,6 @@
 #include <AzCore/Asset/AssetCommon.h>
 #include <AzCore/std/containers/unordered_map.h>
 #include <AzCore/std/parallel/mutex.h>
-#include <ScriptCanvas/Asset/Functions/ScriptCanvasFunctionAsset.h>
 #include <ScriptCanvas/Asset/RuntimeAsset.h>
 #include <ScriptCanvas/Core/SubgraphInterface.h>
 #include <ScriptCanvas/Core/Graph.h>
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/GetVariable.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/GetVariable.cpp
index c8defb77ec..f78a57308a 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/GetVariable.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/GetVariable.cpp
@@ -63,43 +63,6 @@ namespace ScriptCanvas
                 }
             }
 
-            void GetVariableNode::OnInputSignal(const SlotId& slotID)
-            {
-                if (slotID == GetSlotId("In"))
-                {
-                    SC_EXECUTION_TRACE_ANNOTATE_NODE((*this), CreateAnnotationData());
-
-                    if (m_variableView.IsValid())
-                    {
-                        Slot* resultSlot = GetSlot(m_variableDataOutSlotId);
-                        if (resultSlot)
-                        {
-                            const Datum* inputDatum = m_variableView.GetDatum();
-
-                            PushOutput(*inputDatum, *resultSlot);
-
-                            // Push the data for each property slot out as well
-                            for (auto&& propertyAccount : m_propertyAccounts)
-                            {
-                                Slot* propertySlot = GetSlot(propertyAccount.m_propertySlotId);
-                                if (propertySlot && propertyAccount.m_getterFunction)
-                                {
-                                    auto outputOutcome = propertyAccount.m_getterFunction(*inputDatum);
-                                    if (!outputOutcome)
-                                    {
-                                        SCRIPTCANVAS_REPORT_ERROR((*this), outputOutcome.TakeError().data());
-                                        return;
-                                    }
-                                    PushOutput(outputOutcome.TakeValue(), *propertySlot);
-                                }
-                            }
-                        }
-                    }
-
-                    SignalOutput(GetSlotId("Out"));
-                }
-            }
-
             void GetVariableNode::CollectVariableReferences(AZStd::unordered_set< ScriptCanvas::VariableId >& variableIds) const
             {
                 if (m_variableId.IsValid())
@@ -324,7 +287,8 @@ namespace ScriptCanvas
                     ScriptCanvas::Data::Type baseType = ScriptCanvas::Data::Type::Invalid();
                     VariableRequestBus::EventResult(baseType, GetScopedVariableId(), &VariableRequests::GetType);
 
-                    const GraphVariableMapping* variableMap = GetRuntimeBus()->GetVariables();
+                    const GraphVariableMapping* variableMap = nullptr;
+                    GraphRequestBus::EventResult(variableMap, GetOwningScriptCanvasId(), &GraphRequests::GetVariables);
 
                     if (variableMap && baseType.IsValid())
                     {
@@ -360,12 +324,6 @@ namespace ScriptCanvas
                 VariableNodeNotificationBus::Event(GetEntityId(), &VariableNodeNotifications::OnVariableRemovedFromNode, removedVariableId);
             }
 
-            AnnotateNodeSignal GetVariableNode::CreateAnnotationData()
-            {
-                AZ::EntityId assetNodeId = GetRuntimeBus()->FindAssetNodeIdByRuntimeNodeId(GetEntityId());
-                return AnnotateNodeSignal(CreateGraphInfo(GetOwningScriptCanvasId(), GetGraphIdentifier()), AnnotateNodeSignal::AnnotationLevel::Info, m_variableName, AZ::NamedEntityId(assetNodeId, GetNodeName()));
-            }
-
             VariableId GetVariableNode::GetVariableIdRead(const Slot*) const
             {
                 return m_variableId;
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/GetVariable.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/GetVariable.h
index e5011de5c6..08d8d115d5 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/GetVariable.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/GetVariable.h
@@ -58,13 +58,12 @@ namespace ScriptCanvas
                 const Slot* GetVariableOutputSlot() const override;
                 // Translation
                 //////////////////////////////////////////////////////////////////////////
-                
+
 
             protected:
 
                 void OnInit() override;
                 void OnPostActivate() override;
-                void OnInputSignal(const SlotId&) override;
 
                 void AddOutputSlot();
                 void RemoveOutputSlot();
@@ -78,8 +77,6 @@ namespace ScriptCanvas
                 void OnVariableRemoved() override;
                 ////
 
-                AnnotateNodeSignal CreateAnnotationData();
-
                 // Adds/Remove Property Slots from the GetVariable node
                 void AddPropertySlots(const Data::Type& type);
                 void ClearPropertySlots();
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Method.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Method.cpp
index b76c3ce87c..4eafa82331 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Method.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Method.cpp
@@ -25,6 +25,7 @@ namespace MethodCPP
         Unnamed2,
         PluralizeResults,
         AddedPrettyNameFieldToSerialization,
+        StoreInputSlotIdsToSupportNullCheck,
         // add your version above
         Current,
     };
@@ -86,11 +87,6 @@ namespace ScriptCanvas
 
     AZ::Outcome<void, AZStd::string> IsExposable(const AZ::BehaviorMethod& method)
     {
-        if (method.GetNumArguments() > BehaviorContextMethodHelper::MaxCount)
-        {
-            return AZ::Failure(AZStd::string("Too many arguments for a Script Canvas method"));
-        }
-
         for (size_t argIndex(0), sentinel(method.GetNumArguments()); argIndex != sentinel; ++argIndex)
         {
             if (const AZ::BehaviorParameter* argument = method.GetArgument(argIndex))
@@ -115,6 +111,37 @@ namespace ScriptCanvas
     {
         namespace Core
         {
+            bool Method::CanAcceptNullInput([[maybe_unused]] const Slot& executionSlot, const Slot& inputSlot) const
+            {
+                if (m_method)
+                {
+                    auto candidateID = inputSlot.GetId();
+                    auto slotIter = AZStd::find(m_inputSlots.begin(), m_inputSlots.end(), candidateID);
+
+                    if (slotIter != m_inputSlots.end())
+                    {
+                        const size_t index = slotIter - m_inputSlots.begin();
+                        if (index < m_method->GetNumArguments())
+                        {
+                            const auto* argument = m_method->GetArgument(index);
+                            if (argument->m_traits & (AZ::BehaviorParameter::TR_REFERENCE | AZ::BehaviorParameter::TR_THIS_PTR))
+                            {
+                                // references and this pointers cannot accept null input
+                                return false;
+                            }
+
+                            if (!(argument->m_traits & AZ::BehaviorParameter::TR_POINTER))
+                            {
+                                // values cannot accept null input
+                                return false;
+                            }
+                        }
+                    }
+                }                    
+
+                return true;
+            }
+
             const AZ::BehaviorClass* Method::GetClass() const
             {
                 return m_class;
@@ -126,7 +153,7 @@ namespace ScriptCanvas
                 {
                     return AZ::Failure();
                 }
-                
+
                 DependencyReport dependencyNames;
                 for (size_t index(0), sentinel = m_method->GetNumArguments(); index < sentinel; ++index)
                 {
@@ -136,7 +163,7 @@ namespace ScriptCanvas
 
                 return AZ::Success(dependencyNames);
             }
-            
+
             AZ::Outcome<Grammar::LexicalScope, void> Method::GetFunctionCallLexicalScope(const Slot* /*slot*/) const
             {
                 if (m_method)
@@ -144,7 +171,7 @@ namespace ScriptCanvas
                     Grammar::LexicalScope lexicalScope;
 
                     if (m_method->IsMember()
-                    || AZ::FindAttribute(AZ::Script::Attributes::TreatAsMemberFunction, m_method->m_attributes))
+                        || AZ::FindAttribute(AZ::Script::Attributes::TreatAsMemberFunction, m_method->m_attributes))
                     {
                         lexicalScope.m_type = Grammar::LexicalScopeType::Variable;
                     }
@@ -165,7 +192,7 @@ namespace ScriptCanvas
                 if (m_method)
                 {
                     if (m_method->IsMember()
-                    || AZ::FindAttribute(AZ::Script::Attributes::TreatAsMemberFunction, m_method->m_attributes))
+                        || AZ::FindAttribute(AZ::Script::Attributes::TreatAsMemberFunction, m_method->m_attributes))
                     {
                         auto name = BehaviorContextUtils::FindExposedMethodName(*m_method, m_class);
                         if (!name.empty())
@@ -177,7 +204,7 @@ namespace ScriptCanvas
 
                 return AZ::Success(m_lookupName);
             }
-                
+
             EventType Method::GetFunctionEventType(const Slot*) const
             {
                 return m_eventType;
@@ -211,7 +238,7 @@ namespace ScriptCanvas
                 m_lookupName = config.m_lookupName ? AZStd::string(*config.m_lookupName) : config.m_method.m_name;
                 m_methodType = config.m_methodType;
                 m_eventType = config.m_eventType;
-                
+
                 auto isExposableOutcome = IsExposable(config.m_method);
                 AZ_Warning("ScriptCanvas", isExposableOutcome.IsSuccess(), "BehaviorContext Method %s is no longer exposable to ScriptCanvas: %s", isExposableOutcome.GetError().data());
                 ConfigureMethod(config.m_method, config.m_class);
@@ -237,6 +264,11 @@ namespace ScriptCanvas
                     if (addedSlot.IsValid())
                     {
                         MethodHelper::SetSlotToDefaultValue(*this, addedSlot, config, argIndex);
+                        m_inputSlots.push_back(addedSlot);
+                    }
+                    else
+                    {
+                        AZ_Warning("ScriptCanvas", false, "Failed to add method input slot to Method node: %s-%s", config.m_prettyClassName.c_str(), config.m_method.m_name.c_str());
                     }
                 }
             }
@@ -327,7 +359,7 @@ namespace ScriptCanvas
                 }
             }
 
-            void Method::InitializeEvent(const NamespacePath&, AZStd::string_view ebusName,  AZStd::string_view eventName)
+            void Method::InitializeEvent(const NamespacePath&, AZStd::string_view ebusName, AZStd::string_view eventName)
             {
                 AZStd::lock_guard<AZStd::recursive_mutex> lock(m_mutex);
 
@@ -525,8 +557,8 @@ namespace ScriptCanvas
                 if (m_method && m_method->HasResult())
                 {
                     if (branchOnResultMethod.GetNumArguments() == 1
-                        && branchOnResultMethod.HasResult()
-                        && Data::FromAZType(branchOnResultMethod.GetResult()->m_typeId) == Data::Type::Boolean())
+                    && branchOnResultMethod.HasResult()
+                    && Data::FromAZType(branchOnResultMethod.GetResult()->m_typeId) == Data::Type::Boolean())
                     {
                         AZ::Uuid methodResultType = m_method->GetResult()->m_typeId;
                         AZ::Uuid branchOnResultMethodArgType = branchOnResultMethod.GetArgument(0)->m_typeId;
@@ -703,7 +735,7 @@ namespace ScriptCanvas
                     return TupleType{ method, m_methodType, eventType, bcClass };
                 }
 
-                return TupleType{ nullptr, MethodType::Count, EventType::Count, nullptr};
+                return TupleType{ nullptr, MethodType::Count, EventType::Count, nullptr };
             }
 
             void Method::OnWriteEnd()
@@ -802,6 +834,7 @@ namespace ScriptCanvas
                         ->Field("className", &Method::m_className)
                         ->Field("namespaces", &Method::m_namespaces)
                         ->Field("resultSlotIDs", &Method::m_resultSlotIDs)
+                        ->Field("inputSlots", &Method::m_inputSlots)
                         ->Field("prettyClassName", &Method::m_classNamePretty)
                         ;
 
@@ -809,13 +842,13 @@ namespace ScriptCanvas
                     {
                         editContext->Class<Method>("Method", "Method")
                             ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
-                                ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
+                            ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
+                            ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
                             ;
                     }
                 }
             }
 
-        } 
-    } 
-} 
+        }
+    }
+}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Method.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Method.h
index 930b6e8539..3dec8e3e72 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Method.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Method.h
@@ -45,6 +45,8 @@ namespace ScriptCanvas
 
                 size_t GenerateFingerprint() const override;
 
+                bool CanAcceptNullInput(const Slot& executionSlot, const Slot& inputSlot) const override;
+
                 bool GetBranchOnResultCheckName(AZStd::string& exposedName, Grammar::LexicalScope& lexicalScope) const;
 
                 virtual bool GetCheckedOperationInfo(AZ::CheckedOperationInfo& checkedInfo, AZStd::string& exposedName, Grammar::LexicalScope& lexicalScope) const;
@@ -149,8 +151,6 @@ namespace ScriptCanvas
 
                 bool IsExpectingResult() const;
 
-                AZ_INLINE AZStd::vector<SlotId>& ModResultSlotIds() { return m_resultSlotIDs; }
-
                 virtual void OnInitializeOutputPost(const MethodOutputConfig&) {}
 
                 virtual void OnInitializeOutputPre(MethodOutputConfig&) {}
@@ -176,12 +176,13 @@ namespace ScriptCanvas
                 NamespacePath m_namespaces;
                 const AZ::BehaviorMethod* m_method = nullptr;
                 const AZ::BehaviorClass* m_class = nullptr;
+                AZStd::vector<SlotId> m_inputSlots;
                 AZStd::vector<SlotId> m_resultSlotIDs;
                 AZStd::recursive_mutex m_mutex; // post-serialization
                 bool m_warnOnMissingFunction = true;
                 Method(const Method&) = delete;
             };
 
-        } 
-    } 
-} 
+        }
+    }
+}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/MethodUtility.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/MethodUtility.cpp
index 144427d74c..bfb54d5421 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/MethodUtility.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/MethodUtility.cpp
@@ -11,105 +11,6 @@
 
 namespace ScriptCanvas
 {
-    int CountMatchingInputTypes(const Grammar::FunctionPrototype& a, const Grammar::FunctionPrototype& b, const AZStd::vector<size_t>& checkedIndices)
-    {
-        AZ_Warning("ScriptCanvas", a.m_inputs.size() == b.m_inputs.size(), "Function inputs are not the same size");
-
-        int matching = 0;
-
-        if (a.m_inputs.size() == b.m_inputs.size())
-        {
-            if (checkedIndices.empty())
-            {
-                for (size_t index = 0; index < a.m_inputs.size(); ++index)
-                {
-                    if (!a.m_inputs[index]->m_datum.GetType().IsValid()
-                        || a.m_inputs[index]->m_datum.GetType() == b.m_inputs[index]->m_datum.GetType())
-                    {
-                        ++matching;
-                    }
-                }
-            }
-            else
-            {
-                for (const auto checkedIndex : checkedIndices)
-                {
-                    const auto index = checkedIndices[checkedIndex];
-
-                    if (index < a.m_inputs.size())
-                    {
-                        if (!a.m_inputs[index]->m_datum.GetType().IsValid()
-                            || a.m_inputs[index]->m_datum.GetType() == b.m_inputs[index]->m_datum.GetType())
-                        {
-                            ++matching;
-                        }
-                    }
-                    else
-                    {
-                        AZ_Error("ScriptCanvas", false, "Overload checked index is no longer valid");
-                    }
-                }
-            }
-        }
-
-        return matching;
-    }
-
-    BehaviorContextMethodHelper::CallResult BehaviorContextMethodHelper::Call(Node& node, bool isExpectingMultipleResults, const AZ::BehaviorMethod* method, AZ::BehaviorValueParameter* paramBegin, AZ::BehaviorValueParameter* paramEnd, AZStd::vector<SlotId>& resultSlotIds)
-    {
-        if (isExpectingMultipleResults)
-        {
-            return BehaviorContextMethodHelper::Call(node, method, paramBegin, paramEnd, resultSlotIds);
-        }
-        else
-        {
-            return BehaviorContextMethodHelper::Call(node, method, paramBegin, paramEnd, resultSlotIds[0]);
-        }
-    }
-
-    BehaviorContextMethodHelper::CallResult BehaviorContextMethodHelper::Call(Node& node, const AZ::BehaviorMethod* method, AZ::BehaviorValueParameter* paramBegin, AZ::BehaviorValueParameter* paramEnd, SlotId resultSlotId)
-    {
-        AZ_PROFILE_SCOPE_DYNAMIC(AZ::Debug::ProfileCategory::ScriptCanvas, "ScriptCanvas::Method::OnInputSignal::Call %s", method->m_name.c_str());
-        return CallGeneric(node, method, paramBegin, paramEnd, &AttemptCallWithResults, resultSlotId);
-    }
-
-    BehaviorContextMethodHelper::CallResult BehaviorContextMethodHelper::Call(Node& node, const AZ::BehaviorMethod* method, AZ::BehaviorValueParameter* paramBegin, AZ::BehaviorValueParameter* paramEnd, AZStd::vector<SlotId>& resultSlotIds)
-    {
-        AZ_PROFILE_SCOPE_DYNAMIC(AZ::Debug::ProfileCategory::ScriptCanvas, "ScriptCanvas::Method::OnInputSignal::Call %s", method->m_name.c_str());
-        return CallGeneric(node, method, paramBegin, paramEnd, &AttemptCallWithTupleResults, resultSlotIds);
-    }
-
-    AZ::Outcome<BehaviorContextMethodHelper::CallResult, AZStd::string> BehaviorContextMethodHelper::AttemptCallWithResults(Node&, const AZ::BehaviorMethod*, AZ::BehaviorValueParameter*, unsigned int, SlotId)
-    {
-        return AZ::Failure(AZStd::string("This method is slated for deletion"));
-    }
-
-    AZ::Outcome<BehaviorContextMethodHelper::CallResult, AZStd::string> BehaviorContextMethodHelper::AttemptCallWithTupleResults(Node&, const AZ::BehaviorMethod*, AZ::BehaviorValueParameter*, unsigned int, AZStd::vector<SlotId>)
-    {
-        return AZ::Failure(AZStd::string("This method is slated for deletion"));
-    }
-
-    AZ::Outcome<Datum, AZStd::string> BehaviorContextMethodHelper::CallTupleGetMethod(const AZ::BehaviorMethod*, Datum&)
-    {
-        return AZ::Failure(AZStd::string("This method is slated for deletion"));
-    }
-
-    AZ::Outcome<BehaviorContextMethodHelper::CallResult, AZStd::string> BehaviorContextMethodHelper::CallOutcomeTupleMethod(Node&, const SlotId&, Datum&, size_t, AZStd::string)
-    {
-        return AZ::Failure(AZStd::string("to be deleted"));
-    }
-
-    AZ::BehaviorValueParameter BehaviorContextMethodHelper::ToBehaviorValueParameter(const AZ::BehaviorMethod* method, size_t index, const Datum& datum)
-    {
-        const AZ::BehaviorParameter* datumParam = method->GetArgument(index);
-        auto toParamOutcome = datumParam ? datum.ToBehaviorValueParameter(*datumParam) : AZ::Failure(AZStd::string::format("BehaviorMethod contains nullptr BehaviorParameter at index %zu", index));
-        if (toParamOutcome)
-        {
-            return AZ::BehaviorValueParameter(toParamOutcome.TakeValue());
-        }
-        return AZ::BehaviorValueParameter();
-    }
-
     AZStd::unordered_map<size_t, const AZ::BehaviorMethod*> GetTupleGetMethodsFromResult(const AZ::BehaviorMethod& method)
     {
         if (method.HasResult())
@@ -126,7 +27,7 @@ namespace ScriptCanvas
     AZStd::unordered_map<size_t, const AZ::BehaviorMethod*> GetTupleGetMethods(const AZ::TypeId& typeId)
     {
         AZStd::unordered_map<size_t, const AZ::BehaviorMethod*> tupleGetMethodMap;
-        
+
         AZ::BehaviorContext* behaviorContext{};
         AZ::ComponentApplicationBus::BroadcastResult(behaviorContext, &AZ::ComponentApplicationRequests::GetBehaviorContext);
         auto bcClassIterator = behaviorContext->m_typeToClassMap.find(typeId);
@@ -182,4 +83,4 @@ namespace ScriptCanvas
         return AZ::Failure();
     }
 
-} 
+}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/MethodUtility.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/MethodUtility.h
index 92248d3ac6..a6cd84dbf6 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/MethodUtility.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/MethodUtility.h
@@ -19,202 +19,9 @@ namespace ScriptCanvas::Grammar
 
 namespace ScriptCanvas
 {
-    int CountMatchingInputTypes(const Grammar::FunctionPrototype& a, const Grammar::FunctionPrototype& b, const AZStd::vector<size_t>& checkedIndices);
-
-    struct BehaviorContextMethodHelper
-    {
-        enum BehaviorContextInputOutput : size_t
-        {
-            MaxCount = 40,
-        };
-
-        enum class MethodCallStatus
-        {
-            NotAttempted = 0,
-            Attempted,
-            Failed,
-            Succeeded,
-        };
-        
-        struct CallResult
-        {
-            const MethodCallStatus m_status = MethodCallStatus::NotAttempted;
-            const AZStd::string m_executionOutOverride = "Out";
-
-            AZ_INLINE CallResult(const MethodCallStatus status, AZStd::string executionOutOverride = "Out")
-                : m_status(status)
-                , m_executionOutOverride(executionOutOverride)
-            {}
-        };
-
-        template<typename t_Call, typename t_Slots>
-        static CallResult CallGeneric(Node& node, const AZ::BehaviorMethod* method, AZ::BehaviorValueParameter* paramBegin, AZ::BehaviorValueParameter* paramEnd, t_Call attempt, t_Slots& slots);
-        
-        static CallResult Call(Node& node, bool isExpectingMultipleResults, const AZ::BehaviorMethod* method, AZ::BehaviorValueParameter* paramBegin, AZ::BehaviorValueParameter* paramEnd, AZStd::vector<SlotId>& resultSlotIds);
-        static CallResult Call(Node& node, const AZ::BehaviorMethod* method, AZ::BehaviorValueParameter* paramBegin, AZ::BehaviorValueParameter* paramEnd, SlotId resultSlotId);
-        static CallResult Call(Node& node, const AZ::BehaviorMethod* method, AZ::BehaviorValueParameter* paramBegin, AZ::BehaviorValueParameter* paramEnd, AZStd::vector<SlotId>& resultSlotIds);
-        static AZ::Outcome<CallResult, AZStd::string> AttemptCallWithResults(Node& node, const AZ::BehaviorMethod* method, AZ::BehaviorValueParameter* params, unsigned int numExpectedArgs, SlotId resultSlotId);
-        static AZ::Outcome<CallResult, AZStd::string> AttemptCallWithTupleResults(Node& node, const AZ::BehaviorMethod* method, AZ::BehaviorValueParameter* params, unsigned int numExpectedArgs, AZStd::vector<SlotId> resultSlotIds);
-        
-        template<typename ... Args>
-        static AZ::Outcome<Datum, AZStd::string> CallMethodOnDatum(const Datum& input, AZStd::string_view methodName, Args&& ... args);
-
-        template<typename ... Args>
-        static AZ::Outcome<Datum, AZStd::string> CallMethodOnDatumUnpackOutcomeSuccess(const Datum& input, AZStd::string_view methodName, Args&& ... args);
-                
-        template<typename ... Args>
-        static AZStd::vector<AZ::BehaviorValueParameter> CreateParameterList(const AZ::BehaviorMethod* method, Args&&... args);
-
-        static AZ::Outcome<Datum, AZStd::string> CallTupleGetMethod(const AZ::BehaviorMethod* method, Datum& thisPointer);
-
-    private:
-        static AZ::Outcome<CallResult, AZStd::string> CallOutcomeTupleMethod(Node& node, const SlotId& resultSlotId, Datum& outcomeDatum, size_t index, AZStd::string outSlotName);
-        static AZ::BehaviorValueParameter ToBehaviorValueParameter(const AZ::BehaviorMethod* method, size_t index, const Datum& datum);
-
-        template <typename T>
-        static AZ::BehaviorValueParameter ToBehaviorValueParameter(const AZ::BehaviorMethod*, size_t, const T& arg);
-
-        template<typename ... Args, size_t ... Indices>
-        static AZStd::vector<AZ::BehaviorValueParameter> CreateParameterListInternal(const AZ::BehaviorMethod* method, AZStd::index_sequence<Indices...>, Args&&... args);
-    };
-
     AZStd::unordered_map<size_t, const AZ::BehaviorMethod*> GetTupleGetMethodsFromResult(const AZ::BehaviorMethod& method);
 
     AZStd::unordered_map<size_t, const AZ::BehaviorMethod*> GetTupleGetMethods(const AZ::TypeId& typeId);
 
     AZ::Outcome<const AZ::BehaviorMethod*, void> GetTupleGetMethod(const AZ::TypeId& typeID, size_t index);
-
-    template<typename t_Call, typename t_Slots>
-    BehaviorContextMethodHelper::CallResult BehaviorContextMethodHelper::CallGeneric(Node& node, const AZ::BehaviorMethod* method, AZ::BehaviorValueParameter* paramBegin, AZ::BehaviorValueParameter* paramEnd, t_Call attempt, t_Slots& slots)
-    {
-        const auto numExpectedArgs(static_cast<unsigned int>(method->GetNumArguments()));
-        if ((paramEnd - paramBegin) == numExpectedArgs)
-        {
-            AZ::Outcome<CallResult, AZStd::string> withResultsOutcome = attempt(node, method, paramBegin, numExpectedArgs, slots);
-
-            if (!withResultsOutcome.IsSuccess())
-            {
-                SCRIPTCANVAS_REPORT_ERROR((node), "Script Canvas attempt to call %s with a result failed: %s", method->m_name.data(), withResultsOutcome.GetError().data());
-                return CallResult(MethodCallStatus::Failed);
-            }
-            else if (withResultsOutcome.GetValue().m_status == MethodCallStatus::Attempted)
-            {
-                return CallResult(MethodCallStatus::Succeeded, withResultsOutcome.GetValue().m_executionOutOverride);
-            }
-            else if (method->Call(paramBegin, numExpectedArgs))
-            {
-                return CallResult(MethodCallStatus::Succeeded);
-            }
-            else
-            {
-                SCRIPTCANVAS_REPORT_ERROR((node), "Script Canvas attempt to call %s failed", method->m_name.data());
-                return CallResult(MethodCallStatus::Failed);
-            }
-        }
-        else
-        {
-            SCRIPTCANVAS_REPORT_ERROR((node), "Script Canvas attempt to call %s failed, it expects %d args but called with %d", method->m_name.c_str(), numExpectedArgs, paramEnd - paramBegin);
-            return CallResult(MethodCallStatus::NotAttempted);
-        }
-    }
-
-    template<typename ... Args>
-    AZ::Outcome<Datum, AZStd::string> BehaviorContextMethodHelper::CallMethodOnDatumUnpackOutcomeSuccess(const Datum& input, AZStd::string_view methodName, Args&& ... args)
-    {
-        AZ::Outcome<Datum, AZStd::string> methodCallResult = CallMethodOnDatum(input, methodName, args...);
-        if (methodCallResult.IsSuccess())
-        {
-            // Even when successfully called, the method will return an outcome as the result, we need to test that
-            // outcome in case any errors were returned from the invoked function call.
-            const Datum& methodCallResultDatum = methodCallResult.GetValue();
-
-            const auto* actualOutcome = methodCallResultDatum.GetAs<AZ::Outcome<AZ::BehaviorValueParameter, AZStd::string>>();
-            if (actualOutcome && !actualOutcome->IsSuccess())
-            {
-                return AZ::Failure(AZStd::string::format("%s returned an error: %s", methodName.data(), actualOutcome->GetError().c_str()));
-            }
-
-            AZ::Outcome<Datum, AZStd::string> isSuccessCallResult = CallMethodOnDatum(methodCallResult.GetValue(), "IsSuccess");
-            if (isSuccessCallResult.IsSuccess())
-            {
-                if (*isSuccessCallResult.GetValue().GetAs<bool>())
-                {
-                    return CallMethodOnDatum(methodCallResult.GetValue(), "GetValue");
-                }
-                else
-                {
-                    return AZ::Failure(AZStd::string::format("%s returned an error", methodName.data()));
-                }
-            }
-            else
-            {
-                return AZ::Failure(AZStd::string::format("Script Canvas attempt to call %s failed, Failed to query result Outcome success", methodName.data()));
-            }
-        }
-        else
-        {
-            return AZ::Failure(methodCallResult.GetError());
-        }
-        
-        return methodCallResult;
-    }
-
-    template<typename ... Args>
-    AZ::Outcome<Datum, AZStd::string> BehaviorContextMethodHelper::CallMethodOnDatum(const Datum& input, AZStd::string_view methodName, Args&& ... args)
-    {
-        const AZ::BehaviorClass* behaviorClass = AZ::BehaviorContextHelper::GetClass(input.GetType().GetAZType());
-        if (behaviorClass)
-        {
-            auto methodIt = behaviorClass->m_methods.find(methodName);
-
-            if (methodIt != behaviorClass->m_methods.end())
-            {
-                AZ::BehaviorMethod* method = methodIt->second;
-
-                const AZ::BehaviorParameter* resultType = method->HasResult() ? method->GetResult() : nullptr;
-
-                if (resultType)
-                {
-                    // Populate parameters
-                    AZStd::vector<AZ::BehaviorValueParameter> parameters = CreateParameterList(method, input, AZStd::forward<Args>(args)...);
-                    return Datum::CallBehaviorContextMethodResult(method, resultType, parameters.begin(), (unsigned int)AZStd::GetMin(parameters.size(), method->GetNumArguments()), behaviorClass->m_name);
-                }
-                else
-                {
-                    AZStd::vector<AZ::BehaviorValueParameter> parameters = CreateParameterList(method, input, AZStd::forward<Args>(args)...);
-                    if (Datum::CallBehaviorContextMethod(method, parameters.begin(), (unsigned int)AZStd::GetMin(parameters.size(), method->GetNumArguments())).IsSuccess())
-                    {
-                        return AZ::Success(Datum());
-                    }
-                }
-            }
-            else
-            {
-                return AZ::Failure(AZStd::string::format("ScriptCanvas Behavior Context method call failed; method named \"%s\" not found.", methodName.data()));
-            }
-        }
-
-        return AZ::Failure(AZStd::string::format("ScriptCanvas Behavior Context method call failed; unable to retrieve Behavior Class."));
-    }
-
-    template<typename ... Args>
-    AZStd::vector<AZ::BehaviorValueParameter> BehaviorContextMethodHelper::CreateParameterList(const AZ::BehaviorMethod* method, Args&&... args)
-    {
-        // Create an index sequence for the parameters and forward the arguments
-        return CreateParameterListInternal(method, AZStd::make_index_sequence<sizeof...(Args)>{}, AZStd::forward<Args>(args)...);
-    }
-
-    template <typename T>
-    AZ::BehaviorValueParameter BehaviorContextMethodHelper::ToBehaviorValueParameter(const AZ::BehaviorMethod*, size_t, const T& arg)
-    {
-        return AZ::BehaviorValueParameter(&arg);
-    }
-
-    template<typename ... Args, size_t ... Indices>
-    AZStd::vector<AZ::BehaviorValueParameter> BehaviorContextMethodHelper::CreateParameterListInternal(const AZ::BehaviorMethod* method, AZStd::index_sequence<Indices...>, Args&&... args)
-    {
-        // Unpack the arguments and the index sequence to populate the parameter list
-        return { ToBehaviorValueParameter(method, Indices, args)... };
-    }
-
-} 
+}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ReceiveScriptEvent.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ReceiveScriptEvent.cpp
index b797174f59..190c1a78c0 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ReceiveScriptEvent.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ReceiveScriptEvent.cpp
@@ -12,8 +12,8 @@
 #include <AzCore/Component/TickBus.h>
 #include <AzCore/Asset/AssetManager.h>
 
+#include <ScriptCanvas/Core/GraphBus.h>
 #include <ScriptCanvas/Execution/ErrorBus.h>
-#include <ScriptCanvas/Execution/RuntimeBus.h>
 #include <ScriptCanvas/Libraries/Core/EventHandlerTranslationUtility.h>
 #include <ScriptCanvas/Utils/VersionConverters.h>
 
@@ -75,7 +75,7 @@ namespace ScriptCanvas
                         AZ::Data::AssetCatalogRequestBus::BroadcastResult(assetInfo, &AZ::Data::AssetCatalogRequests::GetAssetInfoById, asset.GetId());
 
                         AZStd::string graphAssetName;
-                        RuntimeRequestBus::EventResult(graphAssetName, GetOwningScriptCanvasId(), &RuntimeRequests::GetAssetName);
+                        GraphRequestBus::EventResult(graphAssetName, GetOwningScriptCanvasId(), &GraphRequests::GetAssetName);
 
                         AZ_Error("Script Event", false, "The Script Event asset (%s) has been modified. Open the graph (%s) and re-save it.", assetInfo.m_relativePath.c_str(), graphAssetName.c_str());
                         return;
@@ -93,7 +93,7 @@ namespace ScriptCanvas
                             bool isNewSlot = true;
 
                             const auto busToolTip = AZStd::string::format("%s (Type: %s)", c_busIdTooltip, m_ebus->m_idParam.m_name);
-                            const AZ::TypeId& busId = m_ebus->m_idParam.m_typeId;                            
+                            const AZ::TypeId& busId = m_ebus->m_idParam.m_typeId;
 
                             SlotId addressSlotId;
 
@@ -117,8 +117,8 @@ namespace ScriptCanvas
                             }
                             else
                             {
-                                Data::Type busIdType(AZ::BehaviorContextHelper::IsStringParameter(m_ebus->m_idParam) ? Data::Type::String() : Data::FromAZType(busId));                                
-                                
+                                Data::Type busIdType(AZ::BehaviorContextHelper::IsStringParameter(m_ebus->m_idParam) ? Data::Type::String() : Data::FromAZType(busId));
+
                                 config.ConfigureDatum(AZStd::move(Datum(busIdType, Datum::eOriginality::Original)));
                                 config.m_contractDescs = { { [busIdType]() { return aznew RestrictedTypeContract({ busIdType }); } } };
                             }
@@ -177,11 +177,6 @@ namespace ScriptCanvas
                 m_userData.m_methodDefinition = methodDefinition;
 
                 AZ_Assert(!event.m_parameters.empty(), "No parameters in event!");
-                if (!events[eventIndex].m_function)
-                {
-                    m_handler->InstallGenericHook(events[eventIndex].m_name, &OnEventGenericHook, &m_userData);
-                }
-
                 if (m_eventMap.find(eventId) == m_eventMap.end())
                 {
                     m_eventMap[eventId] = ConfigureEbusEntry(*methodDefinition, event, populationMapping);
@@ -272,7 +267,7 @@ namespace ScriptCanvas
                         SlotId slotId = AddSlot(slotConfiguration, isNewSlot);
 
                         AZ_Error("ScriptCanvas", populationMapping.find(argIdentifier) == populationMapping.end(), "Trying to create the same slot twice. Unable to create sane mapping.");
-                    
+
                         populationMapping[argIdentifier] = slotId;
                         eBusEventEntry.m_parameterSlotIds.push_back(slotId);
                     }
@@ -286,7 +281,7 @@ namespace ScriptCanvas
 
                     slotConfiguration.m_isLatent = true;
                     slotConfiguration.m_name = eventID;
-                    slotConfiguration.SetConnectionType(ConnectionType::Output);                    
+                    slotConfiguration.SetConnectionType(ConnectionType::Output);
                     slotConfiguration.m_addUniqueSlotByNameAndType = true;
 
                     auto remappingIter = m_eventSlotMapping.find(outputSlotId);
@@ -309,12 +304,6 @@ namespace ScriptCanvas
                 return eBusEventEntry;
             }
 
-            void ReceiveScriptEvent::OnEventGenericHook(void* userData, const char* eventName, int eventIndex, AZ::BehaviorValueParameter* result, int numParameters, AZ::BehaviorValueParameter* parameters)
-            {
-                ReceiveScriptEvent::EventHookUserData* eventHookUserData(reinterpret_cast<ReceiveScriptEvent::EventHookUserData*>(userData));
-                eventHookUserData->m_handler->OnEvent(eventName, eventIndex, result, numParameters, parameters);
-            }
-
             void ReceiveScriptEvent::SetAutoConnectToGraphOwner(bool enabled)
             {
                 ScriptCanvas::Slot* connectSlot = ReceiveScriptEventProperty::GetConnectSlot(this);
@@ -325,197 +314,16 @@ namespace ScriptCanvas
                 }
             }
 
-            void ReceiveScriptEvent::OnEvent(const char* eventName, const int, AZ::BehaviorValueParameter* result, const int numParameters, AZ::BehaviorValueParameter* parameters)
-            {
-                AZ_PROFILE_SCOPE_DYNAMIC(AZ::Debug::ProfileCategory::ScriptCanvas, "ReceiveScriptEvent::OnEvent %s", eventName);
-
-                SCRIPTCANVAS_RETURN_IF_ERROR_STATE((*this));
-
-                ScriptEvents::Method method;
-                if (!GetScriptEvent().FindMethod(eventName, method))
-                {
-                    AZ_Warning("Script Events", false, "Failed to find method: %s when trying to handle it.", eventName);
-                    return;
-                }
-
-                auto iter = m_eventMap.find(AZ::Crc32(method.GetNameProperty().GetId().ToString<AZStd::string>().c_str()));
-                if (iter == m_eventMap.end())
-                {
-                    SCRIPTCANVAS_REPORT_ERROR((*this), "Invalid event index in Ebus handler");
-                    return;
-                }
-
-                Internal::ScriptEventEntry& scriptEventEntry = iter->second;
-
-                if (!scriptEventEntry.m_shouldHandleEvent || scriptEventEntry.m_isHandlingEvent)
-                {
-                    AZ_Warning("ScriptCanvas", !scriptEventEntry.m_isHandlingEvent, "Found situation where in handling event(%s::%s) triggered the same event. Possible infinite loop, not handling second call.", GetScriptEvent().GetName().c_str(), eventName);
-                    return;
-                }
-
-                scriptEventEntry.m_isHandlingEvent = true;
-
-                scriptEventEntry.m_resultEvaluated = !scriptEventEntry.IsExpectingResult();
-
-                // route the parameters to the connect nodes input
-                if (scriptEventEntry.m_parameterSlotIds.size() != numParameters)
-                {
-                    SCRIPTCANVAS_REPORT_ERROR((*this), "The Script Event, %s, has %d parameters. While the ScriptCanvas Node (%s) has (%zu) slots. Make sure the node is updated in the Script Canvas graph.", eventName, numParameters, GetNodeName().c_str(), scriptEventEntry.m_parameterSlotIds.size());
-                }
-                else
-                {
-                    for (int parameterIndex(0); parameterIndex < numParameters; ++parameterIndex)
-                    {
-                        const Slot* slot = GetSlot(scriptEventEntry.m_parameterSlotIds[parameterIndex]);
-                        const auto& value = *(parameters + parameterIndex);
-                        const Datum input(value);
-
-                        if (slot->IsTypeMatchFor(input.GetType()))
-                        {
-                            PushOutput(input, *slot);
-                        }
-                        else
-                        {
-                            SCRIPTCANVAS_REPORT_ERROR((*this), "Type mismatch in Script Event %s on ScriptCanvas Node (%s). Make sure the nodes is updated in the Script Canvas graph", eventName, GetNodeName().c_str());
-                        }
-                    }
-                }
-
-                {
-                    // now, this should pass execution off to the nodes that will push their output into this result input
-                    SignalOutput(scriptEventEntry.m_eventSlotId, ExecuteMode::UntilNodeIsFoundInStack);
-                }
-
-                // route executed nodes output to my input, and my input to the result
-                if (scriptEventEntry.IsExpectingResult())
-                {
-                    if (result)
-                    {
-                        if (const Datum* resultInput = FindDatum(scriptEventEntry.m_resultSlotId))
-                        {
-                            scriptEventEntry.m_resultEvaluated = resultInput->ToBehaviorContext(*result);
-                            AZ_Warning("Script Canvas", scriptEventEntry.m_resultEvaluated, "%s expects a result value of type %s to be provided, got %s", scriptEventEntry.m_eventName.c_str(), Data::GetName(resultInput->GetType()).c_str(), result->m_name);
-                        }
-                        else
-                        {
-                            AZ_Warning("Script Canvas", false, "Script Canvas handler expecting a result, but had no ability to return it");
-                        }
-                    }
-                    else
-                    {
-                        AZ_Warning("Script Canvas", false, "Script Canvas handler is expecting a result, but was called without receiving one!");
-                    }   
-                }
-                else
-                {
-                    AZ_Warning("Script Canvas", !result, "Script Canvas handler is not expecting a result, but was called receiving one!");
-                }
-
-                // route executed nodes output to my input, and my input to the result
-                AZ_Warning("Script Canvas", (result != nullptr) == scriptEventEntry.IsExpectingResult(), "Node %s-%s mismatch between expecting a result and getting one!", m_ebus->m_name.c_str(), scriptEventEntry.m_eventName.c_str());
-                AZ_Warning("Script Canvas", scriptEventEntry.m_resultEvaluated, "Node %s-%s result not evaluated properly!", m_ebus->m_name.c_str(), scriptEventEntry.m_eventName.c_str());
-
-                scriptEventEntry.m_isHandlingEvent = false;
-            }
-
             void ReceiveScriptEvent::OnActivate()
             {
                 SetAutoConnectToGraphOwner(m_autoConnectToGraphOwner);
                 ScriptEventBase::OnActivate();
             }
 
-            void ReceiveScriptEvent::OnPostActivate()
-            {
-                
-            }
-
             void ReceiveScriptEvent::OnDeactivate()
             {
-                Disconnect(false);
-
                 ScriptEventBase::OnDeactivate();
             }
-            
-            void ReceiveScriptEvent::Connect()
-            {
-                AZ::EntityId connectToEntityId;
-                AZ::BehaviorValueParameter busIdParameter;
-                busIdParameter.Set(m_ebus->m_idParam);
-                const AZ::Uuid busIdType = m_ebus->m_idParam.m_typeId;
-
-                const Datum* busIdDatum = IsIDRequired() ? FindDatum(GetSlotId(c_busIdName)) : nullptr;
-                if (busIdDatum && !busIdDatum->Empty())
-                {
-                    if (busIdDatum->IS_A(Data::FromAZType(busIdType)) || busIdDatum->IsConvertibleTo(Data::FromAZType(busIdType)))
-                    {
-                        auto busIdOutcome = busIdDatum->ToBehaviorValueParameter(m_ebus->m_idParam);
-                        if (busIdOutcome.IsSuccess())
-                        {
-                            busIdParameter = busIdOutcome.TakeValue();
-                        }
-                    }
-
-                    if (busIdType == azrtti_typeid<AZ::EntityId>())
-                    {
-                        if (auto busEntityId = busIdDatum->GetAs<AZ::EntityId>())
-                        {
-                            if (!busEntityId->IsValid() || *busEntityId == ScriptCanvas::GraphOwnerId)
-                            {
-                                RuntimeRequestBus::EventResult(connectToEntityId, GetOwningScriptCanvasId(), &RuntimeRequests::GetRuntimeEntityId);
-                                busIdParameter.m_value = &connectToEntityId;
-                            }
-                        }
-                    }
-                }
-
-                if (!IsIDRequired() || busIdParameter.GetValueAddress())
-                {
-                    if (m_connected)
-                    {
-                        // Ensure we disconnect if this bus is already connected, this could happen if a different bus Id is provided
-                        // and this node is connected through the Connect slot.
-                        m_handler->Disconnect();
-                    }
-
-                    AZ_VerifyError("Script Canvas", m_handler->Connect(&busIdParameter),
-                        "Unable to connect to EBus with BusIdType %s. The BusIdType of the Script Event (%s) does not match the BusIdType provided.",
-                        busIdType.ToString<AZStd::string>().data(), m_definition.GetName().c_str());
-
-                    m_connected = true;
-                }
-            }
-
-            void ReceiveScriptEvent::CompleteDisconnection()
-            {
-                m_handler->Disconnect();
-                m_connected = false;
-
-                if (IsActivated())
-                {
-                    SlotId onDisconnectSlotId = ReceiveScriptEventProperty::GetOnDisconnectedSlotId(this);
-                    SignalOutput(onDisconnectSlotId);
-                }
-            }
-
-            void ReceiveScriptEvent::Disconnect(bool queueDisconnect)
-            {
-                if (m_connected && m_handler)
-                {
-                    if (queueDisconnect)
-                    {
-                        AZ::SystemTickBus::QueueFunction(
-                            [this]()
-                            {
-                                CompleteDisconnection();
-                            }
-                        );
-                    }
-                    else
-                    {
-                        CompleteDisconnection();
-                    }
-                }
-            }
 
             const Internal::ScriptEventEntry* ReceiveScriptEvent::FindEventWithSlot(const Slot& slot) const
             {
@@ -727,7 +535,7 @@ namespace ScriptCanvas
                 {
                     AZ::BehaviorContext* behaviorContext = nullptr;
                     AZ::ComponentApplicationBus::BroadcastResult(behaviorContext, &AZ::ComponentApplicationBus::Events::GetBehaviorContext);
-                    
+
                     const auto& ebusIterator = behaviorContext->m_ebuses.find(m_definition.GetName());
                     if (ebusIterator == behaviorContext->m_ebuses.end())
                     {
@@ -771,51 +579,6 @@ namespace ScriptCanvas
                 return true;
             }
 
-            void ReceiveScriptEvent::OnInputSignal(const SlotId& slotId)
-            {
-                SlotId connectSlot = ReceiveScriptEventProperty::GetConnectSlotId(this);
-
-                if (connectSlot == slotId)
-                {
-                    const Datum* busIdDatum = FindDatum(GetSlotId(c_busIdName));
-                    if (IsIDRequired() && (!busIdDatum || busIdDatum->Empty()))
-                    {
-                        SlotId failureSlot = ReceiveScriptEventProperty::GetOnFailureSlotId(this);
-                        SignalOutput(failureSlot);
-                        SCRIPTCANVAS_REPORT_ERROR((*this), "In order to connect this node, a valid BusId must be provided.");
-                        return;
-                    }
-                    else
-                    {
-                        Connect();
-                        SlotId onConnectSlotId = ReceiveScriptEventProperty::GetOnConnectedSlotId(this);
-                        SignalOutput(onConnectSlotId);
-                        return;
-                    }
-                }
-
-                SlotId disconnectSlot = ReceiveScriptEventProperty::GetDisconnectSlotId(this);
-                if (disconnectSlot == slotId)
-                {
-                    Disconnect();
-
-                    return;
-                }
-            }
-
-            void ReceiveScriptEvent::OnInputChanged(const Datum&, const SlotId&)
-            {
-                /*
-                if (GetExecutionType() == ExecutionType::Runtime
-                    && m_autoConnectToGraphOwner 
-                    && slotId == FindSlotIdForDescriptor(c_busIdName, SlotDescriptors::DataIn()))
-                {
-                    Disconnect(false);
-                    Connect();
-                }
-                */
-            }
-
             bool ReceiveScriptEvent::IsOutOfDate(const VersionData& graphVersion) const
             {
                 AZ_UNUSED(graphVersion);
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ReceiveScriptEvent.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ReceiveScriptEvent.h
index e541f428db..ea86d263f8 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ReceiveScriptEvent.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ReceiveScriptEvent.h
@@ -42,7 +42,6 @@ namespace ScriptCanvas
                 ~ReceiveScriptEvent() override;
 
                 void OnActivate() override;
-                void OnPostActivate() override;
                 void OnDeactivate() override;
 
                 const AZ::Data::AssetId GetAssetId() const { return m_scriptEventAssetId; }
@@ -55,11 +54,11 @@ namespace ScriptCanvas
                 AZStd::optional<size_t> GetEventIndex(AZStd::string eventName) const override;
                 AZStd::vector<SlotId> GetEventSlotIds() const override;
                 AZStd::vector<SlotId> GetNonEventSlotIds() const override;
-                
+
                 bool IsIDRequired() const;
-                
+
                 bool IsEventSlotId(const SlotId& slotId) const;
-                                
+
                 // NodeVersioning...
                 bool IsOutOfDate(const VersionData& graphVersion) const override;
                 UpdateResult OnUpdateNode() override;
@@ -87,16 +86,9 @@ namespace ScriptCanvas
 
             private:
 
-                void Connect();
-                void Disconnect(bool queueDisconnect = true);
-                void CompleteDisconnection();
-
                 bool CreateEbus();
                 bool SetupHandler();
 
-                void OnInputSignal(const SlotId& slotId) override;
-                void OnInputChanged(const Datum& input, const SlotId& slotId) override;
-                
                 AZ::BehaviorEBusHandler* m_handler = nullptr;
                 AZ::BehaviorEBus* m_ebus = nullptr;
                 AZStd::recursive_mutex m_mutex; // post-serialization
@@ -105,9 +97,6 @@ namespace ScriptCanvas
 
                 void InitializeEvent(AZ::Data::Asset<ScriptEvents::ScriptEventsAsset> asset, int eventIndex, SlotIdMapping& populationMapping);
 
-                static void OnEventGenericHook(void* userData, const char* eventName, int eventIndex, AZ::BehaviorValueParameter* result, int numParameters, AZ::BehaviorValueParameter* parameters);
-                void OnEvent(const char* eventName, const int eventIndex, AZ::BehaviorValueParameter* result, const int numParameters, AZ::BehaviorValueParameter* parameters);
-
                 bool IsEventConnected(const Internal::ScriptEventEntry& entry) const;
 
                 Internal::ScriptEventEntry ConfigureEbusEntry(const ScriptEvents::Method& methodDefinition, const AZ::BehaviorEBusHandler::BusForwarderEvent& event, SlotIdMapping& populationMapping);
@@ -133,6 +122,6 @@ namespace ScriptCanvas
                 bool m_connected;
 
             };
-        } 
+        }
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Repeater.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Repeater.cpp
index 3ff8545746..b5c2f90fcd 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Repeater.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Repeater.cpp
@@ -59,7 +59,7 @@ namespace ScriptCanvas
                 if (slot == nullptr)
                 {
                     // Handle older versions and improperly updated names
-                    for (auto testUnit : { BaseTimerNode::TimeUnits::Seconds, BaseTimerNode::TimeUnits::Ticks})
+                    for (auto testUnit : { BaseTimerNode::TimeUnits::Seconds, BaseTimerNode::TimeUnits::Ticks })
                     {
                         AZStd::string legacyName = BaseTimerNode::s_timeUnitNames[static_cast<int>(testUnit)];
 
@@ -74,28 +74,6 @@ namespace ScriptCanvas
                     }
                 }
             }
-
-            void Repeater::OnInputSignal(const SlotId&)
-            {
-                m_repetionCount = aznumeric_cast<int>(RepeaterProperty::GetRepetitions(this));
-
-                if (m_repetionCount > 0)
-                {
-                    StartTimer();
-                }
-            }
-
-            void Repeater::OnTimeElapsed()
-            {
-                m_repetionCount--;
-                SignalOutput(RepeaterProperty::GetActionSlotId(this), ScriptCanvas::ExecuteMode::UntilNodeIsFoundInStack);
-
-                if (m_repetionCount == 0)
-                {
-                    StopTimer();
-                    SignalOutput(RepeaterProperty::GetCompleteSlotId(this));
-                }
-            }
         }
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Repeater.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Repeater.h
index 3d094feb78..b7c3dfb698 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Repeater.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Repeater.h
@@ -17,6 +17,7 @@ namespace ScriptCanvas
         namespace Core
         {
             //! A node that repeats an execution signal over the specified time
+            //! Deprecated for nodeable version
             class Repeater
                 : public ScriptCanvas::Nodes::Internal::BaseTimerNode
             {
@@ -27,18 +28,11 @@ namespace ScriptCanvas
 
                 void OnInit() override;
 
-                void OnInputSignal(const SlotId& slotId) override;
-                void OnTimeElapsed();
-
                 const char* GetTimeSlotFormat() const override { return "Delay (%s)"; }
-
                 const char* GetBaseTimeSlotName() const override { return "Interval"; }
                 const char* GetBaseTimeSlotToolTip() const override { return "The Interval between repetitions"; }
-                
+
             protected:
-
-                bool AllowInstantResponse() const override { return true; }
-
                 int m_repetionCount;
             };
         }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ScriptEventBase.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ScriptEventBase.cpp
index ac946dc037..52f7b538ef 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ScriptEventBase.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ScriptEventBase.cpp
@@ -10,8 +10,6 @@
 #include <AzCore/RTTI/BehaviorContext.h>
 #include <AzCore/Serialization/Utils.h>
 #include <AzCore/Component/TickBus.h>
-
-#include <ScriptCanvas/Execution/RuntimeBus.h>
 #include <AzCore/Asset/AssetManager.h>
 #include <ScriptEvents/ScriptEventsAsset.h>
 
@@ -23,7 +21,7 @@ namespace ScriptCanvas
         {
             namespace Internal
             {
-                 void ScriptEventEntry::Reflect(AZ::ReflectContext* context)
+                void ScriptEventEntry::Reflect(AZ::ReflectContext* context)
                 {
                     if (AZ::SerializeContext* serialize = azrtti_cast<AZ::SerializeContext*>(context))
                     {
@@ -156,7 +154,7 @@ namespace ScriptCanvas
                     }
 
                     m_definition = definition;
-                 }
+                }
 
                 void ScriptEventBase::OnDeactivate()
                 {
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ScriptEventBase.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ScriptEventBase.h
index d2ec893b5b..5baa76f4b6 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ScriptEventBase.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ScriptEventBase.h
@@ -108,8 +108,6 @@ namespace ScriptCanvas
 
                     virtual void Initialize(const AZ::Data::AssetId assetId);
 
-                    
-
                 protected:
 
                     // AZ::Data::AssetBus::Handler...
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SendScriptEvent.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SendScriptEvent.cpp
index ee1d00e646..4ce7ee6e02 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SendScriptEvent.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SendScriptEvent.cpp
@@ -28,64 +28,6 @@ namespace ScriptCanvas
                 ScriptEvents::ScriptEventNotificationBus::Handler::BusDisconnect();
             }
 
-            void SendScriptEvent::OnInputSignal(const SlotId&)
-            {
-                if (!m_method)
-                {
-                    if (!m_asset.IsReady())
-                    {
-                        m_asset = AZ::Data::AssetManager::Instance().GetAsset<ScriptEvents::ScriptEventsAsset>(m_scriptEventAssetId, AZ::Data::AssetLoadBehavior::PreLoad);
-                    }
-
-                    CreateSender(m_asset);
-                }
-
-                if (!m_method)
-                {
-                    AZStd::string error = AZStd::string::format("Script Event sender node called with no initialized method (%s::%s)!", m_busName.c_str(), m_eventName.c_str());
-                    SCRIPTCANVAS_REPORT_ERROR((*this), error.c_str());
-                }
-
-                if (m_method)
-                {
-                    Node::DatumVector inputDatums = GatherDatumsForDescriptor(SlotDescriptors::DataIn());
-
-                    if (m_method->GetNumArguments() != inputDatums.size())
-                    {
-                        SCRIPTCANVAS_REPORT_ERROR((*this), "The Script Event %s number of parameters %d do not correspond to the number of slots %zu in the Script Canvas node (%s). Make sure the node is updated in the Script Canvas graph.", m_method->m_name.c_str(), m_method->GetNumArguments(), inputDatums.size(), GetNodeName().c_str());
-                        return;
-                    }
-
-                    AZStd::array<AZ::BehaviorValueParameter, BehaviorContextMethodHelper::MaxCount> params;
-                    AZ::BehaviorValueParameter* paramFirst(params.begin());
-                    AZ::BehaviorValueParameter* paramIter = paramFirst;
-                    {
-                        // all input should have been pushed into this node already
-                        int argIndex(0);
-                        for (const Datum* datum : inputDatums)
-                        {
-                            AZ::Outcome<AZ::BehaviorValueParameter, AZStd::string> inputParameter = datum->ToBehaviorValueParameter(*m_method->GetArgument(argIndex));
-                            if (!inputParameter.IsSuccess())
-                            {
-                                SCRIPTCANVAS_REPORT_ERROR((*this), "BehaviorContext method input problem at parameter index %d: %s", argIndex, inputParameter.GetError().data());
-                                return;
-                            }
-
-                            paramIter->Set(inputParameter.GetValue());
-                            ++paramIter;
-                            ++argIndex;
-                        }
-
-                        AZ_PROFILE_SCOPE_DYNAMIC(AZ::Debug::ProfileCategory::ScriptCanvas, "ScriptCanvas::ScriptEvents::OnInputSignal::Call %s::%s", m_busName.c_str(), m_eventName.c_str());
-                        {
-                            BehaviorContextMethodHelper::Call(*this, m_method, paramFirst, paramIter, m_resultSlotID); 
-                        }
-                    }
-                }
-
-                SignalOutput(GetSlotId("Out"));
-            }
-
             ScriptCanvas::EBusBusId SendScriptEvent::GetBusId() const
             {
                 return m_busId;
@@ -155,11 +97,6 @@ namespace ScriptCanvas
 
             AZ::Outcome<void, AZStd::string> IsExposable(const AZ::BehaviorMethod& method)
             {
-                if (method.GetNumArguments() > BehaviorContextMethodHelper::MaxCount)
-                {
-                    return AZ::Failure(AZStd::string("Too many arguments for a Script Canvas method"));
-                }
-
                 for (size_t argIndex(0), sentinel(method.GetNumArguments()); argIndex != sentinel; ++argIndex)
                 {
                     if (const AZ::BehaviorParameter* argument = method.GetArgument(argIndex))
@@ -271,7 +208,7 @@ namespace ScriptCanvas
                 asset.BlockUntilLoadComplete();
 
                 const ScriptEvents::ScriptEvent& definition = asset.Get()->m_definition;
-                
+
                 // If no name has been serialized, this is a new node, so initialize it to the Script Event's definition values.
                 if (m_busId == ScriptCanvas::EBusBusId())
                 {
@@ -295,7 +232,7 @@ namespace ScriptCanvas
                 }
 
                 NamespacePath emptyNamespacePath;
-    
+
                 ScriptEvents::ScriptEventBus::BroadcastResult(m_scriptEvent, &ScriptEvents::ScriptEventRequests::RegisterScriptEvent, assetId, m_version);
 
                 AZ::BehaviorMethod* method{};
@@ -362,9 +299,9 @@ namespace ScriptCanvas
 
                 ScriptEvents::Method scriptEventMethod;
                 definition.FindMethod(method->m_name, scriptEventMethod);
-                
+
                 size_t argIndex = 0;
-                
+
                 // Address slot (BusId)
                 if (method->HasBusId())
                 {
@@ -460,7 +397,7 @@ namespace ScriptCanvas
                 {
                     return true;
                 }
-                
+
                 RegisterScriptEvent(asset);
 
                 if (asset && asset.IsReady())
@@ -491,7 +428,7 @@ namespace ScriptCanvas
                             {
                                 ConfigureMethod(*method);
                                 InitializeResultSlotId();
-                                
+
                                 return true;
                             }
                         }
@@ -591,7 +528,7 @@ namespace ScriptCanvas
                 if (m_scriptEvent == nullptr)
                 {
                     return false;
-                }                
+                }
 
                 m_ebus = m_scriptEvent->GetBehaviorBus();
 
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SendScriptEvent.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SendScriptEvent.h
index 27cd309386..7490fef650 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SendScriptEvent.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SendScriptEvent.h
@@ -79,11 +79,7 @@ namespace ScriptCanvas
                 bool IsConfigured() const { return m_method != nullptr; }
                 void ConfigureMethod(AZ::BehaviorMethod& method);
                 bool RegisterScriptEvent(AZ::Data::Asset<ScriptEvents::ScriptEventsAsset> asset);
-
-                void OnInputSignal(const SlotId&) override;
-
                 void AddInputSlot(size_t slotIndex, size_t argIndex, const AZStd::string_view argName, const AZStd::string_view tooltip, AZ::BehaviorMethod* method, const AZ::BehaviorParameter* argument, AZ::Uuid slotKey, SlotIdMapping& populationMapping);
-
                 void OnRegistered(const ScriptEvents::ScriptEvent&) override;
 
                 SlotId m_resultSlotID;
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SetVariable.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SetVariable.cpp
index 7096f5024e..6d6260aabe 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SetVariable.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SetVariable.cpp
@@ -59,47 +59,6 @@ namespace ScriptCanvas
                 }
             }
 
-            void SetVariableNode::OnInputSignal(const SlotId& slotID)
-            {
-                if (slotID == GetSlotId(GetInputSlotName()))
-                {
-                    const Datum* sourceDatum = FindDatum(m_variableDataInSlotId);                    
-
-                    if (sourceDatum && m_variableView.IsValid())
-                    {
-                        m_variableView.AssignToDatum((*sourceDatum));
-
-                        SC_EXECUTION_TRACE_VARIABLE_CHANGE((m_variableId), (CreateVariableChange((*m_variableView.GetDatum()), m_variableId)));
-                    }
-                    
-                    Slot* resultSlot = GetSlot(m_variableDataOutSlotId);
-                    if (resultSlot && m_variableView.IsValid())
-                    {
-                        const Datum* variableDatum = m_variableView.GetDatum();
-
-                        PushOutput((*variableDatum), *resultSlot);
-
-                        // Push the data for each property slot out as well
-                        for (auto&& propertyAccount : m_propertyAccounts)
-                        {
-                            Slot* propertySlot = GetSlot(propertyAccount.m_propertySlotId);
-                            if (propertySlot && propertyAccount.m_getterFunction)
-                            {
-                                auto outputOutcome = propertyAccount.m_getterFunction((*variableDatum));
-
-                                if (!outputOutcome)
-                                {
-                                    SCRIPTCANVAS_REPORT_ERROR((*this), outputOutcome.TakeError().data());
-                                    return;
-                                }
-                                PushOutput(outputOutcome.TakeValue(), *propertySlot);
-                            }
-                        }
-                    }
-
-                    SignalOutput(GetSlotId(GetOutputSlotName()));
-                }
-            }
             VariableId SetVariableNode::GetVariableIdRead(const Slot*) const
             {
                 return m_variableId;
@@ -283,7 +242,8 @@ namespace ScriptCanvas
                     ScriptCanvas::Data::Type baseType = ScriptCanvas::Data::Type::Invalid();
                     VariableRequestBus::EventResult(baseType, GetScopedVariableId(), &VariableRequests::GetType);
 
-                    const AZStd::unordered_map<VariableId, GraphVariable>* variableMap = GetRuntimeBus()->GetVariables();
+                    const GraphVariableMapping* variableMap = nullptr;
+                    GraphRequestBus::EventResult(variableMap, GetOwningScriptCanvasId(), &GraphRequests::GetVariables);
 
                     if (variableMap && baseType.IsValid())
                     {
@@ -319,12 +279,6 @@ namespace ScriptCanvas
                 VariableNodeNotificationBus::Event(GetEntityId(), &VariableNodeNotifications::OnVariableRemovedFromNode, removedVariableId);
             }
 
-            AnnotateNodeSignal SetVariableNode::CreateAnnotationData()
-            {
-                AZ::EntityId assetNodeId = GetRuntimeBus()->FindAssetNodeIdByRuntimeNodeId(GetEntityId());
-                return AnnotateNodeSignal(CreateGraphInfo(GetOwningScriptCanvasId(), GetGraphIdentifier()), AnnotateNodeSignal::AnnotationLevel::Info, m_variableName, AZ::NamedEntityId(assetNodeId, GetNodeName()));
-            }
-
             void SetVariableNode::AddPropertySlots(const Data::Type& type)
             {
                 Data::GetterContainer getterFunctions = Data::ExplodeToGetters(type);
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SetVariable.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SetVariable.h
index bc97fa6a08..05695a9b1e 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SetVariable.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SetVariable.h
@@ -61,13 +61,12 @@ namespace ScriptCanvas
                 PropertyFields GetPropertyFields() const override;
                 // Translation
                 //////////////////////////////////////////////////////////////////////////
-                
+
 
             protected:
 
                 void OnInit() override;
-                void OnPostActivate() override;                
-                void OnInputSignal(const SlotId&) override;
+                void OnPostActivate() override;
 
                 void AddSlots();
                 void RemoveSlots();
@@ -86,8 +85,6 @@ namespace ScriptCanvas
                 void OnVariableRemoved() override;
                 ////
 
-                AnnotateNodeSignal CreateAnnotationData();
-
                 VariableId m_variableId;
 
                 SlotId m_variableDataInSlotId;
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Start.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Start.cpp
deleted file mode 100644
index 66dfe424c5..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Start.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "Start.h"
-
-#include <ScriptCanvas/Core/GraphBus.h>
-#include <ScriptCanvas/Grammar/Primitives.h>
-
-namespace ScriptCanvas
-{
-    namespace Nodes
-    {
-        namespace Core
-        {
-            void Start::OnInputSignal(const SlotId&)
-            {
-                SignalOutput(StartProperty::GetOutSlotId(this));
-            }
-       }
-    }
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Start.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Start.h
index bc5ca997e8..f4ba99746a 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Start.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Start.h
@@ -25,11 +25,6 @@ namespace ScriptCanvas
             public:
 
                 SCRIPTCANVAS_NODE(Start);
-
-                
-
-                void OnInputSignal(const SlotId&) override;
-
             };
         }
     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/String.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/String.h
deleted file mode 100644
index 712d3d808f..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/String.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <ScriptCanvas/Core/NativeDatumNode.h>
-
-namespace ScriptCanvas
-{
-    namespace Nodes
-    {
-        namespace Core
-        {
-
-            class String 
-                : public NativeDatumNode<String, Data::StringType>
-            {
-            public:
-                using ParentType = NativeDatumNode<String, Data::StringType>;
-                AZ_COMPONENT(String, "{9C9B9D96-1838-4493-A14D-40C77B4DB5DD}", ParentType);
-
-                static void Reflect(AZ::ReflectContext* context)
-                {
-                    if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
-                    {
-                        serializeContext->Class<String, PureData>()
-                            ->Version(3)
-                            ;
-
-                        if (AZ::EditContext* editContext = serializeContext->GetEditContext())
-                        {
-                            editContext->Class<String>("String", "Holds a string value")
-                                ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/String.png")
-                                ;
-                        }
-                    }
-                }                
-
-            };
-        }
-    }
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/UnaryOperator.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/UnaryOperator.cpp
index 43d84f0e28..1695c1d4d3 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/UnaryOperator.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/UnaryOperator.cpp
@@ -18,17 +18,6 @@ namespace ScriptCanvas
         const char* UnaryOperator::k_valueName = "Value";
         const char* UnaryOperator::k_resultName = "Result";
 
-        Datum UnaryOperator::Evaluate([[maybe_unused]] const Datum& value)
-        {
-            AZ_Assert(false, "Evaluate must be overridden");
-            return Datum();
-        };
-
-        void UnaryOperator::OnInputSignal([[maybe_unused]] const SlotId& slot)
-        {
-            AZ_Assert(false, "OnInputSignal must be overridden");
-        }
-
         void UnaryOperator::ConfigureSlots()
         {
             {
@@ -68,25 +57,6 @@ namespace ScriptCanvas
         {
         }
 
-        void UnaryExpression::OnInputSignal(const SlotId&)
-        {
-            const Datum output = Evaluate(*FindDatumByIndex(k_datumIndex));
-            if (auto slot = GetSlot(GetOutputSlotId()))
-            {
-                PushOutput(output, *slot);
-            }
-
-            const bool* value = output.GetAs<bool>();
-            if (value && *value)
-            {
-                SignalOutput(GetSlotId(k_onTrue));
-            }
-            else
-            {
-                SignalOutput(GetSlotId(k_onFalse));
-            }
-        }
-
         void UnaryExpression::ConfigureSlots()
         {
             {
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/UnaryOperator.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/UnaryOperator.h
index d2188f0b3c..fbc481bb48 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/UnaryOperator.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/UnaryOperator.h
@@ -10,7 +10,6 @@
 #include <AzCore/std/typetraits/remove_cv.h>
 #include <AzCore/std/typetraits/function_traits.h>
 #include <ScriptCanvas/Core/Node.h>
-#include <ScriptCanvas/Core/PureData.h>
 #include <ScriptCanvas/Core/Datum.h>
 
 namespace ScriptCanvas
@@ -32,8 +31,6 @@ namespace ScriptCanvas
             static const char* k_onTrue;
             static const char* k_onFalse;
 
-            
-
         protected:
             ConstSlotsOutcome GetSlotsInExecutionThreadByTypeImpl(const Slot&, CombinedSlotType targetSlotType, const Slot*) const override
             {
@@ -45,15 +42,7 @@ namespace ScriptCanvas
 
             void ConfigureSlots() override;
 
-            // must be overridden with the binary operations
-            virtual Datum Evaluate(const Datum& value);
-
-            // Triggered by the execution signal
-            void OnInputSignal(const SlotId& slot) override;
-
             SlotId GetOutputSlotId() const;
-
-            
         };
 
         class UnaryExpression : public UnaryOperator
@@ -67,11 +56,7 @@ namespace ScriptCanvas
 
             void ConfigureSlots() override;
 
-            void OnInputSignal(const SlotId& slot) override;
-
             virtual void InitializeUnaryExpression();
-
-            
         };
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/Entity.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/Entity.cpp
index 79a89ab1bf..b3bb5f474f 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/Entity.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/Entity.cpp
@@ -11,8 +11,6 @@
 
 namespace ScriptCanvas
 {
-   
-    
     static bool OldEntityIdIsValidNodeVersionConverter(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& rootNodeElement)
     {
         int nodeElementIndex = rootNodeElement.FindElement(AZ_CRC("BaseClass1", 0xd4925735));
@@ -64,7 +62,7 @@ namespace ScriptCanvas
                 const AZ::TypeId nodeFunctionGenericMultiReturnTemplateTypeId("{DC5B1799-6C5B-4190-8D90-EF0C2D1BCE4E}");
                 const AZ::TypeId oldEntityIdIsValidFuncSignatureTypeId = azrtti_typeid<bool(*)(AZ::EntityId)>();
                 const AZ::TypeId oldEntityIdIsValidTypeId("{7CEC53AE-E12B-4738-B542-4587B8B95DC2}");
-                
+
                 // Aggregate NodeFunctionGenericMultiReturn<bool(*)(AZ::EntityId), OldIsValidTraits> typeid
                 // NOTE: Aggregation order addition is not commutative and must be in the added last to first: (FirstUuid + ( SecondUuid + (ThirdUuid + ... + (NthUuid))
                 const AZ::TypeId oldIsValidNodeAggregateTypeId = nodeFunctionGenericMultiReturnTemplateTypeId + (oldEntityIdIsValidFuncSignatureTypeId + oldEntityIdIsValidTypeId);
@@ -72,8 +70,6 @@ namespace ScriptCanvas
             }
             if (AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(reflection))
             {
-                using namespace ScriptCanvas::Nodes::Entity;
-                SCRIPT_CANVAS_GENERICS_TO_VM(EntityIDNodes::Registrar, EntityID, behaviorContext, EntityIDNodes::k_categoryName);
                 SCRIPT_CANVAS_GENERICS_TO_VM(EntityNodes::Registrar, Entity, behaviorContext, EntityNodes::k_categoryName);
             }
 
@@ -82,25 +78,15 @@ namespace ScriptCanvas
 
         void Entity::InitNodeRegistry(NodeRegistry& nodeRegistry)
         {
-            using namespace ScriptCanvas::Nodes::Entity;
-            AddNodeToRegistry<Entity, Rotate>(nodeRegistry);
-            AddNodeToRegistry<Entity, EntityID>(nodeRegistry);
-            AddNodeToRegistry<Entity, EntityRef>(nodeRegistry);
             EntityIDNodes::Registrar::AddToRegistry<Entity>(nodeRegistry);
             EntityNodes::Registrar::AddToRegistry<Entity>(nodeRegistry);
         }
 
         AZStd::vector<AZ::ComponentDescriptor*> Entity::GetComponentDescriptors()
         {
-            AZStd::vector<AZ::ComponentDescriptor*> descriptors = {
-                ScriptCanvas::Nodes::Entity::Rotate::CreateDescriptor(),
-                ScriptCanvas::Nodes::Entity::EntityID::CreateDescriptor(),
-                ScriptCanvas::Nodes::Entity::EntityRef::CreateDescriptor()
-            };
-
+            AZStd::vector<AZ::ComponentDescriptor*> descriptors;
             EntityIDNodes::Registrar::AddDescriptors(descriptors);
             EntityNodes::Registrar::AddDescriptors(descriptors);
-
             return descriptors;
         }
     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/Entity.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/Entity.h
index 0bd54f4194..be746e65f0 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/Entity.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/Entity.h
@@ -10,9 +10,6 @@
 // This header is only meant to include the nodes and should not contain
 // shared code
 
-#include "Rotate.h"
 #include "RotateMethod.h"
-#include "EntityIDNode.h"
 #include "EntityIDNodes.h"
-#include "EntityRef.h"
 #include "EntityNodes.h"
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/EntityIDNode.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/EntityIDNode.h
deleted file mode 100644
index 5b60c0cea8..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/EntityIDNode.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <ScriptCanvas/Core/NativeDatumNode.h>
-
-namespace ScriptCanvas
-{
-    namespace Nodes
-    {
-        namespace Entity
-        {
-            class EntityID
-                : public NativeDatumNode<EntityID, Data::EntityIDType>
-            {
-            public:
-                using ParentType = NativeDatumNode<EntityID, Data::EntityIDType>;
-                AZ_COMPONENT(EntityID, "{37F26070-F29B-412A-9228-86D8D10F3C32}", ParentType);
-                
-                static void Reflect(AZ::ReflectContext* reflection)
-                {
-                    if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(reflection))
-                    {
-                        serializeContext->Class<EntityID, PureData>()
-                            ->Version(0)
-                            ;
-
-                        if (AZ::EditContext* editContext = serializeContext->GetEditContext())
-                        {
-                            editContext->Class<EntityID>("EntityID", "Stores a reference to an entity")
-                                ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/EntityID.png")
-                                ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
-                                ;
-                        }
-                    }
-                }
-                      
-            };
-        }
-    }
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/EntityRef.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/EntityRef.h
deleted file mode 100644
index 720205a158..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/EntityRef.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <ScriptCanvas/Libraries/Entity/Entity.h>
-#include <ScriptCanvas/Core/NativeDatumNode.h>
-
-namespace ScriptCanvas
-{
-    namespace Nodes
-    {
-        namespace Entity
-        {
-            class EntityRef
-                : public NativeDatumNode<EntityRef, Data::EntityIDType>
-            {
-            public:
-                using ParentType = NativeDatumNode<EntityRef, Data::EntityIDType>;
-                AZ_COMPONENT(EntityRef, "{0EE5782F-B241-4127-AE53-E6746B00447F}", ParentType);
-                
-                static void Reflect(AZ::ReflectContext* reflection)
-                {
-                    if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(reflection))
-                    {
-                        serializeContext->Class<EntityRef, PureData>()
-                            ->Version(2)
-                            ;
-
-                        if (AZ::EditContext* editContext = serializeContext->GetEditContext())
-                        {
-                            // EntityRef node is special in that it's only created when we drag in an entity from the main scene.
-                            // And is unmodifiable(essentially an external constant). As such, we hide it from the node palette.
-                            editContext->Class<EntityRef>("EntityID", "Stores a reference to an entity")
-                                ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/EntityRef.png")
-                                ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::List)
-                                ;
-                        }
-                    }
-                }
-                                
-                AZ_INLINE void SetEntityRef(const AZ::EntityId& id)
-                {
-                    ModifiableDatumView datumView;
-                    FindModifiableDatumView(GetSlotId(k_setThis), datumView);
-
-                    if (datumView.IsValid())
-                    {
-                        // only called on edit time creation, so no need to push out the data, consider cutting this function if possible
-                        datumView.SetAs(id);
-                        OnOutputChanged((*datumView.GetDatum()));
-                    }
-                }
-
-                AZ_INLINE AZ::EntityId GetEntityRef() const
-                {
-                    AZ::EntityId retVal;
-                    if (auto input = FindDatum(GetSlotId(k_setThis)))
-                    {
-                        const AZ::EntityId* inputId = input->GetAs<AZ::EntityId>();
-
-                        if (inputId)
-                        {
-                            retVal = (*inputId);
-                        }
-                    }
-
-                    return retVal;
-                }
-                
-            };
-        }
-    }
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/Rotate.ScriptCanvasGrammar.xml b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/Rotate.ScriptCanvasGrammar.xml
deleted file mode 100644
index 0b2c5714d7..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/Rotate.ScriptCanvasGrammar.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<ScriptCanvas Include="Include/ScriptCanvas/Libraries/Entity/Rotate.h" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <Class Name="Rotate"
-	       QualifiedName="ScriptCanvas::Nodes::Entity::Rotate"
-	       PreferredClassName="Rotate"
-           Uuid="{6F802B53-E726-430D-9F41-63CFC783F91D}"
-           Base="ScriptCanvas::Node"
-           Category="Entity/Transform"
-           Version="4"
-           Deprecated="true"
-           EditAttributes="AZ::Edit::Attributes::CategoryStyle@.method;ScriptCanvas::Attributes::Node::TitlePaletteOverride@MethodNodeTitlePalette"
-           GeneratePropertyFriend="True"
-           Description="Rotates the given entity by the specified amount.">
-        <In Name="In" Description=""/>
-        <Out Name="Out" Description=""/>
-        <Property Name="Entity"
-                  Description="The entity to apply the rotation on."
-                  Type="AZ::EntityId"
-                  DefaultValue="ScriptCanvas::GraphOwnerId"
-                  IsInput="True"
-                  IsOutput="False" />
-        <Property Name="Euler Angles"
-                  Description="Euler angles, Pitch/Yaw/Roll."
-                  Type="AZ::Vector3"
-                  IsInput="True"
-                  IsOutput="False" />
-    </Class>
-</ScriptCanvas>
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/Rotate.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/Rotate.cpp
deleted file mode 100644
index b1df21ea52..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/Rotate.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <Libraries/Entity/Rotate.h>
-
-#include <ScriptCanvas/Execution/ErrorBus.h>
-
-#include <AzCore/Component/TransformBus.h>
-#include <AzCore/Math/Transform.h>
-#include <ScriptCanvas/Core/GraphBus.h>
-
-namespace ScriptCanvas
-{
-    namespace Nodes
-    {
-        namespace Entity
-        {
-            void Rotate::OnInputSignal(const SlotId&)
-            {
-                AZ::EntityId targetEntity = RotateProperty::GetEntity(this);
-
-                if (!targetEntity.IsValid())
-                {
-                    SCRIPTCANVAS_REPORT_ERROR((*this), "Invalid entity specified");
-                    return;
-                }
-
-                AZ::Entity* entity = nullptr;
-                AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationRequests::FindEntity, targetEntity);
-                if (entity)
-                {
-                    AZ::Vector3 angles = AZ::Vector3::CreateZero();
-                    if (entity->GetState() == AZ::Entity::State::Active)
-                    {
-                        angles = RotateProperty::GetEulerAngles(this);
-
-                        AZ::Quaternion rotation = AZ::ConvertEulerDegreesToQuaternion(angles);
-
-                        AZ::Transform currentTransform = AZ::Transform::CreateIdentity();
-                        AZ::TransformBus::EventResult(currentTransform, targetEntity, &AZ::TransformInterface::GetWorldTM);
-
-                        currentTransform.SetRotation((rotation * currentTransform.GetRotation().GetNormalized()));
-
-                        AZ::TransformBus::Event(targetEntity, &AZ::TransformInterface::SetWorldTM, currentTransform);
-                    }
-                }
-
-                SignalOutput(RotateProperty::GetOutSlotId(this));
-            }
-        }
-    }
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/Rotate.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/Rotate.h
deleted file mode 100644
index cf6c19c417..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/Rotate.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <ScriptCanvas/Core/Node.h>
-
-#include <AzCore/Math/Vector3.h>
-
-#include <Include/ScriptCanvas/Libraries/Entity/Rotate.generated.h>
-
-// LY-103055 Temporary workaround to fix compile error when building Android NDK 19 and above due to AzCodeGenerator
-// not receiving the correct clang system includes
-namespace AZ
-{
-    class EntityId;
-    class Vector3;
-}
-
-namespace ScriptCanvas
-{
-    namespace Nodes
-    {
-        namespace Entity
-        {
-            //! Deprecated: see Entity Transform class' reflection of method "Rotate"
-            class Rotate 
-                : public Node
-            {
-
-            public:
-
-                SCRIPTCANVAS_NODE(Rotate);
-
-                void OnInputSignal(const SlotId&) override;
-
-            };
-        }
-    }
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Libraries.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Libraries.h
index e75191a4f6..529b74d7ab 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Libraries.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Libraries.h
@@ -12,6 +12,21 @@
 #include <AzCore/std/containers/vector.h>
 #include <AzCore/std/containers/unordered_map.h>
 
+#define REFLECT_MATH_LIBRARY_TYPE(MathType, Guid)\
+    struct MathType\
+    {\
+        AZ_TYPE_INFO(MathType, Guid);\
+        static void Reflect(AZ::ReflectContext* reflection)\
+        {\
+            if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(reflection))\
+            {\
+                serializeContext->Class<MathType>()\
+                ->Version(0)\
+                ;\
+            }\
+        }\
+    };
+
 namespace AZ
 {
     class ReflectContext;
@@ -45,7 +60,7 @@ namespace ScriptCanvas
             virtual ~LibraryDefinition() = default;
 
             static const NodeRegistry::NodeList GetNodes(const AZ::Uuid& libraryType)
-            { 
+            {
                 NodeRegistry& registry = (*GetNodeRegistry());
                 const auto& libraryIterator = registry.m_nodeMap.find(libraryType);
                 if (libraryIterator != registry.m_nodeMap.end())
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/And.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/And.h
index fa553036f5..f33c6acde4 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/And.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/And.h
@@ -52,11 +52,6 @@ namespace ScriptCanvas
                 //////////////////////////////////////////////////////////////////////////
 
             protected:
-                Datum Evaluate(const Datum& lhs, const Datum& rhs) override
-                {
-                    return Datum(*lhs.GetAs<bool>() && *rhs.GetAs<bool>());
-                }
-
                 void InitializeBooleanExpression() override
                 {
                     {
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Any.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Any.cpp
index 29fd8a5075..54430a3794 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Any.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Any.cpp
@@ -28,7 +28,7 @@ namespace ScriptCanvas
                 return AZ::Success(DependencyReport{});
             }
 
-            bool Any::IsNoOp() const 
+            bool Any::IsNoOp() const
             {
                 return true;
             }
@@ -60,12 +60,6 @@ namespace ScriptCanvas
                     RegisterExtension(visualExtensions);
                 }
             }
-            
-            void Any::OnInputSignal([[maybe_unused]] const SlotId& slotId)
-            {
-                const SlotId outSlotId = AnyProperty::GetOutSlotId(this);
-                SignalOutput(outSlotId);
-            }
 
             SlotId Any::HandleExtension(AZ::Crc32 extensionId)
             {
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Any.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Any.h
index aca5b2bb51..efc8be90d0 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Any.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Any.h
@@ -30,7 +30,7 @@ namespace ScriptCanvas
 
                     Current
                 };
-                
+
             public:
 
                 SCRIPTCANVAS_NODE(Any);
@@ -44,8 +44,6 @@ namespace ScriptCanvas
                 void OnInit() override;
                 void ConfigureVisualExtensions() override;
 
-                void OnInputSignal(const SlotId& slot) override;
-
                 SlotId HandleExtension(AZ::Crc32 extensionId) override;
 
                 bool CanDeleteSlot(const SlotId& slotId) const override;
@@ -56,10 +54,8 @@ namespace ScriptCanvas
                 /// Translation
                 bool IsNoOp() const override;
 
-                
-
                 AZ::Outcome<DependencyReport, void> GetDependencies() const override;
-                    
+
             protected:
                 ConstSlotsOutcome GetSlotsInExecutionThreadByTypeImpl(const Slot&, CombinedSlotType targetSlotType, const Slot*) const override
                 {
@@ -69,9 +65,7 @@ namespace ScriptCanvas
                 AZ::Crc32 GetInputExtensionId() const { return AZ_CRC("Output", 0xccde149e); }
 
             private:
-
                 AZStd::string GenerateInputName(int counter);
-
                 SlotId AddInputSlot();
                 void FixupStateNames();
             };
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Boolean.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Boolean.h
deleted file mode 100644
index 5a118d9374..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Boolean.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <ScriptCanvas/Core/NativeDatumNode.h>
-
-namespace ScriptCanvas
-{
-    namespace Nodes
-    {
-        namespace Logic
-        {
-            class Boolean 
-                : public NativeDatumNode<Boolean, bool>
-            {
-            public:
-                using ParentType = NativeDatumNode<Boolean, bool>;
-                AZ_COMPONENT(Boolean, "{263E8CAE-9F20-4198-A937-14761A46D996}", ParentType);
-
-                static void Reflect(AZ::ReflectContext* reflection)
-                {
-                    ParentType::Reflect(reflection);
-
-                    if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(reflection))
-                    {
-                        serializeContext->Class<Boolean, ParentType>()
-                            ->Version(4)
-                            ;
-
-                        if (AZ::EditContext* editContext = serializeContext->GetEditContext())
-                        {
-                            editContext->Class<Boolean>("Boolean", "A boolean value (true/false)")
-                                ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Boolean.png")
-                                ;
-                        }
-                    }
-                }
-
-            };
-        }
-    }
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Break.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Break.h
index 6d0718ff2e..3555fea2e2 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Break.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Break.h
@@ -27,11 +27,11 @@ namespace ScriptCanvas
 
                 SCRIPTCANVAS_NODE(Break);
 
-                Break() = default;                   
+                Break() = default;
 
                 AZ::Outcome<DependencyReport, void> GetDependencies() const override;
 
-                
+
 
             };
         }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Cycle.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Cycle.cpp
index a5a75e259c..1149c19230 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Cycle.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Cycle.cpp
@@ -98,26 +98,6 @@ namespace ScriptCanvas
                 return AddSlot(executionConfiguration);
             }
 
-            void  Cycle::OnInputSignal(const SlotId& slot)
-            {
-                if (slot != CycleProperty::GetInSlotId(this))
-                {
-                    return;
-                }
-
-                if (!m_orderedOutputSlots.empty())
-                {
-                    const SlotId& slotId = m_orderedOutputSlots[m_executionSlot];
-                    SignalOutput(slotId);
-
-                    if (++m_executionSlot >= m_orderedOutputSlots.size())
-                    {
-                        m_executionSlot = 0;
-                    }
-                }
-                
-            }
-
             void Cycle::OnSlotRemoved([[maybe_unused]] const SlotId& slotId)
             {
                 FixupStateNames();
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Cycle.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Cycle.h
index c275b8031c..3d903018d0 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Cycle.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Cycle.h
@@ -43,13 +43,9 @@ namespace ScriptCanvas
 
                 ConstSlotsOutcome GetSlotsInExecutionThreadByTypeImpl(const Slot& executionSlot, CombinedSlotType targetSlotType, const Slot* /*executionChildSlot*/) const override;
 
-                
-
             protected:
 
                 AZStd::string GetDisplayGroup() const { return "OutputGroup"; }
-
-                void OnInputSignal(const SlotId& slot) override;
                 void OnSlotRemoved(const SlotId& slotId) override;
 
             private:
@@ -58,7 +54,7 @@ namespace ScriptCanvas
                 void FixupStateNames();
 
                 int m_numOutputs;
-                
+
                 size_t m_executionSlot;
 
                 AZStd::vector< SlotId > m_orderedOutputSlots;
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Gate.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Gate.cpp
index 3a36a265c2..a0462ae69a 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Gate.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Gate.cpp
@@ -17,29 +17,12 @@ namespace ScriptCanvas
         {
             Gate::Gate()
                 : Node()
-                , m_condition(false)
             {}
 
             AZ::Outcome<DependencyReport, void> Gate::GetDependencies() const
             {
                 return AZ::Success(DependencyReport{});
             }
-
-            void Gate::OnInputSignal(const SlotId&)
-            {
-                SlotId trueSlot = GateProperty::GetTrueSlotId(this);
-                SlotId falseSlot = GateProperty::GetFalseSlotId(this);
-
-                m_condition = GateProperty::GetCondition(this);
-                if (m_condition)
-                {
-                    SignalOutput(trueSlot);
-                }
-                else
-                {
-                    SignalOutput(falseSlot);
-                }
-            }
         }
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Gate.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Gate.h
index 0480db1f32..ae9c25573b 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Gate.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Gate.h
@@ -9,7 +9,6 @@
 
 #include <ScriptCanvas/Core/Core.h>
 #include <ScriptCanvas/Core/Node.h>
-#include <ScriptCanvas/Libraries/Logic/Boolean.h>
 
 #include <Include/ScriptCanvas/Libraries/Logic/Gate.generated.h>
 
@@ -24,7 +23,6 @@ namespace ScriptCanvas
                 : public Node
             {
             public:
-
                 SCRIPTCANVAS_NODE(Gate);
 
                 Gate();
@@ -36,22 +34,11 @@ namespace ScriptCanvas
 
                 bool IsIfBranch() const override { return true; }
 
-                
-
             protected:
                 ConstSlotsOutcome GetSlotsInExecutionThreadByTypeImpl(const Slot& /*executionSlot*/, CombinedSlotType targetSlotType, const Slot* /*executionChildSlot*/) const override
                 {
                     return AZ::Success(GetSlotsByType(targetSlotType));
                 }
-
-                //////////////////////////////////////////////////////////////////////////
-
-                void OnInputSignal(const SlotId&) override;
-
-            private:
-
-                bool m_condition;
-
             };
         }
     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Indexer.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Indexer.cpp
deleted file mode 100644
index 85898ad042..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Indexer.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "Indexer.h"
-
-namespace ScriptCanvas
-{
-    namespace Nodes
-    {
-        namespace Logic
-        {
-            void Indexer::OnInputSignal(const SlotId& slotId)
-            {
-                auto slotIndex = FindSlotIndex(slotId);
-                if (slotIndex < 0)
-                {
-                    AZ_Warning("Script Canvas", false, "Could not find slot with id %s", slotId.ToString().c_str());
-                    return;
-                }
-
-                const Datum output(slotIndex);
-
-                const SlotId outSlotId = IndexerProperty::GetOutSlotId(this);
-                if (auto outSlot = GetSlot(outSlotId))
-                {
-                    PushOutput(output, *outSlot);
-                }
-
-                SignalOutput(outSlotId);
-            }
-        }
-    }
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Indexer.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Indexer.h
index bea41a4e14..6a6d335a87 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Indexer.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Indexer.h
@@ -21,16 +21,8 @@ namespace ScriptCanvas
             class Indexer
                 : public Node
             {
-
             public:
-
                 SCRIPTCANVAS_NODE(Indexer);
-
-                Indexer() = default;
-
-            protected:
-
-                void OnInputSignal(const SlotId& slot) override;
             };
         }
     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/IsNull.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/IsNull.cpp
index 480d51643b..851ccb24dd 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/IsNull.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/IsNull.cpp
@@ -39,7 +39,7 @@ namespace ScriptCanvas
             {
                 {
                     auto func = []() { return aznew IsReferenceTypeContract(); };
-                    ContractDescriptor descriptor{ AZStd::move(func) };                    
+                    ContractDescriptor descriptor{ AZStd::move(func) };
 
                     DynamicDataSlotConfiguration slotConfiguration;
 
@@ -61,13 +61,6 @@ namespace ScriptCanvas
                     AddSlot(slotConfiguration);
                 }
             }
-
-            void IsNull::OnInputSignal(const SlotId&)
-            {
-                const bool isNull = FindDatum(GetSlotId("Reference"))->Empty();
-                PushOutput(Datum(isNull), *GetSlot(GetSlotId("Is Null")));
-                SignalOutput(isNull ? IsNullProperty::GetTrueSlotId(this) : IsNullProperty::GetFalseSlotId(this));
-            }
         }
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/IsNull.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/IsNull.h
index 12f996003c..36d608191f 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/IsNull.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/IsNull.h
@@ -34,8 +34,6 @@ namespace ScriptCanvas
 
                 bool IsIfBranchPrefacedWithBooleanExpression() const override;
 
-                
-
             protected:
                 ConstSlotsOutcome GetSlotsInExecutionThreadByTypeImpl(const Slot&, CombinedSlotType targetSlotType, const Slot*) const override
                 {
@@ -43,9 +41,6 @@ namespace ScriptCanvas
                 }
 
                 void OnInit() override;
-
-                void OnInputSignal(const SlotId&) override;
-
             };
         }
     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Logic.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Logic.cpp
index 8bd587ee4b..96e511fa49 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Logic.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Logic.cpp
@@ -43,7 +43,6 @@ namespace ScriptCanvas
             using namespace ScriptCanvas::Nodes::Logic;
             AddNodeToRegistry<Logic, And>(nodeRegistry);
             AddNodeToRegistry<Logic, Any>(nodeRegistry);
-            AddNodeToRegistry<Logic, Boolean>(nodeRegistry);
             AddNodeToRegistry<Logic, Break>(nodeRegistry);
             AddNodeToRegistry<Logic, Cycle>(nodeRegistry);
             AddNodeToRegistry<Logic, Gate>(nodeRegistry);
@@ -54,7 +53,7 @@ namespace ScriptCanvas
             AddNodeToRegistry<Logic, Once>(nodeRegistry);
             AddNodeToRegistry<Logic, Or>(nodeRegistry);
             AddNodeToRegistry<Logic, OrderedSequencer>(nodeRegistry);
-            AddNodeToRegistry<Logic, Sequencer>(nodeRegistry);            
+            AddNodeToRegistry<Logic, Sequencer>(nodeRegistry);
             AddNodeToRegistry<Logic, TargetedSequencer>(nodeRegistry);
             AddNodeToRegistry<Logic, WeightedRandomSequencer>(nodeRegistry);
             AddNodeToRegistry<Logic, While>(nodeRegistry);
@@ -65,7 +64,6 @@ namespace ScriptCanvas
             return AZStd::vector<AZ::ComponentDescriptor*>({
                 ScriptCanvas::Nodes::Logic::And::CreateDescriptor(),
                 ScriptCanvas::Nodes::Logic::Any::CreateDescriptor(),
-                ScriptCanvas::Nodes::Logic::Boolean::CreateDescriptor(),
                 ScriptCanvas::Nodes::Logic::Break::CreateDescriptor(),
                 ScriptCanvas::Nodes::Logic::Cycle::CreateDescriptor(),
                 ScriptCanvas::Nodes::Logic::Gate::CreateDescriptor(),
@@ -80,7 +78,7 @@ namespace ScriptCanvas
                 ScriptCanvas::Nodes::Logic::TargetedSequencer::CreateDescriptor(),
                 ScriptCanvas::Nodes::Logic::WeightedRandomSequencer::CreateDescriptor(),
                 ScriptCanvas::Nodes::Logic::While::CreateDescriptor(),
-            });
+                });
         }
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Logic.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Logic.h
index a59a4e4a88..26fa846885 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Logic.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Logic.h
@@ -12,7 +12,6 @@
 
 #include "And.h"
 #include "Any.h"
-#include "Boolean.h"
 #include "Break.h"
 #include "Cycle.h"
 #include "Gate.h"
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Multiplexer.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Multiplexer.cpp
deleted file mode 100644
index c8af5ae7a4..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Multiplexer.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "Multiplexer.h"
-
-namespace ScriptCanvas
-{
-    namespace Nodes
-    {
-        namespace Logic
-        {
-            Multiplexer::Multiplexer()
-            {}
-
-            void Multiplexer::OnInputSignal(const SlotId& slotId)
-            {
-                auto slotIndex = FindSlotIndex(slotId);
-                if (!slotIndex)
-                {
-                    AZ_Warning("Script Canvas", false, "Could not find slot with Id %s", slotId.ToString().c_str());
-                    return;
-                }
-
-                // These are generated from CodeGen, they essentially
-                // check if there's anything connected on the slot and
-                // they assign the local member with the value, otherwise
-                // they use the default property value.
-                const AZ::s64 selectedIndex = MultiplexerProperty::GetIndex(this);
-
-                if (selectedIndex == slotIndex)
-                {
-                    const SlotId outSlotId = MultiplexerProperty::GetOutSlotId(this);
-                    SignalOutput(outSlotId);
-                }
-            }
-        }
-    }
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Multiplexer.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Multiplexer.h
index 00a974ab8a..e6df414398 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Multiplexer.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Multiplexer.h
@@ -26,12 +26,6 @@ namespace ScriptCanvas
 
                 SCRIPTCANVAS_NODE(Multiplexer);
 
-                Multiplexer();
-
-            protected:
-
-                void OnInputSignal(const SlotId& slot) override;
-
             };
         }
     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Not.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Not.h
index 58e0d747c7..119a36e682 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Not.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Not.h
@@ -8,7 +8,6 @@
 #pragma once
 
 #include <Libraries/Core/UnaryOperator.h>
-#include <Libraries/Logic/Boolean.h>
 
 namespace ScriptCanvas
 {
@@ -64,15 +63,7 @@ namespace ScriptCanvas
                 }
                 // Translation
                 //////////////////////////////////////////////////////////////////////////
-
-            protected:
-
-                Datum Evaluate(const Datum& value) override
-                {
-                    const bool* boolValue = value.GetAs<bool>();
-                    return Datum(boolValue && (!(*boolValue)));
-                }
-            }; 
+            };
 
         }
     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Once.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Once.h
index e216b7e793..fc06fafbbe 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Once.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Once.h
@@ -9,7 +9,6 @@
 
 #include <ScriptCanvas/Core/Core.h>
 #include <ScriptCanvas/Core/Node.h>
-#include <ScriptCanvas/Libraries/Logic/Boolean.h>
 
 #include <Include/ScriptCanvas/Libraries/Logic/Once.generated.h>
 
@@ -32,8 +31,6 @@ namespace ScriptCanvas
 
                 AZ::Outcome<DependencyReport, void> GetDependencies() const override;
 
-                
-
             protected:
 
                 ExecutionNameMap GetExecutionNameMap() const override;
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Or.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Or.h
index 6868dc6e6b..315d254d50 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Or.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Or.h
@@ -50,11 +50,6 @@ namespace ScriptCanvas
                 //////////////////////////////////////////////////////////////////////////
 
             protected:
-                Datum Evaluate(const Datum& lhs, const Datum& rhs) override
-                {
-                    return Datum(*lhs.GetAs<bool>() || *rhs.GetAs<bool>());
-                }
-
                 void InitializeBooleanExpression() override
                 {
                     {
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/OrderedSequencer.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/OrderedSequencer.cpp
index c7c3834594..4061b9adbe 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/OrderedSequencer.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/OrderedSequencer.cpp
@@ -18,7 +18,7 @@ namespace ScriptCanvas
             OrderedSequencer::OrderedSequencer()
                 : Node()
                 , m_numOutputs(0)
-            {                
+            {
             }
 
             AZ::Outcome<DependencyReport, void> OrderedSequencer::GetDependencies() const
@@ -67,15 +67,15 @@ namespace ScriptCanvas
                     visualExtensions.m_connectionType = ConnectionType::Output;
                     visualExtensions.m_identifier = AZ::Crc32("AddOutputGroup");
                     visualExtensions.m_displayGroup = GetDisplayGroup();
-                    
+
                     RegisterExtension(visualExtensions);
                 }
             }
-            
+
             bool OrderedSequencer::CanDeleteSlot(const SlotId& slotId) const
             {
-                Slot* slot = GetSlot(slotId);                
-                
+                Slot* slot = GetSlot(slotId);
+
                 // Only remove execution out slots when we have more then 1 output slot.
                 if (slot && slot->IsExecution() && slot->IsOutput())
                 {
@@ -88,17 +88,17 @@ namespace ScriptCanvas
             SlotId OrderedSequencer::HandleExtension([[maybe_unused]] AZ::Crc32 extensionId)
             {
                 ExecutionSlotConfiguration executionConfiguration(GenerateOutputName(m_numOutputs), ConnectionType::Output);
-                
+
                 executionConfiguration.m_addUniqueSlotByNameAndType = false;
                 executionConfiguration.m_displayGroup = GetDisplayGroup();
-                
+
                 ++m_numOutputs;
-                
+
                 return AddSlot(executionConfiguration);
             }
 
             void OrderedSequencer::OnSlotRemoved([[maybe_unused]] const SlotId& slotId)
-            {                
+            {
                 FixupStateNames();
             }
 
@@ -107,12 +107,12 @@ namespace ScriptCanvas
                 AZStd::string slotName = AZStd::string::format("Out %i", counter);
                 return AZStd::move(slotName);
             }
-            
+
             void OrderedSequencer::FixupStateNames()
             {
                 auto outputSlots = GetAllSlotsByDescriptor(SlotDescriptors::ExecutionOut());
                 m_numOutputs = static_cast<int>(outputSlots.size());
-                
+
                 for (int i = 0; i < outputSlots.size(); ++i)
                 {
                     Slot* slot = GetSlot(outputSlots[i]->GetId());
@@ -122,7 +122,7 @@ namespace ScriptCanvas
                         slot->Rename(GenerateOutputName(i));
                     }
                 }
-            }            
+            }
         }
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/OrderedSequencer.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/OrderedSequencer.h
index f973446702..ca07b60834 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/OrderedSequencer.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/OrderedSequencer.h
@@ -22,7 +22,7 @@ namespace ScriptCanvas
             class OrderedSequencer
                 : public Node
             {
- 
+
             public:
 
                 SCRIPTCANVAS_NODE(OrderedSequencer);
@@ -43,10 +43,10 @@ namespace ScriptCanvas
 
                 void ConfigureVisualExtensions() override;
 
-                
+
 
             protected:
-            
+
                 AZStd::string GetDisplayGroup() const { return "OutputGroup"; }
 
             protected:
@@ -57,11 +57,11 @@ namespace ScriptCanvas
 
                 AZStd::string GenerateOutputName(int counter) const;
                 void FixupStateNames();
-                
+
                 int m_numOutputs;
-                
+
                 AZStd::vector< SlotId > m_orderedOutputSlots;
             };
         }
-    }   
+    }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Sequencer.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Sequencer.cpp
index 75693f994c..1612727fc3 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Sequencer.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Sequencer.cpp
@@ -29,7 +29,7 @@ namespace ScriptCanvas
             {
                 auto inSlot = SequencerProperty::GetInSlot(this);
                 auto nextSlot = SequencerProperty::GetNextSlot(this);
-                
+
                 if (inSlot && inSlot->IsConnected())
                 {
                     // Replace by TargetedSequencer
@@ -107,50 +107,6 @@ namespace ScriptCanvas
                 }
             }
 
-            void  Sequencer::OnInputSignal(const SlotId& slot)
-            {
-                m_selectedIndex = SequencerProperty::GetIndex(this);
-                m_order = SequencerProperty::GetOrder(this);
-
-                const SlotId inSlot = SequencerProperty::GetInSlotId(this);
-                const SlotId nextSlot = SequencerProperty::GetNextSlotId(this);
-                
-                if (slot == inSlot)
-                {
-                    m_currentIndex = m_selectedIndex;
-                } 
-                else if (slot == nextSlot)
-                {
-                    int step = m_order == Order::Forward ? 1 : -1;
-
-                    m_outputIsValid = false;
-                    int startIndex = m_currentIndex;
-                    while (!m_outputIsValid)
-                    {
-                        m_currentIndex = (m_currentIndex + step + NUMBER_OF_OUTPUTS) % NUMBER_OF_OUTPUTS;
-                        SlotId outSlotId = GetCurrentSlotId();
-                        Slot* outSlot = GetSlot(outSlotId);
-                        if (outSlot)
-                        {
-                            m_outputIsValid = !GetConnectedNodes(*outSlot).empty();
-                        }
-
-                        //Avoid infinite loop when none of the outputs or only the current output connects to other nodes.
-                        if (m_currentIndex == startIndex)
-                        {
-                            m_outputIsValid = false;
-                            break;
-                        }
-                    }
-                }
-
-                if (m_outputIsValid)
-                {
-                    SlotId outSlotId = GetCurrentSlotId();
-                    SignalOutput(outSlotId);
-                }
-            }
-
             SlotId Sequencer::GetCurrentSlotId() const
             {
                 AZStd::string slotName = "Out" + AZStd::to_string(m_currentIndex);
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Sequencer.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Sequencer.h
index 347d21baa2..a4fe3f358d 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Sequencer.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Sequencer.h
@@ -43,10 +43,6 @@ namespace ScriptCanvas
                 int m_order;
                 int m_selectedIndex;
 
-            protected:
-
-                void OnInputSignal(const SlotId& slot) override;
-
             private:
                 int m_currentIndex;
                 bool m_outputIsValid;
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/TargetedSequencer.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/TargetedSequencer.cpp
index ec55784a33..5e47397e46 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/TargetedSequencer.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/TargetedSequencer.cpp
@@ -18,9 +18,9 @@ namespace ScriptCanvas
             TargetedSequencer::TargetedSequencer()
                 : Node()
                 , m_numOutputs(0)
-            {                
+            {
             }
-            
+
             void TargetedSequencer::OnInit()
             {
                 m_numOutputs = static_cast<int>(GetAllSlotsByDescriptor(SlotDescriptors::ExecutionOut()).size());
@@ -45,11 +45,11 @@ namespace ScriptCanvas
                     RegisterExtension(visualExtensions);
                 }
             }
-            
+
             bool TargetedSequencer::CanDeleteSlot(const SlotId& slotId) const
             {
-                Slot* slot = GetSlot(slotId);                
-                
+                Slot* slot = GetSlot(slotId);
+
                 // Only remove execution out slots when we have more then 1 output slot.
                 if (slot && slot->IsExecution() && slot->IsOutput())
                 {
@@ -62,42 +62,17 @@ namespace ScriptCanvas
             SlotId TargetedSequencer::HandleExtension([[maybe_unused]] AZ::Crc32 extensionId)
             {
                 ExecutionSlotConfiguration executionConfiguration(GenerateOutputName(m_numOutputs), ConnectionType::Output);
-                
+
                 executionConfiguration.m_addUniqueSlotByNameAndType = false;
                 executionConfiguration.m_displayGroup = GetDisplayGroup();
-                
+
                 ++m_numOutputs;
-                
+
                 return AddSlot(executionConfiguration);
             }
 
-            void  TargetedSequencer::OnInputSignal(const SlotId& slot)
-            {
-                if (slot != TargetedSequencerProperty::GetInSlotId(this))
-                {
-                    return;
-                }                
-                
-                int targetIndex = TargetedSequencerProperty::GetIndex(this);
-                
-                if (targetIndex < 0
-                    || targetIndex >= m_numOutputs)
-                {
-                    SCRIPTCANVAS_REPORT_ERROR((*this), "Switch node was given an out of bound index.");
-                    return;
-                }                
-                
-                AZStd::string slotName = GenerateOutputName(targetIndex);
-                SlotId outSlotId = GetSlotId(slotName.c_str());
-
-                if (outSlotId.IsValid())
-                {
-                    SignalOutput(outSlotId);
-                }
-            }
-            
             void TargetedSequencer::OnSlotRemoved([[maybe_unused]] const SlotId& slotId)
-            {                
+            {
                 FixupStateNames();
             }
 
@@ -106,12 +81,12 @@ namespace ScriptCanvas
                 AZStd::string slotName = AZStd::string::format("Out %i", counter);
                 return AZStd::move(slotName);
             }
-            
+
             void TargetedSequencer::FixupStateNames()
             {
                 auto outputSlots = GetAllSlotsByDescriptor(SlotDescriptors::ExecutionOut());
                 m_numOutputs = static_cast<int>(outputSlots.size());
-                
+
                 for (int i = 0; i < outputSlots.size(); ++i)
                 {
                     Slot* slot = GetSlot(outputSlots[i]->GetId());
@@ -121,7 +96,7 @@ namespace ScriptCanvas
                         slot->Rename(GenerateOutputName(i));
                     }
                 }
-            }            
+            }
         }
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/TargetedSequencer.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/TargetedSequencer.h
index 7f50fbeb11..f263d8d9e4 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/TargetedSequencer.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/TargetedSequencer.h
@@ -31,10 +31,10 @@ namespace ScriptCanvas
                 void OnInit() override;
                 void OnConfigured() override;
                 void ConfigureVisualExtensions() override;
-                
+
                 bool CanDeleteSlot(const SlotId& slotId) const;
 
-                SlotId HandleExtension(AZ::Crc32 extensionId);        
+                SlotId HandleExtension(AZ::Crc32 extensionId);
 
                 // Script Canvas Translation...
                 bool IsSwitchStatement() const override { return true; }
@@ -51,17 +51,16 @@ namespace ScriptCanvas
                 //////////////////////////////////////////////////////////////////////////
 
             protected:
-            
+
                 AZStd::string GetDisplayGroup() const { return "OutputGroup"; }
 
-                void OnInputSignal(const SlotId& slot) override;                
                 void OnSlotRemoved(const SlotId& slotId) override;
 
             private:
 
                 AZStd::string GenerateOutputName(int counter);
                 void FixupStateNames();
-                
+
                 int m_numOutputs;
             };
         }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/WeightedRandomSequencer.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/WeightedRandomSequencer.cpp
index 80646e66a1..1954821587 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/WeightedRandomSequencer.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/WeightedRandomSequencer.cpp
@@ -30,7 +30,7 @@ namespace ScriptCanvas
                 return AZ::Success(DependencyReport());
             }
 
-            ConstSlotsOutcome WeightedRandomSequencer::GetSlotsInExecutionThreadByTypeImpl(const Slot& , CombinedSlotType targetSlotType, const Slot* /*executionChildSlot*/) const
+            ConstSlotsOutcome WeightedRandomSequencer::GetSlotsInExecutionThreadByTypeImpl(const Slot&, CombinedSlotType targetSlotType, const Slot* /*executionChildSlot*/) const
             {
                 return AZ::Success(GetSlotsByType(targetSlotType));
             }
@@ -45,7 +45,7 @@ namespace ScriptCanvas
                             ->Version(1)
                             ->Field("WeightSlotId", &WeightedPairing::m_weightSlotId)
                             ->Field("ExecutionSlotId", &WeightedPairing::m_executionSlotId)
-                        ;
+                            ;
                     }
                 }
             }
@@ -57,7 +57,7 @@ namespace ScriptCanvas
                     EndpointNotificationBus::MultiHandler::BusConnect({ GetEntityId(), weightedPairing.m_weightSlotId });
                     EndpointNotificationBus::MultiHandler::BusConnect({ GetEntityId(), weightedPairing.m_executionSlotId });
                 }
-                
+
                 // We always want at least one weighted transition state
                 if (m_weightedPairings.empty())
                 {
@@ -130,63 +130,6 @@ namespace ScriptCanvas
 
                 return isValid;
             }
-            
-            void WeightedRandomSequencer::OnInputSignal(const SlotId& slotId)
-            {
-                const SlotId inSlotId = WeightedRandomSequencerProperty::GetInSlotId(this);
-                
-                if (slotId == inSlotId)
-                {
-                    int runningTotal = 0;
-                    
-                    AZStd::vector< WeightedStruct > weightedStructs;
-                    weightedStructs.reserve(m_weightedPairings.size());
-                    
-                    for (const WeightedPairing& weightedPairing : m_weightedPairings)
-                    {
-                        const Datum* datum = FindDatum(weightedPairing.m_weightSlotId);
-                        
-                        if (datum)
-                        {
-                            WeightedStruct weightedStruct;
-                            weightedStruct.m_executionSlotId = weightedPairing.m_executionSlotId;
-                            
-                            if (datum->GetType().IS_A(ScriptCanvas::Data::Type::Number()))
-                            {
-                                int weight = aznumeric_cast<int>((*datum->GetAs<Data::NumberType>()));
-                                
-                                runningTotal += weight;                                
-                                weightedStruct.m_totalWeight = runningTotal;
-                            }
-
-                            weightedStructs.emplace_back(weightedStruct);
-                        }                        
-                    }
-                    
-                    // We have no weights. So just trigger the first execution output
-                    // Weighted pairings is controlled to never be empty.
-                    if (runningTotal == 0)
-                    {          
-                        if (!m_weightedPairings.empty())
-                        {
-                            SignalOutput(m_weightedPairings.front().m_executionSlotId);
-                        }
-                        
-                        return;
-                    }
-                    
-                    int weightedResult = MathNodeUtilities::GetRandomIntegral<int>(1, runningTotal);                    
-                    
-                    for (const WeightedStruct& weightedStruct : weightedStructs)
-                    {
-                        if (weightedResult <= weightedStruct.m_totalWeight)
-                        {
-                            SignalOutput(weightedStruct.m_executionSlotId);
-                            break;
-                        }
-                    }
-                }
-            }
 
             SlotId WeightedRandomSequencer::HandleExtension(AZ::Crc32 extensionId)
             {
@@ -219,9 +162,9 @@ namespace ScriptCanvas
             {
                 for (auto pairIter = m_weightedPairings.begin(); pairIter != m_weightedPairings.end(); ++pairIter)
                 {
-                    
+
                     if (pairIter->m_executionSlotId == slotId
-                        || pairIter->m_weightSlotId == slotId)                        
+                        || pairIter->m_weightSlotId == slotId)
                     {
                         SlotId executionSlot = pairIter->m_executionSlotId;
                         SlotId weightSlot = pairIter->m_weightSlotId;
@@ -235,15 +178,15 @@ namespace ScriptCanvas
                         else if (slotId == weightSlot)
                         {
                             RemoveSlot(executionSlot);
-                        }                        
-                        
+                        }
+
                         break;
                     }
                 }
-                
+
                 FixupStateNames();
             }
-            
+
             bool WeightedRandomSequencer::AllWeightsFilled() const
             {
                 bool isFilled = true;
@@ -254,7 +197,7 @@ namespace ScriptCanvas
                         isFilled = false;
                         break;
                     }
-                }             
+                }
 
                 return isFilled;
             }
@@ -282,15 +225,15 @@ namespace ScriptCanvas
 
                 return hasExcess;
             }
-            
+
             WeightedRandomSequencer::WeightedPairing WeightedRandomSequencer::AddWeightedPair()
             {
                 int counterWeight = static_cast<int>(m_weightedPairings.size()) + 1;
-            
-                WeightedPairing weightedPairing;                
+
+                WeightedPairing weightedPairing;
 
                 DataSlotConfiguration dataSlotConfiguration;
-                
+
                 dataSlotConfiguration.SetConnectionType(ConnectionType::Input);
                 dataSlotConfiguration.m_name = GenerateDataName(counterWeight);
                 dataSlotConfiguration.m_toolTip = "The weight associated with the execution state.";
@@ -299,24 +242,24 @@ namespace ScriptCanvas
                 dataSlotConfiguration.SetDefaultValue(1.0f);
 
                 dataSlotConfiguration.m_displayGroup = GetDisplayGroup();
-                
+
                 weightedPairing.m_weightSlotId = AddSlot(dataSlotConfiguration);
-                
+
                 ExecutionSlotConfiguration  slotConfiguration;
-                
+
                 slotConfiguration.m_name = GenerateOutName(counterWeight);
                 slotConfiguration.m_addUniqueSlotByNameAndType = false;
                 slotConfiguration.SetConnectionType(ConnectionType::Output);
 
                 slotConfiguration.m_displayGroup = GetDisplayGroup();
-                
-                weightedPairing.m_executionSlotId = AddSlot(slotConfiguration);                
-                
+
+                weightedPairing.m_executionSlotId = AddSlot(slotConfiguration);
+
                 m_weightedPairings.push_back(weightedPairing);
 
                 return weightedPairing;
             }
-            
+
             void WeightedRandomSequencer::FixupStateNames()
             {
                 int counter = 1;
@@ -324,30 +267,30 @@ namespace ScriptCanvas
                 {
                     AZStd::string dataName = GenerateDataName(counter);
                     AZStd::string executionName = GenerateOutName(counter);
-                    
+
                     Slot* dataSlot = GetSlot(weightedPairing.m_weightSlotId);
-                    
+
                     if (dataSlot)
                     {
                         dataSlot->Rename(dataName);
                     }
-                    
+
                     Slot* executionSlot = GetSlot(weightedPairing.m_executionSlotId);
-                    
+
                     if (executionSlot)
                     {
                         executionSlot->Rename(executionName);
                     }
-                    
+
                     ++counter;
                 }
             }
-            
+
             AZStd::string WeightedRandomSequencer::GenerateDataName(int counter)
             {
                 return AZStd::string::format("Weight %i", counter);
             }
-            
+
             AZStd::string WeightedRandomSequencer::GenerateOutName(int counter)
             {
                 return AZStd::string::format("Out %i", counter);
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/WeightedRandomSequencer.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/WeightedRandomSequencer.h
index f58f89690d..cffd7569c3 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/WeightedRandomSequencer.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/WeightedRandomSequencer.h
@@ -22,16 +22,14 @@ namespace ScriptCanvas
             class WeightedRandomSequencer
                 : public Node
             {
-
             public:
-
                 SCRIPTCANVAS_NODE(WeightedRandomSequencer);
 
                 static void ReflectDataTypes(AZ::ReflectContext* reflectContext);
-            
+
                 WeightedRandomSequencer() = default;
                 ~WeightedRandomSequencer() = default;
-                
+
                 AZ::Outcome<DependencyReport, void> GetDependencies() const override;
 
                 ConstSlotsOutcome GetSlotsInExecutionThreadByTypeImpl(const Slot& executionSlot, CombinedSlotType targetSlotType, const Slot* /*executionChildSlot*/) const override;
@@ -41,24 +39,20 @@ namespace ScriptCanvas
                 void ConfigureVisualExtensions() override;
 
                 bool OnValidateNode(ValidationResults& validationResults);
-                
-                void OnInputSignal(const SlotId& slot);
 
                 SlotId HandleExtension(AZ::Crc32 extensionId) override;
 
-                
-
                 bool CanDeleteSlot(const SlotId& slotId) const override;
 
                 void OnSlotRemoved(const SlotId& slotId) override;
                 ////
-                
+
             protected:
 
                 AZ::Crc32 GetWeightExtensionId() const { return AZ_CRC("WRS_Weight_Extension", 0xd17b9467); }
                 AZ::Crc32 GetExecutionExtensionId() const { return AZ_CRC("WRS_Execution_Extension", 0x0706035e); }
-                AZStd::string GetDisplayGroup() const { return "WeightedExecutionGroup";  }
-            
+                AZStd::string GetDisplayGroup() const { return "WeightedExecutionGroup"; }
+
             private:
 
                 struct WeightedPairing
@@ -74,22 +68,22 @@ namespace ScriptCanvas
                     int m_totalWeight;
                     SlotId m_executionSlotId;
                 };
-            
+
                 void RemoveWeightedPair(SlotId slotId);
-            
+
                 bool AllWeightsFilled() const;
                 bool HasExcessEndpoints() const;
-                
+
                 WeightedPairing AddWeightedPair();
                 void FixupStateNames();
-                
+
                 AZStd::string GenerateDataName(int counter);
-                AZStd::string GenerateOutName(int counter);                
+                AZStd::string GenerateOutName(int counter);
 
                 using WeightedPairingList = AZStd::vector<WeightedPairing>;
 
                 WeightedPairingList m_weightedPairings;
             };
         }
-    }   
+    }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/While.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/While.cpp
index 25535d3102..ffc3af4832 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/While.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/While.cpp
@@ -19,7 +19,7 @@ namespace ScriptCanvas
             {
                 return AZ::Success(DependencyReport{});
             }
-            
+
             SlotId While::GetLoopFinishSlotId() const
             {
                 return WhileProperty::GetOutSlotId(const_cast<While*>(this));
@@ -31,8 +31,8 @@ namespace ScriptCanvas
             }
 
             bool While::IsFormalLoop() const
-            { 
-                return true; 
+            {
+                return true;
             }
         }
     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/While.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/While.h
index 68a6b9fdfc..b4ce578bee 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/While.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/While.h
@@ -29,19 +29,16 @@ namespace ScriptCanvas
                 AZ::Outcome<DependencyReport, void> GetDependencies() const override;
 
                 SlotId GetLoopFinishSlotId() const override;
-                
+
                 SlotId GetLoopSlotId() const override;
-                
+
                 bool IsFormalLoop() const override;
 
-                
-                
             protected:
                 ConstSlotsOutcome GetSlotsInExecutionThreadByTypeImpl(const Slot& /*executionSlot*/, CombinedSlotType targetSlotType, const Slot* /*executionChildSlot*/) const override
                 {
                     return AZ::Success(GetSlotsByType(targetSlotType));
                 }
-
             };
         }
     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/AABBNode.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/AABBNode.h
deleted file mode 100644
index fb138194c5..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/AABBNode.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <ScriptCanvas/Core/NativeDatumNode.h>
-
-namespace ScriptCanvas
-{
-    namespace Nodes
-    {
-        namespace Math
-        {
-            class AABB
-                : public NativeDatumNode<AABB, Data::AABBType>
-            {
-            public:
-                using ParentType = NativeDatumNode<AABB, Data::AABBType>;
-                AZ_COMPONENT(AABB, "{AB0C2753-680E-47AD-8277-66B3AC01C659}", ParentType);
-
-                static void Reflect(AZ::ReflectContext* reflection)
-                {
-                    ParentType::Reflect(reflection);
-
-                    if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(reflection))
-                    {
-                        serializeContext->Class<AABB, ParentType>()
-                            ->Version(0)
-                            ;
-
-                        if (AZ::EditContext* editContext = serializeContext->GetEditContext())
-                        {
-                            editContext->Class<AABB>("AABB", "An axis-aligned bounding box value")
-                                ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/AABB.png")
-                                ;
-                        }
-                    }
-                }
-
-            };
-        }
-    }
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/CRCNode.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/CRCNode.h
deleted file mode 100644
index b1824d0e70..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/CRCNode.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <ScriptCanvas/Core/NativeDatumNode.h>
-
-namespace ScriptCanvas
-{
-    namespace Nodes
-    {
-        namespace Math
-        {
-            class CRC
-                : public NativeDatumNode<CRC, AZ::Crc32>
-            {
-            public:
-                using ParentType = NativeDatumNode<CRC, AZ::Crc32>;
-                AZ_COMPONENT(CRC, "{AC47D631-38C3-4B03-A987-425189D1D165}", ParentType);
-
-                static void Reflect(AZ::ReflectContext* reflection)
-                {
-                    ParentType::Reflect(reflection);
-
-                    if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(reflection))
-                    {
-                        serializeContext->Class<CRC, ParentType>()
-                            ->Version(0)
-                            ;
-
-                        if (AZ::EditContext* editContext = serializeContext->GetEditContext())
-                        {
-                            editContext->Class<CRC>("CRC", "A CRC value")
-                                ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/CRC.png")
-                                ;
-                        }
-                    }
-                }
-
-            };
-        }
-    }
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/ColorNode.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/ColorNode.h
deleted file mode 100644
index 84b9b38b69..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/ColorNode.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <ScriptCanvas/Core/NativeDatumNode.h>
-
-namespace ScriptCanvas
-{
-    namespace Nodes
-    {
-        namespace Math
-        {
-            class Color
-                : public NativeDatumNode<Color, Data::ColorType>
-            {
-            public:
-                using ParentType = NativeDatumNode<Color, Data::ColorType>;
-                AZ_COMPONENT(Color, "{26FBE6FF-C4B4-4D62-9474-3B2EE1B3E165}", ParentType);
-
-                static void Reflect(AZ::ReflectContext* reflection)
-                {
-                    ParentType::Reflect(reflection);
-
-                    if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(reflection))
-                    {
-                        serializeContext->Class<Color, ParentType>()
-                            ->Version(0)
-                            ;
-
-                        if (AZ::EditContext* editContext = serializeContext->GetEditContext())
-                        {
-                            editContext->Class<Color>("Color", "A four channel color value")
-                                ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Color.png")
-                                ;
-                        }
-                    }
-                }
-
-            };
-        }
-    }
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Divide.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Divide.h
index 7320fff037..fad147241a 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Divide.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Divide.h
@@ -51,21 +51,6 @@ namespace ScriptCanvas
                     nodeConfig.m_type = AZ::Uuid("DC17E19F-3829-410D-9A0B-AD60C6066DAA");
                     return nodeConfig;
                 }
-
-            protected:
-                Datum Evaluate(const Datum& lhs, const Datum& rhs) override
-                {
-                    const Data::NumberType lhsValue = *lhs.GetAs<Data::NumberType>();
-                    const Data::NumberType rhsValue = *rhs.GetAs<Data::NumberType>();
-
-                    if (AZ::IsClose(rhsValue, 0.0, 0.0001))
-                    {
-                        SCRIPTCANVAS_REPORT_ERROR((*this), "Divide by zero");
-                        return Datum();
-                    }
-
-                    return Datum(lhsValue / rhsValue);
-                }
             };
 
         }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Math.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Math.cpp
index 6fa228c3b9..fd3f325ee0 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Math.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Math.cpp
@@ -13,6 +13,26 @@
 
 namespace ScriptCanvas
 {
+    namespace Nodes
+    {
+        namespace Math
+        {
+            REFLECT_MATH_LIBRARY_TYPE(AABB, "{AB0C2753-680E-47AD-8277-66B3AC01C659}");
+            REFLECT_MATH_LIBRARY_TYPE(Color, "{6CC7B2F9-F551-4CB8-A713-4149959AE337}");
+            REFLECT_MATH_LIBRARY_TYPE(CRC, "{D8B65A5B-38FF-4B41-9FA4-FCA080D75625}");
+            REFLECT_MATH_LIBRARY_TYPE(Matrix3x3, "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}");
+            REFLECT_MATH_LIBRARY_TYPE(Matrix4x4, "{537AB179-E23C-492D-8EF7-53845A2DB163}");
+            REFLECT_MATH_LIBRARY_TYPE(OBB, "{8CBDA3B7-9DCD-4A04-A12C-123C322CA63A}");
+            REFLECT_MATH_LIBRARY_TYPE(Plane, "{F2C799DF-2CC1-4DD8-91DC-18C2D517BAB0}");
+            REFLECT_MATH_LIBRARY_TYPE(Quaternion, "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}");
+            REFLECT_MATH_LIBRARY_TYPE(Random, "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}");
+            REFLECT_MATH_LIBRARY_TYPE(Transform, "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}");
+            REFLECT_MATH_LIBRARY_TYPE(Vector2, "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}");
+            REFLECT_MATH_LIBRARY_TYPE(Vector3, "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}");
+            REFLECT_MATH_LIBRARY_TYPE(Vector4, "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}");
+        }
+    }
+
     namespace Library
     {
         void Math::Reflect(AZ::ReflectContext* reflection)
@@ -38,8 +58,8 @@ namespace ScriptCanvas
             {
                 using namespace ScriptCanvas::Nodes::Math;
                 SCRIPT_CANVAS_GENERICS_TO_VM(AABBNodes::Registrar, AABB, behaviorContext, AABBNodes::k_categoryName);
-                SCRIPT_CANVAS_GENERICS_TO_VM(CRCNodes::Registrar, CRC, behaviorContext, CRCNodes::k_categoryName);
                 SCRIPT_CANVAS_GENERICS_TO_VM(ColorNodes::Registrar, Color, behaviorContext, ColorNodes::k_categoryName);
+                SCRIPT_CANVAS_GENERICS_TO_VM(CRCNodes::Registrar, CRC, behaviorContext, CRCNodes::k_categoryName);
                 SCRIPT_CANVAS_GENERICS_TO_VM(MathNodes::Registrar, Math, behaviorContext, MathNodes::k_categoryName);
                 SCRIPT_CANVAS_GENERICS_TO_VM(Matrix3x3Nodes::Registrar, Matrix3x3, behaviorContext, Matrix3x3Nodes::k_categoryName);
                 SCRIPT_CANVAS_GENERICS_TO_VM(Matrix4x4Nodes::Registrar, Matrix4x4, behaviorContext, Matrix4x4Nodes::k_categoryName);
@@ -59,25 +79,12 @@ namespace ScriptCanvas
         void Math::InitNodeRegistry(NodeRegistry& nodeRegistry)
         {
             using namespace ScriptCanvas::Nodes::Math;
-            AddNodeToRegistry<Math, AABB>(nodeRegistry);
-            AddNodeToRegistry<Math, CRC>(nodeRegistry);
-            AddNodeToRegistry<Math, Color>(nodeRegistry);
+
             AddNodeToRegistry<Math, Divide>(nodeRegistry);
-            AddNodeToRegistry<Math, Matrix3x3>(nodeRegistry);
-            AddNodeToRegistry<Math, Matrix4x4>(nodeRegistry);
             AddNodeToRegistry<Math, MathExpression>(nodeRegistry);
             AddNodeToRegistry<Math, Multiply>(nodeRegistry);
-            AddNodeToRegistry<Math, Number>(nodeRegistry);
-            AddNodeToRegistry<Math, OBB>(nodeRegistry);
-            AddNodeToRegistry<Math, Plane>(nodeRegistry);           
-            AddNodeToRegistry<Math, Random>(nodeRegistry);
-            AddNodeToRegistry<Math, Quaternion>(nodeRegistry);
             AddNodeToRegistry<Math, Subtract>(nodeRegistry);
             AddNodeToRegistry<Math, Sum>(nodeRegistry);
-            AddNodeToRegistry<Math, Transform>(nodeRegistry);
-            AddNodeToRegistry<Math, Vector2>(nodeRegistry);
-            AddNodeToRegistry<Math, Vector3>(nodeRegistry);
-            AddNodeToRegistry<Math, Vector4>(nodeRegistry);
 
             AABBNodes::Registrar::AddToRegistry<Math>(nodeRegistry);
             ColorNodes::Registrar::AddToRegistry<Math>(nodeRegistry);
@@ -94,29 +101,15 @@ namespace ScriptCanvas
             Vector3Nodes::Registrar::AddToRegistry<Math>(nodeRegistry);
             Vector4Nodes::Registrar::AddToRegistry<Math>(nodeRegistry);
         }
-        
+
         AZStd::vector<AZ::ComponentDescriptor*> Math::GetComponentDescriptors()
         {
             AZStd::vector<AZ::ComponentDescriptor*> descriptors = {
-                ScriptCanvas::Nodes::Math::AABB::CreateDescriptor(),
-                ScriptCanvas::Nodes::Math::CRC::CreateDescriptor(),
-                ScriptCanvas::Nodes::Math::Color::CreateDescriptor(),
                 ScriptCanvas::Nodes::Math::Divide::CreateDescriptor(),
-                ScriptCanvas::Nodes::Math::Matrix3x3::CreateDescriptor(),
-                ScriptCanvas::Nodes::Math::Matrix4x4::CreateDescriptor(),
                 ScriptCanvas::Nodes::Math::MathExpression::CreateDescriptor(),
                 ScriptCanvas::Nodes::Math::Multiply::CreateDescriptor(),
-                ScriptCanvas::Nodes::Math::Number::CreateDescriptor(),
-                ScriptCanvas::Nodes::Math::OBB::CreateDescriptor(),
-                ScriptCanvas::Nodes::Math::Plane::CreateDescriptor(),
-                ScriptCanvas::Nodes::Math::Random::CreateDescriptor(),
-                ScriptCanvas::Nodes::Math::Quaternion::CreateDescriptor(),
                 ScriptCanvas::Nodes::Math::Subtract::CreateDescriptor(),
                 ScriptCanvas::Nodes::Math::Sum::CreateDescriptor(),
-                ScriptCanvas::Nodes::Math::Transform::CreateDescriptor(),
-                ScriptCanvas::Nodes::Math::Vector2::CreateDescriptor(),
-                ScriptCanvas::Nodes::Math::Vector3::CreateDescriptor(),
-                ScriptCanvas::Nodes::Math::Vector4::CreateDescriptor(),
             };
 
             AABBNodes::Registrar::AddDescriptors(descriptors);
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Math.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Math.h
index e9b39c582f..cc4795498a 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Math.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Math.h
@@ -10,34 +10,22 @@
 // This header is only meant to include the nodes and should not contain
 // shared code
 
-#include "AABBNode.h"
 #include "AABBNodes.h"
-#include "ColorNode.h"
 #include "ColorNodes.h"
-#include "CRCNode.h"
 #include "CRCNodes.h"
 #include "Divide.h"
 #include "MathGenerics.h"
 #include "MathRandom.h"
-#include "Matrix3x3Node.h"
 #include "Matrix3x3Nodes.h"
-#include "Matrix4x4Node.h"
 #include "Matrix4x4Nodes.h"
 #include "MathExpression.h"
 #include "Multiply.h"
-#include "Number.h"
-#include "OBBNode.h"
 #include "OBBNodes.h"
-#include "PlaneNode.h"
 #include "PlaneNodes.h"
-#include "Random.h"
-#include "Rotation.h"
 #include "RotationNodes.h"
 #include "Subtract.h"
 #include "Sum.h"
-#include "Transform.h"
 #include "TransformNodes.h"
-#include "Vector.h"
 #include "Vector2Nodes.h"
 #include "Vector3Nodes.h"
 #include "Vector4Nodes.h"
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathExpression.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathExpression.cpp
index 83cf0621fb..86fe9681e1 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathExpression.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathExpression.cpp
@@ -12,17 +12,6 @@ namespace ScriptCanvas
     {
         namespace Math
         {
-            void MathExpression::OnResult(const ExpressionEvaluation::ExpressionResult& result)
-            {
-                if (result.is<double>())
-                {
-                    Datum output;
-                    output.Set(AZStd::any_cast<double>(result));
-                    PushOutput(output, (*MathExpressionProperty::GetResultSlot(this)));
-                    SignalOutput(MathExpressionProperty::GetOutSlotId(this));
-                }
-            }
-
             ExpressionEvaluation::ParseOutcome MathExpression::ParseExpression(const AZStd::string& formatString)
             {
                 const AZStd::unordered_set<ExpressionEvaluation::ExpressionParserId> mathInterfaceSet = {
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathExpression.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathExpression.h
index 76d952b92c..eb091cc095 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathExpression.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathExpression.h
@@ -37,7 +37,6 @@ namespace ScriptCanvas
                     return AZ::Success(GetSlotsByType(targetSlotType));
                 }
 
-                void OnResult(const ExpressionEvaluation::ExpressionResult& result) override;
                 ExpressionEvaluation::ParseOutcome ParseExpression(const AZStd::string& formatString) override;
 
                 AZStd::string GetExpressionSeparator() const override;
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathGenerics.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathGenerics.h
index 1cd73b770c..baa287488d 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathGenerics.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathGenerics.h
@@ -42,5 +42,5 @@ namespace ScriptCanvas
             StringToNumberNode
         >;
     }
-} 
+}
 
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathNodeUtilities.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathNodeUtilities.cpp
index 5d652c2919..6deb1420e2 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathNodeUtilities.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathNodeUtilities.cpp
@@ -58,7 +58,7 @@ namespace ScriptCanvas
             AZ_Assert(randomEngineVar.IsConstructed(), "random engine is not initialized");
             return dis(randomEngineVar->m_randomEngine);
         }
-        
+
         AZ::s64 GetRandom(AZ::s64 lhs, AZ::s64 rhs)
         {
             if (lhs == rhs)
@@ -74,5 +74,5 @@ namespace ScriptCanvas
         }
 
     }
-} 
+}
 
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathNodeUtilities.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathNodeUtilities.h
index 1d5c18ecdf..4a6e7713e8 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathNodeUtilities.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathNodeUtilities.h
@@ -24,11 +24,11 @@ namespace ScriptCanvas
 
         template<int t_Index>
         AZ_INLINE void DefaultToleranceEpsilon(Node& node) { SetDefaultValuesByIndex<t_Index>::_(node, Data::ToleranceEpsilon()); }
-        
+
         Data::NumberType GetRandom(Data::NumberType lhs, Data::NumberType rhs);
 
-        AZ::s64 GetRandom(AZ::s64 lhs, AZ::s64 rhs); 
-                                
+        AZ::s64 GetRandom(AZ::s64 lhs, AZ::s64 rhs);
+
         template<typename NumberType>
         AZ_INLINE NumberType GetRandomIntegral(NumberType lhs, NumberType rhs)
         {
@@ -56,5 +56,5 @@ namespace ScriptCanvas
         void RandomEngineInit();
         void RandomEngineReset();
     }
-} 
+}
 
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathRandom.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathRandom.h
index 1e304dc898..74d1abb269 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathRandom.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathRandom.h
@@ -26,9 +26,9 @@ namespace ScriptCanvas
         AZ_INLINE Data::ColorType RandomColor(Data::ColorType minValue, Data::ColorType maxValue)
         {
             return Data::ColorType(MathNodeUtilities::GetRandomReal<float>(minValue.GetR(), maxValue.GetR()),
-                                    MathNodeUtilities::GetRandomReal<float>(minValue.GetG(), maxValue.GetG()),
-                                    MathNodeUtilities::GetRandomReal<float>(minValue.GetB(), maxValue.GetB()),
-                                    MathNodeUtilities::GetRandomReal<float>(minValue.GetA(), maxValue.GetA()));
+                MathNodeUtilities::GetRandomReal<float>(minValue.GetG(), maxValue.GetG()),
+                MathNodeUtilities::GetRandomReal<float>(minValue.GetB(), maxValue.GetB()),
+                MathNodeUtilities::GetRandomReal<float>(minValue.GetA(), maxValue.GetA()));
         }
 
         SCRIPT_CANVAS_GENERIC_FUNCTION_NODE_WITH_DEFAULTS(RandomColor, SetRandomColorDefaults, k_categoryName, "{0A984F40-322B-44A6-8753-6D2056A96659}", "Returns a random color [Min, Max]", "Min", "Max");
@@ -81,8 +81,8 @@ namespace ScriptCanvas
         {
             Data::Vector3Type halfDimensions = 0.5f * dimensions;
             Data::Vector3Type point(MathNodeUtilities::GetRandomReal<float>(-halfDimensions.GetX(), halfDimensions.GetX()),
-                                    MathNodeUtilities::GetRandomReal<float>(-halfDimensions.GetY(), halfDimensions.GetY()),
-                                    MathNodeUtilities::GetRandomReal<float>(-halfDimensions.GetZ(), halfDimensions.GetZ()));
+                MathNodeUtilities::GetRandomReal<float>(-halfDimensions.GetY(), halfDimensions.GetY()),
+                MathNodeUtilities::GetRandomReal<float>(-halfDimensions.GetZ(), halfDimensions.GetZ()));
             return point;
         }
         SCRIPT_CANVAS_GENERIC_FUNCTION_NODE_WITH_DEFAULTS(RandomPointInBox, SetRandomPointInBoxDefaults, k_categoryName, "{6785C5F8-2F87-4AD6-AE15-87FE5E72D142}", "returns a random point in a box", "Dimensions");
@@ -99,8 +99,8 @@ namespace ScriptCanvas
             float theta = MathNodeUtilities::GetRandomReal<float>(0.f, AZ::Constants::TwoPi - std::numeric_limits<float>::epsilon());
 
             Data::Vector3Type point(fRadius * cosf(theta),
-                                    fRadius * sinf(theta),
-                                    0.f);
+                fRadius * sinf(theta),
+                0.f);
             return point;
         }
         SCRIPT_CANVAS_GENERIC_FUNCTION_NODE_WITH_DEFAULTS(RandomPointOnCircle, SetRandomPointOnCircleDefaults, k_categoryName, "{2F079E35-216D-42B3-AA81-C9823F732893}", "returns a random point on the circumference of a circle", "Radius");
@@ -150,8 +150,8 @@ namespace ScriptCanvas
             float theta = MathNodeUtilities::GetRandomReal<float>(0.f, AZ::Constants::TwoPi - std::numeric_limits<float>::epsilon());
 
             Data::Vector3Type point(r * cosf(theta),
-                                    r * sinf(theta),
-                                    MathNodeUtilities::GetRandomReal<float>(fNegHalfHeight, fHalfHeight));
+                r * sinf(theta),
+                MathNodeUtilities::GetRandomReal<float>(fNegHalfHeight, fHalfHeight));
             return point;
         }
         SCRIPT_CANVAS_GENERIC_FUNCTION_NODE_WITH_DEFAULTS(RandomPointInCylinder, SetRandomPointInCylinderDefaults, k_categoryName, "{BD81133C-AAC0-44B0-9C9A-D06E780F4CCE}", "returns a random point in a cylinder", "Radius", "Height");
@@ -168,8 +168,8 @@ namespace ScriptCanvas
             float theta = MathNodeUtilities::GetRandomReal<float>(0.f, AZ::Constants::TwoPi - std::numeric_limits<float>::epsilon());
 
             Data::Vector3Type point(r * cosf(theta),
-                                    r * sinf(theta),
-                                    0.f);
+                r * sinf(theta),
+                0.f);
             return point;
         }
         SCRIPT_CANVAS_GENERIC_FUNCTION_NODE_WITH_DEFAULTS(RandomPointInCircle, SetRandomPointInCircleDefaults, k_categoryName, "{93378981-85DD-42B9-9D2D-826BE68BBE8F}", "returns a random point inside the area of a circle", "Radius");
@@ -234,8 +234,8 @@ namespace ScriptCanvas
         {
             Data::Vector2Type halfDimensions = 0.5f * dimensions;
             Data::Vector3Type point(MathNodeUtilities::GetRandomReal<float>(-halfDimensions.GetX(), halfDimensions.GetX()),
-                                    MathNodeUtilities::GetRandomReal<float>(-halfDimensions.GetY(), halfDimensions.GetY()),
-                                    0.f);
+                MathNodeUtilities::GetRandomReal<float>(-halfDimensions.GetY(), halfDimensions.GetY()),
+                0.f);
             return point;
         }
         SCRIPT_CANVAS_GENERIC_FUNCTION_NODE_WITH_DEFAULTS(RandomPointInSquare, SetRandomPointInSquareDefaults, k_categoryName, "{B81B4049-CBD2-460E-A4AB-155AB8FFDCB9}", "returns a random point in a square", "Dimensions");
@@ -295,7 +295,7 @@ namespace ScriptCanvas
         {
             float theta = MathNodeUtilities::GetRandomReal<float>(0.f, AZ::Constants::TwoPi - std::numeric_limits<float>::epsilon());
             return Data::Vector2Type(cosf(theta),
-                                        sinf(theta));
+                sinf(theta));
         }
         SCRIPT_CANVAS_GENERIC_FUNCTION_NODE(RandomUnitVector2, k_categoryName, "{02CE950A-06F8-485D-87E9-77FDE808B160}", "returns a random Vector2 direction");
 
@@ -324,7 +324,7 @@ namespace ScriptCanvas
         AZ_INLINE Data::Vector2Type RandomVector2(Data::Vector2Type minValue, Data::Vector2Type maxValue)
         {
             return Data::Vector2Type(MathNodeUtilities::GetRandomReal<float>(minValue.GetX(), maxValue.GetX()),
-                                        MathNodeUtilities::GetRandomReal<float>(minValue.GetY(), maxValue.GetY()));
+                MathNodeUtilities::GetRandomReal<float>(minValue.GetY(), maxValue.GetY()));
         }
         SCRIPT_CANVAS_GENERIC_FUNCTION_NODE_WITH_DEFAULTS(RandomVector2, SetRandomVector2Defaults, k_categoryName, "{6F9982F5-D6F6-4568-8A83-D5A35390D425}", "returns a random Vector2", "Min", "Max");
 
@@ -337,8 +337,8 @@ namespace ScriptCanvas
         AZ_INLINE Data::Vector3Type RandomVector3(Data::Vector3Type minValue, Data::Vector3Type maxValue)
         {
             return Data::Vector3Type(MathNodeUtilities::GetRandomReal<float>(minValue.GetX(), maxValue.GetX()),
-                                        MathNodeUtilities::GetRandomReal<float>(minValue.GetY(), maxValue.GetY()),
-                                        MathNodeUtilities::GetRandomReal<float>(minValue.GetZ(), maxValue.GetZ()));
+                MathNodeUtilities::GetRandomReal<float>(minValue.GetY(), maxValue.GetY()),
+                MathNodeUtilities::GetRandomReal<float>(minValue.GetZ(), maxValue.GetZ()));
         }
         SCRIPT_CANVAS_GENERIC_FUNCTION_NODE_WITH_DEFAULTS(RandomVector3, SetRandomVector3Defaults, k_categoryName, "{FF5526DC-E56D-4101-B7DE-4E7283E31B10}", "returns a random Vector3", "Min", "Max");
 
@@ -351,15 +351,15 @@ namespace ScriptCanvas
         AZ_INLINE Data::Vector4Type RandomVector4(Data::Vector4Type minValue, Data::Vector4Type maxValue)
         {
             return Data::Vector4Type(MathNodeUtilities::GetRandomReal<float>(minValue.GetX(), maxValue.GetX()),
-                                        MathNodeUtilities::GetRandomReal<float>(minValue.GetY(), maxValue.GetY()),
-                                        MathNodeUtilities::GetRandomReal<float>(minValue.GetZ(), maxValue.GetZ()),
-                                        MathNodeUtilities::GetRandomReal<float>(minValue.GetW(), maxValue.GetW()));
+                MathNodeUtilities::GetRandomReal<float>(minValue.GetY(), maxValue.GetY()),
+                MathNodeUtilities::GetRandomReal<float>(minValue.GetZ(), maxValue.GetZ()),
+                MathNodeUtilities::GetRandomReal<float>(minValue.GetW(), maxValue.GetW()));
         }
         SCRIPT_CANVAS_GENERIC_FUNCTION_NODE_WITH_DEFAULTS(RandomVector4, SetRandomVector4Defaults, k_categoryName, "{76FCA9CF-7BBF-471C-9D4A-67FE8E9C6298}", "returns a random Vector4", "Min", "Max");
 
         AZ_INLINE void SetRandomPointInArcDefaults(Node& node)
         {
-            SetDefaultValuesByIndex<0>::_(node, Data::Vector3Type(0.f,0.f,0.f));
+            SetDefaultValuesByIndex<0>::_(node, Data::Vector3Type(0.f, 0.f, 0.f));
             SetDefaultValuesByIndex<1>::_(node, Data::Vector3Type(1.f, 0.f, 0.f));
             SetDefaultValuesByIndex<2>::_(node, Data::Vector3Type(0.f, 0.f, 1.f));
             SetDefaultValuesByIndex<3>::_(node, Data::NumberType(1.0));
@@ -405,7 +405,7 @@ namespace ScriptCanvas
 
         SCRIPT_CANVAS_GENERIC_FUNCTION_NODE_WITH_DEFAULTS(RandomPointInWedge, SetRandomPointInWedgeDefaults, k_categoryName, "{F224DA37-240D-4ABB-A97A-3565197B94B4}", "returns a random point in the specified wedge", "Origin", "Direction", "Normal", "Radius", "Height", "Angle");
 
-        using Registrar = RegistrarGeneric<
+        using Registrar = RegistrarGeneric <
             RandomColorNode
             , RandomGrayscaleNode
             , RandomIntegerNode
@@ -427,6 +427,6 @@ namespace ScriptCanvas
             , RandomVector4Node
             , RandomPointInArcNode
             , RandomPointInWedgeNode
-        >;
+        > ;
     }
-} 
+}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Matrix3x3Node.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Matrix3x3Node.h
deleted file mode 100644
index 4417413567..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Matrix3x3Node.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <ScriptCanvas/Core/NativeDatumNode.h>
-#include <AzCore/Math/Matrix3x3.h>
-
-namespace ScriptCanvas
-{
-    namespace Nodes
-    {
-        namespace Math
-        {
-            class Matrix3x3
-                : public NativeDatumNode<Matrix3x3, AZ::Matrix3x3>
-            {
-            public:
-                using ParentType = NativeDatumNode<Matrix3x3, AZ::Matrix3x3>;
-                AZ_COMPONENT(Matrix3x3, "{9FDA1949-A74F-4D27-BBD0-8E6F165291FE}", ParentType);
-
-                static void Reflect(AZ::ReflectContext* reflection)
-                {
-                    ParentType::Reflect(reflection);
-
-                    if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(reflection))
-                    {
-                        serializeContext->Class<Matrix3x3, ParentType>()
-                            ->Version(0)
-                            ;
-
-                        if (AZ::EditContext* editContext = serializeContext->GetEditContext())
-                        {
-                            editContext->Class<Matrix3x3>("Matrix3x3", "A 3x3 matrix value")
-                                ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Matrix3x3.png")
-                                ;
-                        }
-                    }
-                }
-
-            };
-        }
-    }
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Matrix4x4Node.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Matrix4x4Node.h
deleted file mode 100644
index da7d5983f4..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Matrix4x4Node.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <ScriptCanvas/Core/NativeDatumNode.h>
-
-namespace ScriptCanvas
-{
-    namespace Nodes
-    {
-        namespace Math
-        {
-            class Matrix4x4
-                : public NativeDatumNode<Matrix4x4, AZ::Matrix4x4>
-            {
-            public:
-                using ParentType = NativeDatumNode<Matrix4x4, AZ::Matrix4x4>;
-                AZ_COMPONENT(Matrix4x4, "{CF059648-8BE5-4CC6-B909-4D3EBD945071}", ParentType);
-
-                static void Reflect(AZ::ReflectContext* reflection)
-                {
-                    ParentType::Reflect(reflection);
-
-                    if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(reflection))
-                    {
-                        serializeContext->Class<Matrix4x4, ParentType>()
-                            ->Version(0)
-                            ;
-
-                        if (AZ::EditContext* editContext = serializeContext->GetEditContext())
-                        {
-                            editContext->Class<Matrix4x4>("Matrix4x4", "A 4x4 matrix value")
-                                ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Matrix4x4.png")
-                                ;
-                        }
-                    }
-                }
-
-            };
-        }
-    }
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Multiply.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Multiply.h
index c0761502c0..76ccf3cd96 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Multiply.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Multiply.h
@@ -50,12 +50,6 @@ namespace ScriptCanvas
                     nodeConfig.m_type = AZ::Uuid("E9BB45A1-AE96-47B0-B2BF-2927D420A28C");
                     return nodeConfig;
                 }
-                
-            protected:
-                Datum Evaluate(const Datum& lhs, const Datum& rhs) override
-                {
-                    return Datum(*lhs.GetAs<Data::NumberType>() * *rhs.GetAs<Data::NumberType>());
-                }
             };
 
         }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Number.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Number.h
deleted file mode 100644
index 9639f1fce7..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Number.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <ScriptCanvas/Core/NativeDatumNode.h>
-
-namespace ScriptCanvas
-{
-    namespace Nodes
-    {
-        namespace Math
-        {
-            class Number
-                : public NativeDatumNode<Number, Data::NumberType>
-            {
-            public:
-                using ParentType = NativeDatumNode<Number, Data::NumberType>;
-                AZ_COMPONENT(Number, "{E1E746E9-2761-431E-9D06-717381F9822D}", ParentType);
-
-                static void Reflect(AZ::ReflectContext* reflection)
-                {
-                    if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(reflection))
-                    {
-                        serializeContext->Class<Number, PureData>()
-                            ->Version(3)
-                            ;
-
-                        if (AZ::EditContext* editContext = serializeContext->GetEditContext())
-                        {
-                            editContext->Class<Number>("Number", "A numeric value")
-                                ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Number.png")
-                                ;
-                        }
-                    }
-                }
-
-            };
-        }
-    }
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/OBBNode.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/OBBNode.h
deleted file mode 100644
index 24718c82f4..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/OBBNode.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <ScriptCanvas/Core/NativeDatumNode.h>
-
-namespace ScriptCanvas
-{
-    namespace Nodes
-    {
-        namespace Math
-        {
-            class OBB
-                : public NativeDatumNode<OBB, Data::OBBType>
-            {
-            public:
-                using ParentType = NativeDatumNode<OBB, Data::OBBType>;
-                AZ_COMPONENT(OBB, "{C63E8C27-412B-4CEE-959B-3D97E1D17370}", ParentType);
-
-                static void Reflect(AZ::ReflectContext* reflection)
-                {
-                    ParentType::Reflect(reflection);
-
-                    if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(reflection))
-                    {
-                        serializeContext->Class<OBB, ParentType>()
-                            ->Version(0)
-                            ;
-
-                        if (AZ::EditContext* editContext = serializeContext->GetEditContext())
-                        {
-                            editContext->Class<OBB>("OBB", "An oriented bounding box value")
-                                ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/OBB.png")
-                                ;
-                        }
-                    }
-                }
-
-            };
-        }
-    }
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/PlaneNode.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/PlaneNode.h
deleted file mode 100644
index c429eb1dc3..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/PlaneNode.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <ScriptCanvas/Core/NativeDatumNode.h>
-
-namespace ScriptCanvas
-{
-    namespace Nodes
-    {
-        namespace Math
-        {
-            class Plane
-                : public NativeDatumNode<Plane, Data::PlaneType>
-            {
-            public:
-                using ParentType = NativeDatumNode<Plane, Data::PlaneType>;
-                AZ_COMPONENT(Plane, "{A756E230-B4DC-42E7-A160-20A803CC8FA1}", ParentType);
-
-                static void Reflect(AZ::ReflectContext* reflection)
-                {
-                    ParentType::Reflect(reflection);
-
-                    if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(reflection))
-                    {
-                        serializeContext->Class<Plane, ParentType>()
-                            ->Version(0)
-                            ;
-
-                        if (AZ::EditContext* editContext = serializeContext->GetEditContext())
-                        {
-                            editContext->Class<Plane>("Plane", "A plane value according to the equation: Ax + By + Cz + D = 0")
-                                ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Plane.png")
-                                ;
-                        }
-                    }
-                }
-                
-            };
-        }
-    }
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Random.ScriptCanvasGrammar.xml b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Random.ScriptCanvasGrammar.xml
deleted file mode 100644
index d2f3aede03..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Random.ScriptCanvasGrammar.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<ScriptCanvas Include="Include/ScriptCanvas/Libraries/Math/Random.h" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <Class Name="Random"
-	       QualifiedName="ScriptCanvas::Nodes::Math::Random"
-	       PreferredClassName="Random"
-           Uuid="{7884F790-EA26-49AE-9168-D4C415C0D9C3}"
-           Base="ScriptCanvas::Node"
-           Category="Math/Random/Deprecated"
-           EditAttributes="AZ::Script::Attributes::ExcludeFrom@AZ::Script::Attributes::ExcludeFlags::All"
-           GeneratePropertyFriend="True"
-           Deprecated="True"
-           Description="Provides a random number in the range specified">
-        <In Name="In" Description="When signaled, execution is delayed at this node according to the specified properties." Contracts="DisallowReentrantExecutionContract"/>
-        <Out Name="Out" Description="Signaled when the delay reaches zero."/>
-        <Property Name="Min"
-                  Description=""
-                  Type="float"
-                  DefaultValue="0.f"
-                  IsInput="True"
-                  IsOutput="False" />
-        <Property Name="Max"
-                  Description=""
-                  Type="float"
-                  DefaultValue="1.f"
-                  IsInput="True"
-                  IsOutput="False" />
-        <Property Name="Result"
-                  Description="."
-                  Type="float"
-                  IsInput="False"
-                  IsOutput="True" />
-    </Class>
-</ScriptCanvas>
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Random.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Random.cpp
deleted file mode 100644
index dba370fa7c..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Random.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "Random.h"
-#include <Libraries/Math/MathNodeUtilities.h>
-
-namespace ScriptCanvas
-{
-    namespace Nodes
-    {
-        namespace Math
-        {
-         
-            void Random::OnInputSignal(const SlotId& slotId)
-            {
-                if (slotId == RandomProperty::GetInSlotId(this))
-                {
-                    const SlotId resultSlotId = RandomProperty::GetResultSlotId(this);
-
-                    if (Slot* resultSlot = GetSlot(resultSlotId))
-                    {
-                        float minValue = RandomProperty::GetMin(this);
-                        float maxValue = RandomProperty::GetMax(this);
-
-                        auto randVal = MathNodeUtilities::GetRandom(minValue, maxValue);
-
-                        Datum o(Data::Type::Number(), Datum::eOriginality::Copy);
-                        o.Set(randVal);
-                        PushOutput(o, *resultSlot);
-                    }
-                }
-
-                SignalOutput(RandomProperty::GetOutSlotId(this));
-            }
-
-        }
-    }
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Random.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Random.h
deleted file mode 100644
index a5cc7d1aa9..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Random.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-
-#include <Libraries/Core/BinaryOperator.h>
-
-#include <Include/ScriptCanvas/Libraries/Math/Random.generated.h>
-
-
-namespace ScriptCanvas
-{
-    namespace Nodes
-    {
-        namespace Math
-        {
-            //! Provides a random value within the specified range, uses std::uniform_real_distribution and std::mt19937
-            class Random
-                : public Node
-            {
-            public:
-
-                SCRIPTCANVAS_NODE(Random);
-
-                void OnInputSignal(const SlotId& slotId);
-
-            };
-        }
-    }
-}
-
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Rotation.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Rotation.h
deleted file mode 100644
index 9e23a206a1..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Rotation.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <ScriptCanvas/Core/NativeDatumNode.h>
-
-namespace ScriptCanvas
-{
-    namespace Nodes
-    {
-        namespace Math
-        {
-            class Quaternion
-                : public NativeDatumNode<Quaternion, Data::QuaternionType>
-            {
-            public:
-                using ParentType = NativeDatumNode<Quaternion, Data::QuaternionType>;
-                AZ_COMPONENT(Quaternion, "{E17FE11D-69F2-4746-B582-778B48D0BF47}", ParentType);
-
-                static void Reflect(AZ::ReflectContext* reflection)
-                {
-                    if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(reflection))
-                    {
-                        serializeContext->Class<Quaternion, PureData>()
-                            ->Version(0)
-                            ;
-
-                        if (AZ::EditContext* editContext = serializeContext->GetEditContext())
-                        {
-                            editContext->Class<Quaternion>("Quaternion", "imaginary(X, Y, Z), real W")
-                                ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Quaternion.png")
-                                ;
-                        }
-                    }
-                }
-
-            };
-        }
-    }
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/RotationNodes.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/RotationNodes.h
index 0f20bcf8c9..9cf3320767 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/RotationNodes.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/RotationNodes.h
@@ -20,7 +20,7 @@ namespace ScriptCanvas
         using namespace Data;
         using namespace MathNodeUtilities;
         static const char* k_categoryName = "Math/Quaternion";
-        
+
         AZ_INLINE QuaternionType Add(QuaternionType a, QuaternionType b)
         {
             return a + b;
@@ -106,7 +106,7 @@ namespace ScriptCanvas
             return QuaternionType::CreateFromVector3AndValue(imaginary, aznumeric_cast<float>(real));
         }
         SCRIPT_CANVAS_GENERIC_FUNCTION_NODE(FromVector3AndValue, k_categoryName, "{955FE6EB-7C38-4587-BBB7-9C886ACEAF94}", "returns a rotation with the imaginary elements from Imaginary and the real element from Real", "Imaginary", "Real");
-        
+
         AZ_INLINE NumberType GetElement(QuaternionType source, NumberType index)
         {
             return source.GetElement(AZ::GetClamp(aznumeric_cast<int>(index), 0, 3));
@@ -172,7 +172,7 @@ namespace ScriptCanvas
             return a.Lerp(b, aznumeric_cast<float>(t));
         }
         SCRIPT_CANVAS_GENERIC_FUNCTION_NODE(Lerp, k_categoryName, "{91CF1C54-89C6-4A00-A53D-20C58454C4EC}", "returns a the linear interpolation between From and To by the amount T", "From", "To", "T");
-        
+
         AZ_INLINE QuaternionType ModX(QuaternionType source, NumberType value)
         {
             source.SetX(aznumeric_cast<float>(value));
@@ -228,7 +228,7 @@ namespace ScriptCanvas
         AZ_INLINE std::tuple<QuaternionType, NumberType> NormalizeWithLength(QuaternionType source)
         {
             const float length = source.NormalizeWithLength();
-            return std::make_tuple( source, length );
+            return std::make_tuple(source, length);
         }
         SCRIPT_CANVAS_GENERIC_FUNCTION_MULTI_RESULTS_NODE(NormalizeWithLength, k_categoryName, "{E1A7F3F8-854E-4BA1-9DEA-7507BEC6D369}", "returns the normalized version of Source, and the length of Source", "Source", "Normalized", "Length");
 
@@ -249,7 +249,7 @@ namespace ScriptCanvas
             return QuaternionType::CreateRotationZ(AZ::DegToRad(aznumeric_caster(degrees)));
         }
         SCRIPT_CANVAS_GENERIC_FUNCTION_NODE(RotationZDegrees, k_categoryName, "{8BC8B0FE-51A1-4ECC-AFF1-A828A0FC8F8F}", "creates a rotation of Degrees around the z-axis", "Degrees");
-        
+
         AZ_INLINE QuaternionType ShortestArc(Vector3Type from, Vector3Type to)
         {
             return QuaternionType::CreateShortestArc(from, to);
@@ -279,7 +279,7 @@ namespace ScriptCanvas
             return aznumeric_caster(AZ::RadToDeg(source.GetAngle()));
         }
         SCRIPT_CANVAS_GENERIC_FUNCTION_NODE(ToAngleDegrees, k_categoryName, "{3EA78793-9AFA-4857-8CB8-CD0D47E97D25}", "returns the angle of angle-axis pair that Source represents in degrees", "Source");
-              
+
         AZ_INLINE Vector3Type ToImaginary(QuaternionType source)
         {
             return source.GetImaginary();
@@ -301,7 +301,7 @@ namespace ScriptCanvas
 
         SCRIPT_CANVAS_GENERIC_FUNCTION_NODE(RotateVector3, k_categoryName, "{DDF7C05C-7148-4860-93A3-D507C5896B6C}", "Returns a new Vector3 that is the source vector3 rotated by the given Quaternion", "Quaternion", "Vector");
 
-        using Registrar = RegistrarGeneric<
+        using Registrar = RegistrarGeneric <
             AddNode
             , ConjugateNode
             , ConvertTransformToRotationNode
@@ -369,5 +369,5 @@ namespace ScriptCanvas
         > ;
 
     }
-} 
+}
 
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Subtract.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Subtract.h
index ecffc724cc..65563bec0b 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Subtract.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Subtract.h
@@ -50,12 +50,6 @@ namespace ScriptCanvas
                     nodeConfig.m_type = AZ::Uuid("D0615D0A-027F-47F6-A02B-E35DAF22F431");
                     return nodeConfig;
                 }
-                
-            protected:
-                Datum Evaluate(const Datum& lhs, const Datum& rhs) override
-                {
-                    return Datum(*lhs.GetAs<Data::NumberType>() - *rhs.GetAs<Data::NumberType>());
-                }
             };
 
         }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Sum.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Sum.h
index ed53b66878..b7cf6757e2 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Sum.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Sum.h
@@ -24,7 +24,7 @@ namespace ScriptCanvas
                 AZ_COMPONENT(Sum, "{6C52B2D1-3526-4855-A217-5106D54F6B90}", ArithmeticExpression);
 
                 static void Reflect(AZ::ReflectContext* reflection)
-                { 
+                {
                     if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(reflection))
                     {
                         serializeContext->Class<Sum, ArithmeticExpression>()
@@ -52,12 +52,6 @@ namespace ScriptCanvas
                     nodeConfig.m_type = AZ::Uuid("C1B42FEC-0545-4511-9FAC-11E0387FEDF0");
                     return nodeConfig;
                 }
-                
-            protected:
-                Datum Evaluate(const Datum& lhs, const Datum& rhs) override
-                {
-                    return Datum(*lhs.GetAs<Data::NumberType>() + *rhs.GetAs<Data::NumberType>());
-                }
             };
         }
     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Transform.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Transform.h
deleted file mode 100644
index e4260966a9..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Transform.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <ScriptCanvas/Core/NativeDatumNode.h>
-
-namespace ScriptCanvas
-{
-    namespace Nodes
-    {
-        namespace Math
-        {
-            class Transform
-                : public NativeDatumNode<Transform, Data::TransformType>
-            {
-            public:
-                using ParentType = NativeDatumNode<Transform, Data::TransformType>;
-                AZ_COMPONENT(Transform, "{B74F127B-72E0-486B-86FF-2233767C2804}", ParentType);
-
-                static void Reflect(AZ::ReflectContext* reflection)
-                {
-                    if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(reflection))
-                    {
-                        serializeContext->Class<Transform, PureData>()
-                            ->Version(0)
-                            ;
-
-                        if (AZ::EditContext* editContext = serializeContext->GetEditContext())
-                        {
-                            editContext->Class<Transform>("Transform", "A 3D transform value")
-                                ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Transform.png")
-                                ;
-                        }
-                    }
-                }
-            };
-        }
-    }
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/TransformNodes.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/TransformNodes.h
index 0f0fdddcac..441be22702 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/TransformNodes.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/TransformNodes.h
@@ -24,7 +24,7 @@ namespace ScriptCanvas
         AZ_INLINE std::tuple<NumberType, TransformType> ExtractUniformScale(TransformType source)
         {
             auto scale(source.ExtractUniformScale());
-            return std::make_tuple( scale, source );
+            return std::make_tuple(scale, source);
         }
         SCRIPT_CANVAS_GENERIC_FUNCTION_MULTI_RESULTS_NODE(ExtractUniformScale, k_categoryName, "{8DFE5247-0950-4CD1-87E6-0CAAD42F1637}", "returns the uniform scale as a float, and a transform with the scale extracted ", "Source", "Uniform Scale", "Extracted");
 
@@ -114,7 +114,7 @@ namespace ScriptCanvas
             return source.IsFinite();
         }
         SCRIPT_CANVAS_GENERIC_FUNCTION_NODE(IsFinite, k_categoryName, "{B7D23934-0101-40B9-80E8-3D88C8580B25}", "returns true if every row of source is finite, else false", "Source");
-        
+
         AZ_INLINE BooleanType IsOrthogonal(const TransformType& source, NumberType tolerance)
         {
             return source.IsOrthogonal(aznumeric_cast<float>(tolerance));
@@ -139,7 +139,7 @@ namespace ScriptCanvas
             return source.TransformVector(multiplier);
         }
         SCRIPT_CANVAS_GENERIC_FUNCTION_NODE(Multiply3x3ByVector3, k_categoryName, "{4F2ABFC6-2E93-4A9D-8639-C7967DB318DB}", "returns Source's 3x3 upper matrix post multiplied by Multiplier", "Source", "Multiplier");
-        
+
         AZ_INLINE TransformType MultiplyByUniformScale(TransformType source, NumberType scale)
         {
             source.MultiplyByUniformScale(scale);
@@ -170,7 +170,7 @@ namespace ScriptCanvas
             return source.GetOrthogonalized();
         }
         SCRIPT_CANVAS_GENERIC_FUNCTION_NODE(Orthogonalize, k_categoryName, "{2B4140CD-6E22-44D3-BDB5-309E69FE7CC2}", "returns an orthogonal matrix if the Source is almost orthogonal", "Source");
-        
+
         AZ_INLINE TransformType RotationXDegrees(NumberType degrees)
         {
             return TransformType::CreateRotationX(AZ::DegToRad(aznumeric_caster(degrees)));
@@ -194,13 +194,13 @@ namespace ScriptCanvas
             return source.GetUniformScale();
         }
         SCRIPT_CANVAS_GENERIC_FUNCTION_NODE(ToScale, k_categoryName, "{063C58AD-F567-464D-A432-F298FE3953A6}", "returns the uniform scale of the Source", "Source");
-        
+
         using Registrar = RegistrarGeneric
-            < 
+            <
 #if ENABLE_EXTENDED_MATH_SUPPORT
-            ExtractUniformScaleNode ,
+            ExtractUniformScaleNode,
 #endif
-              FromMatrix3x3AndTranslationNode
+            FromMatrix3x3AndTranslationNode
             , FromMatrix3x3Node
             , FromRotationAndTranslationNode
             , FromRotationNode
@@ -245,8 +245,8 @@ namespace ScriptCanvas
             , TransposedMultiply3x3Node
             , ZeroNode
 #endif
-            >;
+            > ;
 
     }
-} 
+}
 
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Vector.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Vector.h
deleted file mode 100644
index af5054c45e..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Vector.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <ScriptCanvas/Core/NativeDatumNode.h>
-
-namespace ScriptCanvas
-{
-    namespace Nodes
-    {
-        namespace Math
-        {
-            class Vector2
-                : public NativeDatumNode<Vector2, AZ::Vector2>
-            {
-            public:
-                using ParentType = NativeDatumNode<Vector2, AZ::Vector2>;
-                AZ_COMPONENT(Vector2, "{EB647398-7F56-4727-9C7C-277593DB1F11}", ParentType);
-
-                static void Reflect(AZ::ReflectContext* reflection)
-                {
-                    ParentType::Reflect(reflection);
-
-                    if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(reflection))
-                    {
-                        serializeContext->Class<Vector2, ParentType>()
-                            ->Version(0)
-                            ;
-
-                        if (AZ::EditContext* editContext = serializeContext->GetEditContext())
-                        {
-                            editContext->Class<Vector2>("Vector2", "A 2D vector value")
-                                ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Vector.png")
-                                ;
-                        }
-                    }
-                }
-
-            };
-
-            class Vector3
-                : public NativeDatumNode<Vector3, AZ::Vector3>
-            {
-            public:
-                using ParentType = NativeDatumNode<Vector3, AZ::Vector3>;
-                AZ_COMPONENT(Vector3, "{95A12BDE-D4B4-47E8-A917-3E42F678E7FA}", ParentType);
-
-                static void Reflect(AZ::ReflectContext* reflection)
-                {
-                    ParentType::Reflect(reflection);
-
-                    if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(reflection))
-                    {
-                        serializeContext->Class<Vector3, ParentType>()
-                            ->Version(0)
-                            ;
-
-                        if (AZ::EditContext* editContext = serializeContext->GetEditContext())
-                        {
-                            editContext->Class<Vector3>("Vector3", "A 3D vector value")
-                                ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Vector.png")
-                                ;
-                        }
-                    }
-                }
-
-            };
-
-            class Vector4
-                : public NativeDatumNode<Vector4, AZ::Vector4>
-            {
-            public:
-                using ParentType = NativeDatumNode<Vector4, AZ::Vector4>;
-                AZ_COMPONENT(Vector4, "{9CAE50A1-C575-4DFC-95C5-FA0A12DABCBD}", ParentType);
-
-                static void Reflect(AZ::ReflectContext* reflection)
-                {
-                    ParentType::Reflect(reflection);
-
-                    if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(reflection))
-                    {
-                        serializeContext->Class<Vector4, ParentType>()
-                            ->Version(0)
-                            ;
-
-                        if (AZ::EditContext* editContext = serializeContext->GetEditContext())
-                        {
-                            editContext->Class<Vector4>("Vector4", "A 4D vector value")
-                                ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Vector.png")
-                                ;
-                        }
-                    }
-                }
-
-            };
-        }
-    }
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Vector2Nodes.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Vector2Nodes.h
index a807243f92..68fc2e729e 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Vector2Nodes.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Vector2Nodes.h
@@ -165,7 +165,7 @@ namespace ScriptCanvas
             return a.GetMin(b);
         }
         SCRIPT_CANVAS_GENERIC_FUNCTION_NODE(Min, k_categoryName, "{815685B8-B877-4D54-9E11-D0161185B4B9}", "returns the vector (min(A.x, B.x), min(A.y, B.y))", "A", "B");
-        
+
         AZ_INLINE Vector2Type SetX(Vector2Type source, NumberType value)
         {
             source.SetX(aznumeric_caster(value));
@@ -242,7 +242,7 @@ namespace ScriptCanvas
         }
         SCRIPT_CANVAS_GENERIC_FUNCTION_NODE(ToPerpendicular, k_categoryName, "{CC4DC102-8B50-4828-BA94-0586F34E0D37}", "returns the vector (-Source.y, Source.x), a 90 degree, positive rotation", "Source");
 
-        using Registrar = RegistrarGeneric<
+        using Registrar = RegistrarGeneric <
             AbsoluteNode
             , AddNode
             , AngleNode
@@ -294,8 +294,8 @@ namespace ScriptCanvas
             , SlerpNode
             , SubtractNode
             , ToPerpendicularNode
-        >;
+        > ;
 
     }
-} 
+}
 
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Vector3Nodes.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Vector3Nodes.h
index a74ae45e67..3c6f4a65e7 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Vector3Nodes.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Vector3Nodes.h
@@ -33,14 +33,14 @@ namespace ScriptCanvas
             return lhs + rhs;
         }
         SCRIPT_CANVAS_GENERIC_FUNCTION_NODE_DEPRECATED(Add, k_categoryName, "{0F554E23-9AB6-4D17-A517-C885ECD024F0}", "This node is deprecated, use Add (+), it provides contextual type and slots", "A", "B");
-        
+
         AZ_INLINE Vector3Type AngleMod(const Vector3Type source)
         {
             return source.GetAngleMod();
         }
         SCRIPT_CANVAS_GENERIC_FUNCTION_NODE(AngleMod, k_categoryName, "{BF5C12A8-F42D-43E7-9CE3-D16D30B182D2}", "wraps the angle in each element into the range [-pi, pi]", "Source")
 
-        AZ_INLINE std::tuple<Vector3Type, Vector3Type> BuildTangentBasis(Vector3Type source)
+            AZ_INLINE std::tuple<Vector3Type, Vector3Type> BuildTangentBasis(Vector3Type source)
         {
             std::tuple<Vector3Type, Vector3Type> tangentBitangent;
             source.NormalizeSafe();
@@ -48,13 +48,13 @@ namespace ScriptCanvas
             return tangentBitangent;
         }
         SCRIPT_CANVAS_GENERIC_FUNCTION_MULTI_RESULTS_NODE(BuildTangentBasis, k_categoryName, "{3EBA365F-063A-45A0-BDD1-ED0F995AD310}", "returns a tangent basis from the normal", "Normal", "Tangent", "Bitangent");
-                
+
         AZ_INLINE Vector3Type Clamp(const Vector3Type source, const Vector3Type min, const Vector3Type max)
         {
             return source.GetClamp(min, max);
         }
         SCRIPT_CANVAS_GENERIC_FUNCTION_NODE(Clamp, k_categoryName, "{28305F88-0940-43C8-B0A8-B8CEB3B0B82A}", "returns vector clamped to [min, max] and equal to source if possible", "Source", "Min", "Max");
-        
+
         AZ_INLINE Vector3Type Cosine(const Vector3Type source)
         {
             return source.GetCos();
@@ -66,7 +66,7 @@ namespace ScriptCanvas
             return lhs.Cross(rhs);
         }
         SCRIPT_CANVAS_GENERIC_FUNCTION_NODE(Cross, k_categoryName, "{6FAF4ACA-A100-4B71-ACF8-F1DB4674F51C}", "returns the vector cross product of A X B", "A", "B");
-                
+
         AZ_INLINE Vector3Type CrossXAxis(const Vector3Type source)
         {
             return source.CrossXAxis();
@@ -120,7 +120,7 @@ namespace ScriptCanvas
             return lhs.Dot(rhs);
         }
         SCRIPT_CANVAS_GENERIC_FUNCTION_NODE(Dot, k_categoryName, "{5DFA6260-C044-4798-A55C-3CF5F3DB45CE}", "returns the vector dot product of A dot B", "A", "B");
-                
+
         AZ_INLINE Vector3Type FromElement(Vector3Type source, const NumberType index, const NumberType value)
         {
             source.SetElement(AZ::GetClamp(aznumeric_cast<int>(index), 0, 2), aznumeric_cast<float>(value));
@@ -200,7 +200,7 @@ namespace ScriptCanvas
             return from.Lerp(to, aznumeric_cast<float>(t));
         }
         SCRIPT_CANVAS_GENERIC_FUNCTION_NODE(Lerp, k_categoryName, "{AA063267-DA0F-4407-9356-30B4E89A9FA4}", "returns the linear interpolation (From + ((To - From) * T)", "From", "To", "T");
-                
+
         AZ_INLINE Vector3Type Max(const Vector3Type a, const Vector3Type b)
         {
             return a.GetMax(b);
@@ -297,7 +297,7 @@ namespace ScriptCanvas
             return std::make_tuple(sin, cos);
         }
         SCRIPT_CANVAS_GENERIC_FUNCTION_MULTI_RESULTS_NODE(SineCosine, k_categoryName, "{04EE253D-680D-4F95-A451-837EAE104E88}", "returns a vector from the sine of each element from the source, and from the cosine of each element from the source", "Source", "Sine", "Cosine");
-        
+
         AZ_INLINE Vector3Type Slerp(const Vector3Type from, const Vector3Type to, const NumberType t)
         {
             return from.Slerp(to, aznumeric_cast<float>(t));
@@ -328,7 +328,7 @@ namespace ScriptCanvas
         }
         SCRIPT_CANVAS_GENERIC_FUNCTION_NODE(ZAxisCross, k_categoryName, "{29206E84-392C-412E-9DD5-781B2759260D}", "returns the vector cross product of Z-Axis X Source", "Source");
 
-        using Registrar = RegistrarGeneric<
+        using Registrar = RegistrarGeneric <
             AbsoluteNode
             , AddNode
 
@@ -409,8 +409,8 @@ namespace ScriptCanvas
             , ZAxisCrossNode
 #endif
 
-        >;
+        > ;
 
     }
-} 
+}
 
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Vector4Nodes.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Vector4Nodes.h
index c8ce20fe14..284582be57 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Vector4Nodes.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Vector4Nodes.h
@@ -74,13 +74,13 @@ namespace ScriptCanvas
             return Vector4Type(aznumeric_cast<float>(x), aznumeric_cast<float>(y), aznumeric_cast<float>(z), aznumeric_cast<float>(w));
         }
         SCRIPT_CANVAS_GENERIC_FUNCTION_NODE(FromValues, k_categoryName, "{725D79B8-1CB1-4473-8480-4DE584C75540}", "returns a vector from elements", "X", "Y", "Z", "W");
-        
+
         AZ_INLINE Vector4Type FromVector3AndNumber(Vector3Type source, const NumberType w)
         {
             return Vector4Type::CreateFromVector3AndFloat(source, aznumeric_cast<float>(w));
         }
         SCRIPT_CANVAS_GENERIC_FUNCTION_NODE(FromVector3AndNumber, k_categoryName, "{577E2B26-BEC1-4CC7-B23B-5172ED1BFF6E}", "returns a vector with x,y,z from Source and w from W", "Source", "W");
-                
+
         AZ_INLINE NumberType GetElement(const Vector4Type source, const NumberType index)
         {
             return source.GetElement(AZ::GetClamp(aznumeric_cast<int>(index), 0, 3));
@@ -99,7 +99,7 @@ namespace ScriptCanvas
             return source;
         }
         SCRIPT_CANVAS_GENERIC_FUNCTION_NODE(Homogenize, k_categoryName, "{9A3FAB19-0442-44A5-8454-12003BA146EE}", "returns a vector with all components divided by the w element", "Source");
-        
+
         AZ_INLINE BooleanType IsClose(const Vector4Type a, const Vector4Type b, NumberType tolerance)
         {
             return a.IsClose(b, aznumeric_cast<float>(tolerance));
@@ -212,8 +212,8 @@ namespace ScriptCanvas
             return lhs - rhs;
         }
         SCRIPT_CANVAS_GENERIC_FUNCTION_NODE_DEPRECATED(Subtract, k_categoryName, "{A5FA6465-9C39-4A44-BD7C-E8ECF9503E46}", "This node is deprecated, use Subtract (-), it provides contextual type and slots", "A", "B");
-                        
-        using Registrar = RegistrarGeneric<
+
+        using Registrar = RegistrarGeneric <
             AbsoluteNode,
             AddNode,
             DivideByNumberNode,
@@ -260,8 +260,8 @@ namespace ScriptCanvas
 
             ReciprocalNode,
             SubtractNode
-        >;
+        > ;
 
     }
-} 
+}
 
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorAt.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorAt.cpp
index 6b5b2770de..ed676034d8 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorAt.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorAt.cpp
@@ -91,70 +91,6 @@ namespace ScriptCanvas
                     }
                 }
             }
-
-            void OperatorAt::KeyNotFound(const Datum* containerDatum)
-            {
-                Datum defaultDatum;
-                AZStd::vector<AZ::Uuid> types = ScriptCanvas::Data::GetContainedTypes(GetSourceAZType());
-
-                int index = Data::IsMapContainerType(containerDatum->GetType()) ? 1 : 0;
-
-                Data::Type type = Data::FromAZType(types[index]);
-                defaultDatum.SetType(type);
-
-                PushOutput(defaultDatum, *GetSlot(*m_outputSlots.begin()));
-                SignalOutput(GetSlotId("Key Not Found"));
-            }
-
-            void OperatorAt::InvokeOperator()
-            {
-                Slot* inputSlot = GetFirstInputSourceSlot();
-
-                if (inputSlot)
-                {
-                    SlotId sourceSlotId = inputSlot->GetId();
-                    const Datum* containerDatum = FindDatum(sourceSlotId);
-                    
-                    if (Datum::IsValidDatum(containerDatum))
-                    {
-                        const Datum* inputKeyDatum = FindDatum(*m_inputSlots.begin());
-                        AZ::Outcome<Datum, AZStd::string> valueOutcome = BehaviorContextMethodHelper::CallMethodOnDatumUnpackOutcomeSuccess(*containerDatum, "At", *inputKeyDatum);
-                        if (!valueOutcome.IsSuccess())
-                        {
-                            KeyNotFound(containerDatum);
-                            return;
-                        }
-
-                        if (Data::IsVectorContainerType(containerDatum->GetType()))
-                        {
-                            PushOutput(valueOutcome.TakeValue(), *GetSlot(*m_outputSlots.begin()));
-                            SignalOutput(GetSlotId("Out"));
-                        }
-                        else if (Data::IsSetContainerType(containerDatum->GetType()) || Data::IsMapContainerType(containerDatum->GetType()))
-                        {
-                            Datum keyDatum = valueOutcome.TakeValue();
-                            if (keyDatum.Empty())
-                            {
-                                KeyNotFound(containerDatum);
-                            }
-                            else
-                            {
-                                PushOutput(keyDatum, *GetSlot(*m_outputSlots.begin()));
-                                SignalOutput(GetSlotId("Out"));
-                            }
-                        }
-                    }
-                }
-            }
-
-            void OperatorAt::OnInputSignal(const SlotId& slotId)
-            {
-                const SlotId inSlotId = OperatorBaseProperty::GetInSlotId(this);
-                if (slotId == inSlotId)
-                {
-                    InvokeOperator();
-                }
-            }
         }
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorAt.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorAt.h
index e20de1a02b..ceae2211a0 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorAt.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorAt.h
@@ -36,9 +36,6 @@ namespace ScriptCanvas
 
                 void ConfigureContracts(SourceType sourceType, AZStd::vector<ContractDescriptor>& contractDescs) override;
                 void OnSourceTypeChanged() override;
-                void OnInputSignal(const SlotId& slotId) override;
-                void InvokeOperator();
-                void KeyNotFound(const Datum* containerDatum);
             };
 
         }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorBack.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorBack.cpp
index 99607c37f3..658c561c8b 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorBack.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorBack.cpp
@@ -41,50 +41,13 @@ namespace ScriptCanvas
                         slotConfiguration.m_toolTip = "The value at the specified index";
                         slotConfiguration.m_displayGroup = GetSourceDisplayGroup();
                         slotConfiguration.SetType(type);
-                        slotConfiguration.SetConnectionType(ConnectionType::Output);                        
+                        slotConfiguration.SetConnectionType(ConnectionType::Output);
 
                         m_outputSlots.insert(AddSlot(slotConfiguration));
                     }
                 }
             }
 
-            void OperatorBack::InvokeOperator()
-            {
-                const SlotSet& slotSets = GetSourceSlots();
-
-                if (!slotSets.empty())
-                {
-                    SlotId sourceSlotId = (*slotSets.begin());
-                    const Datum* containerDatum = FindDatum(sourceSlotId);
-
-                    if (Datum::IsValidDatum(containerDatum))
-                    {
-                        const Datum* inputKeyDatum = FindDatum(*m_inputSlots.begin());
-                        AZ::Outcome<Datum, AZStd::string> valueOutcome = BehaviorContextMethodHelper::CallMethodOnDatumUnpackOutcomeSuccess(*containerDatum, "Back", *inputKeyDatum);
-                        if (!valueOutcome.IsSuccess())
-                        {
-                            SCRIPTCANVAS_REPORT_ERROR((*this), "Failed to call Back on container: %s", valueOutcome.GetError().c_str());
-                            return;
-                        }
-
-                        if (Data::IsVectorContainerType(containerDatum->GetType()))
-                        {
-                            PushOutput(valueOutcome.TakeValue(), *GetSlot(*m_outputSlots.begin()));
-                        }
-                    }
-                }
-
-                SignalOutput(GetSlotId("Out"));
-            }
-
-            void OperatorBack::OnInputSignal(const SlotId& slotId)
-            {
-                const SlotId inSlotId = OperatorBaseProperty::GetInSlotId(this);
-                if (slotId == inSlotId)
-                {
-                    InvokeOperator();
-                }
-            }
         }
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorBack.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorBack.h
index 41c4b2cbc1..068043975f 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorBack.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorBack.h
@@ -35,10 +35,7 @@ namespace ScriptCanvas
 
                 void ConfigureContracts(SourceType sourceType, AZStd::vector<ContractDescriptor>& contractDescs) override;
                 void OnSourceTypeChanged() override;
-                void OnInputSignal(const SlotId& slotId) override;
-                void InvokeOperator();
             };
-
         }
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorClear.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorClear.cpp
index 36890c9720..38118ed8c1 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorClear.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorClear.cpp
@@ -67,36 +67,6 @@ namespace ScriptCanvas
                 }
                 ////
             }
-
-            void OperatorClear::OnInputSignal(const SlotId& slotId)
-            {
-                const SlotId inSlotId = OperatorBaseProperty::GetInSlotId(this);
-
-                if (slotId != inSlotId)
-                {
-                    return;
-                }
-
-                SlotId sourceSlotId = OperatorClearProperty::GetSourceSlotId(this);
-
-                if (const Datum* containerDatum = FindDatum(sourceSlotId))
-                {
-                    if (Datum::IsValidDatum(containerDatum))
-                    {
-                        AZ::Outcome<Datum, AZStd::string> clearOutcome = BehaviorContextMethodHelper::CallMethodOnDatum(*containerDatum, "Clear");
-                        if (!clearOutcome.IsSuccess())
-                        {
-                            SCRIPTCANVAS_REPORT_ERROR((*this), "Failed to call Clear on container: %s", clearOutcome.GetError().c_str());
-                            return;
-                        }
-
-                        // Push the source container as an output to support chaining
-                        PushOutput(*containerDatum, *OperatorClearProperty::GetContainerSlot(this));
-                    }
-                }
-
-                SignalOutput(GetSlotId("Out"));
-            }
         }
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorClear.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorClear.h
index a0ccad1379..2b7e24682f 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorClear.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorClear.h
@@ -41,10 +41,6 @@ namespace ScriptCanvas
                 OperatorClear() = default;
 
                 void OnInit() override;
-
-            protected:
-
-                void OnInputSignal(const SlotId& slotId) override;
             };
 
         }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorEmpty.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorEmpty.cpp
index 71ee545397..e62b671268 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorEmpty.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorEmpty.cpp
@@ -70,49 +70,6 @@ namespace ScriptCanvas
                 }
                 ////
             }
-
-            void OperatorEmpty::OnInputSignal(const SlotId& slotId)
-            {
-                const SlotId inSlotId = OperatorEmptyProperty::GetInSlotId(this);
-                if (slotId == inSlotId)
-                {
-                    SlotId sourceSlotId = OperatorEmptyProperty::GetSourceSlotId(this);
-
-                    const Datum* containerDatum = FindDatum(sourceSlotId);
-
-                    if (Datum::IsValidDatum(containerDatum))
-                    {
-                        // Is the container empty?
-                        auto emptyOutcome = BehaviorContextMethodHelper::CallMethodOnDatum(*containerDatum, "Empty");
-                        if (!emptyOutcome)
-                        {
-                            SCRIPTCANVAS_REPORT_ERROR((*this), "Failed to call Empty on container: %s", emptyOutcome.GetError().c_str());
-                            return;
-                        }
-
-                        Datum emptyResult = emptyOutcome.TakeValue();
-                        bool isEmpty = *emptyResult.GetAs<bool>();
-
-                        PushOutput(Datum(isEmpty), *GetSlot(OperatorEmptyProperty::GetIsEmptySlotId(this)));
-
-                        if (isEmpty)
-                        {
-                            SignalOutput(OperatorEmptyProperty::GetTrueSlotId(this));
-                        }
-                        else
-                        {
-                            SignalOutput(OperatorEmptyProperty::GetFalseSlotId(this));
-                        }
-                    }
-                    else
-                    {
-                        PushOutput(Datum(true), *GetSlot(OperatorEmptyProperty::GetIsEmptySlotId(this)));
-                        SignalOutput(OperatorEmptyProperty::GetFalseSlotId(this));
-                    }
-
-                    SignalOutput(OperatorEmptyProperty::GetOutSlotId(this));
-                }
-            }
         }
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorEmpty.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorEmpty.h
index 5cc26c126e..148142d3c8 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorEmpty.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorEmpty.h
@@ -21,22 +21,15 @@ namespace ScriptCanvas
             class OperatorEmpty : public Node
             {
             public:
-
                 SCRIPTCANVAS_NODE(OperatorEmpty);
 
-
                 void CustomizeReplacementNode(Node* replacementNode, AZStd::unordered_map<SlotId, AZStd::vector<SlotId>>& outSlotIdMap) const override;
 
                 static bool OperatorEmptyVersionConverter(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement);
 
                 OperatorEmpty() = default;
 
-                // Node...
                 void OnInit() override;
-                ////
-
-                void OnInputSignal(const SlotId& slotId) override;
-
             };
         }
     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorErase.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorErase.cpp
index 15328b42fb..92c753c5b8 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorErase.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorErase.cpp
@@ -95,47 +95,6 @@ namespace ScriptCanvas
                 }
             }
 
-            void OperatorErase::InvokeOperator()
-            {
-                Slot* inputSlot = GetFirstInputSourceSlot();
-                Slot* outputSlot = GetFirstOutputSourceSlot();
-
-                if (inputSlot && outputSlot)
-                {
-                    SlotId sourceSlotId = inputSlot->GetId();
-                    const Datum* containerDatum = FindDatum(sourceSlotId);
-
-                    if (Datum::IsValidDatum(containerDatum))
-                    {
-                        const Datum* inputKeyDatum = FindDatum(*m_inputSlots.begin());
-                        AZ::Outcome<Datum, AZStd::string> valueOutcome = BehaviorContextMethodHelper::CallMethodOnDatum(*containerDatum, "Erase", *inputKeyDatum);
-
-                        if (valueOutcome.IsSuccess())
-                        {
-                            // Push the source container as an output to support chaining
-                            PushOutput(*containerDatum, (*outputSlot));
-
-                            auto outcomeInnerResult = valueOutcome.GetValue().GetAs< AZ::Outcome<void, void>>();
-                            if (outcomeInnerResult && !outcomeInnerResult->IsSuccess())
-                            {
-                                SignalOutput(GetSlotId("Element Not Found"));
-                                return;
-                            }
-                        }
-                    }
-                }
-
-                SignalOutput(GetSlotId("Out"));
-            }
-
-            void OperatorErase::OnInputSignal(const SlotId& slotId)
-            {
-                const SlotId inSlotId = OperatorBaseProperty::GetInSlotId(this);
-                if (slotId == inSlotId)
-                {
-                    InvokeOperator();
-                }
-            }
         }
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorErase.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorErase.h
index dc5d8c4c0c..95ddfcb275 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorErase.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorErase.h
@@ -39,8 +39,6 @@ namespace ScriptCanvas
 
                 void ConfigureContracts(SourceType sourceType, AZStd::vector<ContractDescriptor>& contractDescs) override;
                 void OnSourceTypeChanged() override;
-                void OnInputSignal(const SlotId& slotId) override;
-                void InvokeOperator();
 
             private:
                 bool m_missedElementNotFound = false;
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorFront.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorFront.cpp
index 794ee8aeb0..bd97e4cd4e 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorFront.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorFront.cpp
@@ -46,43 +46,6 @@ namespace ScriptCanvas
                 }
             }
 
-            void OperatorFront::InvokeOperator()
-            {
-                const SlotSet& slotSets = GetSourceSlots();
-
-                if (!slotSets.empty())
-                {
-                    SlotId sourceSlotId = (*slotSets.begin());
-                    const Datum* containerDatum = FindDatum(sourceSlotId);
-
-                    if (Datum::IsValidDatum(containerDatum))
-                    {
-                        const Datum* inputKeyDatum = FindDatum(*m_inputSlots.begin());
-                        AZ::Outcome<Datum, AZStd::string> valueOutcome = BehaviorContextMethodHelper::CallMethodOnDatumUnpackOutcomeSuccess(*containerDatum, "Front", *inputKeyDatum);
-                        if (!valueOutcome.IsSuccess())
-                        {
-                            SCRIPTCANVAS_REPORT_ERROR((*this), "Failed to call Front on container: %s", valueOutcome.GetError().c_str());
-                            return;
-                        }
-
-                        if (Data::IsVectorContainerType(containerDatum->GetType()))
-                        {
-                            PushOutput(valueOutcome.TakeValue(), *GetSlot(*m_outputSlots.begin()));
-                        }
-                    }
-                }
-
-                SignalOutput(GetSlotId("Out"));
-            }
-
-            void OperatorFront::OnInputSignal(const SlotId& slotId)
-            {
-                const SlotId inSlotId = OperatorBaseProperty::GetInSlotId(this);
-                if (slotId == inSlotId)
-                {
-                    InvokeOperator();
-                }
-            }
         }
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorFront.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorFront.h
index cb41f6a479..64ea312f5d 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorFront.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorFront.h
@@ -35,10 +35,7 @@ namespace ScriptCanvas
 
                 void ConfigureContracts(SourceType sourceType, AZStd::vector<ContractDescriptor>& contractDescs) override;
                 void OnSourceTypeChanged() override;
-                void OnInputSignal(const SlotId& slotId) override;
-                void InvokeOperator();
             };
-
         }
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorInsert.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorInsert.cpp
index bce98a6776..7628aa10cc 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorInsert.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorInsert.cpp
@@ -50,7 +50,7 @@ namespace ScriptCanvas
                         slotConfiguration.m_name = Data::GetName(type);
                         slotConfiguration.m_displayGroup = GetSourceDisplayGroup();
                         slotConfiguration.SetType(type);
-                        slotConfiguration.SetConnectionType(ConnectionType::Input);                        
+                        slotConfiguration.SetConnectionType(ConnectionType::Input);
 
                         m_inputSlots.insert(AddSlot(slotConfiguration));
                     }
@@ -84,108 +84,6 @@ namespace ScriptCanvas
                 }
             }
 
-            void OperatorInsert::InvokeOperator()
-            {
-                Slot* inputSlot = GetFirstInputSourceSlot();
-                Slot* outputSlot = GetFirstOutputSourceSlot();
-
-                if (inputSlot && outputSlot)
-                {
-                    SlotId sourceSlotId = inputSlot->GetId();
-                    const Datum* containerDatum = FindDatum(sourceSlotId);
-
-                    if (Datum::IsValidDatum(containerDatum))
-                    {
-                        AZ::BehaviorMethod* method = GetOperatorMethod("Insert");
-                        AZ_Assert(method, "The contract must have failed because you should not be able to invoke an operator for a type that does not have the method");
-
-                        AZStd::array<AZ::BehaviorValueParameter, BehaviorContextMethodHelper::MaxCount> params;
-
-                        AZ::BehaviorValueParameter* paramFirst(params.begin());
-                        AZ::BehaviorValueParameter* paramIter = paramFirst;
-
-                        if (Data::IsVectorContainerType(GetSourceAZType()))
-                        {
-                            // Container
-                            auto behaviorParameter = method->GetArgument(0);
-                            AZ::Outcome<AZ::BehaviorValueParameter, AZStd::string> param0 = containerDatum->ToBehaviorValueParameter(*behaviorParameter);
-                            paramIter->Set(param0.GetValue());
-                            ++paramIter;
-
-                            // Get the size of the container
-                            auto sizeOutcome = BehaviorContextMethodHelper::CallMethodOnDatum(*containerDatum, "Size");
-                            if (!sizeOutcome)
-                            {
-                                SCRIPTCANVAS_REPORT_ERROR((*this), "Failed to get size of container: %s", sizeOutcome.GetError().c_str());
-                                return;
-                            }
-
-                            auto inputSlotIterator = m_inputSlots.begin();
-
-                            // Index
-                            behaviorParameter = method->GetArgument(1);
-                            const Datum* indexDatum = FindDatum(*inputSlotIterator);
-                            AZ::Outcome<AZ::BehaviorValueParameter, AZStd::string> param2 = indexDatum->ToBehaviorValueParameter(*behaviorParameter);
-
-                            paramIter->Set(param2.GetValue());
-                            ++paramIter;
-
-                            // Value to insert
-                            behaviorParameter = method->GetArgument(2);
-                            ++inputSlotIterator;
-                            const Datum* inputDatum = FindDatum(*inputSlotIterator);
-                            AZ::Outcome<AZ::BehaviorValueParameter, AZStd::string> param1 = inputDatum->ToBehaviorValueParameter(*behaviorParameter);
-                            paramIter->Set(param1.GetValue());
-                            ++paramIter;
-                        }
-                        else if (Data::IsMapContainerType(GetSourceAZType()))
-                        {
-                            auto inputSlotIterator = m_inputSlots.begin();
-                            const Datum* keyDatum = FindDatum(*inputSlotIterator++);
-                            const Datum* valueDatum = FindDatum(*inputSlotIterator);
-
-                            if (keyDatum && valueDatum)
-                            {
-                                // Container
-                                const AZ::BehaviorParameter* behaviorParameter = method->GetArgument(0);
-                                AZ::Outcome<AZ::BehaviorValueParameter, AZStd::string> param0 = containerDatum->ToBehaviorValueParameter(*behaviorParameter);
-                                paramIter->Set(param0.GetValue());
-                                ++paramIter;
-
-                                // Key
-                                behaviorParameter = method->GetArgument(1);
-                                AZ::Outcome<AZ::BehaviorValueParameter, AZStd::string> param1 = keyDatum->ToBehaviorValueParameter(*behaviorParameter);
-                                paramIter->Set(param1.GetValue());
-                                ++paramIter;
-
-                                // Value to insert
-                                behaviorParameter = method->GetArgument(2);
-                                AZ::Outcome<AZ::BehaviorValueParameter, AZStd::string> param2 = valueDatum->ToBehaviorValueParameter(*behaviorParameter);
-                                paramIter->Set(param2.GetValue());
-                                ++paramIter;
-                            }
-                        }
-
-                        AZStd::vector<SlotId> resultSlotIDs;
-                        resultSlotIDs.push_back();
-                        BehaviorContextMethodHelper::Call(*this, false, method, paramFirst, paramIter, resultSlotIDs);
-
-                        // Push the source container as an output to support chaining
-                        PushOutput(*containerDatum, (*outputSlot));
-                    }
-                }
-
-                SignalOutput(GetSlotId("Out"));
-            }
-
-            void OperatorInsert::OnInputSignal(const SlotId& slotId)
-            {
-                const SlotId inSlotId = OperatorBaseProperty::GetInSlotId(this);
-                if (slotId == inSlotId)
-                {
-                    InvokeOperator();
-                }
-            }
         }
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorInsert.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorInsert.h
index 970c8ab780..0fda9b0654 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorInsert.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorInsert.h
@@ -33,9 +33,6 @@ namespace ScriptCanvas
 
                 void ConfigureContracts(SourceType sourceType, AZStd::vector<ContractDescriptor>& contractDescs) override;
                 void OnSourceTypeChanged() override;
-                void OnInputSignal(const SlotId& slotId) override;
-                void InvokeOperator();
-
             };
         }
     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorPushBack.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorPushBack.cpp
index e449d04d34..cf8eb306c4 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorPushBack.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorPushBack.cpp
@@ -42,73 +42,6 @@ namespace ScriptCanvas
                     m_inputSlots.insert(AddSlot(slotConfiguration));
                 }
             }
-
-            void OperatorPushBack::InvokeOperator()
-            {
-                Slot*  inputSlot = GetFirstInputSourceSlot();
-                Slot*  outputSlot = GetFirstOutputSourceSlot();                
-
-                if (inputSlot && outputSlot)
-                {
-                    const Datum* containerDatum = FindDatum(inputSlot->GetId());
-
-                    if (Datum::IsValidDatum(containerDatum))
-                    {
-                        AZ::BehaviorMethod* method = GetOperatorMethod("PushBack");
-                        AZ_Assert(method, "The contract must have failed because you should not be able to invoke an operator for a type that does not have the method");
-
-                        AZStd::array<AZ::BehaviorValueParameter, BehaviorContextMethodHelper::MaxCount> params;
-
-                        AZ::BehaviorValueParameter* paramFirst(params.begin());
-                        AZ::BehaviorValueParameter* paramIter = paramFirst;
-
-                        if (Data::IsVectorContainerType(GetSourceAZType()))
-                        {
-                            // Container
-                            auto behaviorParameter = method->GetArgument(0);
-
-                            AZ::Outcome<AZ::BehaviorValueParameter, AZStd::string> param0 = containerDatum->ToBehaviorValueParameter(*behaviorParameter);
-                            paramIter->Set(param0.GetValue());
-                            ++paramIter;
-
-                            const auto& inputSlotIterator = m_inputSlots.begin();
-
-                            // Value to push
-                            behaviorParameter = method->GetArgument(1);
-                            const Datum* inputDatum = FindDatum(*inputSlotIterator);
-                            AZ_Assert(inputDatum, "Unable to GetInput for Input slot Id");
-                            if (inputDatum)
-                            {
-                                AZ::Outcome<AZ::BehaviorValueParameter, AZStd::string> param1 = inputDatum->ToBehaviorValueParameter(*behaviorParameter);
-                                paramIter->Set(param1.GetValue());
-                                ++paramIter;
-                            }
-                        }
-                        else if (Data::IsMapContainerType(GetSourceAZType()))
-                        {
-                            SCRIPTCANVAS_REPORT_ERROR((*this), "PushBack is not a supported operation on maps");
-                            return;
-                        }
-
-                        AZStd::vector<SlotId> resultSlotIDs;
-                        resultSlotIDs.push_back();
-                        BehaviorContextMethodHelper::Call(*this, false, method, paramFirst, paramIter, resultSlotIDs);
-
-                        PushOutput(*containerDatum, (*outputSlot));
-                    }
-                }
-
-                SignalOutput(GetSlotId("Out"));
-            }
-
-            void OperatorPushBack::OnInputSignal(const SlotId& slotId)
-            {
-                const SlotId inSlotId = OperatorBaseProperty::GetInSlotId(this);
-                if (slotId == inSlotId)
-                {
-                    InvokeOperator();
-                }
-            }
         }
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorPushBack.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorPushBack.h
index 695d6a6f93..5f74dd9dc9 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorPushBack.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorPushBack.h
@@ -32,9 +32,6 @@ namespace ScriptCanvas
 
                 void ConfigureContracts(SourceType sourceType, AZStd::vector<ContractDescriptor>& contractDescs) override;
                 void OnSourceTypeChanged() override;
-                void OnInputSignal(const SlotId& slotId) override;
-                void InvokeOperator();
-
             };
         }
     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorSize.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorSize.cpp
index 29c5e61a21..f24bfb2890 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorSize.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorSize.cpp
@@ -66,7 +66,7 @@ namespace ScriptCanvas
                     AZ::SerializeContext::DataElementNode baseNodeElement = operatorBaseClass->GetSubElement(nodeElementIndex);
 
                     classElement.RemoveElementByName(AZ::Crc32("BaseClass1"));
-                    classElement.AddElement(baseNodeElement);                    
+                    classElement.AddElement(baseNodeElement);
                 }
 
                 return true;
@@ -85,42 +85,6 @@ namespace ScriptCanvas
                 }
                 ////
             }
-
-            void OperatorSize::OnInputSignal(const SlotId& slotId)
-            {
-                const SlotId inSlotId = OperatorSizeProperty::GetInSlotId(this);
-                if (slotId == inSlotId)
-                {
-
-                    SlotId sourceSlotId = OperatorSizeProperty::GetSourceSlotId(this);
-                    SlotId sizeSlotId = OperatorSizeProperty::GetSizeSlotId(this);
-
-                    const Datum* containerDatum = FindDatum(sourceSlotId);
-
-                    if (Datum::IsValidDatum(containerDatum))
-                    {
-                        // Get the size of the container
-                        auto sizeOutcome = BehaviorContextMethodHelper::CallMethodOnDatum(*containerDatum, "Size");
-                        if (!sizeOutcome)
-                        {
-                            SCRIPTCANVAS_REPORT_ERROR((*this), "Failed to get size of container: %s", sizeOutcome.GetError().c_str());
-                            return;
-                        }
-
-                        // Index
-                        Datum sizeResult = sizeOutcome.TakeValue();
-
-                        PushOutput(sizeResult, *GetSlot(sizeSlotId));                        
-                    }
-                    else
-                    {
-                        Datum zero(0);
-                        PushOutput(zero, *GetSlot(sizeSlotId));
-                    }
-
-                    SignalOutput(OperatorSizeProperty::GetOutSlotId(this));
-                }
-            }
         }
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorSize.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorSize.h
index 3199b09ebd..c323977d33 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorSize.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorSize.h
@@ -33,10 +33,7 @@ namespace ScriptCanvas
                 // Node...
                 void OnInit() override;
                 ////
-
-                void OnInputSignal(const SlotId& slotId) override;
-
-            }; 
+            };
         }
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorAdd.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorAdd.cpp
index a82e8f9871..0eaf7a9a85 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorAdd.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorAdd.cpp
@@ -45,13 +45,13 @@ namespace ScriptCanvas
                 Data::ColorType operator()(const Data::ColorType& lhs, const Datum& rhs)
                 {
                     const AZ::Color* dataRhs = rhs.GetAs<AZ::Color>();
-                    
+
                     float a = AZ::GetClamp<float>(lhs.GetA(), 0.f, 1.f) + AZ::GetClamp<float>(dataRhs->GetA(), 0.f, 1.f);
                     float r = AZ::GetClamp<float>(lhs.GetR(), 0.f, 1.f) + AZ::GetClamp<float>(dataRhs->GetR(), 0.f, 1.f);
                     float g = AZ::GetClamp<float>(lhs.GetG(), 0.f, 1.f) + AZ::GetClamp<float>(dataRhs->GetG(), 0.f, 1.f);
                     float b = AZ::GetClamp<float>(lhs.GetB(), 0.f, 1.f) + AZ::GetClamp<float>(dataRhs->GetB(), 0.f, 1.f);
 
-                    return AZ::Color(r, g, b, a);                    
+                    return AZ::Color(r, g, b, a);
                 }
             };
 
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorArithmetic.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorArithmetic.cpp
index 7d6fb74768..a1dcbbc0e7 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorArithmetic.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorArithmetic.cpp
@@ -55,68 +55,6 @@ namespace ScriptCanvas
                 }
             }
 
-            void OperatorArithmetic::OnInputSignal([[maybe_unused]] const SlotId& slotId)
-            {
-                AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::ScriptCanvas);
-
-                if (!m_scrapedInputs)
-                    {
-                    m_scrapedInputs = true;
-
-                        AZStd::vector< Slot* > groupedSlots = GetSlotsWithDynamicGroup(GetArithmeticDynamicTypeGroup());
-
-                    SlotId fallbackId;
-
-                        for (Slot* groupedSlot : groupedSlots)
-                        {
-                            if (groupedSlot->IsInput())
-                            {
-                                SlotId groupedSlotId = groupedSlot->GetId();
-
-                            if (!fallbackId.IsValid())
-                                {
-                                fallbackId = groupedSlotId;
-                            }
-
-                            if ((groupedSlot->IsVariableReference() && groupedSlot->GetVariableReference().IsValid()) || IsConnected(groupedSlotId) || IsValidArithmeticSlot(groupedSlotId))
-                            {
-                                const Datum* inputDatum = groupedSlot->FindDatum();
-
-                                if (inputDatum && inputDatum->GetType().IsValid() && inputDatum->GetType().GetType() != Data::eType::BehaviorContextObject)
-                                {
-                                    m_applicableInputs.emplace_back(inputDatum);
-                                }
-                                }
-                            }
-                            else if (groupedSlot->IsOutput())
-                            {
-                            m_resultSlot = groupedSlot;
-                            }
-
-                        m_outSlot = GetSlotByName("Out")->GetId();
-                    }
-
-                    // If none of our inputs are valid input slots. Just use the first one we found to fall into a default use case.
-                    if (m_applicableInputs.empty())
-                    {
-                        const Datum* inputDatum = FindDatum(fallbackId);
-
-                        if (inputDatum && inputDatum->GetType().IsValid())
-                        {
-                            m_applicableInputs.emplace_back(inputDatum);
-                        }
-                            }
-
-                    if (!m_applicableInputs.empty())
-                    {
-                        const Datum* datum = m_applicableInputs.front();
-                        m_result.SetType(datum->GetType());
-                        }
-                    }
-
-                    InvokeOperator();
-                }
-
             void OperatorArithmetic::OnConfigured()
             {
                 auto slotList = GetSlotsWithDynamicGroup(GetArithmeticDynamicTypeGroup());
@@ -135,7 +73,7 @@ namespace ScriptCanvas
             {
                 // Version conversion for previous elements                
                 for (Slot& currentSlot : ModSlots())
-                {                    
+                {
                     if (currentSlot.IsData())
                     {
                         auto& contracts = currentSlot.GetContracts();
@@ -151,7 +89,7 @@ namespace ScriptCanvas
                                     contract->SetSupportedOperator(OperatorFunction());
                                     contract->SetSupportedNativeTypes(GetSupportedNativeDataTypes());
                                 }
-                            }                            
+                            }
                         }
 
                         if (!currentSlot.IsDynamicSlot())
@@ -172,17 +110,17 @@ namespace ScriptCanvas
             void OperatorArithmetic::OnActivate()
             {
                 if (m_scrapedInputs)
-            {
+                {
                     m_scrapedInputs = false;
                     m_applicableInputs.clear();
 
-                    m_result.ReconfigureDatumTo(AZStd::move(ScriptCanvas::Datum()));                    
+                    m_result.ReconfigureDatumTo(AZStd::move(ScriptCanvas::Datum()));
                 }
             }
 
             void OperatorArithmetic::ConfigureVisualExtensions()
             {
-            {
+                {
                     VisualExtensionSlotConfiguration visualExtensions(VisualExtensionSlotConfiguration::VisualExtensionType::ExtenderSlot);
 
                     visualExtensions.m_name = "Add Operand";
@@ -212,12 +150,12 @@ namespace ScriptCanvas
 
             bool OperatorArithmetic::CanDeleteSlot(const SlotId& slotId) const
             {
-                Slot* slot = GetSlot(slotId);            
+                Slot* slot = GetSlot(slotId);
 
                 if (slot && slot->GetDynamicGroup() == GetArithmeticDynamicTypeGroup())
                 {
                     if (!slot->IsOutput())
-                    {                        
+                    {
                         auto slotList = GetSlotsWithDynamicGroup(GetArithmeticDynamicTypeGroup());
 
                         int inputCount = 0;
@@ -247,14 +185,14 @@ namespace ScriptCanvas
                 }
                 else if (operands.size() == 1)
                 {
-                const Datum* operand = operands.front();
+                    const Datum* operand = operands.front();
                     result = (*operand);
                     return;
                 }
 
                 auto type = result.GetType();
-                    Operator(type.GetType(), operands, result);
-                }
+                Operator(type.GetType(), operands, result);
+            }
 
             void OperatorArithmetic::Operator(Data::eType type, const ArithmeticOperands& operands, Datum& result)
             {
@@ -269,20 +207,6 @@ namespace ScriptCanvas
                 AZ_UNUSED(dataType);
             }
 
-            void OperatorArithmetic::InvokeOperator()
-            {
-                if (!m_result.GetType().IsValid())
-                {
-                    return;
-                }
-
-                Evaluate(m_applicableInputs, m_result);
-
-                PushOutput(m_result, (*m_resultSlot));
-
-                SignalOutput(m_outSlot);
-            }
-
             SlotId OperatorArithmetic::CreateSlot(AZStd::string_view name, AZStd::string_view toolTip, ConnectionType connectionType)
             {
                 DynamicDataSlotConfiguration slotConfiguration;
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorArithmetic.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorArithmetic.h
index 716c9111af..86a5b17c52 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorArithmetic.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorArithmetic.h
@@ -65,7 +65,7 @@ namespace ScriptCanvas
                 AZ::Crc32 GetArithmeticExtensionId() const { return AZ_CRC("AddnewValueExtension", 0xea20301c); }
                 AZ::Crc32 GetArithmeticDynamicTypeGroup() const { return AZ_CRC("ArithmeticGroup", 0x4271e41f); }
                 AZStd::string GetArithmeticDisplayGroup() const { return "ArithmeticGroup"; }
-                
+
                 virtual AZStd::string_view OperatorFunction() const { return ""; }
                 virtual AZStd::unordered_set< Data::Type > GetSupportedNativeDataTypes() const
                 {
@@ -81,15 +81,14 @@ namespace ScriptCanvas
                         Data::Type::Matrix4x4()
                     };
                 }
-                
+
                 // Node
                 void OnSlotDisplayTypeChanged(const SlotId& slotId, const Data::Type& dataType) override final;
                 void OnDynamicGroupDisplayTypeChanged(const AZ::Crc32& dynamicGroup, const Data::Type& dataType) override final;
-                void OnInputSignal(const SlotId& slotId) override;
-                
+
                 void OnConfigured() override;
                 void OnInit() override;
-                void OnActivate() override;                
+                void OnActivate() override;
                 void ConfigureVisualExtensions() override;
 
                 SlotId HandleExtension(AZ::Crc32 extensionId) override;
@@ -101,7 +100,6 @@ namespace ScriptCanvas
 
                 virtual void Operator(Data::eType type, const ArithmeticOperands& operands, Datum& result);
                 virtual void InitializeSlot(const SlotId& slotId, const Data::Type& dataType);
-                virtual void InvokeOperator();
 
                 //////////////////////////////////////////////////////////////////////////
                 // Translation
@@ -130,7 +128,7 @@ namespace ScriptCanvas
                 Slot* m_resultSlot;
                 SlotId m_outSlot;
             };
-            
+
             //! Deprecated: kept here for version conversion
             class OperatorArithmeticUnary : public OperatorArithmetic
             {
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorDiv.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorDiv.cpp
index b50d06e9e9..8d26ad221f 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorDiv.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorDiv.cpp
@@ -27,7 +27,7 @@ namespace ScriptCanvas
                 Type operator()(const Type& a, const Datum& b)
                 {
                     const Type* dataB = b.GetAs<Type>();
-                    
+
                     const Type& divisor = (*dataB);
                     if (AZ::IsClose(divisor, Type(0), std::numeric_limits<Type>::epsilon()))
                     {
@@ -35,7 +35,7 @@ namespace ScriptCanvas
                         return Type(0);
                     }
 
-                    return a / divisor;                    
+                    return a / divisor;
                 }
 
             private:
@@ -65,9 +65,9 @@ namespace ScriptCanvas
                             SCRIPTCANVAS_REPORT_ERROR((*m_node), "Divide by Zero");
                             return VectorType(0);
                         }
-                    }                    
-                    
-                    return a / (*divisor);                    
+                    }
+
+                    return a / (*divisor);
                 }
 
                 OperatorDivVectorTypes(Node* node)
@@ -114,7 +114,7 @@ namespace ScriptCanvas
                 {
                     const AZ::Color* dataA = lhs.GetAs<AZ::Color>();
                     const AZ::Color* dataB = rhs.GetAs<AZ::Color>();
-                    
+
                     if (dataB->IsClose(AZ::Color(), std::numeric_limits<float>::epsilon()))
                     {
                         // Divide by zero
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorDiv.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorDiv.h
index 61121ff85d..37089fe5ec 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorDiv.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorDiv.h
@@ -33,7 +33,7 @@ namespace ScriptCanvas
 
             protected:
 
-                void InitializeSlot(const SlotId& slotId, const ScriptCanvas::Data::Type& dataType) override;                
+                void InitializeSlot(const SlotId& slotId, const ScriptCanvas::Data::Type& dataType) override;
                 bool IsValidArithmeticSlot(const SlotId& slotId) const override;
 
                 void OnResetDatumToDefaultValue(ModifiableDatumView& datumView) override;
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorDivideByNumber.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorDivideByNumber.cpp
index 27a8e5f846..9ba4a7f4ae 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorDivideByNumber.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorDivideByNumber.cpp
@@ -104,98 +104,6 @@ namespace ScriptCanvas
                 }
             }
 
-            void OperatorDivideByNumber::OnInputSignal(const SlotId& slotId)
-            {
-                if (slotId != OperatorDivideByNumberProperty::GetInSlotId(this))
-                {
-                    return;
-                }
-
-                Data::Type type = GetDisplayType(AZ::Crc32("DivideGroup"));
-
-                if (!type.IsValid())
-                {
-                    return;
-                }
-
-                const Datum* operand = FindDatum(m_operandId);
-
-                if (operand == nullptr)
-                {
-                    SCRIPTCANVAS_REPORT_ERROR((*this), "Operand is nullptr");
-                    return;
-                }
-
-                const float divisorValue = aznumeric_cast<float>(OperatorDivideByNumberProperty::GetDivisor(this));
-
-                if (AZ::IsClose(divisorValue, 0.f, std::numeric_limits<float>::epsilon()))
-                {
-                    SCRIPTCANVAS_REPORT_ERROR((*this), "Division by zero");
-                    return;
-                }
-
-                Datum result;
-
-                switch (type.GetType())
-                {
-                case Data::eType::Number:
-                {
-                    const Data::NumberType* number = operand->GetAs<Data::NumberType>();
-                    Data::NumberType resultValue = (*number) / divisorValue;
-                    result = Datum(resultValue);
-                }
-                break;
-                case Data::eType::Vector2:
-                {
-                    const Data::Vector2Type* vector = operand->GetAs<Data::Vector2Type>();
-                    AZ::Vector2 resultValue = (*vector) / divisorValue;
-                    result = Datum(resultValue);
-                }
-                break;
-                case Data::eType::Vector3:
-                {
-                    const Data::Vector3Type* vector = operand->GetAs<Data::Vector3Type>();
-                    AZ::Vector3 resultValue = (*vector) / divisorValue;
-                    result = Datum(resultValue);
-                }
-                break;
-                case Data::eType::Vector4:
-                {
-                    const Data::Vector4Type* vector = operand->GetAs<Data::Vector4Type>();
-                    AZ::Vector4 resultValue = (*vector) / divisorValue;
-                    result = Datum(resultValue);
-                }
-                break;
-                case Data::eType::Quaternion:
-                {
-                    const Data::QuaternionType* quaternion = operand->GetAs<Data::QuaternionType>();
-                    Data::QuaternionType resultValue = (*quaternion) / divisorValue;
-                    result = Datum(resultValue);
-                }
-                break;
-                case Data::eType::Matrix3x3:
-                {
-                    const Data::Matrix3x3Type* matrix = operand->GetAs<Data::Matrix3x3Type>();
-                    Data::Matrix3x3Type resultValue = (*matrix) / divisorValue;
-                    result = Datum(resultValue);
-                }
-                break;
-                case Data::eType::Color:
-                {
-                    const Data::ColorType *color = operand->GetAs<Data::ColorType>();
-                    Data::ColorType resultValue = (*color) / divisorValue;
-                    result = Datum(resultValue);
-                }
-                break;
-                default:
-                    result = Datum();
-                    AZ_Error("Script Canvas", false, "Divide by Number does not support the provided data type.");
-                    break;
-                }
-
-                PushOutput(result, (*OperatorDivideByNumberProperty::GetResultSlot(this)));
-                SignalOutput(OperatorDivideByNumberProperty::GetOutSlotId(this));
-            }
         }
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorDivideByNumber.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorDivideByNumber.h
index 10df09a42e..c1eb08fddc 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorDivideByNumber.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorDivideByNumber.h
@@ -19,9 +19,9 @@ namespace ScriptCanvas
 #define DIVIDABLE_TYPES { Data::Type::Number(), Data::Type::Vector2(), Data::Type::Vector3(), Data::Type::Vector4() }
 
             //! Deprecated: see MethodOverloaded for "Divide by Number (/)"
-            class OperatorDivideByNumber 
+            class OperatorDivideByNumber
                 : public Node
-            {                
+            {
             public:
 
                 SCRIPTCANVAS_NODE(OperatorDivideByNumber);
@@ -42,7 +42,6 @@ namespace ScriptCanvas
 
                 // Nodes...
                 void OnInit() override;
-                void OnInputSignal(const SlotId& slotId) override;
                 ////
 
             protected:
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLength.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLength.cpp
index b52b6d8da2..9cde2d7322 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLength.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLength.cpp
@@ -70,58 +70,6 @@ namespace ScriptCanvas
                     ConfigureSlots();
                 }
             }
-
-            void OperatorLength::OnInputSignal(const SlotId& slotId)
-            {
-                if (slotId != OperatorLengthProperty::GetInSlotId(this))
-                {
-                    return;
-                }
-
-                Data::Type type = GetDisplayType(AZ::Crc32("SourceGroup"));
-
-                if (!type.IsValid())
-                {
-                    return;
-                }
-
-                Datum result;
-                const Datum* operand = FindDatum(OperatorLengthProperty::GetSourceSlotId(this));
-
-                switch (type.GetType())
-                {
-                case Data::eType::Vector2:
-                {
-                    const AZ::Vector2* vector = operand->GetAs<AZ::Vector2>();
-                    result = Datum(vector->GetLength());
-                }
-                break;
-                case Data::eType::Vector3:
-                {
-                    const AZ::Vector3* vector = operand->GetAs<AZ::Vector3>();
-                    result = Datum(vector->GetLength());
-                }
-                break;
-                case Data::eType::Vector4:
-                {
-                    const AZ::Vector4* vector = operand->GetAs<AZ::Vector4>();
-                    result = Datum(vector->GetLength());
-                }
-                break;
-                case Data::eType::Quaternion:
-                {
-                    const AZ::Quaternion* vector = operand->GetAs<AZ::Quaternion>();
-                    result = Datum(vector->GetLength());
-                }
-                break;
-                default:
-                    AZ_Assert(false, "Length operator not defined for type: %s", Data::ToAZType(type).ToString<AZStd::string>().c_str());
-                    break;
-                }
-
-                PushOutput(result, (*OperatorLengthProperty::GetLengthSlot(this)));
-                SignalOutput(OperatorLengthProperty::GetOutSlotId(this));
-            }
         }
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLength.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLength.h
index f49c384439..188d8c2583 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLength.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLength.h
@@ -38,10 +38,7 @@ namespace ScriptCanvas
                 OperatorLength() = default;
                 ~OperatorLength() = default;
 
-                // Node...
                 void OnInit() override;
-                void OnInputSignal(const SlotId& slotId) override;
-                ////
 
             };
         }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerp.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerp.cpp
index 079073fa64..43b1be3f6d 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerp.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerp.cpp
@@ -25,7 +25,7 @@ namespace ScriptCanvas
             SlotId stepId = LerpBetweenProperty::GetStepSlotId(this);
 
             if (stepId.IsValid())
-            {                
+            {
                 for (const SlotId& slotId : { m_startSlotId, m_stopSlotId, m_speedSlotId, stepId })
                 {
                     Slot* slot = GetSlot(slotId);
@@ -51,133 +51,10 @@ namespace ScriptCanvas
             ////////
         }
 
-        void LerpBetween::OnDeactivate()
-        {
-            AZ::SystemTickBus::Handler::BusDisconnect();
-            AZ::TickBus::Handler::BusDisconnect();
-        }
-
         void LerpBetween::OnConfigured()
         {
             SetupInternalSlotReferences();
         }
-        
-        void LerpBetween::OnSystemTick()
-        {
-            // Ping pong between the system and the normal tick bus for a consistent starting point for the lerp
-            AZ::SystemTickBus::Handler::BusDisconnect();
-            AZ::TickBus::Handler::BusConnect();
-        }
-        
-        void LerpBetween::OnTick(float deltaTime, [[maybe_unused]] AZ::ScriptTimePoint timePoint)
-        {
-            bool lerpComplete = false;
-            
-            m_counter += deltaTime;
-            
-            if (m_counter >= m_duration)
-            {
-                lerpComplete = true;
-                m_counter = m_duration;
-            }
-            
-            float percent = m_counter/m_duration;
-            
-            SignalLerpStep(percent);
-        }
-        
-        void LerpBetween::OnInputSignal(const SlotId& slotId)
-        {
-            if (slotId == LerpBetweenProperty::GetCancelSlotId(this))
-            {
-                CancelLerp();
-            }
-            else if (slotId == LerpBetweenProperty::GetInSlotId(this))
-            {
-                CancelLerp();
-                
-                AZ::SystemTickBus::Handler::BusConnect();
-                
-                float speedOnlyTime = 0.0;
-                float maxDuration = 0.0;
-                
-                const Datum* durationDatum = FindDatum(m_maximumTimeSlotId);
-                const Datum* speedDatum = FindDatum(m_speedSlotId);
-                
-                if (durationDatum)
-                {
-                    maxDuration = static_cast<float>((*durationDatum->GetAs<Data::NumberType>()));
-                }
-
-                Data::Type displayType = GetDisplayType(AZ::Crc32("LerpGroup"));
-
-                if (displayType == Data::Type::Number())
-                {
-                    SetupStartStop<Data::NumberType>(displayType);
-
-                    if (!m_differenceDatum.GetType().IsValid())
-                    {
-                        return;
-                    }
-                    
-                    Data::NumberType difference = (*m_differenceDatum.GetAs<Data::NumberType>());                    
-                    Data::NumberType speed = (*speedDatum->GetAs<Data::NumberType>());
-                    
-                    if (AZ::IsClose(speed, 0.0, Data::ToleranceEpsilon()))
-                    {
-                        speedOnlyTime = -1.0f;
-                    }
-                    else
-                    {
-                        speedOnlyTime = fabsf(static_cast<float>(difference)/static_cast<float>(speed));
-                    }                        
-                }
-                else if (displayType == Data::Type::Vector2())
-                {
-                    SetupStartStop<Data::Vector2Type>(displayType);
-                    speedOnlyTime = CalculateVectorSpeedTime<Data::Vector2Type>(speedDatum);
-                }
-                else if (displayType == Data::Type::Vector3())
-                {
-                    SetupStartStop<Data::Vector3Type>(displayType);
-                    speedOnlyTime = CalculateVectorSpeedTime<Data::Vector3Type>(speedDatum);
-                }
-                else if (displayType == Data::Type::Vector4())
-                {
-                    SetupStartStop<Data::Vector4Type>(displayType);
-                    speedOnlyTime = CalculateVectorSpeedTime<Data::Vector4Type>(speedDatum);
-                }
-                
-                m_counter = 0;
-                
-                if (speedOnlyTime >= 0.0f && maxDuration >= 0.0f)
-                {
-                    m_duration = AZStd::min(speedOnlyTime, maxDuration);
-                }
-                else if (speedOnlyTime >= 0.0f)
-                {
-                    m_duration = speedOnlyTime;
-                }
-                else if (maxDuration >= 0.0f)
-                {
-                    m_duration = maxDuration;
-                }
-                else
-                {
-                    AZ_Error("ScriptCanvas", false, "Lerp Between not given a valid speed or duration to perofrm the lerp at. Defaulting to 1 second duration");
-                    m_duration = 1.0;
-                }
-                
-                if (AZ::IsClose(m_duration, 0.0f, AZ::Constants::FloatEpsilon))
-                {
-                    CancelLerp();
-                    
-                    SignalLerpStep(1.0f);
-                }
-                
-                SignalOutput(LerpBetweenProperty::GetOutSlotId(this));
-            }
-        }        
 
         void LerpBetween::SetupInternalSlotReferences()
         {
@@ -189,52 +66,7 @@ namespace ScriptCanvas
             m_stepSlotId = LerpBetweenProperty::GetStepSlotId(this);
             m_percentSlotId = LerpBetweenProperty::GetPercentSlotId(this);
         }
-        
-        void LerpBetween::CancelLerp()
-        {
-            AZ::SystemTickBus::Handler::BusDisconnect();
-            AZ::TickBus::Handler::BusDisconnect();            
-        }
-        
-        void LerpBetween::SignalLerpStep(float percent)
-        {
-            Data::Type displayType = GetDisplayType(AZ::Crc32("LerpGroup"));
 
-            Datum stepDatum(displayType, Datum::eOriginality::Original);
-            stepDatum.SetToDefaultValueOfType();
-            
-            if (displayType == Data::Type::Number())
-            {
-                CalculateLerpStep<Data::NumberType>(percent, stepDatum);
-            }
-            else if (displayType == Data::Type::Vector2())
-            {
-                CalculateLerpStep<Data::Vector2Type>(percent, stepDatum);
-            }
-            else if (displayType == Data::Type::Vector3())
-            {
-                CalculateLerpStep<Data::Vector3Type>(percent, stepDatum);
-            }
-            else if (displayType == Data::Type::Vector4())
-            {
-                CalculateLerpStep<Data::Vector4Type>(percent, stepDatum);
-            }
-
-            if (AZ::IsClose(percent, 1.0f, AZ::Constants::FloatEpsilon))
-            {
-                SignalOutput(LerpBetweenProperty::GetLerpCompleteSlotId(this));
-                AZ::TickBus::Handler::BusDisconnect();
-            }
-
-            Datum percentDatum(ScriptCanvas::Data::Type::Number(), Datum::eOriginality::Original);
-            percentDatum.Set<Data::NumberType>(percent);
-            
-            PushOutput(percentDatum, *GetSlot(m_percentSlotId));
-            PushOutput(stepDatum, *GetSlot(m_stepSlotId));
-            
-            SignalOutput(LerpBetweenProperty::GetTickSlotId(this));            
-        }
-        
         bool LerpBetween::IsGroupConnected() const
         {
             bool hasConnections = false;
@@ -246,10 +78,10 @@ namespace ScriptCanvas
                     break;
                 }
             }
-            
+
             return hasConnections;
         }
-        
+
         bool LerpBetween::IsInGroup(const SlotId& slotId) const
         {
             return m_groupedSlotIds.count(slotId) > 0;
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerp.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerp.h
index cb54f2f236..f6f67f30bf 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerp.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerp.h
@@ -25,10 +25,8 @@ namespace ScriptCanvas
 #define LERPABLE_TYPES { Data::Type::Number(), Data::Type::Vector2(), Data::Type::Vector3(), Data::Type::Vector4() }
 
         //! Deprecated: see NodeableNodeOverloadedLerp
-        class LerpBetween 
+        class LerpBetween
             : public Node
-            , public AZ::SystemTickBus::Handler
-            , public AZ::TickBus::Handler
         {
         public:
 
@@ -52,105 +50,21 @@ namespace ScriptCanvas
 
             LerpBetween() = default;
             ~LerpBetween() override = default;
-            
+
             void OnInit() override;
-            void OnDeactivate() override;
             void OnConfigured() override;
-            
-            // SystemTickBus...
-            void OnSystemTick() override;
-            ////
-            
-            // TickBus...
-            void OnTick(float deltaTime, AZ::ScriptTimePoint timePoint) override;                
-            ////
-            
-            // Node...
-            void OnInputSignal(const SlotId& slotId) override;
-            ////
-            
+
         private:
 
             void SetupInternalSlotReferences();
-        
-            void CancelLerp();
-
-            void SignalLerpStep(float percent);
-            
             bool IsGroupConnected() const;
-            bool IsInGroup(const SlotId& slotId) const;            
-            
-            template<typename DataType>
-            void CalculateLerpStep(float percent, Datum& stepDatum)
-            {
-                const DataType* startValue = m_startDatum.GetAs<DataType>();
-                const DataType* differenceValue = m_differenceDatum.GetAs<DataType>();
-                
-                if (startValue == nullptr || differenceValue == nullptr)
-                {
-                    return;
-                }
+            bool IsInGroup(const SlotId& slotId) const;
 
-                DataType stepValue = (*startValue) + (*differenceValue) * percent;
-                stepDatum.Set<DataType>(stepValue);
-            }
-            
-            template<typename DataType>
-            void SetupStartStop(Data::Type displayType)
-            {
-                const Datum* startDatum = FindDatum(m_startSlotId);
-                const Datum* endDatum = FindDatum(m_stopSlotId);
-                
-                m_startDatum = (*startDatum);
-                m_differenceDatum = Datum(displayType, Datum::eOriginality::Original);
-                
-                const DataType* startValue = startDatum->GetAs<DataType>();
-                const DataType* endValue = endDatum->GetAs<DataType>();
-
-                if (startValue == nullptr || endValue == nullptr)
-                {
-                    m_differenceDatum.SetToDefaultValueOfType();
-                }
-                else
-                {
-                    DataType difference = (*endValue) - (*startValue);
-                    m_differenceDatum.Set<DataType>(difference);
-                }
-            }
-            
-            template<typename DataType>
-            float CalculateVectorSpeedTime(const Datum* speedDatum)
-            {
-                const DataType* dataType = speedDatum->GetAs<DataType>();
-                
-                float speedLength = 0.0f;
-                
-                if (dataType)
-                {
-                    speedLength = dataType->GetLength();
-                }
-                
-                if (AZ::IsClose(speedLength, 0.0f, AZ::Constants::FloatEpsilon))
-                {
-                    return -1.0;
-                }
-                
-                float differenceLength = 0.0;
-                const DataType* differenceValue = m_differenceDatum.GetAs<DataType>();
-                
-                if (differenceValue)
-                {
-                    differenceLength = differenceValue->GetLength();
-                }
-                
-                return fabsf(static_cast<float>(differenceLength/speedLength));
-            }            
-            
             AZStd::unordered_set< SlotId > m_groupedSlotIds;
-        
+
             float m_duration;
             float m_counter;
-            
+
             Datum m_startDatum;
             Datum m_differenceDatum;
         };
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeable.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeable.h
index 3807bff5e7..813c433a4f 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeable.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeable.h
@@ -129,7 +129,7 @@ namespace ScriptCanvas
                 return AZ::TickBus::Handler::BusIsConnected()
                     || AZ::SystemTickBus::Handler::BusIsConnected();
             }
-                        
+
         protected:
             size_t GetRequiredOutCount() const override
             {
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeableNode.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeableNode.cpp
index 6082e768ef..4ae3ff8c1f 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeableNode.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeableNode.cpp
@@ -189,7 +189,7 @@ namespace ScriptCanvas
 
                         dataSlotConfiguration.SetConnectionType(ScriptCanvas::ConnectionType::Output);
                         dataSlotConfiguration.m_dynamicDataType = DynamicDataType::Value;
-                        
+
                         SlotId slotIdStep = AddSlot(dataSlotConfiguration);
                         AZ_Assert(slotIdStep.IsValid(), "Data slot is not created successfully.");
                         latentOut.outputs.push_back(slotIdStep);
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeableNode.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeableNode.h
index 27b1f85612..1c2ed58403 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeableNode.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeableNode.h
@@ -29,7 +29,7 @@ namespace ScriptCanvas
             AZ::Crc32 GetDataDynamicGroup() const { return AZ_CRC("LerpDataDynamicGroup", 0x62b5f89e); }
         };
 
-    } 
+    }
 
-} 
+}
 
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorMul.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorMul.cpp
index 62d10ba58d..1eaba6bf17 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorMul.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorMul.cpp
@@ -75,7 +75,7 @@ namespace ScriptCanvas
                     break;
                 case Data::eType::Matrix4x4:
                     OperatorEvaluator::Evaluate<Data::Matrix4x4Type>(OperatorMulImpl<Data::Matrix4x4Type>(), operands, result);
-                    break; 
+                    break;
                 default:
                     AZ_Assert(false, "Multiplication operator not defined for type: %s", Data::ToAZType(type).ToString<AZStd::string>().c_str());
                     break;
@@ -88,7 +88,7 @@ namespace ScriptCanvas
                 FindModifiableDatumView(slotId, datumView);
 
                 OnResetDatumToDefaultValue(datumView);
-            }            
+            }
 
             bool OperatorMul::IsValidArithmeticSlot(const SlotId& slotId) const
             {
@@ -110,7 +110,7 @@ namespace ScriptCanvas
                 return (datum != nullptr);
             }
 
-            void OperatorMul::OnResetDatumToDefaultValue(ModifiableDatumView& datumView)            
+            void OperatorMul::OnResetDatumToDefaultValue(ModifiableDatumView& datumView)
             {
                 Data::Type displayType = GetDisplayType(GetArithmeticDynamicTypeGroup());
 
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorMul.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorMul.h
index e901aa519b..91ec6cc112 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorMul.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorMul.h
@@ -29,7 +29,7 @@ namespace ScriptCanvas
 
                 AZStd::unordered_set< Data::Type > GetSupportedNativeDataTypes() const override;
                 void Operator(Data::eType type, const ArithmeticOperands& operands, Datum& result) override;
-   
+
             protected:
 
                 void InitializeSlot(const SlotId& slotId, const ScriptCanvas::Data::Type& dataType) override;
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorSub.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorSub.cpp
index 1246feb521..82e16591a3 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorSub.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorSub.cpp
@@ -50,7 +50,7 @@ namespace ScriptCanvas
                 {
                     const AZ::Matrix3x3* dataRhs = rhs.GetAs<AZ::Matrix3x3>();
 
-                    return AZ::Matrix3x3::CreateFromColumns(lhs.GetColumn(0) - dataRhs->GetColumn(0), lhs.GetColumn(1) - dataRhs->GetColumn(1), lhs.GetColumn(2) - dataRhs->GetColumn(2));                    
+                    return AZ::Matrix3x3::CreateFromColumns(lhs.GetColumn(0) - dataRhs->GetColumn(0), lhs.GetColumn(1) - dataRhs->GetColumn(1), lhs.GetColumn(2) - dataRhs->GetColumn(2));
                 }
             };
 
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorSub.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorSub.h
index 2797a4fdea..bf1db9bfe2 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorSub.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorSub.h
@@ -17,7 +17,7 @@ namespace ScriptCanvas
         namespace Operators
         {
             //! Node that provides subtraction
-            class OperatorSub: public OperatorArithmetic
+            class OperatorSub : public OperatorArithmetic
             {
             public:
 
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Operator.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Operator.cpp
index 329b8d4c31..94b42d2829 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Operator.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Operator.cpp
@@ -182,7 +182,7 @@ namespace ScriptCanvas
                                     break;
                                 }
                             }
-                        }                        
+                        }
 
                         if (!handledConfiguration)
                         {
@@ -250,7 +250,7 @@ namespace ScriptCanvas
 
                         if (handledConfiguration)
                         {
-                            configurationIter = unhandledConfigurations.erase(configurationIter);                            
+                            configurationIter = unhandledConfigurations.erase(configurationIter);
                         }
                         else
                         {
@@ -296,7 +296,7 @@ namespace ScriptCanvas
                         m_sourceDisplayType = dataType;
                         OnDisplayTypeChanged(dataType);
                     }
-                }                
+                }
             }
 
             void OperatorBase::OnSlotRemoved(const SlotId& slotId)
@@ -319,7 +319,7 @@ namespace ScriptCanvas
 
                 return nullptr;
             }
-            
+
             Slot* OperatorBase::GetFirstOutputSourceSlot() const
             {
                 for (const SlotId& slotId : m_sourceSlots)
@@ -429,7 +429,7 @@ namespace ScriptCanvas
 
                 bool isInBatchAdd = false;
                 GraphRequestBus::EventResult(isInBatchAdd, GetOwningScriptCanvasId(), &GraphRequests::IsBatchAddingGraphData);
-                
+
                 if (IsSourceSlotId(currentSlotId))
                 {
                     auto node = AZ::EntityUtils::FindFirstDerivedComponent<Node>(endpoint.GetNodeId());
@@ -493,7 +493,7 @@ namespace ScriptCanvas
             }
 
             SlotId OperatorBase::AddSlotWithSourceType()
-            {                
+            {
                 Data::Type type = Data::Type::Invalid();
 
                 if (!m_sourceTypes.empty())
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Operator.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Operator.h
index 7401b60d21..57efee7faf 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Operator.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Operator.h
@@ -22,7 +22,7 @@ namespace ScriptCanvas
     {
         namespace Operators
         {
-            class OperatorBase 
+            class OperatorBase
                 : public ScriptCanvas::Node
             {
             public:
@@ -41,7 +41,7 @@ namespace ScriptCanvas
                 {
                     SourceType m_sourceType = SourceType::SourceInput;
 
-                    DynamicDataType m_dynamicDataType  = DynamicDataType::Any;
+                    DynamicDataType m_dynamicDataType = DynamicDataType::Any;
 
                     AZStd::string m_name;
                     AZStd::string m_tooltip;
@@ -103,7 +103,7 @@ namespace ScriptCanvas
 
                 virtual void OnInputSlotAdded(const SlotId& inputSlotId) { AZ_UNUSED(inputSlotId); };
                 virtual void OnDataInputSlotConnected([[maybe_unused]] const SlotId& slotId, [[maybe_unused]] const Endpoint& endpoint) {}
-                virtual void OnDataInputSlotDisconnected([[maybe_unused]] const SlotId& slotId, [[maybe_unused]] const Endpoint& endpoint) {}                
+                virtual void OnDataInputSlotDisconnected([[maybe_unused]] const SlotId& slotId, [[maybe_unused]] const Endpoint& endpoint) {}
 
                 AZ::BehaviorMethod* GetOperatorMethod(const char* methodName);
 
@@ -121,13 +121,6 @@ namespace ScriptCanvas
                 virtual void OnSourceConnected([[maybe_unused]] const SlotId& slotId) {}
                 virtual void OnSourceDisconnected([[maybe_unused]] const SlotId& slotId) {}
 
-                //! Implements the operator's behavior, the vector of Datums represents the list of operands.
-                virtual void Evaluate(const OperatorOperands& operands, Datum& result)
-                {
-                    AZ_UNUSED(operands);
-                    AZ_UNUSED(result);
-                }
-
             private:
                 OperatorConfiguration m_operatorConfiguration;
 
@@ -180,32 +173,6 @@ namespace ScriptCanvas
                     }
                 }
             };
-
-            // Base class for an small helper object that wraps the function to invoke
-            class OperationHelper
-            {
-            public:
-
-                Datum operator()(const AZStd::vector<Datum>& operands, Datum& result)
-                {
-                    AZStd::vector<Datum>::const_iterator operand = operands.begin();
-                    result = *operand;
-                    for (++operand; operand != operands.end(); ++operand)
-                    {
-                        result = Operator(result, *operand);
-                    }
-
-                    return result;
-                }
-
-            protected:
-                virtual Datum Operator(const Datum&, const Datum&) = 0;
-            };
-
-// Helper macro to invoke an operator function for a specialized type
-#define CallOperatorFunction(Operator, DataType, Type) \
-    if (DataType == Data::FromAZType(azrtti_typeid<Type>())) {  Operator<Type> operation; operation(operands, result); }
-
         }
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Operators.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Operators.cpp
index 6a35c246c9..b1ee7bf471 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Operators.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Operators.cpp
@@ -49,7 +49,7 @@ namespace ScriptCanvas
         void Operators::InitNodeRegistry(NodeRegistry& nodeRegistry)
         {
             using namespace ScriptCanvas::Nodes::Operators;
-            
+
             // Math
             AddNodeToRegistry<Operators, OperatorAdd>(nodeRegistry);
             AddNodeToRegistry<Operators, OperatorDiv>(nodeRegistry);
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Spawning/SpawnNodeable.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Spawning/SpawnNodeable.h
index 3a913826c2..05bf91f5dd 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Spawning/SpawnNodeable.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Spawning/SpawnNodeable.h
@@ -20,8 +20,8 @@
 namespace ScriptCanvas::Nodeables::Spawning
 {
     class SpawnNodeable
-        : public ScriptCanvas::Nodeable,
-            public AZ::TickBus::Handler
+        : public ScriptCanvas::Nodeable
+        , public AZ::TickBus::Handler
     {
         SCRIPTCANVAS_NODE(SpawnNodeable);
     public:
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Contains.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Contains.cpp
index b88b2edbd3..ec43c1fc8b 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Contains.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Contains.cpp
@@ -52,32 +52,6 @@ namespace ScriptCanvas
                 }
             }
 
-            void Contains::OnInputSignal(const SlotId&)
-            {
-                AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::ScriptCanvas, "ScriptCanvas::Contains::OnInputSignal");
-
-                AZStd::string sourceString = ContainsProperty::GetSource(this);
-                AZStd::string patternString = ContainsProperty::GetPattern(this);
-
-                bool caseSensitive = ContainsProperty::GetCaseSensitive(this);
-                bool searchFromEnd = ContainsProperty::GetSearchFromEnd(this);
-
-                auto index = AzFramework::StringFunc::Find(sourceString.c_str(), patternString.c_str(), 0, searchFromEnd, caseSensitive);
-                if (index != AZStd::string::npos)
-                {
-                    const SlotId outputIndexSlotId = ContainsProperty::GetIndexSlotId(this);
-                    if (auto* indexSlot = GetSlot(outputIndexSlotId))
-                    {
-                        Datum outputIndex(index);
-                        PushOutput(outputIndex, *indexSlot);
-                    }
-
-                    SignalOutput(GetSlotId("True"));
-                    return;
-                }
-
-                SignalOutput(GetSlotId("False"));
-            }
         }
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Contains.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Contains.h
index e2756f6ebf..d877972a1a 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Contains.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Contains.h
@@ -29,10 +29,6 @@ namespace ScriptCanvas
                 void OnInit() override;
                 void CustomizeReplacementNode(Node* replacementNode, AZStd::unordered_map<SlotId, AZStd::vector<SlotId>>& outSlotIdMap) const override;
 
-            protected:
-
-                void OnInputSignal(const SlotId& slotId) override;
-
             };
         }
     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Format.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Format.cpp
index 1b71390e0c..b362209cb0 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Format.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Format.cpp
@@ -6,27 +6,3 @@
  */
 
 #include "Format.h"
-
-namespace ScriptCanvas
-{
-    namespace Nodes
-    {
-        namespace String
-        {
-            void Format::OnInputSignal(const SlotId&)
-            {
-                AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::ScriptCanvas, "ScriptCanvas::Format::OnInputSignal");
-
-                Datum output = Datum(ProcessFormat());
-                
-                const SlotId outputTextSlotId = FormatProperty::GetStringSlotId(this);
-                if (auto* slot = GetSlot(outputTextSlotId))
-                {
-                    PushOutput(output, *slot);
-                }
-
-                SignalOutput(GetSlotId("Out"));
-            }
-        }
-    }
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Format.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Format.h
index 6e5c50d2ae..2fd606a422 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Format.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Format.h
@@ -23,12 +23,8 @@ namespace ScriptCanvas
             class Format
                 : public Internal::StringFormatted
             {
-            protected:
-
+            public:
                 SCRIPTCANVAS_NODE(Format);
-
-                void OnInputSignal(const SlotId& slotId) override;
-
             };
         }
     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Print.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Print.cpp
deleted file mode 100644
index 26f3716b6a..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Print.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "Print.h"
-
-#include <ScriptCanvas/Execution/RuntimeBus.h>
-#include <ScriptCanvas/Execution/ExecutionBus.h>
-
-namespace ScriptCanvas
-{
-    namespace Nodes
-    {
-        namespace String
-        {
-            void Print::OnInputSignal([[maybe_unused]] const SlotId& slotId)
-            {
-#if !defined(PERFORMANCE_BUILD) && !defined(_RELEASE) 
-                AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::ScriptCanvas, "ScriptCanvas::Print::OnInputSignal");
-
-                AZStd::string text = ProcessFormat();
-
-                AZ_TracePrintf("Script Canvas", "%s\n", text.c_str());
-                LogNotificationBus::Event(GetOwningScriptCanvasId(), &LogNotifications::LogMessage, text);
-
-                AZ::EntityId assetNodeId{};
-                ScriptCanvas::RuntimeRequestBus::EventResult(assetNodeId, GetOwningScriptCanvasId(), &ScriptCanvas::RuntimeRequests::FindAssetNodeIdByRuntimeNodeId, GetEntityId());
-
-                SC_EXECUTION_TRACE_ANNOTATE_NODE((*this), (AnnotateNodeSignal(CreateGraphInfo(GetOwningScriptCanvasId(), GetGraphIdentifier()), AnnotateNodeSignal::AnnotationLevel::Info, text, AZ::NamedEntityId(assetNodeId, GetNodeName()))));
-#endif
-                SignalOutput(GetSlotId("Out"));
-
-            }
-        }
-    }
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Print.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Print.h
index 0f971f99e7..1c16e30cd6 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Print.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Print.h
@@ -8,9 +8,7 @@
 #pragma once
 
 #include <ScriptCanvas/Core/Node.h>
-
 #include <ScriptCanvas/Internal/Nodes/StringFormatted.h>
-
 #include <Include/ScriptCanvas/Libraries/String/Print.generated.h>
 
 namespace ScriptCanvas
@@ -23,12 +21,8 @@ namespace ScriptCanvas
             class Print
                 : public Internal::StringFormatted
             {
-            protected:
-
+            public:
                 SCRIPTCANVAS_NODE(Print);
-                
-                void OnInputSignal(const SlotId&) override;
-
             };
         }
     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Replace.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Replace.cpp
index 56a7ae2ef8..57e2510baa 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Replace.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Replace.cpp
@@ -51,28 +51,6 @@ namespace ScriptCanvas
                 }
             }
 
-            void Replace::OnInputSignal(const SlotId&)
-            {
-                AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::ScriptCanvas, "ScriptCanvas::Replace::OnInputSignal");
-
-                AZStd::string sourceString = ReplaceProperty::GetSource(this);
-                AZStd::string replaceString = ReplaceProperty::GetReplace(this);
-                AZStd::string withString = ReplaceProperty::GetWith(this);
-
-                bool caseSensitive = ReplaceProperty::GetCaseSensitive(this);
-                
-                AzFramework::StringFunc::Replace(sourceString, replaceString.c_str(), withString.c_str(), caseSensitive);
-
-                const SlotId outputResultSlotId = ReplaceProperty::GetResultSlotId(this);
-
-                ScriptCanvas::Datum output(sourceString);
-                if (auto* outputSlot = GetSlot(outputResultSlotId))
-                {
-                    PushOutput(output, *outputSlot);
-                }
-
-                SignalOutput(GetSlotId("Out"));
-            }
         }
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Replace.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Replace.h
index 6c69818ac9..db31a85a82 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Replace.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Replace.h
@@ -28,11 +28,6 @@ namespace ScriptCanvas
 
                 void OnInit() override;
                 void CustomizeReplacementNode(Node* replacementNode, AZStd::unordered_map<SlotId, AZStd::vector<SlotId>>& outSlotIdMap) const override;
-
-            protected:
-
-                void OnInputSignal(const SlotId& slotId) override;
-
             };
         }
     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Utilities.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Utilities.cpp
index ad36615e26..959b8ef3c8 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Utilities.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Utilities.cpp
@@ -31,108 +31,15 @@ namespace ScriptCanvas
                 }
             }
 
-            void StartsWith::OnInputSignal(const SlotId&)
-            {
-                AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::ScriptCanvas, "ScriptCanvas::StartsWith::OnInputSignal");
-
-                AZStd::string sourceString = StartsWithProperty::GetSource(this);
-                AZStd::string patternString = StartsWithProperty::GetPattern(this);
-
-                bool caseSensitive = StartsWithProperty::GetCaseSensitive(this);
-
-                if (AzFramework::StringFunc::StartsWith(sourceString.c_str(), patternString.c_str(), caseSensitive))
-                {
-                    SignalOutput(GetSlotId("True"));
-                }
-                else
-                {
-                    SignalOutput(GetSlotId("False"));
-                }
-            }
-
-            void EndsWith::OnInputSignal(const SlotId&)
-            {
-                AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::ScriptCanvas, "ScriptCanvas::EndssWith::OnInputSignal");
-
-                AZStd::string sourceString = EndsWithProperty::GetSource(this);
-                AZStd::string patternString = EndsWithProperty::GetPattern(this);
-
-                bool caseSensitive = EndsWithProperty::GetCaseSensitive(this);
-
-                if (AzFramework::StringFunc::EndsWith(sourceString.c_str(), patternString.c_str(), caseSensitive))
-                {
-                    SignalOutput(GetSlotId("True"));
-                }
-                else
-                {
-                    SignalOutput(GetSlotId("False"));
-                }
-            }
-
             void Split::CustomizeReplacementNode(Node* replacementNode, AZStd::unordered_map<SlotId, AZStd::vector<SlotId>>& outSlotIdMap) const
             {
                 ReplaceStringUtilityNodeOutputSlot(this, replacementNode, outSlotIdMap);
             }
 
-            void Split::OnInputSignal(const SlotId&)
-            {
-                AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::ScriptCanvas, "ScriptCanvas::Split::OnInputSignal");
-
-                AZStd::string sourceString = SplitProperty::GetSource(this);
-                AZStd::string delimiterString = SplitProperty::GetDelimiters(this);
-
-                AZStd::vector<AZStd::string> stringArray;
-
-                AzFramework::StringFunc::Tokenize(sourceString.c_str(), stringArray, delimiterString.c_str(), false, false);
-
-                const SlotId outputResultSlotId = SplitProperty::GetStringArraySlotId(this);
-                if (auto* outputSlot = GetSlot(outputResultSlotId))
-                {
-                    ScriptCanvas::Datum output(ScriptCanvas::Data::FromAZType(azrtti_typeid<AZStd::vector<AZStd::string>>()), ScriptCanvas::Datum::eOriginality::Original, &stringArray, azrtti_typeid<AZStd::vector<AZStd::string>>());
-                    PushOutput(output, *outputSlot);
-                }
-
-                SignalOutput(GetSlotId("Out"));
-            }
-
             void Join::CustomizeReplacementNode(Node* replacementNode, AZStd::unordered_map<SlotId, AZStd::vector<SlotId>>& outSlotIdMap) const
             {
                 ReplaceStringUtilityNodeOutputSlot(this, replacementNode, outSlotIdMap);
             }
-
-            void Join::OnInputSignal(const SlotId&)
-            {
-                AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::ScriptCanvas, "ScriptCanvas::Join::OnInputSignal");
-
-                AZStd::vector<AZStd::string> sourceArray = JoinProperty::GetStringArray(this);
-                AZStd::string separatorString = JoinProperty::GetSeparator(this);
-
-                AZStd::string result;
-                size_t index = 0;
-                const size_t length = sourceArray.size();
-                for (auto string : sourceArray)
-                {
-                    if (index < length - 1)
-                    {
-                        result.append(AZStd::string::format("%s%s", string.c_str(), separatorString.c_str()));
-                    }
-                    else
-                    {
-                        result.append(string);
-                    }
-                    ++index;
-                }
-
-                const SlotId outputResultSlotId = JoinProperty::GetStringSlotId(this);
-                if (auto* outputSlot = GetSlot(outputResultSlotId))
-                {
-                    ScriptCanvas::Datum output(result);
-                    PushOutput(output, *outputSlot);
-                }
-
-                SignalOutput(GetSlotId("Out"));
-            }
-
         }
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Utilities.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Utilities.h
index c1dad1f0e5..fef7fb2bd7 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Utilities.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Utilities.h
@@ -24,10 +24,6 @@ namespace ScriptCanvas
             {
             public:
                 SCRIPTCANVAS_NODE(StartsWith);
-            protected:
-
-                void OnInputSignal(const SlotId& slotId) override;
-
             };
 
             //! Deprecated: see class String's reflection of method "Ends With"
@@ -36,10 +32,6 @@ namespace ScriptCanvas
             {
             public:
                 SCRIPTCANVAS_NODE(EndsWith);
-            protected:
-
-                void OnInputSignal(const SlotId& slotId) override;
-
             };
 
             //! Deprecated: see class String's reflection of method "Ends With"
@@ -55,9 +47,6 @@ namespace ScriptCanvas
             protected:
 
                 static const char* k_defaultDelimiter;
-
-                void OnInputSignal(const SlotId& slotId) override;
-
             };
 
             //! Deprecated: see class String's reflection of method "Join"
@@ -73,9 +62,6 @@ namespace ScriptCanvas
             protected:
 
                 static const char* k_defaultSeparator;
-
-                void OnInputSignal(const SlotId& slotId) override;
-
             };
 
         }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Countdown.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Countdown.cpp
index ee06418e68..f9afd2b80c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Countdown.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Countdown.cpp
@@ -38,28 +38,11 @@ namespace ScriptCanvas
                 }
             }
 
-            void TimeDelay::OnInputSignal(const SlotId& slotId)
-            {
-                if (slotId == TimeDelayProperty::GetInSlotId(this))
-                {
-                    if (!IsActive())
-                    {
-                        StartTimer();
-                    }
-                }
-            }
-
             bool TimeDelay::AllowInstantResponse() const
             {
                 return true;
             }
 
-            void TimeDelay::OnTimeElapsed()
-            {
-                StopTimer();
-                SignalOutput(TimeDelayProperty::GetOutSlotId(this));
-            }
-
             //////////////
             // TickDelay
             //////////////
@@ -85,56 +68,6 @@ namespace ScriptCanvas
             {
             }
 
-            void TickDelay::OnDeactivate()
-            {
-                AZ::TickBus::Handler::BusDisconnect();
-                AZ::SystemTickBus::Handler::BusDisconnect();
-            }
-
-            void TickDelay::OnInputSignal(const SlotId&)
-            {
-                m_tickCounter = TickDelayProperty::GetTicks(this);
-
-                if (m_tickCounter >= 0)
-                {
-                    if (!AZ::SystemTickBus::Handler::BusIsConnected())
-                    {
-                        AZ::SystemTickBus::Handler::BusConnect();
-                    }
-                }
-            }
-
-            void TickDelay::OnSystemTick()
-            {
-                AZ::SystemTickBus::Handler::BusDisconnect();
-
-                if (!AZ::TickBus::Handler::BusIsConnected())
-                {
-                    AZ::TickBus::Handler::BusDisconnect();
-                }
-
-                m_tickOrder = TickDelayProperty::GetTickOrder(this);
-                AZ::TickBus::Handler::BusConnect();
-            }
-
-            void TickDelay::OnTick(float, AZ::ScriptTimePoint)
-            {
-                --m_tickCounter;
-
-                if (m_tickCounter <= 0)
-                {
-                    const SlotId outSlot = TickDelayProperty::GetOutSlotId(this);
-
-                    SignalOutput(outSlot);
-                    AZ::TickBus::Handler::BusDisconnect();
-                }
-            }
-
-            int TickDelay::GetTickOrder()
-            {
-                return m_tickOrder;
-            }
-
             //////////////
             // CountDown
             //////////////
@@ -148,86 +81,12 @@ namespace ScriptCanvas
                 , m_currentTime(0.)
             {}
 
-            void Countdown::OnInputSignal(const SlotId& slot)
-            {
-                SlotId inSlotId = CountdownProperty::GetInSlotId(this);
-                SlotId resetSlotId = CountdownProperty::GetResetSlotId(this);
-                SlotId cancelSlotId = CountdownProperty::GetCancelSlotId(this);
-
-                if (slot == resetSlotId || (slot == inSlotId && !AZ::TickBus::Handler::BusIsConnected()))
-                {
-                    // If we're resetting, we need to disconnect.
-                    AZ::TickBus::Handler::BusDisconnect();
-
-                    m_countdownSeconds = CountdownProperty::GetTime(this);
-                    m_looping = CountdownProperty::GetLoop(this);
-                    m_holdTime = CountdownProperty::GetHold(this);
-                    
-                    m_currentTime = m_countdownSeconds;
-
-                    AZ::TickBus::Handler::BusConnect();
-                }
-                else if (slot == cancelSlotId)
-                {
-                    m_holding = false;
-                    m_currentTime = 0.f;
-
-                    AZ::TickBus::Handler::BusDisconnect();
-                }
-            }
-
             bool Countdown::IsOutOfDate(const VersionData& graphVersion) const
             {
                 AZ_UNUSED(graphVersion);
                 return !CountdownProperty::GetCancelSlotId(this).IsValid();
             }
 
-            void Countdown::OnTick(float deltaTime, AZ::ScriptTimePoint)
-            {
-                m_currentTime -= static_cast<float>(deltaTime);
-
-                if (m_currentTime <= 0.f)
-                {
-                    if (m_holding)
-                    {
-                        m_holding = false;
-                        m_currentTime = m_countdownSeconds;
-                        return;
-                    }
-                    else
-                    {
-                        const SlotId outSlot = CountdownProperty::GetOutSlotId(this);
-                        
-                        if (Slot* elapsedSlot = CountdownProperty::GetElapsedSlot(this))
-                        {
-                            float elapsedTime = m_countdownSeconds - m_currentTime;
-
-                            Datum o(Data::Type::Number(), Datum::eOriginality::Copy);
-                            o.Set(elapsedTime);
-
-                            PushOutput(o, *elapsedSlot);
-                        }
-
-                        SignalOutput(outSlot);
-                    }
-
-                    if (!m_looping)
-                    {
-                        AZ::TickBus::Handler::BusDisconnect();
-                    }
-                    else
-                    {
-                        m_holding = m_holdTime > 0.f;
-                        m_currentTime = m_holding ? m_holdTime : m_countdownSeconds;
-                    }
-                }
-            }
-
-            void Countdown::OnDeactivate()
-            {
-                AZ::TickBus::Handler::BusDisconnect();
-            }
-
             UpdateResult Countdown::OnUpdateNode()
             {
                 // Add in the missing cancel slot
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Countdown.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Countdown.h
index 1809bece64..00bc52edfa 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Countdown.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Countdown.h
@@ -36,10 +36,8 @@ namespace ScriptCanvas
 
                 TimeDelay() = default;
 
-                void OnInputSignal(const SlotId&) override;
 
                 bool AllowInstantResponse() const override;
-                void OnTimeElapsed() override;
 
                 const char* GetBaseTimeSlotToolTip() const override { return "The amount of time to delay before the Out is signalled."; }
 
@@ -48,8 +46,6 @@ namespace ScriptCanvas
             // Deprecated: see TimeDelayNodeableNode
             class TickDelay
                 : public Node
-                , AZ::TickBus::Handler
-                , AZ::SystemTickBus::Handler
             {
             public:
 
@@ -59,18 +55,6 @@ namespace ScriptCanvas
 
                 void CustomizeReplacementNode(Node* replacementNode, AZStd::unordered_map<SlotId, AZStd::vector<SlotId>>& outSlotIdMap) const override;
 
-                void OnDeactivate() override;
-                void OnInputSignal(const SlotId&) override;
-
-                // SystemTickBus...
-                void OnSystemTick() override;
-                ////
-
-                // TickBus...
-                void OnTick(float deltaTime, AZ::ScriptTimePoint timePoint) override;
-                int GetTickOrder() override;
-                ////
-
             protected:
 
                 int m_tickCounter;
@@ -78,9 +62,8 @@ namespace ScriptCanvas
             };
 
             //! Deprecated: see DelayNodeableNode
-            class Countdown 
+            class Countdown
                 : public Node
-                , AZ::TickBus::Handler
             {
 
             public:
@@ -101,8 +84,6 @@ namespace ScriptCanvas
                 //! Internal counter to track time elapsed
                 float m_currentTime;
 
-                void OnInputSignal(const SlotId&) override;
-
                 bool ShowHoldTime() const
                 {
                     // TODO: This only works on the property grid. If a true value is connected to the "SetLoop" slot,
@@ -114,12 +95,6 @@ namespace ScriptCanvas
 
             protected:
 
-                void OnDeactivate() override;
-
-                // AZ::TickBus
-                void OnTick(float deltaTime, AZ::ScriptTimePoint time) override;
-                ////
-
                 UpdateResult OnUpdateNode() override;
 
             };
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DelayNodeable.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DelayNodeable.h
index 260f0dd5f0..8d3231f170 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DelayNodeable.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DelayNodeable.h
@@ -21,13 +21,13 @@ namespace ScriptCanvas
     {
         namespace Time
         {
-            class DelayNodeable 
+            class DelayNodeable
                 : public ScriptCanvas::Nodeable
                 , public AZ::TickBus::Handler
             {
             public:
                 SCRIPTCANVAS_NODE(DelayNodeable);
-                                
+
             protected:
                 void OnDeactivate() override;
 
@@ -43,7 +43,7 @@ namespace ScriptCanvas
                 float m_currentTime = 0.0f;
                 float m_holdTime = 0.0f;
 
-                void InitiateCountdown(bool reset, float countdownSeconds, bool looping, float holdTime);                
+                void InitiateCountdown(bool reset, float countdownSeconds, bool looping, float holdTime);
             };
         }
     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Duration.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Duration.cpp
index c1e47e21b9..e7f9413166 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Duration.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Duration.cpp
@@ -21,48 +21,6 @@ namespace ScriptCanvas
                 , m_elapsedTime(0.f)
                 , m_currentTime(0.)
             {}
-
-            void Duration::OnInputSignal(const SlotId&)
-            {
-                m_durationSeconds = DurationProperty::GetDuration(this);
-                m_elapsedTime = 0.f;
-
-                m_currentTime = m_durationSeconds;
-
-                AZ::TickBus::Handler::BusConnect();
-            }
-
-            void Duration::OnTick(float deltaTime, [[maybe_unused]] AZ::ScriptTimePoint time)
-            {
-                const SlotId outSlot = DurationProperty::GetOutSlotId(this);
-                const SlotId doneSlot = DurationProperty::GetDoneSlotId(this);
-                const SlotId elapsedSlot = DurationProperty::GetElapsedSlotId(this);
-
-                if (m_currentTime > 0.f)
-                {
-                    Datum o(Data::Type::Number(), Datum::eOriginality::Copy);
-                    o.Set(m_elapsedTime);
-                    if (auto* slot = GetSlot(elapsedSlot))
-                    {
-                        PushOutput(o, *slot);
-                    }
-
-                    SignalOutput(outSlot);
-
-                    m_currentTime -= static_cast<float>(deltaTime);
-                    m_elapsedTime += static_cast<float>(deltaTime);
-                }
-                else
-                {
-                    SignalOutput(doneSlot);
-                    AZ::TickBus::Handler::BusDisconnect();
-                }
-            }
-
-            void Duration::OnDeactivate()
-            {
-                AZ::TickBus::Handler::BusDisconnect();
-            }
         }
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Duration.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Duration.h
index dd6c7868cf..98136225c6 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Duration.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Duration.h
@@ -23,9 +23,8 @@ namespace ScriptCanvas
         namespace Time
         {
             //! Deprecated: see DurationNodeableNode
-            class Duration 
+            class Duration
                 : public Node
-                , AZ::TickBus::Handler
             {
 
             public:
@@ -41,14 +40,6 @@ namespace ScriptCanvas
 
                 //! Internal counter to track time elapsed
                 float m_currentTime;
-
-                void OnInputSignal(const SlotId&) override;
-            
-            protected:
-
-                void OnDeactivate() override;
-                void OnTick(float deltaTime, AZ::ScriptTimePoint time) override;
-
             };
         }
     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DurationNodeable.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DurationNodeable.h
index 2915232cff..1b0169699b 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DurationNodeable.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DurationNodeable.h
@@ -21,7 +21,7 @@ namespace ScriptCanvas
     {
         namespace Time
         {
-            class DurationNodeable 
+            class DurationNodeable
                 : public ScriptCanvas::Nodeable
                 , public AZ::TickBus::Handler
             {
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/HeartBeat.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/HeartBeat.cpp
index 62ed77ab2f..350a64923e 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/HeartBeat.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/HeartBeat.cpp
@@ -38,22 +38,6 @@ namespace ScriptCanvas
                 }
             }
 
-            void HeartBeat::OnInputSignal(const SlotId& slotId)
-            {
-                if (slotId == HeartBeatProperty::GetStartSlotId(this))
-                {
-                    StartTimer();
-                }
-                else if (slotId == HeartBeatProperty::GetStopSlotId(this))
-                {
-                    StopTimer();
-                }
-            }
-
-            void HeartBeat::OnTimeElapsed()
-            {
-                SignalOutput(HeartBeatProperty::GetPulseSlotId(this));
-            }
         }
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/HeartBeat.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/HeartBeat.h
index 967376e932..1e12395834 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/HeartBeat.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/HeartBeat.h
@@ -27,16 +27,13 @@ namespace ScriptCanvas
 
                 void CustomizeReplacementNode(Node* replacementNode, AZStd::unordered_map<SlotId, AZStd::vector<SlotId>>& outSlotIdMap) const override;
 
-                void OnInputSignal(const SlotId&) override;
-
                 const char* GetBaseTimeSlotName() const override { return "Interval"; }
                 const char* GetBaseTimeSlotToolTip() const override { return "The amount of time between pulses."; }
 
             protected:
 
-                void OnTimeElapsed() override;
 
-             };
+            };
         }
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Time.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Time.cpp
index 7a6e5bc859..e55ddb3b35 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Time.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Time.cpp
@@ -57,7 +57,7 @@ namespace ScriptCanvas
             AddNodeToRegistry<Time, ScriptCanvas::Nodes::TimeDelayNodeableNode>(nodeRegistry);
             AddNodeToRegistry<Time, ScriptCanvas::Nodes::TimerNodeableNode>(nodeRegistry);
         }
-        
+
         AZStd::vector<AZ::ComponentDescriptor*> Time::GetComponentDescriptors()
         {
             return AZStd::vector<AZ::ComponentDescriptor*>({
@@ -73,7 +73,7 @@ namespace ScriptCanvas
                 ScriptCanvas::Nodes::HeartBeatNodeableNode::CreateDescriptor(),
                 ScriptCanvas::Nodes::TimeDelayNodeableNode::CreateDescriptor(),
                 ScriptCanvas::Nodes::TimerNodeableNode::CreateDescriptor(),
-            });
+                });
         }
     }
 
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Timer.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Timer.cpp
index 0465c49b43..8fb5d666fa 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Timer.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Timer.cpp
@@ -20,54 +20,6 @@ namespace ScriptCanvas
                 , m_seconds(0.f)
                 , m_milliseconds(0.f)
             {}
-
-            void Timer::OnTick([[maybe_unused]] float deltaTime, AZ::ScriptTimePoint time)
-            {
-                const SlotId millisecondsSlot = TimerProperty::GetMillisecondsSlotId(this);
-
-                double milliseconds = time.GetMilliseconds() - m_start.GetMilliseconds();
-                Datum objms(Data::Type::Number(), Datum::eOriginality::Copy);
-                objms.Set(milliseconds);
-                if (auto* slot = GetSlot(millisecondsSlot))
-                {
-                    PushOutput(objms, *slot);
-                }
-
-                const SlotId secondsSlot = TimerProperty::GetSecondsSlotId(this);
-
-                double seconds = time.GetSeconds() - m_start.GetSeconds();
-                Datum objs(Data::Type::Number(), Datum::eOriginality::Copy);
-                objs.Set(seconds);
-                if (auto* slot = GetSlot(secondsSlot))
-                {
-                    PushOutput(objs, *slot);
-                }
-
-                const SlotId outSlot = TimerProperty::GetOutSlotId(this);
-                SignalOutput(outSlot);
-
-            }
-
-            void Timer::OnInputSignal(const SlotId& slotId)
-            {
-                const SlotId startSlot = TimerProperty::GetStartSlotId(this);
-                const SlotId stopSlot = TimerProperty::GetStopSlotId(this);
-
-                if (slotId == startSlot)
-                {
-                    AZ::TickBus::Handler::BusConnect();
-                    m_start = AZ::ScriptTimePoint();
-                }
-                else if (slotId == stopSlot)
-                {
-                    AZ::TickBus::Handler::BusDisconnect();
-                }
-            }
-
-            void Timer::OnDeactivate()
-            {
-                AZ::TickBus::Handler::BusDisconnect();
-            }
         }
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Timer.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Timer.h
index 58ba646891..8cabda3f15 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Timer.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Timer.h
@@ -23,28 +23,17 @@ namespace ScriptCanvas
         namespace Time
         {
             //! Deprecated: See TimerNodeableNode
-            class Timer 
+            class Timer
                 : public Node
-                , AZ::TickBus::Handler
             {
             public:
 
                 SCRIPTCANVAS_NODE(Timer);
 
                 Timer();
-                
+
                 float m_seconds;
                 float m_milliseconds;
-            
-            protected:
-
-                AZ::ScriptTimePoint m_start;
-
-                void OnInputSignal(const SlotId& slotId) override;
-
-                void OnDeactivate() override;
-                void OnTick(float deltaTime, AZ::ScriptTimePoint time) override;
-
             };
         }
     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/TimerNodeable.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/TimerNodeable.h
index 2e73dc524c..e2de4b25ba 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/TimerNodeable.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/TimerNodeable.h
@@ -21,7 +21,7 @@ namespace ScriptCanvas
     {
         namespace Time
         {
-            class TimerNodeable 
+            class TimerNodeable
                 : public Nodeables::Time::BaseTimer
             {
                 SCRIPTCANVAS_NODE(TimerNodeable);
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/AddFailure.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/AddFailure.cpp
index 301db76008..b27065aca2 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/AddFailure.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/AddFailure.cpp
@@ -9,19 +9,3 @@
 
 #include "UnitTestBus.h"
 
-namespace ScriptCanvas
-{
-    namespace Nodes
-    {
-        namespace UnitTesting
-        {
-            void AddFailure::OnInputSignal([[maybe_unused]] const SlotId& slotId)
-            {
-                const auto report = FindDatum(GetSlotId("Report"))->GetAs<Data::StringType>();
-                ScriptCanvas::UnitTesting::Bus::Event(GetOwningScriptCanvasId(), &ScriptCanvas::UnitTesting::BusTraits::AddFailure, *report);
-
-                SignalOutput(GetSlotId("Out"));
-            }
-        }
-    }
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/AddFailure.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/AddFailure.h
index 1c0e5a6fd4..88d7ab5e24 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/AddFailure.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/AddFailure.h
@@ -23,9 +23,6 @@ namespace ScriptCanvas
             public:
 
                 SCRIPTCANVAS_NODE(AddFailure);
-
-                void OnInputSignal(const SlotId& slotId) override;
-
             };
         }
     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/AddSuccess.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/AddSuccess.cpp
deleted file mode 100644
index ee9b8975b0..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/AddSuccess.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "AddSuccess.h"
-
-#include "UnitTestBus.h"
-
-namespace ScriptCanvas
-{
-    namespace Nodes
-    {
-        namespace UnitTesting
-        {
-            void AddSuccess::OnInputSignal([[maybe_unused]] const SlotId& slotId)
-            {
-                const auto report = FindDatum(GetSlotId("Report"))->GetAs<Data::StringType>();
-                ScriptCanvas::UnitTesting::Bus::Event
-                    ( GetOwningScriptCanvasId()
-                    , &ScriptCanvas::UnitTesting::BusTraits::AddSuccess
-                    , *report);
-
-                SignalOutput(GetSlotId("Out"));
-            }
-        } 
-    } 
-} 
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/AddSuccess.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/AddSuccess.h
index c6793ad432..68f494bb72 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/AddSuccess.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/AddSuccess.h
@@ -23,9 +23,6 @@ namespace ScriptCanvas
             public:
 
                 SCRIPTCANVAS_NODE(AddSuccess);
-
-                void OnInputSignal(const SlotId& slotId) override;
-
             };
         }
     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/Auxiliary/Auxiliary.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/Auxiliary/Auxiliary.cpp
index dff5dff30c..d9da655cc3 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/Auxiliary/Auxiliary.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/Auxiliary/Auxiliary.cpp
@@ -37,8 +37,8 @@ namespace ScriptCanvas
             }
 
             const char* StringConversion::CStyleToCStyle(const char* input)
-            { 
-                return input; 
+            {
+                return input;
             }
 
             void StringConversion::Reflect(AZ::ReflectContext* reflection)
@@ -69,17 +69,17 @@ namespace ScriptCanvas
                         ->Field("outcomeVector3Void", &TypeExposition::m_outcomeVector3Void)
                         ;
                 }
-                
+
                 if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(reflection))
                 {
                     behaviorContext->Class<TypeExposition>("TypeExposition")
                         ->Method("Reflect_AZStd::array<AZ::Vector3, 2>", [](AZStd::array<AZ::Vector3, 2>& vector) {  return vector.size();  })
-                            ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
+                        ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
                         ->Method("Reflect_AZ::Outcome<AZ::Vector3, void>", [](AZ::Outcome<AZ::Vector3>& vector) { return vector.IsSuccess();  })
-                            ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
+                        ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
                         ;
                 }
             }
         }
-    } 
-} 
+    }
+}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/Auxiliary/Auxiliary.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/Auxiliary/Auxiliary.h
index 94c307e07d..a56dd8775b 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/Auxiliary/Auxiliary.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/Auxiliary/Auxiliary.h
@@ -36,14 +36,14 @@ namespace ScriptCanvas
             };
 
             using EBus = AZ::EBus<EBusTraits>;
-            
-            class EBusHandler 
+
+            class EBusHandler
                 : public EBus::Handler
                 , public AZ::BehaviorEBusHandler
             {
             public:
                 AZ_EBUS_BEHAVIOR_BINDER
-                    ( EBusHandler
+                (EBusHandler
                     , "{5168D163-AAB9-417D-9FD4-CE10541D51CE}"
                     , AZ::SystemAllocator
                     , CStyleToCStyle
@@ -95,14 +95,14 @@ namespace ScriptCanvas
                     return result;
                 }
             };
-            
+
             class StringConversion
             {
             public:
                 AZ_TYPE_INFO(StringConversion, "{47A9CF0C-6F34-4E0C-B1F9-F908FC2B7388}");
 
                 static const char* CStyleToCStyle(const char* input);
-            
+
                 static void Reflect(AZ::ReflectContext* reflection);
             };
 
@@ -118,5 +118,5 @@ namespace ScriptCanvas
                 AZ::Outcome<AZ::Vector3> m_outcomeVector3Void;
             };
         }
-    } 
-} 
+    }
+}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/Checkpoint.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/Checkpoint.cpp
deleted file mode 100644
index 5b77bea492..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/Checkpoint.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "Checkpoint.h"
-
-#include "UnitTestBus.h"
-
-namespace ScriptCanvas
-{
-    namespace Nodes
-    {
-        namespace UnitTesting
-        {
-            void Checkpoint::OnInputSignal([[maybe_unused]] const SlotId& slotId)
-            {
-                const auto report = FindDatum(GetSlotId("Report"))->GetAs<Data::StringType>();
-
-                ScriptCanvas::UnitTesting::Bus::Event(GetOwningScriptCanvasId(), &ScriptCanvas::UnitTesting::BusTraits::Checkpoint, *report);
-                
-                SignalOutput(GetSlotId("Out"));
-            }
-        }
-    }
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/Checkpoint.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/Checkpoint.h
index 551d250b6b..db7c666a78 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/Checkpoint.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/Checkpoint.h
@@ -22,9 +22,6 @@ namespace ScriptCanvas
             public:
 
                 SCRIPTCANVAS_NODE(Checkpoint);
-
-                void OnInputSignal(const SlotId& slotId) override;
-
             };
         }
     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectEqual.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectEqual.cpp
index 019286355b..142ef9932a 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectEqual.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectEqual.cpp
@@ -50,40 +50,6 @@ namespace ScriptCanvas
                 }
                 ////
             }
-
-            void ExpectEqual::OnInputSignal([[maybe_unused]] const SlotId& slotId)
-            {
-                auto lhs = FindDatum(GetSlotId("Candidate"));
-                if (!lhs)
-                {
-                    return;
-                }
-
-                auto rhs = FindDatum(GetSlotId("Reference"));
-                if (!rhs)
-                {
-                    return;
-                }
-
-                if (lhs->GetType() != rhs->GetType())
-                {
-                    ScriptCanvas::UnitTesting::Bus::Event
-                        ( GetOwningScriptCanvasId()
-                        , &ScriptCanvas::UnitTesting::BusTraits::AddFailure
-                        , "Type mismatch in comparison operator");
-
-                    SignalOutput(GetSlotId("Out"));
-                    return;
-                }
-
-
-                switch (lhs->GetType().GetType())
-                {
-                    SCRIPT_CANVAS_UNIT_TEST_LEGACY_NODE_EQUALITY_IMPLEMENTATIONS(ExpectEqual);
-                }
-
-                SignalOutput(GetSlotId("Out"));
-            }
         }
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectEqual.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectEqual.h
index bfb5b4ffb2..623a928aa2 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectEqual.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectEqual.h
@@ -25,8 +25,6 @@ namespace ScriptCanvas
                 SCRIPTCANVAS_NODE(ExpectEqual);
 
                 void OnInit() override;
-                void OnInputSignal(const SlotId& slotId) override;
-
             };
         }
     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectFalse.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectFalse.cpp
index 77bf80fd73..c128f4c30f 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectFalse.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectFalse.cpp
@@ -33,20 +33,6 @@ namespace ScriptCanvas
                 }
                 ////
             }
-
-            void ExpectFalse::OnInputSignal([[maybe_unused]] const SlotId& slotId)
-            {
-                const auto value = FindDatum(GetSlotId("Candidate"))->GetAs<Data::BooleanType>();
-                const auto report = FindDatum(GetSlotId("Report"))->GetAs<Data::StringType>();
-
-                ScriptCanvas::UnitTesting::Bus::Event
-                          ( GetOwningScriptCanvasId()
-                          , &ScriptCanvas::UnitTesting::BusTraits::ExpectFalse
-                          , *value
-                          , *report);
-                
-                SignalOutput(GetSlotId("Out"));
-            }
         }
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectFalse.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectFalse.h
index ca18f6f2d5..a50cba74d0 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectFalse.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectFalse.h
@@ -25,8 +25,6 @@ namespace ScriptCanvas
                 SCRIPTCANVAS_NODE(ExpectFalse);
 
                 void OnInit() override;
-                void OnInputSignal(const SlotId& slotId) override;
-
             };
         }
     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThan.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThan.cpp
index 28e2f7a8bd..ded5ae7050 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThan.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThan.cpp
@@ -50,40 +50,6 @@ namespace ScriptCanvas
                 }
                 ////
             }
-
-            void ExpectGreaterThan::OnInputSignal([[maybe_unused]] const SlotId& slotId)
-            {
-                auto lhs = FindDatum(GetSlotId("Candidate"));
-                if (!lhs)
-                {
-                    return;
-                }
-
-                auto rhs = FindDatum(GetSlotId("Reference"));
-                if (!rhs)
-                {
-                    return;
-                }
-
-                if (lhs->GetType() != rhs->GetType())
-                {
-                    ScriptCanvas::UnitTesting::Bus::Event
-                    ( GetOwningScriptCanvasId()
-                        , &ScriptCanvas::UnitTesting::BusTraits::AddFailure
-                        , "Type mismatch in comparison operator");
-
-                    SignalOutput(GetSlotId("Out"));
-                    return;
-                }
-
-
-                switch (lhs->GetType().GetType())
-                {
-                    SCRIPT_CANVAS_UNIT_TEST_LEGACY_NODE_COMPARE_IMPLEMENTATIONS(ExpectGreaterThan);
-                }
-
-                SignalOutput(GetSlotId("Out"));
-            }
         }
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThan.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThan.h
index d9d7f8630d..94219fab60 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThan.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThan.h
@@ -25,8 +25,6 @@ namespace ScriptCanvas
                 SCRIPTCANVAS_NODE(ExpectGreaterThan);
 
                 void OnInit() override;
-                void OnInputSignal(const SlotId& slotId) override;
-
             };
         }
     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThanEqual.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThanEqual.cpp
index 7b782094de..b2d4279b5c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThanEqual.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThanEqual.cpp
@@ -50,40 +50,6 @@ namespace ScriptCanvas
                 }
                 ////
             }
-
-            void ExpectGreaterThanEqual::OnInputSignal([[maybe_unused]] const SlotId& slotId)
-            {
-                auto lhs = FindDatum(GetSlotId("Candidate"));
-                if (!lhs)
-                {
-                    return;
-                }
-
-                auto rhs = FindDatum(GetSlotId("Reference"));
-                if (!rhs)
-                {
-                    return;
-                }
-
-                if (lhs->GetType() != rhs->GetType())
-                {
-                    ScriptCanvas::UnitTesting::Bus::Event
-                        ( GetOwningScriptCanvasId()
-                        , &ScriptCanvas::UnitTesting::BusTraits::AddFailure
-                        , "Type mismatch in comparison operator");
-
-                    SignalOutput(GetSlotId("Out"));
-                    return;
-                }
-                
-
-                switch (lhs->GetType().GetType())
-                {
-                    SCRIPT_CANVAS_UNIT_TEST_LEGACY_NODE_COMPARE_IMPLEMENTATIONS(ExpectGreaterThanEqual);
-                }
-
-                SignalOutput(GetSlotId("Out"));
-            }
-        } 
-    } 
-} 
+        }
+    }
+}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThanEqual.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThanEqual.h
index 7ef46a9dc9..2607e2569f 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThanEqual.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThanEqual.h
@@ -25,8 +25,6 @@ namespace ScriptCanvas
                 SCRIPTCANVAS_NODE(ExpectGreaterThanEqual);
 
                 void OnInit() override;
-                void OnInputSignal(const SlotId& slotId) override;
-
             };
         }
     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThan.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThan.cpp
index 327cfb49b3..1ea4afcf5a 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThan.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThan.cpp
@@ -48,41 +48,6 @@ namespace ScriptCanvas
                         SetDynamicGroup(referenceSlot->GetId(), AZ_CRC("DynamicGroup", 0x219a2e3a));
                     }
                 }
-                ////
-            }
-
-            void ExpectLessThan::OnInputSignal([[maybe_unused]] const SlotId& slotId)
-            {
-                auto lhs = FindDatum(GetSlotId("Candidate"));
-                if (!lhs)
-                {
-                    return;
-                }
-
-                auto rhs = FindDatum(GetSlotId("Reference"));
-                if (!rhs)
-                {
-                    return;
-                }
-
-                if (lhs->GetType() != rhs->GetType())
-                {
-                    ScriptCanvas::UnitTesting::Bus::Event
-                        ( GetOwningScriptCanvasId()
-                        , &ScriptCanvas::UnitTesting::BusTraits::AddFailure
-                        , "Type mismatch in comparison operator");
-
-                    SignalOutput(GetSlotId("Out"));
-                    return;
-                }
-
-
-                switch (lhs->GetType().GetType())
-                {
-                    SCRIPT_CANVAS_UNIT_TEST_LEGACY_NODE_COMPARE_IMPLEMENTATIONS(ExpectLessThan);
-                }
-
-                SignalOutput(GetSlotId("Out"));
             }
         }
     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThan.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThan.h
index fb9ca5737c..bc8e70a3be 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThan.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThan.h
@@ -25,8 +25,6 @@ namespace ScriptCanvas
                 SCRIPTCANVAS_NODE(ExpectLessThan);
 
                 void OnInit() override;
-                void OnInputSignal(const SlotId& slotId) override;
-
             };
         }
     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThanEqual.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThanEqual.cpp
index 3649816abc..2357ab5068 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThanEqual.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThanEqual.cpp
@@ -50,40 +50,6 @@ namespace ScriptCanvas
                 }
                 ////
             }
-
-            void ExpectLessThanEqual::OnInputSignal([[maybe_unused]] const SlotId& slotId)
-            {
-                auto lhs = FindDatum(GetSlotId("Candidate"));
-                if (!lhs)
-                {
-                    return;
-                }
-
-                auto rhs = FindDatum(GetSlotId("Reference"));
-                if (!rhs)
-                {
-                    return;
-                }
-
-                if (lhs->GetType() != rhs->GetType())
-                {
-                    ScriptCanvas::UnitTesting::Bus::Event
-                        ( GetOwningScriptCanvasId()
-                        , &ScriptCanvas::UnitTesting::BusTraits::AddFailure
-                        , "Type mismatch in comparison operator");
-                    
-                    SignalOutput(GetSlotId("Out"));
-                    return;
-                }
-
-
-                switch (lhs->GetType().GetType())
-                {
-                    SCRIPT_CANVAS_UNIT_TEST_LEGACY_NODE_COMPARE_IMPLEMENTATIONS(ExpectLessThanEqual);
-                }
-
-                SignalOutput(GetSlotId("Out"));
-            }
         }
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThanEqual.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThanEqual.h
index 577aa4f8ff..0408a58a35 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThanEqual.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThanEqual.h
@@ -25,8 +25,6 @@ namespace ScriptCanvas
                 SCRIPTCANVAS_NODE(ExpectLessThanEqual);
 
                 void OnInit() override;
-                void OnInputSignal(const SlotId& slotId) override;
-
             };
         }
     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectNotEqual.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectNotEqual.cpp
index 6b5d3fa98c..1182d7db4f 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectNotEqual.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectNotEqual.cpp
@@ -50,40 +50,6 @@ namespace ScriptCanvas
                 }
                 ////
             }
-
-            void ExpectNotEqual::OnInputSignal([[maybe_unused]] const SlotId& slotId)
-            {
-                auto lhs = FindDatum(GetSlotId("Candidate"));
-                if (!lhs)
-                {
-                    return;
-                }
-
-                auto rhs = FindDatum(GetSlotId("Reference"));
-                if (!rhs)
-                {
-                    return;
-                }
-
-                if (lhs->GetType() != rhs->GetType())
-                {
-                    ScriptCanvas::UnitTesting::Bus::Event
-                        ( GetOwningScriptCanvasId()
-                        , &ScriptCanvas::UnitTesting::BusTraits::AddFailure
-                        , "Type mismatch in comparison operator");
-                    
-                    SignalOutput(GetSlotId("Out"));
-                    return; 
-                }
-
-
-                switch (lhs->GetType().GetType())
-                {
-                    SCRIPT_CANVAS_UNIT_TEST_LEGACY_NODE_EQUALITY_IMPLEMENTATIONS(ExpectNotEqual);
-                }
-
-                SignalOutput(GetSlotId("Out"));
-            }
         }
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectNotEqual.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectNotEqual.h
index effc011b5a..57b7d09a80 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectNotEqual.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectNotEqual.h
@@ -25,8 +25,6 @@ namespace ScriptCanvas
                 SCRIPTCANVAS_NODE(ExpectNotEqual);
 
                 void OnInit() override;
-                void OnInputSignal(const SlotId& slotId) override;
-
             };
         }
     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectTrue.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectTrue.cpp
index ae0ec8a168..d7b2ca8cf0 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectTrue.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectTrue.cpp
@@ -33,16 +33,6 @@ namespace ScriptCanvas
                 }
                 ////
             }
-
-            void ExpectTrue::OnInputSignal([[maybe_unused]] const SlotId& slotId)
-            {
-                const auto value = FindDatum(GetSlotId("Candidate"))->GetAs<Data::BooleanType>();
-                const auto report = FindDatum(GetSlotId("Report"))->GetAs<Data::StringType>();
-
-                ScriptCanvas::UnitTesting::Bus::Event(GetOwningScriptCanvasId(), &ScriptCanvas::UnitTesting::BusTraits::ExpectTrue, *value, *report);
-                
-                SignalOutput(GetSlotId("Out"));
-            }
         }
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectTrue.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectTrue.h
index 6d94dc7403..c5d163bb88 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectTrue.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectTrue.h
@@ -25,8 +25,6 @@ namespace ScriptCanvas
                 SCRIPTCANVAS_NODE(ExpectTrue);
 
                 void OnInit() override;
-                void OnInputSignal(const SlotId& slotId) override;
-                
             };
         }
     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/MarkComplete.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/MarkComplete.cpp
deleted file mode 100644
index e7613695e8..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/MarkComplete.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "MarkComplete.h"
-
-#include "UnitTestBus.h"
-
-namespace ScriptCanvas
-{
-    namespace Nodes
-    {
-        namespace UnitTesting
-        {
-            void MarkComplete::OnInputSignal([[maybe_unused]] const SlotId& slotId)
-            {
-                const auto report = FindDatum(GetSlotId("Report"))->GetAs<Data::StringType>();
-                ScriptCanvas::UnitTesting::Bus::Event(GetOwningScriptCanvasId(), &ScriptCanvas::UnitTesting::BusTraits::MarkComplete, *report);
-                SignalOutput(GetSlotId("Out"));
-            }
-        }
-    }
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/MarkComplete.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/MarkComplete.h
index 9f86fe5b28..126746019f 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/MarkComplete.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/MarkComplete.h
@@ -23,9 +23,6 @@ namespace ScriptCanvas
             public:
 
                 SCRIPTCANVAS_NODE(MarkComplete);
-
-                void OnInputSignal(const SlotId& slotId) override;
-
             }; 
         }
     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Results/ErrorText.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Results/ErrorText.h
index 339c0fc3a1..928d1d7202 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Results/ErrorText.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Results/ErrorText.h
@@ -74,6 +74,7 @@ namespace ScriptCanvas
         constexpr const char* NotEnoughBranchesForReturn = "Not enough branches for defined out return values.";
         constexpr const char* NotEnoughInputForArithmeticOperator = "Not enough input for arithmetic operator";
         constexpr const char* NullEntityInGraph = "Null entity pointer in graph";
+        constexpr const char* NullInputKnown = "The input is known to be null, and the node does not accept it";
         constexpr const char* ParseExecutionMultipleOutSyntaxSugarChildExecutionRemovedAndNotReplaced = "ParseExecutionMultipleOutSyntaxSugar: child execution node was removed, and not replaced.";
         constexpr const char* ParseExecutionMultipleOutSyntaxSugarMismatchOutSize = "ParseExecutionMultipleOutSyntaxSugar: mismatch in connect nodes vs source slots size";
         constexpr const char* ParseExecutionMultipleOutSyntaxSugarNonNullChildExecutionFound = "ParseExecutionMultipleOutSyntaxSugar: non null child execution node";
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLua.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLua.cpp
index 772fda4f7e..085a0928bc 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLua.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLua.cpp
@@ -24,8 +24,6 @@
 #include <ScriptCanvas/Grammar/PrimitivesExecution.h>
 
 #include "GraphToLuaUtility.h"
-#include "TranslationContext.h"
-#include "TranslationContextBus.h"
 
 namespace GraphToLuaCpp
 {
@@ -92,9 +90,7 @@ namespace ScriptCanvas
         {
             SystemRequestBus::BroadcastResult(m_systemConfiguration, &SystemRequests::GetSystemComponentConfiguration);
             MarkTranslationStart();
-            RequestBus::BroadcastResult(m_context, &RequestTraits::GetTranslationContext);
-            AZ_Assert(m_context, "Nothing is possible without the context");
-
+            
             m_tableName = GraphToLuaCpp::FileNameToTableName(m_model.GetSource().m_name);
             m_tableName += m_configuration.m_suffix;
 
@@ -138,12 +134,12 @@ namespace ScriptCanvas
 
         const AZStd::string& GraphToLua::FindAbbreviation(AZStd::string_view dependency) const
         {
-            return m_context->FindAbbreviation(dependency);
+            return m_context.FindAbbreviation(dependency);
         }
 
         const AZStd::string& GraphToLua::FindLibrary(AZStd::string_view dependency) const
         {
-            return m_context->FindLibrary(dependency);
+            return m_context.FindLibrary(dependency);
         }
 
         AZStd::string_view GraphToLua::GetOperatorString(Grammar::ExecutionTreeConstPtr execution)
@@ -806,7 +802,7 @@ namespace ScriptCanvas
 
             m_dotLua.Write("(");
 
-            if (execution->IsStart() && execution->IsPure())
+            if (execution == m_model.GetStart() && execution->IsPure())
             {
                 m_dotLua.Write(Grammar::k_executionStateVariableName);
 
@@ -1589,8 +1585,10 @@ namespace ScriptCanvas
                 break;
             }
 
-            // #functions2 pure on graph start nodes with dependencies can only be added to the graph as variables
-//             if (execution->IsStart() && execution->IsPure())
+            // #functions2 pure on graph start nodes with dependencies can only be added to the graph as variables, which is a work-flow we may never want to support
+            // as it effectively duplicates the Component-Entity-System. Technically, if this functionality is desired, one could just add another script component
+            // with the additional graph...
+//             if (execution->IsStartCall() && execution->IsPure())
 //             {
 //                 WriteFunctionCallInputOfChildStart(execution);
 //             }
@@ -1944,7 +1942,7 @@ namespace ScriptCanvas
                 {
                     const auto requirement = ParseConstructionRequirement(variable);
 
-                    if (requirement == Grammar::VariableConstructionRequirement::None || (requirement != Grammar::VariableConstructionRequirement::Static && !execution->IsStart()))
+                    if (requirement == Grammar::VariableConstructionRequirement::None || (requirement != Grammar::VariableConstructionRequirement::Static && !execution->IsStartCall()))
                     {
                         m_dotLua.WriteLineIndented("local %s = %s", variable->m_name.data(), ToValueString(variable->m_datum, m_configuration).data());
                     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLua.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLua.h
index ba46b21c65..347cb764e9 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLua.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLua.h
@@ -16,6 +16,7 @@
 #include <ScriptCanvas/Core/ScriptCanvasBus.h>
 
 #include "GraphToX.h"
+#include "TranslationContext.h"
 #include "TranslationResult.h"
 #include "TranslationUtilities.h"
 
@@ -60,7 +61,7 @@ namespace ScriptCanvas
             RuntimeInputs m_runtimeInputs;
             BuildConfiguration m_executionConfig = BuildConfiguration::Release;
             FunctionBlockConfig m_functionBlockConfig = FunctionBlockConfig::Ignored;
-            const Context* m_context = nullptr;
+            Context m_context;
             AZStd::string m_tableName;
             Writer m_dotLua;
             SystemComponentConfiguration m_systemConfiguration;
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/TranslationContext.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/TranslationContext.h
index ea49f90bde..40f04f2f47 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/TranslationContext.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/TranslationContext.h
@@ -10,7 +10,6 @@
 #include <AzCore/Memory/Memory.h>
 #include <AzCore/Memory/SystemAllocator.h>
 #include "Translation.h"
-#include "TranslationContextBus.h"
 
 namespace ScriptCanvas
 {
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/TranslationContextBus.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/TranslationContextBus.h
deleted file mode 100644
index 0edac2afe3..0000000000
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/TranslationContextBus.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/EBus/EBus.h>
-
-#include "Translation.h"
-
-namespace ScriptCanvas
-{
-    namespace Translation
-    {
-        class Context;
-
-        struct RequestTraits : public AZ::EBusTraits
-        {
-            static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-
-            virtual Context* GetTranslationContext() = 0;
-        };
-
-        using RequestBus = AZ::EBus<RequestTraits>;
-
-        struct EventTraits : public AZ::EBusTraits
-        {
-            static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-        };
-
-        using EventBus = AZ::EBus<EventTraits>;
-
-    } 
-
-}
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/GraphVariable.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/GraphVariable.cpp
index ece0357626..058489374f 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/GraphVariable.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/GraphVariable.cpp
@@ -10,7 +10,6 @@
 #include <ScriptCanvas/Asset/RuntimeAsset.h>
 #include <ScriptCanvas/Core/GraphScopedTypes.h>
 #include <ScriptCanvas/Core/ModifiableDatumView.h>
-#include <ScriptCanvas/Execution/RuntimeBus.h>
 #include <ScriptCanvas/Variable/VariableBus.h>
 
 namespace ScriptCanvas
@@ -412,37 +411,6 @@ namespace ScriptCanvas
         return AZ::Edit::PropertyVisibility::Show;
     }
 
-    AZ::Crc32 GraphVariable::GetScriptInputControlVisibility() const
-    {
-        AZ::Data::AssetType assetType = AZ::Data::AssetType::CreateNull();
-
-        ScriptCanvas::RuntimeRequestBus::EventResult(assetType, m_scriptCanvasId, &ScriptCanvas::RuntimeRequests::GetAssetType);
-
-        if (assetType == azrtti_typeid<ScriptCanvas::RuntimeAsset>())
-        {
-            return m_inputControlVisibility;
-        }
-        else
-        {
-            return AZ::Edit::PropertyVisibility::Hide;
-        }
-    }
-
-    AZ::Crc32 GraphVariable::GetFunctionInputControlVisibility() const
-    {
-        AZ::Data::AssetType assetType = AZ::Data::AssetType::CreateNull();
-        ScriptCanvas::RuntimeRequestBus::EventResult(assetType, m_scriptCanvasId, &ScriptCanvas::RuntimeRequests::GetAssetType);
-
-        if (assetType == azrtti_typeid<ScriptCanvas::SubgraphInterfaceAsset>())
-        {
-            return AZ::Edit::PropertyVisibility::Show;
-        }
-        else
-        {
-            return AZ::Edit::PropertyVisibility::Hide;
-        }
-    }
-
     AZ::Crc32 GraphVariable::GetVisibility() const
     {
         return m_visibility;
@@ -552,7 +520,7 @@ namespace ScriptCanvas
     bool GraphVariable::IsInFunction() const
     {
         AZ::Data::AssetType assetType = AZ::Data::AssetType::CreateNull();
-        ScriptCanvas::RuntimeRequestBus::EventResult(assetType, m_scriptCanvasId, &ScriptCanvas::RuntimeRequests::GetAssetType);
+        ScriptCanvas::GraphRequestBus::EventResult(assetType, m_scriptCanvasId, &ScriptCanvas::GraphRequests::GetAssetType);
 
         return assetType == azrtti_typeid<ScriptCanvas::SubgraphInterfaceAsset>();
     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/GraphVariable.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/GraphVariable.h
index b6ad7fcf30..90086ac7f7 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/GraphVariable.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/GraphVariable.h
@@ -140,10 +140,8 @@ namespace ScriptCanvas
 
         AZ::Crc32 GetInputControlVisibility() const;
         AZ::Crc32 GetScopeControlVisibility() const;
-        AZ::Crc32 GetScriptInputControlVisibility() const;
         AZ::Crc32 GetNetworkSettingsVisibility() const;
-        AZ::Crc32 GetFunctionInputControlVisibility() const;
-        
+
         AZ::Crc32 GetVisibility() const;
         void SetVisibility(AZ::Crc32 visibility);
 
diff --git a/Gems/ScriptCanvas/Code/Source/ScriptCanvasCommonGem.cpp b/Gems/ScriptCanvas/Code/Source/ScriptCanvasCommonGem.cpp
index 1c614dc5bc..fe8e8d20df 100644
--- a/Gems/ScriptCanvas/Code/Source/ScriptCanvasCommonGem.cpp
+++ b/Gems/ScriptCanvas/Code/Source/ScriptCanvasCommonGem.cpp
@@ -11,7 +11,6 @@
 #include <Asset/RuntimeAssetSystemComponent.h>
 #include <ScriptCanvas/Core/Graph.h>
 #include <ScriptCanvas/Core/Connection.h>
-#include <ScriptCanvas/Core/PureData.h>
 
 #include <ScriptCanvas/Data/DataRegistry.h>
 #include <ScriptCanvas/Libraries/Libraries.h>
@@ -21,7 +20,6 @@
 #include <ScriptCanvas/Libraries/Libraries.h>
 #include <ScriptCanvas/Libraries/Math/MathNodeUtilities.h>
 #include <ScriptCanvas/Variable/GraphVariableManagerComponent.h>
-#include <ScriptCanvas/Asset/Functions/ScriptCanvasFunctionAsset.h>
 
 namespace ScriptCanvas
 {
@@ -42,8 +40,6 @@ namespace ScriptCanvas
             ScriptCanvas::Node::CreateDescriptor(),
             ScriptCanvas::Debugger::ServiceComponent::CreateDescriptor(),
             ScriptCanvas::Graph::CreateDescriptor(),
-            ScriptCanvasEditor::ScriptCanvasFunctionDataComponent::CreateDescriptor(),
-            ScriptCanvas::PureData::CreateDescriptor(),
             ScriptCanvas::GraphVariableManagerComponent::CreateDescriptor(),
             ScriptCanvas::RuntimeComponent::CreateDescriptor(),
             
diff --git a/Gems/ScriptCanvas/Code/scriptcanvasgem_common_files.cmake b/Gems/ScriptCanvas/Code/scriptcanvasgem_common_files.cmake
index 28bcd49fe7..17273b7ae0 100644
--- a/Gems/ScriptCanvas/Code/scriptcanvasgem_common_files.cmake
+++ b/Gems/ScriptCanvas/Code/scriptcanvasgem_common_files.cmake
@@ -25,9 +25,8 @@ set(FILES
     Include/ScriptCanvas/Asset/RuntimeAssetHandler.h
     Include/ScriptCanvas/Asset/ScriptCanvasAssetBase.h
     Include/ScriptCanvas/Asset/ScriptCanvasAssetData.h
-    Include/ScriptCanvas/Asset/Functions/ScriptCanvasFunctionAsset.h
-    Include/ScriptCanvas/Asset/Functions/RuntimeFunctionAssetHandler.cpp
-    Include/ScriptCanvas/Asset/Functions/RuntimeFunctionAssetHandler.h
+    Include/ScriptCanvas/Asset/SubgraphInterfaceAssetHandler.cpp
+    Include/ScriptCanvas/Asset/SubgraphInterfaceAssetHandler.h
     Include/ScriptCanvas/Core/ScriptCanvasBus.h
     Include/ScriptCanvas/Core/ExecutionNotificationsBus.cpp
     Include/ScriptCanvas/Core/ExecutionNotificationsBus.h
@@ -35,7 +34,6 @@ set(FILES
     Include/ScriptCanvas/Core/NodeBus.h
     Include/ScriptCanvas/Core/EBusNodeBus.h
     Include/ScriptCanvas/Core/NodelingBus.h
-    Include/ScriptCanvas/Core/SignalBus.h
     Include/ScriptCanvas/Core/ContractBus.h
     Include/ScriptCanvas/Core/Attributes.h
     Include/ScriptCanvas/Core/Connection.cpp
@@ -66,7 +64,6 @@ set(FILES
     Include/ScriptCanvas/Core/MethodConfiguration.cpp
     Include/ScriptCanvas/Core/ModifiableDatumView.cpp
     Include/ScriptCanvas/Core/ModifiableDatumView.h
-    Include/ScriptCanvas/Core/NativeDatumNode.h
     Include/ScriptCanvas/Core/Node.cpp
     Include/ScriptCanvas/Core/Node.h
     Include/ScriptCanvas/Core/Nodeable.cpp
@@ -76,8 +73,6 @@ set(FILES
     Include/ScriptCanvas/Core/NodeableNodeOverloaded.cpp
     Include/ScriptCanvas/Core/NodeableNodeOverloaded.h
     Include/ScriptCanvas/Core/NodeFunctionGeneric.h
-    Include/ScriptCanvas/Core/PureData.cpp
-    Include/ScriptCanvas/Core/PureData.h
     Include/ScriptCanvas/Core/Slot.cpp
     Include/ScriptCanvas/Core/Slot.h
     Include/ScriptCanvas/Core/SlotConfigurationDefaults.h
@@ -106,7 +101,6 @@ set(FILES
     Include/ScriptCanvas/Translation/Translation.cpp
     Include/ScriptCanvas/Translation/TranslationContext.h
     Include/ScriptCanvas/Translation/TranslationContext.cpp
-    Include/ScriptCanvas/Translation/TranslationContextBus.h
     Include/ScriptCanvas/Translation/TranslationResult.h
     Include/ScriptCanvas/Translation/TranslationResult.cpp
     Include/ScriptCanvas/Translation/TranslationUtilities.h
@@ -131,8 +125,6 @@ set(FILES
     Include/ScriptCanvas/Core/Contracts/DisplayGroupConnectedSlotLimitContract.h
     Include/ScriptCanvas/Core/Contracts/DynamicTypeContract.cpp
     Include/ScriptCanvas/Core/Contracts/DynamicTypeContract.h
-    Include/ScriptCanvas/Core/Contracts/ExclusivePureDataContract.cpp
-    Include/ScriptCanvas/Core/Contracts/ExclusivePureDataContract.h
     Include/ScriptCanvas/Core/Contracts/IsReferenceTypeContract.cpp
     Include/ScriptCanvas/Core/Contracts/IsReferenceTypeContract.h
     Include/ScriptCanvas/Core/Contracts/MathOperatorContract.cpp
@@ -174,7 +166,6 @@ set(FILES
     Include/ScriptCanvas/Execution/NativeHostDeclarations.cpp
     Include/ScriptCanvas/Execution/NativeHostDefinitions.h
     Include/ScriptCanvas/Execution/NativeHostDefinitions.cpp
-    Include/ScriptCanvas/Execution/RuntimeBus.h
     Include/ScriptCanvas/Execution/RuntimeComponent.h
     Include/ScriptCanvas/Execution/RuntimeComponent.cpp
     Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.h
@@ -204,11 +195,6 @@ set(FILES
     Include/ScriptCanvas/Grammar/DebugMap.cpp
     Include/ScriptCanvas/Grammar/ExecutionTraversalListeners.h
     Include/ScriptCanvas/Grammar/ExecutionTraversalListeners.cpp
-    Include/ScriptCanvas/Grammar/FunctionsLegacySupport.h
-    Include/ScriptCanvas/Grammar/FunctionsLegacySupport.cpp
-    Include/ScriptCanvas/Grammar/GrammarContext.h
-    Include/ScriptCanvas/Grammar/GrammarContext.cpp
-    Include/ScriptCanvas/Grammar/GrammarContextBus.h
     Include/ScriptCanvas/Grammar/ParsingMetaData.h
     Include/ScriptCanvas/Grammar/ParsingMetaData.cpp
     Include/ScriptCanvas/Grammar/ParsingUtilities.h
@@ -228,7 +214,6 @@ set(FILES
     Include/ScriptCanvas/Execution/NativeHostDeclarations.h
     Include/ScriptCanvas/Execution/NativeHostDefinitions.cpp
     Include/ScriptCanvas/Execution/NativeHostDefinitions.h
-    Include/ScriptCanvas/Execution/RuntimeBus.h
     Include/ScriptCanvas/Execution/RuntimeComponent.cpp
     Include/ScriptCanvas/Execution/RuntimeComponent.h
     Include/ScriptCanvas/Internal/Nodeables/BaseTimer.cpp
@@ -250,8 +235,6 @@ set(FILES
     Include/ScriptCanvas/Libraries/Core/AzEventHandler.cpp
     Include/ScriptCanvas/Libraries/Core/AzEventHandler.h
     Include/ScriptCanvas/Libraries/Core/AzEventHandler.ScriptCanvasGrammar.xml
-    Include/ScriptCanvas/Libraries/Core/BehaviorContextObjectNode.cpp
-    Include/ScriptCanvas/Libraries/Core/BehaviorContextObjectNode.h
     Include/ScriptCanvas/Libraries/Core/BinaryOperator.cpp
     Include/ScriptCanvas/Libraries/Core/BinaryOperator.h
     Include/ScriptCanvas/Libraries/Core/CoreNodes.cpp
@@ -265,10 +248,6 @@ set(FILES
     Include/ScriptCanvas/Libraries/Core/ExtractProperty.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Core/EventHandlerTranslationUtility.h
     Include/ScriptCanvas/Libraries/Core/EventHandlerTranslationUtility.cpp
-    Include/ScriptCanvas/Libraries/Core/Error.cpp
-    Include/ScriptCanvas/Libraries/Core/Error.h
-    Include/ScriptCanvas/Libraries/Core/ErrorHandler.cpp
-    Include/ScriptCanvas/Libraries/Core/ErrorHandler.h
     Include/ScriptCanvas/Libraries/Core/ForEach.cpp
     Include/ScriptCanvas/Libraries/Core/ForEach.h
     Include/ScriptCanvas/Libraries/Core/ForEach.ScriptCanvasGrammar.xml
@@ -311,28 +290,20 @@ set(FILES
     Include/ScriptCanvas/Libraries/Core/SetVariable.cpp
     Include/ScriptCanvas/Libraries/Core/SetVariable.h
     Include/ScriptCanvas/Libraries/Core/SetVariable.ScriptCanvasGrammar.xml
-    Include/ScriptCanvas/Libraries/Core/Start.cpp
     Include/ScriptCanvas/Libraries/Core/Start.h
     Include/ScriptCanvas/Libraries/Core/Start.ScriptCanvasGrammar.xml
-    Include/ScriptCanvas/Libraries/Core/String.h
     Include/ScriptCanvas/Libraries/Core/UnaryOperator.cpp
     Include/ScriptCanvas/Libraries/Core/UnaryOperator.h
     Include/ScriptCanvas/Libraries/Entity/Entity.cpp
     Include/ScriptCanvas/Libraries/Entity/Entity.h
-    Include/ScriptCanvas/Libraries/Entity/EntityIDNode.h
     Include/ScriptCanvas/Libraries/Entity/EntityIDNodes.h
     Include/ScriptCanvas/Libraries/Entity/EntityNodes.h
-    Include/ScriptCanvas/Libraries/Entity/EntityRef.h
-    Include/ScriptCanvas/Libraries/Entity/Rotate.cpp
-    Include/ScriptCanvas/Libraries/Entity/Rotate.h
-    Include/ScriptCanvas/Libraries/Entity/Rotate.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Entity/RotateMethod.cpp
     Include/ScriptCanvas/Libraries/Entity/RotateMethod.h
     Include/ScriptCanvas/Libraries/Logic/And.h
     Include/ScriptCanvas/Libraries/Logic/Any.cpp
     Include/ScriptCanvas/Libraries/Logic/Any.h
     Include/ScriptCanvas/Libraries/Logic/Any.ScriptCanvasGrammar.xml
-    Include/ScriptCanvas/Libraries/Logic/Boolean.h
     Include/ScriptCanvas/Libraries/Logic/Break.h
     Include/ScriptCanvas/Libraries/Logic/Break.cpp
     Include/ScriptCanvas/Libraries/Logic/Break.ScriptCanvasGrammar.xml
@@ -342,7 +313,6 @@ set(FILES
     Include/ScriptCanvas/Libraries/Logic/Gate.cpp
     Include/ScriptCanvas/Libraries/Logic/Gate.h
     Include/ScriptCanvas/Libraries/Logic/Gate.ScriptCanvasGrammar.xml
-    Include/ScriptCanvas/Libraries/Logic/Indexer.cpp
     Include/ScriptCanvas/Libraries/Logic/Indexer.h
     Include/ScriptCanvas/Libraries/Logic/Indexer.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Logic/IsNull.cpp
@@ -350,7 +320,6 @@ set(FILES
     Include/ScriptCanvas/Libraries/Logic/IsNull.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Logic/Logic.cpp
     Include/ScriptCanvas/Libraries/Logic/Logic.h
-    Include/ScriptCanvas/Libraries/Logic/Multiplexer.cpp
     Include/ScriptCanvas/Libraries/Logic/Multiplexer.h
     Include/ScriptCanvas/Libraries/Logic/Multiplexer.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Logic/Not.h
@@ -373,11 +342,8 @@ set(FILES
     Include/ScriptCanvas/Libraries/Logic/While.cpp
     Include/ScriptCanvas/Libraries/Logic/While.h
     Include/ScriptCanvas/Libraries/Logic/While.ScriptCanvasGrammar.xml
-    Include/ScriptCanvas/Libraries/Math/AABBNode.h
     Include/ScriptCanvas/Libraries/Math/AABBNodes.h
-    Include/ScriptCanvas/Libraries/Math/ColorNode.h
     Include/ScriptCanvas/Libraries/Math/ColorNodes.h
-    Include/ScriptCanvas/Libraries/Math/CRCNode.h
     Include/ScriptCanvas/Libraries/Math/CRCNodes.h
     Include/ScriptCanvas/Libraries/Math/Divide.h
     Include/ScriptCanvas/Libraries/Math/Math.cpp
@@ -389,26 +355,15 @@ set(FILES
     Include/ScriptCanvas/Libraries/Math/MathNodeUtilities.h
     Include/ScriptCanvas/Libraries/Math/MathGenerics.h
     Include/ScriptCanvas/Libraries/Math/MathRandom.h
-    Include/ScriptCanvas/Libraries/Math/Matrix3x3Node.h
     Include/ScriptCanvas/Libraries/Math/Matrix3x3Nodes.h
-    Include/ScriptCanvas/Libraries/Math/Matrix4x4Node.h
     Include/ScriptCanvas/Libraries/Math/Matrix4x4Nodes.h
     Include/ScriptCanvas/Libraries/Math/Multiply.h
-    Include/ScriptCanvas/Libraries/Math/Number.h
-    Include/ScriptCanvas/Libraries/Math/OBBNode.h
     Include/ScriptCanvas/Libraries/Math/OBBNodes.h
-    Include/ScriptCanvas/Libraries/Math/PlaneNode.h
     Include/ScriptCanvas/Libraries/Math/PlaneNodes.h
-    Include/ScriptCanvas/Libraries/Math/Random.cpp
-    Include/ScriptCanvas/Libraries/Math/Random.h
-    Include/ScriptCanvas/Libraries/Math/Random.ScriptCanvasGrammar.xml
-    Include/ScriptCanvas/Libraries/Math/Rotation.h
     Include/ScriptCanvas/Libraries/Math/RotationNodes.h
     Include/ScriptCanvas/Libraries/Math/Subtract.h
     Include/ScriptCanvas/Libraries/Math/Sum.h
-    Include/ScriptCanvas/Libraries/Math/Transform.h
     Include/ScriptCanvas/Libraries/Math/TransformNodes.h
-    Include/ScriptCanvas/Libraries/Math/Vector.h
     Include/ScriptCanvas/Libraries/Math/Vector2Nodes.h
     Include/ScriptCanvas/Libraries/Math/Vector3Nodes.h
     Include/ScriptCanvas/Libraries/Math/Vector4Nodes.h
@@ -461,7 +416,6 @@ set(FILES
     Include/ScriptCanvas/Libraries/String/Format.cpp
     Include/ScriptCanvas/Libraries/String/Format.h
     Include/ScriptCanvas/Libraries/String/Format.ScriptCanvasGrammar.xml
-    Include/ScriptCanvas/Libraries/String/Print.cpp
     Include/ScriptCanvas/Libraries/String/Print.h
     Include/ScriptCanvas/Libraries/String/Print.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/String/Replace.cpp
@@ -478,10 +432,8 @@ set(FILES
     Include/ScriptCanvas/Libraries/UnitTesting/AddFailure.cpp
     Include/ScriptCanvas/Libraries/UnitTesting/AddFailure.h
     Include/ScriptCanvas/Libraries/UnitTesting/AddFailure.ScriptCanvasGrammar.xml
-    Include/ScriptCanvas/Libraries/UnitTesting/AddSuccess.cpp
     Include/ScriptCanvas/Libraries/UnitTesting/AddSuccess.h
     Include/ScriptCanvas/Libraries/UnitTesting/AddSuccess.ScriptCanvasGrammar.xml
-    Include/ScriptCanvas/Libraries/UnitTesting/Checkpoint.cpp
     Include/ScriptCanvas/Libraries/UnitTesting/Checkpoint.h
     Include/ScriptCanvas/Libraries/UnitTesting/Checkpoint.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/UnitTesting/ExpectEqual.cpp
@@ -508,7 +460,6 @@ set(FILES
     Include/ScriptCanvas/Libraries/UnitTesting/ExpectTrue.cpp
     Include/ScriptCanvas/Libraries/UnitTesting/ExpectTrue.h
     Include/ScriptCanvas/Libraries/UnitTesting/ExpectTrue.ScriptCanvasGrammar.xml
-    Include/ScriptCanvas/Libraries/UnitTesting/MarkComplete.cpp
     Include/ScriptCanvas/Libraries/UnitTesting/MarkComplete.h
     Include/ScriptCanvas/Libraries/UnitTesting/MarkComplete.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBus.h
diff --git a/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_builder_files.cmake b/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_builder_files.cmake
index a401a0cc1d..339973aa8e 100644
--- a/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_builder_files.cmake
+++ b/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_builder_files.cmake
@@ -14,5 +14,4 @@ set(FILES
     Builder/ScriptCanvasBuilderWorker.cpp
     Builder/ScriptCanvasBuilderWorker.h
     Builder/ScriptCanvasBuilderWorkerUtility.cpp
-    Builder/ScriptCanvasFunctionBuilderWorker.cpp
 )
diff --git a/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_files.cmake b/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_files.cmake
index daa2a599ce..309fa83edc 100644
--- a/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_files.cmake
+++ b/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_files.cmake
@@ -21,8 +21,6 @@ set(FILES
     Editor/Assets/ScriptCanvasAssetHelpers.h
     Editor/Assets/ScriptCanvasAssetHelpers.cpp
     Editor/Assets/ScriptCanvasAssetTrackerDefinitions.h
-    Editor/Include/ScriptCanvas/Assets/Functions/ScriptCanvasFunctionAssetHandler.h
-    Editor/Assets/Functions/ScriptCanvasFunctionAssetHandler.cpp
     Editor/Include/ScriptCanvas/Assets/ScriptCanvasAsset.h
     Editor/Assets/ScriptCanvasAsset.cpp
     Editor/Include/ScriptCanvas/Assets/ScriptCanvasAssetBus.h
@@ -31,11 +29,6 @@ set(FILES
     Editor/Assets/ScriptCanvasAssetHandler.cpp
     Editor/Assets/ScriptCanvasAssetHolder.h
     Editor/Assets/ScriptCanvasAssetHolder.cpp
-    Editor/Assets/ScriptCanvasAssetInstance.h
-    Editor/Assets/ScriptCanvasAssetInstance.cpp
-    Editor/Assets/ScriptCanvasAssetReference.h
-    Editor/Assets/ScriptCanvasAssetReference.cpp
-    Editor/Assets/ScriptCanvasAssetReferenceContainer.h
     Editor/Assets/ScriptCanvasMemoryAsset.h
     Editor/Assets/ScriptCanvasMemoryAsset.cpp
     Editor/Assets/ScriptCanvasUndoHelper.h
@@ -84,8 +77,6 @@ set(FILES
     Editor/GraphCanvas/Components/NodeDescriptors/EBusHandlerNodeDescriptorComponent.h
     Editor/GraphCanvas/Components/NodeDescriptors/EBusSenderNodeDescriptorComponent.cpp
     Editor/GraphCanvas/Components/NodeDescriptors/EBusSenderNodeDescriptorComponent.h
-    Editor/GraphCanvas/Components/NodeDescriptors/EntityRefNodeDescriptorComponent.cpp
-    Editor/GraphCanvas/Components/NodeDescriptors/EntityRefNodeDescriptorComponent.h
     Editor/GraphCanvas/Components/NodeDescriptors/FunctionNodeDescriptorComponent.cpp
     Editor/GraphCanvas/Components/NodeDescriptors/FunctionNodeDescriptorComponent.h
     Editor/GraphCanvas/Components/NodeDescriptors/FunctionDefinitionNodeDescriptorComponent.h
@@ -129,16 +120,12 @@ set(FILES
     Editor/Model/LibraryDataModel.cpp
     Editor/Model/UnitTestBrowserFilterModel.h
     Editor/Model/UnitTestBrowserFilterModel.cpp
-    Editor/Nodes/EditorLibrary.h
-    Editor/Nodes/EditorLibrary.cpp
     Editor/Nodes/NodeCreateUtils.h
     Editor/Nodes/NodeCreateUtils.cpp
     Editor/Nodes/NodeDisplayUtils.h
     Editor/Nodes/NodeDisplayUtils.cpp
     Editor/Nodes/NodeUtils.h
     Editor/Nodes/NodeUtils.cpp
-    Editor/Nodes/ScriptCanvasAssetNode.h
-    Editor/Nodes/ScriptCanvasAssetNode.cpp
     Editor/Translation/TranslationHelper.h
     Editor/Undo/ScriptCanvasGraphCommand.cpp
     Editor/Undo/ScriptCanvasGraphCommand.h
diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/GraphActions.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/GraphActions.cpp
index f016dd0a8d..777dcdd1b6 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/GraphActions.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/GraphActions.cpp
@@ -73,19 +73,6 @@ namespace ScriptCanvasDeveloper
             {
                 return AZ::Failure<AZStd::string>("Active graph is not the newly created graph.");
             }
-            else
-            {
-                ScriptCanvas::ScriptCanvasId scriptCanvasId;
-                ScriptCanvasEditor::GeneralRequestBus::BroadcastResult(scriptCanvasId, &ScriptCanvasEditor::GeneralRequests::GetScriptCanvasId, activeGraphCanvasId);
-
-                bool isRuntimeGraph = false;
-                ScriptCanvasEditor::EditorGraphRequestBus::EventResult(isRuntimeGraph, scriptCanvasId, &ScriptCanvasEditor::EditorGraphRequests::IsRuntimeGraph);
-
-                if (!isRuntimeGraph)
-                {
-                    return AZ::Failure<AZStd::string>("Created a new Graph, but graph is not of type Runtime Graph.");
-                }
-            }
         }
 
         return CompoundAction::GenerateReport();
@@ -140,19 +127,6 @@ namespace ScriptCanvasDeveloper
             {
                 return AZ::Failure<AZStd::string>("Active graph is not the newly created function.");
             }
-            else
-            {
-                ScriptCanvas::ScriptCanvasId scriptCanvasId;
-                ScriptCanvasEditor::GeneralRequestBus::BroadcastResult(scriptCanvasId, &ScriptCanvasEditor::GeneralRequests::GetScriptCanvasId, activeGraphCanvasId);
-
-                bool isFunctionGraph = false;
-                ScriptCanvasEditor::EditorGraphRequestBus::EventResult(isFunctionGraph, scriptCanvasId, &ScriptCanvasEditor::EditorGraphRequests::IsFunctionGraph);
-
-                if (!isFunctionGraph)
-                {
-                    return AZ::Failure<AZStd::string>("Created a new Graph, but graph is not of type Function.");
-                }
-            }
         }
 
         return CompoundAction::GenerateReport();
diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/GraphCreationTests.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/GraphCreationTests.cpp
index bc372a4f50..cb182b1852 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/GraphCreationTests.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/GraphCreationTests.cpp
@@ -75,19 +75,6 @@ namespace ScriptCanvasDeveloper
             {
                 ReportError("Active graph is not the newly created graph using hotkey.");
             }
-            else
-            {
-                ScriptCanvas::ScriptCanvasId scriptCanvasId;
-                ScriptCanvasEditor::GeneralRequestBus::BroadcastResult(scriptCanvasId, &ScriptCanvasEditor::GeneralRequests::GetScriptCanvasId, activeGraphCanvasId);
-
-                bool isRuntimeGraph = false;
-                ScriptCanvasEditor::EditorGraphRequestBus::EventResult(isRuntimeGraph, scriptCanvasId, &ScriptCanvasEditor::EditorGraphRequests::IsRuntimeGraph);
-
-                if (!isRuntimeGraph)
-                {
-                    ReportError("Failed to create Runtime graph using button");
-                }
-            }
         }
 
         GraphCanvas::AssetEditorNotificationBus::Handler::BusDisconnect();
diff --git a/Gems/ScriptCanvasTesting/Assets/ScriptCanvas/UnitTests/LY_SC_UnitTest_ParseErrorOnKnownNull.scriptcanvas b/Gems/ScriptCanvasTesting/Assets/ScriptCanvas/UnitTests/LY_SC_UnitTest_ParseErrorOnKnownNull.scriptcanvas
new file mode 100644
index 0000000000..4453617996
--- /dev/null
+++ b/Gems/ScriptCanvasTesting/Assets/ScriptCanvas/UnitTests/LY_SC_UnitTest_ParseErrorOnKnownNull.scriptcanvas
@@ -0,0 +1,947 @@
+<ObjectStream version="3">
+	<Class name="ScriptCanvasData" version="4" type="{1072E894-0C67-4091-8B64-F7DB324AD13C}">
+		<Class name="AZStd::unique_ptr" field="m_scriptCanvas" type="{8FFB6D85-994F-5262-BA1C-D0082A7F65C5}">
+			<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+				<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+					<Class name="AZ::u64" field="id" value="3430442328828" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+				</Class>
+				<Class name="AZStd::string" field="Name" value="ErrorOnKnownNullPointer" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+					<Class name="Graph" field="element" version="8" type="{4D755CA9-AB92-462C-B24F-0B3376F19967}">
+						<Class name="Graph" field="BaseClass1" version="18" type="{C3267D77-EEDC-490E-9E42-F1D1F473E184}">
+							<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+								<Class name="AZ::u64" field="Id" value="14369183947501644497" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+							</Class>
+							<Class name="GraphData" field="m_graphData" version="4" type="{ADCB5EB5-8D3F-42ED-8F65-EAB58A82C381}">
+								<Class name="AZStd::unordered_set" field="m_nodes" type="{27BF7BD3-6E17-5619-9363-3FC3D9A5369D}">
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="3434737296124" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="SC-Node(Start)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Start" field="element" version="2" type="{F200B22A-5903-483A-BF63-5241BC03632B}">
+												<Class name="Node" field="BaseClass1" version="14" type="{52B454AE-FA7E-4FE9-87D3-A1CAB235C691}">
+													<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+														<Class name="AZ::u64" field="Id" value="2033847097088246225" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="AZStd::list" field="Slots" type="{E01B3091-9B44-571A-A87B-7D0E2768D774}">
+														<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+															<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{D72C8619-DDC5-4408-832D-22345F3114F0}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="slotName" value="Out" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::string" field="toolTip" value="Signaled when the entity that owns this graph is fully activated." type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															</Class>
+															<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+														</Class>
+													</Class>
+													<Class name="AZStd::list" field="Datums" type="{36259B04-FAAB-5E8A-B7BF-A5E2EA5A9B3A}"/>
+													<Class name="int" field="NodeDisabledFlag" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="3439032263420" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="SC-Node(Print)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Print" field="element" type="{E1940FB4-83FE-4594-9AFF-375FF7603338}">
+												<Class name="StringFormatted" field="BaseClass1" version="1" type="{0B1577E0-339D-4573-93D1-6C311AD12A13}">
+													<Class name="Node" field="BaseClass1" version="14" type="{52B454AE-FA7E-4FE9-87D3-A1CAB235C691}">
+														<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+															<Class name="AZ::u64" field="Id" value="629773797142035969" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+														</Class>
+														<Class name="AZStd::list" field="Slots" type="{E01B3091-9B44-571A-A87B-7D0E2768D774}">
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{279B9DE9-1DF4-4AEB-A074-59CFBD714405}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="In" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="Input signal" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{EA671789-719F-465F-A150-58FA10DE99DD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="3" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Value" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="Value which replaces instances of {Value} in the resulting string." type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="4" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{4599647A-45DD-585B-AFC0-4BAD29EB49A7}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="1015031923" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{91E58ABF-D3DA-4755-B0A5-ADE45FE95990}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Out" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+														</Class>
+														<Class name="AZStd::list" field="Datums" type="{36259B04-FAAB-5E8A-B7BF-A5E2EA5A9B3A}">
+															<Class name="Datum" field="element" version="7" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+																<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="4" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{4599647A-45DD-585B-AFC0-4BAD29EB49A7}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="m_originality" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="RuntimeVariable" field="m_datumStorage" type="{6E969359-5AF5-4ECA-BE89-A96AB30A624E}">
+																	<Class name="any" field="value" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																		<Class name="AZStd::intrusive_ptr" field="m_data" type="{2349F1C2-6C74-54C9-8B7E-CBE24DDE8850}">
+																			<Class name="BehaviorContextObject" field="element" type="{B735214D-5182-4536-B748-61EC83C1F007}">
+																				<Class name="unsigned int" field="m_flags" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																				<Class name="any" field="m_object" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+																			</Class>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="m_datumLabel" value="Value" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															</Class>
+														</Class>
+														<Class name="int" field="NodeDisabledFlag" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+													</Class>
+													<Class name="AZStd::string" field="m_format" value="{Value}" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													<Class name="int" field="m_numericPrecision" value="4" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+													<Class name="AZStd::map" field="m_arrayBindingMap" type="{B3879B66-F836-5380-B4C8-4D519373E77E}">
+														<Class name="AZStd::pair" field="element" type="{F7CB29A1-551D-5BAD-9B38-B2279A75B957}">
+															<Class name="AZ::u64" field="value1" value="1" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+															<Class name="SlotId" field="value2" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{EA671789-719F-465F-A150-58FA10DE99DD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+														</Class>
+													</Class>
+													<Class name="AZStd::vector" field="m_unresolvedString" type="{99DAD0BC-740E-5E82-826B-8FC7968CC02C}">
+														<Class name="AZStd::string" field="element" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+														<Class name="AZStd::string" field="element" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													</Class>
+													<Class name="AZStd::map" field="m_formatSlotMap" type="{8E9FB38C-2A95-5DC6-B051-90FF0BA8567F}">
+														<Class name="AZStd::pair" field="element" type="{A17FF4ED-B460-5612-99F4-90D2832CF8F5}">
+															<Class name="AZStd::string" field="value1" value="Value" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="SlotId" field="value2" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{EA671789-719F-465F-A150-58FA10DE99DD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+														</Class>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="3443327230716" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="SC-Node(Insert)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="MethodOverloaded" field="element" version="6" type="{C1E3C9D0-42E3-4D00-AE73-2A881E7E76A8}">
+												<Class name="Method" field="BaseClass1" version="6" type="{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF}">
+													<Class name="Node" field="BaseClass1" version="14" type="{52B454AE-FA7E-4FE9-87D3-A1CAB235C691}">
+														<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+															<Class name="AZ::u64" field="Id" value="374087475034111554" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+														</Class>
+														<Class name="AZStd::list" field="Slots" type="{E01B3091-9B44-571A-A87B-7D0E2768D774}">
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{BE0E5D1E-52C5-4F5B-92F1-BDB160A77B72}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="OverloadContract" field="element" type="{45622160-13C5-46E3-94D9-AE2EAFE6AC64}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Container" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="The container into which to insert the value" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="4" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{4599647A-45DD-585B-AFC0-4BAD29EB49A7}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{E0F907E0-DD75-41DF-B510-031618CE04D2}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="OverloadContract" field="element" type="{45622160-13C5-46E3-94D9-AE2EAFE6AC64}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Index" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="The index at which to insert the value" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{E209E33F-102A-4696-92DF-5C9222200AB0}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="3" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="OverloadContract" field="element" type="{45622160-13C5-46E3-94D9-AE2EAFE6AC64}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Value" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="The value that is to be inserted" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="8" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{309C25E4-5997-438A-97E4-2CEF5E6AFEC5}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="In" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{1CDC77AC-8428-46F5-9277-530A54375996}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Out" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{0CA71D22-0920-415F-A78B-D6B83DAA4BF2}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="OverloadContract" field="element" type="{45622160-13C5-46E3-94D9-AE2EAFE6AC64}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Container" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="4" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{4599647A-45DD-585B-AFC0-4BAD29EB49A7}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+														</Class>
+														<Class name="AZStd::list" field="Datums" type="{36259B04-FAAB-5E8A-B7BF-A5E2EA5A9B3A}">
+															<Class name="Datum" field="element" version="7" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+																<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="4" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{4599647A-45DD-585B-AFC0-4BAD29EB49A7}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="m_originality" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="RuntimeVariable" field="m_datumStorage" type="{6E969359-5AF5-4ECA-BE89-A96AB30A624E}">
+																	<Class name="any" field="value" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																		<Class name="AZStd::intrusive_ptr" field="m_data" type="{2349F1C2-6C74-54C9-8B7E-CBE24DDE8850}">
+																			<Class name="BehaviorContextObject" field="element" type="{B735214D-5182-4536-B748-61EC83C1F007}">
+																				<Class name="unsigned int" field="m_flags" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																				<Class name="any" field="m_object" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+																			</Class>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="m_datumLabel" value="Container" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															</Class>
+															<Class name="Datum" field="element" version="7" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+																<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="RuntimeVariable" field="m_datumStorage" type="{6E969359-5AF5-4ECA-BE89-A96AB30A624E}">
+																	<Class name="any" field="value" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																		<Class name="double" field="m_data" value="0.0000000" type="{110C4B14-11A8-4E9D-8638-5051013A56AC}"/>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="m_datumLabel" value="Index" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															</Class>
+															<Class name="Datum" field="element" version="7" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+																<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="8" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="RuntimeVariable" field="m_datumStorage" type="{6E969359-5AF5-4ECA-BE89-A96AB30A624E}">
+																	<Class name="any" field="value" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																		<Class name="Vector3" field="m_data" value="0.0000000 0.0000000 0.0000000" type="{8379EB7D-01FA-4538-B64B-A6543B4BE73D}"/>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="m_datumLabel" value="Value" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															</Class>
+														</Class>
+														<Class name="int" field="NodeDisabledFlag" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+													</Class>
+													<Class name="int" field="methodType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+													<Class name="AZStd::string" field="methodName" value="Insert" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													<Class name="AZStd::string" field="className" value="AZStd::vector&lt;Vector3, allocator&gt;" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													<Class name="AZStd::vector" field="namespaces" type="{99DAD0BC-740E-5E82-826B-8FC7968CC02C}"/>
+													<Class name="AZStd::vector" field="resultSlotIDs" type="{D0B13803-101B-54D8-914C-0DA49FDFA268}">
+														<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+															<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+														</Class>
+													</Class>
+													<Class name="AZStd::vector" field="inputSlots" type="{D0B13803-101B-54D8-914C-0DA49FDFA268}">
+														<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+															<Class name="AZ::Uuid" field="m_id" value="{BE0E5D1E-52C5-4F5B-92F1-BDB160A77B72}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+														</Class>
+														<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+															<Class name="AZ::Uuid" field="m_id" value="{E0F907E0-DD75-41DF-B510-031618CE04D2}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+														</Class>
+														<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+															<Class name="AZ::Uuid" field="m_id" value="{E209E33F-102A-4696-92DF-5C9222200AB0}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+														</Class>
+													</Class>
+													<Class name="AZStd::string" field="prettyClassName" value="Array&lt;String&gt;" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+												</Class>
+												<Class name="AZStd::vector" field="orderedInputSlotIds" type="{D0B13803-101B-54D8-914C-0DA49FDFA268}">
+													<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{BE0E5D1E-52C5-4F5B-92F1-BDB160A77B72}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+													<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{E0F907E0-DD75-41DF-B510-031618CE04D2}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+													<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{E209E33F-102A-4696-92DF-5C9222200AB0}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="AZStd::vector" field="outputSlotIds" type="{D0B13803-101B-54D8-914C-0DA49FDFA268}">
+													<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{0CA71D22-0920-415F-A78B-D6B83DAA4BF2}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+								</Class>
+								<Class name="AZStd::vector" field="m_connections" type="{21786AF0-2606-5B9A-86EB-0892E2820E6C}">
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="3447622198012" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(On Graph Start: Out), destEndpoint=(Insert: In)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="8879085108177758537" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="3434737296124" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{D72C8619-DDC5-4408-832D-22345F3114F0}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="3443327230716" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{309C25E4-5997-438A-97E4-2CEF5E6AFEC5}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="3451917165308" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Insert: Out), destEndpoint=(Print: In)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="1330942341500010242" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="3443327230716" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{1CDC77AC-8428-46F5-9277-530A54375996}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="3439032263420" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{279B9DE9-1DF4-4AEB-A074-59CFBD714405}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="3456212132604" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Insert: Container), destEndpoint=(Print: Value)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="2410298168189703837" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="3443327230716" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{0CA71D22-0920-415F-A78B-D6B83DAA4BF2}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="3439032263420" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{EA671789-719F-465F-A150-58FA10DE99DD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+								</Class>
+								<Class name="AZStd::unordered_map" field="m_dependentAssets" type="{1BC78FA9-1D82-5F17-BD28-C35D1F4FA737}"/>
+								<Class name="AZStd::vector" field="m_scriptEventAssets" type="{479100D9-6931-5E23-8494-5A28EF2FCD8A}"/>
+							</Class>
+							<Class name="unsigned char" field="executionMode" value="0" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+							<Class name="AZ::Uuid" field="m_assetType" value="{3E2AC8CD-713F-453E-967F-29517F331784}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+							<Class name="SlotId" field="versionData" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+								<Class name="AZ::Uuid" field="m_id" value="{01000000-0100-0000-0000-000090508EA5}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+							</Class>
+						</Class>
+						<Class name="unsigned int" field="m_variableCounter" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+						<Class name="bool" field="m_saveFormatConverted" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+						<Class name="AZStd::unordered_map" field="GraphCanvasData" type="{0005D26C-B35A-5C30-B60C-5716482946CB}">
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="3443327230716" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="PersistentIdComponentSaveData" field="value2" version="1" type="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZ::Uuid" field="PersistentId" value="{5487CA75-434C-403B-A12C-37EC98B45CC0}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{328FF15C-C302-458F-A43D-E1794DE0904E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeneralNodeTitleComponentSaveData" field="value2" version="1" type="{328FF15C-C302-458F-A43D-E1794DE0904E}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="PaletteOverride" value="MethodNodeTitlePalette" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="StylingComponentSaveData" field="value2" version="1" type="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="SubStyle" value=".method" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeometrySaveData" field="value2" version="1" type="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}">
+												<Class name="Vector2" field="Position" value="100.0000000 400.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="NodeSaveData" field="value2" version="1" type="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}">
+												<Class name="bool" field="HideUnusedSlots" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="3439032263420" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="NodeSaveData" field="value2" version="1" type="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}">
+												<Class name="bool" field="HideUnusedSlots" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeometrySaveData" field="value2" version="1" type="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}">
+												<Class name="Vector2" field="Position" value="620.0000000 380.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="StylingComponentSaveData" field="value2" version="1" type="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="SubStyle" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{328FF15C-C302-458F-A43D-E1794DE0904E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeneralNodeTitleComponentSaveData" field="value2" version="1" type="{328FF15C-C302-458F-A43D-E1794DE0904E}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="PaletteOverride" value="StringNodeTitlePalette" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="PersistentIdComponentSaveData" field="value2" version="1" type="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZ::Uuid" field="PersistentId" value="{650A3E6F-45F0-4A2A-BB1A-613AAD01EC89}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="3434737296124" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="NodeSaveData" field="value2" version="1" type="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}">
+												<Class name="bool" field="HideUnusedSlots" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeometrySaveData" field="value2" version="1" type="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}">
+												<Class name="Vector2" field="Position" value="-100.0000000 380.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="StylingComponentSaveData" field="value2" version="1" type="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="SubStyle" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{328FF15C-C302-458F-A43D-E1794DE0904E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeneralNodeTitleComponentSaveData" field="value2" version="1" type="{328FF15C-C302-458F-A43D-E1794DE0904E}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="PaletteOverride" value="TimeNodeTitlePalette" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="PersistentIdComponentSaveData" field="value2" version="1" type="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZ::Uuid" field="PersistentId" value="{E5B9507D-D230-4E91-B5B1-527C887C0EF6}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="3430442328828" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{5F84B500-8C45-40D1-8EFC-A5306B241444}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="SceneComponentSaveData" field="value2" version="3" type="{5F84B500-8C45-40D1-8EFC-A5306B241444}">
+												<Class name="AZStd::vector" field="Constructs" type="{60BF495A-9BEF-5429-836B-37ADEA39CEA0}"/>
+												<Class name="ViewParams" field="ViewParams" version="1" type="{D016BF86-DFBB-4AF0-AD26-27F6AB737740}">
+													<Class name="double" field="Scale" value="1.0000000" type="{110C4B14-11A8-4E9D-8638-5051013A56AC}"/>
+													<Class name="float" field="AnchorX" value="-298.0000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+													<Class name="float" field="AnchorY" value="80.0000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+												</Class>
+												<Class name="unsigned int" field="BookmarkCounter" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+						</Class>
+						<Class name="AZStd::unordered_map" field="CRCCacheMap" type="{2376BDB0-D7B6-586B-A603-42BE703EB2C9}"/>
+						<Class name="GraphStatisticsHelper" field="StatisticsHelper" version="1" type="{7D5B7A65-F749-493E-BA5C-6B8724791F03}">
+							<Class name="AZStd::unordered_map" field="InstanceCounter" type="{9EC84E0A-F296-5212-8B69-4DE48E695D61}">
+								<Class name="AZStd::pair" field="element" type="{0CE5EF6F-834D-519F-B2EC-C2763B8BB99C}">
+									<Class name="AZ::u64" field="value1" value="4199610336680704683" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+									<Class name="int" field="value2" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+								</Class>
+								<Class name="AZStd::pair" field="element" type="{0CE5EF6F-834D-519F-B2EC-C2763B8BB99C}">
+									<Class name="AZ::u64" field="value1" value="10684225535275896474" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+									<Class name="int" field="value2" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+								</Class>
+								<Class name="AZStd::pair" field="element" type="{0CE5EF6F-834D-519F-B2EC-C2763B8BB99C}">
+									<Class name="AZ::u64" field="value1" value="7938438815433796325" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+									<Class name="int" field="value2" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+								</Class>
+							</Class>
+						</Class>
+						<Class name="int" field="GraphCanvasSaveVersion" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+					</Class>
+					<Class name="EditorGraphVariableManagerComponent" field="element" type="{86B7CC96-9830-4BD1-85C3-0C0BD0BFBEE7}">
+						<Class name="GraphVariableManagerComponent" field="BaseClass1" version="3" type="{825DC28D-667D-43D0-AF11-73681351DD2F}">
+							<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+								<Class name="AZ::u64" field="Id" value="14036452196925709023" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+							</Class>
+							<Class name="VariableData" field="m_variableData" version="3" type="{4F80659A-CD11-424E-BF04-AF02ABAC06B0}">
+								<Class name="AZStd::unordered_map" field="m_nameVariableMap" type="{6C3A5734-6C27-5033-B033-D5CAD11DE55A}">
+									<Class name="AZStd::pair" field="element" type="{E64D2110-EB38-5AE1-9B1D-3C06A10C7D6A}">
+										<Class name="VariableId" field="value1" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+											<Class name="AZ::Uuid" field="m_id" value="{20417B52-0B3D-415E-92A8-B7BB5D5EB395}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+										</Class>
+										<Class name="GraphVariable" field="value2" version="4" type="{5BDC128B-8355-479C-8FA8-4BFFAB6915A8}">
+											<Class name="Datum" field="Datum" version="7" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+												<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+												<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+													<Class name="unsigned int" field="m_type" value="4" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+													<Class name="AZ::Uuid" field="m_azType" value="{4599647A-45DD-585B-AFC0-4BAD29EB49A7}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+												</Class>
+												<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+												<Class name="RuntimeVariable" field="m_datumStorage" type="{6E969359-5AF5-4ECA-BE89-A96AB30A624E}">
+													<Class name="any" field="value" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+														<Class name="AZStd::intrusive_ptr" field="m_data" type="{2349F1C2-6C74-54C9-8B7E-CBE24DDE8850}">
+															<Class name="BehaviorContextObject" field="element" type="{B735214D-5182-4536-B748-61EC83C1F007}">
+																<Class name="unsigned int" field="m_flags" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="any" field="m_object" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																	<Class name="AZStd::vector" field="m_data" type="{4599647A-45DD-585B-AFC0-4BAD29EB49A7}"/>
+																</Class>
+															</Class>
+														</Class>
+													</Class>
+												</Class>
+												<Class name="AZStd::string" field="m_datumLabel" value="Array&lt;Vector3&gt;" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+											<Class name="Crc32" field="InputControlVisibility" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+												<Class name="unsigned int" field="Value" value="2755429085" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+											</Class>
+											<Class name="AZStd::string" field="ExposureCategory" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											<Class name="int" field="SortPriority" value="-1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+											<Class name="ReplicaNetworkProperties" field="ReplicaNetProps" version="1" type="{4F055551-DD75-4877-93CE-E80C844FC155}">
+												<Class name="bool" field="m_isSynchronized" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+											<Class name="VariableId" field="VariableId" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+												<Class name="AZ::Uuid" field="m_id" value="{20417B52-0B3D-415E-92A8-B7BB5D5EB395}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+											<Class name="AZStd::string" field="VariableName" value="Variable 2" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											<Class name="unsigned char" field="Scope" value="0" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+											<Class name="unsigned char" field="InitialValueSource" value="0" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::unordered_map" field="CopiedVariableRemapping" type="{723F81A5-0980-50C7-8B1F-BE646339362B}"/>
+						</Class>
+					</Class>
+				</Class>
+				<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+				<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+			</Class>
+		</Class>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/ScriptCanvasTesting/Code/Platform/Common/MSVC/scriptcanvastesting_editor_tests_msvc.cmake b/Gems/ScriptCanvasTesting/Code/Platform/Common/MSVC/scriptcanvastesting_editor_tests_msvc.cmake
index 95d699cd27..0d70c9d05c 100644
--- a/Gems/ScriptCanvasTesting/Code/Platform/Common/MSVC/scriptcanvastesting_editor_tests_msvc.cmake
+++ b/Gems/ScriptCanvasTesting/Code/Platform/Common/MSVC/scriptcanvastesting_editor_tests_msvc.cmake
@@ -8,7 +8,6 @@
 ly_add_source_properties(
     SOURCES
         Source/Framework/ScriptCanvasTestUtilities.cpp
-        Tests/ScriptCanvas_Async.cpp
         Tests/ScriptCanvas_BehaviorContext.cpp
         Tests/ScriptCanvas_ContainerSupport.cpp
         Tests/ScriptCanvas_Core.cpp
diff --git a/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestNodes.cpp b/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestNodes.cpp
index cf866d9f83..e54c83c5d3 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestNodes.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestNodes.cpp
@@ -11,8 +11,6 @@
 #include <ScriptCanvas/Core/Core.h>
 #include <ScriptCanvas/Core/Graph.h>
 #include <ScriptCanvas/Core/SlotConfigurationDefaults.h>
-#include <ScriptCanvas/Grammar/GrammarContext.h>
-#include <ScriptCanvas/Grammar/GrammarContextBus.h>
 
 #include <gtest/gtest.h>
 
@@ -33,25 +31,6 @@ namespace TestNodes
         AddSlot(slotConfiguration);
     }
 
-    void TestResult::OnInputSignal(const ScriptCanvas::SlotId&)
-    {
-        auto valueDatum = FindDatum(GetSlotId("Value"));
-        if (!valueDatum)
-        {
-            return;
-        }
-
-        valueDatum->ToString(m_string);
-
-        // technically, I should remove this, make it an object that holds a string, with an untyped slot, and this could be a local value
-        if (!m_string.empty())
-        {
-            AZ_TracePrintf("Script Canvas", "%s\n", m_string.c_str());
-        }
-
-        SignalOutput(GetSlotId(ScriptCanvas::CommonSlots::GeneralOutSlot::GetName()));
-    }
-
     void TestResult::Reflect(AZ::ReflectContext* context)
     {
         AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
@@ -105,11 +84,6 @@ namespace TestNodes
         AddSlot(ScriptCanvas::DataSlotConfiguration(Data::Type::Number(), "Get Number", ScriptCanvas::ConnectionType::Output));
     }
 
-    void ContractNode::OnInputSignal(const ScriptCanvas::SlotId&)
-    {
-        SignalOutput(GetSlotId(ScriptCanvas::CommonSlots::GeneralOutSlot::GetName()));
-    }
-
     //////////////////////////////////////////////////////////////////////////////
     void InfiniteLoopNode::Reflect(AZ::ReflectContext* reflection)
     {
@@ -121,11 +95,6 @@ namespace TestNodes
         }
     }
 
-    void InfiniteLoopNode::OnInputSignal(const ScriptCanvas::SlotId&)
-    {
-        SignalOutput(GetSlotId("Before Infinity"));
-    }
-
     void InfiniteLoopNode::OnInit()
     {
         AddSlot(ScriptCanvas::CommonSlots::GeneralInSlot());
@@ -159,13 +128,6 @@ namespace TestNodes
         AddSlot(slotConfiguration);
     }
 
-    void UnitTestErrorNode::OnInputSignal(const ScriptCanvas::SlotId&)
-    {
-        SCRIPTCANVAS_REPORT_ERROR((*this), "Unit test error!");
-
-        SignalOutput(GetSlotId("Out"));
-    }
-
     //////////////////////////////////////////////////////////////////////////////
 
     void AddNodeWithRemoveSlot::Reflect(AZ::ReflectContext* reflection)
@@ -205,30 +167,6 @@ namespace TestNodes
         return Node::RemoveSlot(slotId, true, emitWarning);
     }
 
-    void AddNodeWithRemoveSlot::OnInputSignal(const ScriptCanvas::SlotId& slotId)
-    {
-        if (slotId == GetSlotId("In"))
-        {
-            ScriptCanvas::Data::NumberType result{};
-            for (const ScriptCanvas::SlotId& dynamicSlotId : m_dynamicSlotIds)
-            {
-                if (auto numberInput = FindDatum(dynamicSlotId))
-                {
-                    if (auto argValue = numberInput->GetAs<ScriptCanvas::Data::NumberType>())
-                    {
-                        result += *argValue;
-                    }
-                }
-            }
-
-            auto resultType = GetSlotDataType(m_resultSlotId);
-            EXPECT_TRUE(resultType.IsValid());
-            ScriptCanvas::Datum output(result);;
-            PushOutput(output, *GetSlot(m_resultSlotId));
-            SignalOutput(GetSlotId("Out"));
-        }
-    }
-
     void AddNodeWithRemoveSlot::OnInit()
     {
         Node::AddSlot(ScriptCanvas::CommonSlots::GeneralInSlot());
@@ -290,28 +228,6 @@ namespace TestNodes
     }
 
     //////////////////////////////////////////////////////////////////////////////
-
-    void StringView::OnInputSignal(const ScriptCanvas::SlotId&)
-    {
-        auto viewDatum = FindDatum(GetSlotId("View"));
-
-        if (!viewDatum)
-        {
-            return;
-        }
-
-        ScriptCanvas::Data::StringType result;
-        viewDatum->ToString(result);
-
-        ScriptCanvas::Datum output(result);
-        auto resultSlot = GetSlot(m_resultSlotId);
-        if (resultSlot)
-        {
-            PushOutput(output, *resultSlot);
-        }
-        SignalOutput(GetSlotId("Out"));
-    }
-
     void StringView::Reflect(AZ::ReflectContext* context)
     {
         AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
@@ -354,36 +270,6 @@ namespace TestNodes
         return addedSlotId;
     }
 
-
-    void InsertSlotConcatNode::OnInputSignal(const ScriptCanvas::SlotId& slotId)
-    {
-        if (slotId == GetSlotId(ScriptCanvas::CommonSlots::GeneralInSlot::GetName()))
-        {
-            ScriptCanvas::Data::StringType result{};
-
-            for (const ScriptCanvas::Slot* concatSlot : GetAllSlotsByDescriptor(ScriptCanvas::SlotDescriptors::DataIn()))
-            {
-                if (auto inputDatum = FindDatum(concatSlot->GetId()))
-                {
-                    ScriptCanvas::Data::StringType stringArg;
-                    if (inputDatum->ToString(stringArg))
-                    {
-                        result += stringArg;
-                    }
-                }
-            }
-
-            auto resultSlotId = GetSlotId("Result");
-            auto resultType = GetSlotDataType(resultSlotId);
-            EXPECT_TRUE(resultType.IsValid());
-            if (auto resultSlot = GetSlot(resultSlotId))
-            {
-                PushOutput(ScriptCanvas::Datum(result), *resultSlot);
-            }
-            SignalOutput(GetSlotId("Out"));
-        }
-    }
-
     void InsertSlotConcatNode::OnInit()
     {
         Node::AddSlot(ScriptCanvas::CommonSlots::GeneralInSlot());
diff --git a/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestNodes.h b/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestNodes.h
index 8963cb4708..3790ab735f 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestNodes.h
+++ b/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestNodes.h
@@ -32,7 +32,6 @@ namespace TestNodes
     protected:
 
         void OnInit() override;
-        void OnInputSignal(const ScriptCanvas::SlotId&) override;
 
     private:
 
@@ -49,9 +48,6 @@ namespace TestNodes
 
         void OnInit() override;
 
-    protected:
-
-        void OnInputSignal(const ScriptCanvas::SlotId&) override;
     };
 
     //////////////////////////////////////////////////////////////////////////////
@@ -64,9 +60,6 @@ namespace TestNodes
         static void Reflect(AZ::ReflectContext* reflection);
 
     protected:
-
-        void OnInputSignal(const ScriptCanvas::SlotId&) override;
-
         void OnInit() override;
 
     };
@@ -84,8 +77,6 @@ namespace TestNodes
 
         void OnInit() override;
 
-        void OnInputSignal(const ScriptCanvas::SlotId&) override;
-
     };
 
     //////////////////////////////////////////////////////////////////////////////
@@ -101,8 +92,6 @@ namespace TestNodes
         bool RemoveSlot(const ScriptCanvas::SlotId& slotId, bool emitWarning = true);
 
     protected:
-        void OnInputSignal(const ScriptCanvas::SlotId& slotId) override;
-
         void OnInit() override;
 
         AZStd::vector<ScriptCanvas::SlotId> m_dynamicSlotIds;
@@ -120,8 +109,6 @@ namespace TestNodes
 
         void OnInit() override;
 
-        void OnInputSignal(const ScriptCanvas::SlotId&) override;
-
     public:
 
         static void Reflect(AZ::ReflectContext* context);
@@ -141,9 +128,7 @@ namespace TestNodes
         ScriptCanvas::SlotId InsertSlot(AZ::s64 index, AZStd::string_view slotName);
 
     protected:
-        void OnInputSignal(const ScriptCanvas::SlotId& slotId) override;
-
-        void OnInit() override;
+       void OnInit() override;
     };
     
     //////////////////////////////////////////////////////////////////////////////
diff --git a/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestUtilities.cpp b/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestUtilities.cpp
index 8f769aefa4..03ecba29be 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestUtilities.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestUtilities.cpp
@@ -470,14 +470,6 @@ namespace ScriptCanvasTests
     AZ::u32 TestBehaviorContextObject::s_createdCount = 0;
     AZ::u32 TestBehaviorContextObject::s_destroyedCount = 0;
 
-    ScriptCanvas::Nodes::Core::BehaviorContextObjectNode* CreateTestObjectNode(const AZ::EntityId& graphUniqueId, AZ::EntityId& entityOut, const AZ::Uuid& objectTypeID)
-    {
-        ScriptCanvas::Nodes::Core::BehaviorContextObjectNode* node = CreateTestNode<ScriptCanvas::Nodes::Core::BehaviorContextObjectNode>(graphUniqueId, entityOut);
-        EXPECT_TRUE(node != nullptr);
-        node->InitializeObject(objectTypeID);
-        return node;
-    }
-
     AZ::EntityId CreateClassFunctionNode(const ScriptCanvasId& scriptCanvasId, AZStd::string_view className, AZStd::string_view methodName)
     {
         using namespace ScriptCanvas;
@@ -495,93 +487,6 @@ namespace ScriptCanvasTests
         return methodNodeID;
     }
 
-    ScriptCanvas::Node* CreateDataNodeByType(const ScriptCanvasId& scriptCanvasId, const ScriptCanvas::Data::Type& type, AZ::EntityId& nodeIDout)
-    {
-        using namespace ScriptCanvas;
-
-        Node* node(nullptr);
-
-        switch (type.GetType())
-        {
-        case Data::eType::AABB:
-            node = CreateTestNode<ScriptCanvas::Nodes::Math::AABB>(scriptCanvasId, nodeIDout);
-            break;
-
-        case Data::eType::BehaviorContextObject:
-        {
-            auto objectNode = CreateTestNode<ScriptCanvas::Nodes::Core::BehaviorContextObjectNode>(scriptCanvasId, nodeIDout);
-            objectNode->InitializeObject(type);
-            node = objectNode;
-        }
-        break;
-
-        case Data::eType::Boolean:
-            node = CreateTestNode<ScriptCanvas::Nodes::Logic::Boolean>(scriptCanvasId, nodeIDout);
-            break;
-
-        case Data::eType::Color:
-            node = CreateTestNode<ScriptCanvas::Nodes::Math::Color>(scriptCanvasId, nodeIDout);
-            break;
-
-        case Data::eType::CRC:
-            node = CreateTestNode<ScriptCanvas::Nodes::Math::CRC>(scriptCanvasId, nodeIDout);
-            break;
-
-        case Data::eType::EntityID:
-            node = CreateTestNode<ScriptCanvas::Nodes::Entity::EntityRef>(scriptCanvasId, nodeIDout);
-            break;
-
-        case Data::eType::Matrix3x3:
-            node = CreateTestNode<ScriptCanvas::Nodes::Math::Matrix3x3>(scriptCanvasId, nodeIDout);
-            break;
-
-        case Data::eType::Matrix4x4:
-            node = CreateTestNode<ScriptCanvas::Nodes::Math::Matrix4x4>(scriptCanvasId, nodeIDout);
-            break;
-
-        case Data::eType::Number:
-            node = CreateTestNode<ScriptCanvas::Nodes::Math::Number>(scriptCanvasId, nodeIDout);
-            break;
-
-        case Data::eType::OBB:
-            node = CreateTestNode<ScriptCanvas::Nodes::Math::OBB>(scriptCanvasId, nodeIDout);
-            break;
-
-        case Data::eType::Plane:
-            node = CreateTestNode<ScriptCanvas::Nodes::Math::Plane>(scriptCanvasId, nodeIDout);
-            break;
-
-        case Data::eType::Quaternion:
-            node = CreateTestNode<ScriptCanvas::Nodes::Math::Quaternion>(scriptCanvasId, nodeIDout);
-            break;
-
-        case Data::eType::String:
-            node = CreateTestNode<ScriptCanvas::Nodes::Core::String>(scriptCanvasId, nodeIDout);
-            break;
-
-        case Data::eType::Transform:
-            node = CreateTestNode<ScriptCanvas::Nodes::Math::Transform>(scriptCanvasId, nodeIDout);
-            break;
-
-        case Data::eType::Vector2:
-            node = CreateTestNode<ScriptCanvas::Nodes::Math::Vector2>(scriptCanvasId, nodeIDout);
-            break;
-
-        case Data::eType::Vector3:
-            node = CreateTestNode<ScriptCanvas::Nodes::Math::Vector3>(scriptCanvasId, nodeIDout);
-            break;
-
-        case Data::eType::Vector4:
-            node = CreateTestNode<ScriptCanvas::Nodes::Math::Vector4>(scriptCanvasId, nodeIDout);
-            break;
-
-        default:
-            AZ_Error("ScriptCanvas", false, "unsupported data type");
-        }
-
-        return node;
-    }
-
     AZStd::string SlotDescriptorToString(ScriptCanvas::SlotDescriptor descriptor)
     {
         AZStd::string name;
diff --git a/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestUtilities.h b/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestUtilities.h
index e1879f6038..ba48af6ac3 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestUtilities.h
+++ b/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestUtilities.h
@@ -69,23 +69,6 @@ namespace ScriptCanvasTests
         return GetTestNode<t_NodeType>(scriptCanvasId, entityOut);
     }
 
-    ScriptCanvas::Node* CreateDataNodeByType(const ScriptCanvas::ScriptCanvasId& scriptCanvasId, const ScriptCanvas::Data::Type& type, AZ::EntityId& nodeIDout);
-
-    template<typename t_Value>
-    ScriptCanvas::Node* CreateDataNode(const ScriptCanvas::ScriptCanvasId& scriptCanvasId, const t_Value& value, AZ::EntityId& nodeIDout)
-    {
-        using namespace ScriptCanvas;
-        const Data::Type operandType = Data::FromAZType(azrtti_typeid<t_Value>());
-        Node* node = CreateDataNodeByType(scriptCanvasId, operandType, nodeIDout);
-
-        EXPECT_NE(node, nullptr);
-        if (node)
-        {
-            node->SetInput_UNIT_TEST("Set", value);
-        }
-        return node;
-    }
-
     template<typename t_Value>
     ScriptCanvas::VariableId CreateVariable(ScriptCanvas::ScriptCanvasId scriptCanvasId, const t_Value& value, AZStd::string_view variableName)
     {
@@ -101,7 +84,6 @@ namespace ScriptCanvasTests
         return addVariableOutcome.TakeValue();
     }
 
-    ScriptCanvas::Nodes::Core::BehaviorContextObjectNode* CreateTestObjectNode(const ScriptCanvas::ScriptCanvasId& scriptCanvasId, AZ::EntityId& entityOut, const AZ::Uuid& objectTypeID);
     AZ::EntityId CreateClassFunctionNode(const ScriptCanvas::ScriptCanvasId& scriptCanvasId, AZStd::string_view className, AZStd::string_view methodName);
     AZStd::string SlotDescriptorToString(ScriptCanvas::SlotDescriptor type);
     void DumpSlots(const ScriptCanvas::Node& node);
diff --git a/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Async.cpp b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Async.cpp
deleted file mode 100644
index e50914c0a6..0000000000
--- a/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Async.cpp
+++ /dev/null
@@ -1,316 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include <AzCore/PlatformDef.h>
-#include <AzCore/Component/ComponentApplicationBus.h>
-#include <AzCore/std/smart_ptr/make_shared.h>
-
-#include <Source/Framework/ScriptCanvasTestFixture.h>
-#include <Source/Framework/ScriptCanvasTestUtilities.h>
-
-#include <ScriptCanvas/Core/SlotConfigurationDefaults.h>
-
-using namespace ScriptCanvasTests;
-using namespace ScriptCanvasEditor;
-
-// Asynchronous ScriptCanvas Behaviors
-
-#if AZ_COMPILER_MSVC
-
-#include <future>
-
-class AsyncEvent : public AZ::EBusTraits
-{
-public:
-
-    //////////////////////////////////////////////////////////////////////////
-    // EBusTraits overrides
-    static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
-    using BusIdType = AZ::EntityId;
-    using MutexType = AZStd::recursive_mutex;
-    static const bool LocklessDispatch = true;
-
-    //////////////////////////////////////////////////////////////////////////
-
-    virtual void OnAsyncEvent() = 0;
-};
-
-using AsyncEventNotificationBus = AZ::EBus<AsyncEvent>;
-
-class LongRunningProcessSimulator3000
-{
-public:
-
-    static void Run(const AZ::EntityId& listener)
-    {
-        int duration = 40;
-        while (--duration > 0)
-        {
-            AZStd::this_thread::sleep_for(AZStd::chrono::milliseconds(10));
-        }
-
-        AsyncEventNotificationBus::Event(listener, &AsyncEvent::OnAsyncEvent);
-    }
-};
-
-class AsyncNode
-    : public ScriptCanvas::Node
-    , protected AsyncEventNotificationBus::Handler
-    , protected AZ::TickBus::Handler
-{
-public:
-    AZ_COMPONENT(AsyncNode, "{0A7FF6C6-878B-42EC-A8BB-4D29C4039853}", ScriptCanvas::Node);
-
-    bool IsEntryPoint() const { return true; }
-
-    AsyncNode()
-        : Node()
-    {}
-
-    static void Reflect(AZ::ReflectContext* reflection)
-    {
-        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(reflection);
-        if (serializeContext)
-        {
-            serializeContext->Class<AsyncNode, Node>()
-                ->Version(1)
-                ;
-        }
-    }
-
-    void ConfigureSlots() override
-    {
-        AddSlot(ScriptCanvas::CommonSlots::GeneralInSlot());
-        AddSlot(ScriptCanvas::CommonSlots::GeneralOutSlot());
-    }
-
-    void OnActivate() override
-    {
-        ScriptCanvasTestFixture::s_asyncOperationActive = true;
-        AZ::TickBus::Handler::BusConnect();
-        AsyncEventNotificationBus::Handler::BusConnect(GetEntityId());
-
-        std::packaged_task<void()> task([this]() { LongRunningProcessSimulator3000::Run(GetEntityId()); }); // wrap the function
-
-        m_eventThread = AZStd::make_shared<AZStd::thread>(AZStd::move(task)); // launch on a thread
-    }
-
-    void OnDeactivate() override
-    {
-        if (m_eventThread)
-        {
-            m_eventThread->join();
-            m_eventThread.reset();
-        }
-
-        // We've received the event, no longer need the bus connection
-        AsyncEventNotificationBus::Handler::BusDisconnect();
-
-        // We're done, kick it out.
-        SignalOutput(GetSlotId("Out"));
-
-        // Disconnect from tick bus as well
-        AZ::TickBus::Handler::BusDisconnect();
-    }
-
-    virtual void HandleAsyncEvent()
-    {
-        EXPECT_GT(m_duration, 0.f);
-
-        Shutdown();
-    }
-
-    void OnAsyncEvent() override
-    {
-        HandleAsyncEvent();
-    }
-
-    void Shutdown()
-    {
-        ScriptCanvasTestFixture::s_asyncOperationActive = false;
-    }
-
-    void OnTick(float deltaTime, AZ::ScriptTimePoint) override
-    {
-        AZ_TracePrintf("Debug", "Awaiting async operation: %.2f\n", m_duration);
-        m_duration += deltaTime;
-    }
-
-protected:
-    AZStd::shared_ptr<AZStd::thread> m_eventThread;
-private:
-    double m_duration = 0.f;
-};
-
-TEST_F(ScriptCanvasTestFixture, Asynchronous_Behaviors)
-{
-    using namespace ScriptCanvas;
-
-    RegisterComponentDescriptor<AsyncNode>();
-
-    // Make the graph.
-    ScriptCanvas::Graph* graph =nullptr;
-    SystemRequestBus::BroadcastResult(graph, &SystemRequests::MakeGraph);
-    ASSERT_TRUE(graph != nullptr);
-
-    AZ::Entity* graphEntity = graph->GetEntity();
-    graphEntity->Init();
-
-    const ScriptCanvasId& graphUniqueId = graph->GetScriptCanvasId();
-
-    AZ::Entity* startEntity{ aznew AZ::Entity };
-    startEntity->Init();
-
-    AZ::EntityId startNodeId;
-    CreateTestNode<ScriptCanvas::Nodes::Core::Start>(graphUniqueId, startNodeId);
-
-    AZ::EntityId asyncNodeId;
-    CreateTestNode<AsyncNode>(graphUniqueId, asyncNodeId);
-
-    EXPECT_TRUE(Connect(*graph, startNodeId, ScriptCanvas::CommonSlots::GeneralOutSlot::GetName(), asyncNodeId, ScriptCanvas::CommonSlots::GeneralInSlot::GetName()));
-    
-    {
-        ScopedOutputSuppression supressOutput;
-        graphEntity->Activate();
-
-        // Tick the TickBus while the graph entity is active
-        while (ScriptCanvasTestFixture::s_asyncOperationActive)
-        {
-            AZ::TickBus::ExecuteQueuedEvents();
-            AZStd::this_thread::sleep_for(AZStd::chrono::milliseconds(100));
-            AZ::TickBus::Broadcast(&AZ::TickEvents::OnTick, 0.01f, AZ::ScriptTimePoint(AZStd::chrono::system_clock::now()));
-        }
-    }
-
-    graphEntity->Deactivate();
-    delete graphEntity;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-namespace
-{
-    // Fibonacci solver, used to compare against the graph version.
-    long ComputeFibonacci(int digits)
-    {
-        int a = 0;
-        int b = 1;
-        long sum = 0;
-        for (int i = 0; i < digits - 2; ++i)
-        {
-            sum = a + b;
-            a = b;
-            b = sum;
-        }
-        return sum;
-    }
-}
-
-class AsyncFibonacciComputeNode
-    : public AsyncNode
-{
-public:    
-    AZ_COMPONENT(AsyncFibonacciComputeNode, "{B198F52D-708C-414B-BB90-DFF0462D7F03}", AsyncNode);
-
-    AsyncFibonacciComputeNode()
-        : AsyncNode()
-    {}
-
-    bool IsEntryPoint() const { return true; }
-
-    static const int k_numberOfFibonacciDigits = 64;
-
-    static void Reflect(AZ::ReflectContext* reflection)
-    {
-        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(reflection);
-        if (serializeContext)
-        {
-            serializeContext->Class<AsyncFibonacciComputeNode, AsyncNode>()
-                ->Version(1)
-                ;
-        }
-    }
-
-    void OnActivate() override
-    {
-        AZ::TickBus::Handler::BusConnect();
-        AsyncEventNotificationBus::Handler::BusConnect(GetEntityId());
-
-        int digits = k_numberOfFibonacciDigits;
-
-        std::promise<long> p;
-        m_computeFuture = p.get_future();
-        m_eventThread = AZStd::make_shared<AZStd::thread>([this, digits, p = AZStd::move(p)]() mutable
-        {
-            p.set_value(ComputeFibonacci(digits));
-            AsyncEventNotificationBus::Event(GetEntityId(), &AsyncEvent::OnAsyncEvent);
-        });
-    }
-
-    void HandleAsyncEvent() override
-    {
-        m_result = m_computeFuture.get();
-
-        EXPECT_EQ(m_result, ComputeFibonacci(k_numberOfFibonacciDigits));
-    }
-
-    void OnTick(float deltaTime, AZ::ScriptTimePoint) override
-    {
-        AZ_TracePrintf("Debug", "Awaiting async fib operation: %.2f\n", m_duration);
-        m_duration += deltaTime;
-
-        if (m_result != 0)
-        {
-            Shutdown();
-        }
-    }
-
-private:
-    std::future<long> m_computeFuture;
-    long m_result = 0;
-    double m_duration = 0.f;
-};
-
-TEST_F(ScriptCanvasTestFixture, ComputeFibonacciAsyncGraphTest)
-{
-    using namespace ScriptCanvas;
-
-    RegisterComponentDescriptor<AsyncNode>();
-    RegisterComponentDescriptor<AsyncFibonacciComputeNode>();
-
-    // Make the graph.
-    ScriptCanvas::Graph* graph =nullptr;
-    SystemRequestBus::BroadcastResult(graph, &SystemRequests::MakeGraph);
-    ASSERT_NE(graph, nullptr);
-
-    AZ::Entity* graphEntity = graph->GetEntity();
-    graphEntity->Init();
-
-    const ScriptCanvasId& graphUniqueId = graph->GetScriptCanvasId();
-
-    AZ::EntityId startNodeId;
-    CreateTestNode<ScriptCanvas::Nodes::Core::Start>(graphUniqueId, startNodeId);
-
-    AZ::EntityId asyncNodeId;
-    CreateTestNode<AsyncFibonacciComputeNode>(graphUniqueId, asyncNodeId);
-
-    EXPECT_TRUE(Connect(*graph, startNodeId, "Out", asyncNodeId, "In"));
-
-    graphEntity->Activate();
-
-    // Tick the TickBus while the graph entity is active
-    while (ScriptCanvasTestFixture::s_asyncOperationActive)
-    {
-        AZ::TickBus::ExecuteQueuedEvents();
-        AZStd::this_thread::sleep_for(AZStd::chrono::milliseconds(100));
-        AZ::TickBus::Broadcast(&AZ::TickEvents::OnTick, 0.01f, AZ::ScriptTimePoint(AZStd::chrono::system_clock::now()));
-    }
-
-    graphEntity->Deactivate();
-    delete graphEntity;
-}
-
-#endif // AZ_COMPILER_MSVC
diff --git a/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_BehaviorContext.cpp b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_BehaviorContext.cpp
index be0f57665a..c1fdbc2b60 100644
--- a/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_BehaviorContext.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_BehaviorContext.cpp
@@ -12,7 +12,6 @@
 #include <Source/Framework/ScriptCanvasTestNodes.h>
 
 #include <ScriptCanvas/Libraries/Core/Start.h>
-#include <ScriptCanvas/Libraries/Core/BehaviorContextObjectNode.h>
 #include <AzCore/Math/Uuid.h>
 #include <AzCore/std/string/string.h>
 
@@ -20,187 +19,6 @@ using namespace ScriptCanvasTests;
 using namespace ScriptCanvasEditor;
 using namespace TestNodes;
 
-TEST_F(ScriptCanvasTestFixture, BehaviorContextObjectGenericConstructor)
-{
-    using namespace ScriptCanvas;
-    
-    TestBehaviorContextObject::Reflect(m_serializeContext);
-    TestBehaviorContextObject::Reflect(m_behaviorContext);
-
-    
-    AZ::Entity* graphEntity = aznew AZ::Entity("Graph");
-    graphEntity->Init();
-    SystemRequestBus::Broadcast(&SystemRequests::CreateGraphOnEntity, graphEntity);
-    auto graph = graphEntity->FindComponent<ScriptCanvas::Graph>();
-    EXPECT_NE(nullptr, graph);
-
-    const ScriptCanvasId& graphUniqueId = graph->GetScriptCanvasId();
-    
-    //Validates the GenericConstructorOverride attribute is being used to construct types that are normally not initialized in C++
-    AZ::EntityId vector3IdA;
-    ScriptCanvas::Nodes::Core::BehaviorContextObjectNode* vector3NodeA = CreateTestNode<ScriptCanvas::Nodes::Core::BehaviorContextObjectNode>(graphUniqueId, vector3IdA);
-    vector3NodeA->InitializeObject(azrtti_typeid<TestBehaviorContextObject>());
-    
-    ReportErrors(graph);
-
-    if (auto result = vector3NodeA->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set"))
-    {
-        EXPECT_EQ(0, result->GetValue());
-    }
-    else
-    {
-        ADD_FAILURE();
-    }
-
-    delete graphEntity;
-    
-    m_serializeContext->EnableRemoveReflection();
-    m_behaviorContext->EnableRemoveReflection();
-    TestBehaviorContextObject::Reflect(m_serializeContext);
-    TestBehaviorContextObject::Reflect(m_behaviorContext);
-    m_serializeContext->DisableRemoveReflection();
-    m_behaviorContext->DisableRemoveReflection();
-}
-
-// Tests the basic footprint of the ebus node both before and after graph activation to make sure all internal bookeeping is correct.
-TEST_F(ScriptCanvasTestFixture, BehaviorContext_BusHandlerNodeFootPrint)
-{
-    using namespace ScriptCanvas;
-
-    TemplateEventTestHandler<AZ::Uuid>::Reflect(m_serializeContext);
-    TemplateEventTestHandler<AZ::Uuid>::Reflect(m_behaviorContext);
-
-    auto graphEntity = aznew AZ::Entity;
-    SystemRequestBus::Broadcast(&SystemRequests::CreateGraphOnEntity, graphEntity);
-    ScriptCanvas::Graph* graph = AZ::EntityUtils::FindFirstDerivedComponent<ScriptCanvas::Graph>(graphEntity);
-    graphEntity->Init();
-
-    const ScriptCanvasId& graphUniqueId = graph->GetScriptCanvasId();
-
-    AZ::EntityId uuidEventHandlerId;
-    auto uuidEventHandler = CreateTestNode<ScriptCanvas::Nodes::Core::EBusEventHandler>(graphUniqueId, uuidEventHandlerId);
-    uuidEventHandler->InitializeBus("TemplateEventTestHandler<AZ::Uuid >");
-    AZ::Uuid uuidBusId = AZ::Uuid::CreateName("TemplateEventBus");
-    uuidEventHandler->SetInput_UNIT_TEST(ScriptCanvas::Nodes::Core::EBusEventHandler::c_busIdName, uuidBusId); //Set Uuid bus id
-    
-    {
-        auto eventEntry = uuidEventHandler->FindEvent("VectorCreatedEvent");
-        EXPECT_NE(nullptr, eventEntry);
-        EXPECT_EQ(eventEntry->m_parameterSlotIds.size(), 1);
-        EXPECT_TRUE(eventEntry->m_resultSlotId.IsValid());
-
-        {
-            const Slot* outputSlot = uuidEventHandler->GetSlot(eventEntry->m_eventSlotId);
-            EXPECT_EQ(outputSlot->GetDescriptor(), SlotDescriptors::ExecutionOut());
-        }
-
-        {
-            const Slot* dataSlot = uuidEventHandler->GetSlot(eventEntry->m_parameterSlotIds[0]);
-
-            EXPECT_EQ(dataSlot->GetDescriptor(), SlotDescriptors::DataOut());
-            EXPECT_EQ(dataSlot->GetDataType(), Data::Type::Vector3());
-
-            const Datum* datum = uuidEventHandler->FindDatum(eventEntry->m_parameterSlotIds[0]);
-            EXPECT_EQ(nullptr, datum);
-
-            ModifiableDatumView datumView;
-            uuidEventHandler->FindModifiableDatumView(eventEntry->m_parameterSlotIds[0], datumView);
-
-            EXPECT_FALSE(datumView.IsValid());
-        }
-
-        {
-            const Slot* resultSlot = uuidEventHandler->GetSlot(eventEntry->m_resultSlotId);
-
-            EXPECT_EQ(resultSlot->GetDescriptor(), SlotDescriptors::DataIn());
-            EXPECT_EQ(resultSlot->GetDataType(), Data::Type::Vector3());
-
-            const Datum* datum = uuidEventHandler->FindDatum(eventEntry->m_resultSlotId);
-            EXPECT_NE(nullptr, datum);
-
-            if (datum)
-            {
-                EXPECT_TRUE(datum->IS_A<Data::Vector3Type>());
-            }
-
-            ModifiableDatumView datumView;
-            uuidEventHandler->FindModifiableDatumView(eventEntry->m_resultSlotId, datumView);
-
-            EXPECT_TRUE(datumView.IsValid());
-
-            if (datumView.IsValid())
-            {                
-                const Datum* datum2 = datumView.GetDatum();
-                EXPECT_TRUE(datum2->IS_A<Data::Vector3Type>());
-            }
-        }
-    }
-
-    graphEntity->Activate();
-
-    {
-        auto eventEntry = uuidEventHandler->FindEvent("VectorCreatedEvent");
-        EXPECT_NE(nullptr, eventEntry);
-        EXPECT_EQ(eventEntry->m_parameterSlotIds.size(), 1);
-        EXPECT_TRUE(eventEntry->m_resultSlotId.IsValid());
-
-        {
-            const Slot* outputSlot = uuidEventHandler->GetSlot(eventEntry->m_eventSlotId);
-            EXPECT_EQ(outputSlot->GetDescriptor(), SlotDescriptors::ExecutionOut());
-        }
-
-        {
-            const Slot* dataSlot = uuidEventHandler->GetSlot(eventEntry->m_parameterSlotIds[0]);
-
-            EXPECT_EQ(dataSlot->GetDescriptor(), SlotDescriptors::DataOut());
-            EXPECT_EQ(dataSlot->GetDataType(), Data::Type::Vector3());
-
-            const Datum* datum = uuidEventHandler->FindDatum(eventEntry->m_parameterSlotIds[0]);
-            EXPECT_EQ(nullptr, datum);
-
-            ModifiableDatumView datumView;
-            uuidEventHandler->FindModifiableDatumView(eventEntry->m_parameterSlotIds[0], datumView);
-
-            EXPECT_FALSE(datumView.IsValid());
-        }
-
-        {
-            const Slot* resultSlot = uuidEventHandler->GetSlot(eventEntry->m_resultSlotId);
-
-            EXPECT_EQ(resultSlot->GetDescriptor(), SlotDescriptors::DataIn());
-            EXPECT_EQ(resultSlot->GetDataType(), Data::Type::Vector3());
-
-            const Datum* datum = uuidEventHandler->FindDatum(eventEntry->m_resultSlotId);
-            EXPECT_NE(nullptr, datum);
-
-            if (datum)
-            {
-                EXPECT_TRUE(datum->IS_A<Data::Vector3Type>());
-            }
-
-            ModifiableDatumView datumView;
-            uuidEventHandler->FindModifiableDatumView(eventEntry->m_resultSlotId, datumView);
-
-            EXPECT_TRUE(datumView.IsValid());
-
-            if (datumView.IsValid())
-            {
-                const Datum* datum2 = datumView.GetDatum();
-                EXPECT_TRUE(datum2->IS_A<Data::Vector3Type>());
-            }
-        }
-    }
-
-    delete graphEntity;
-
-    m_serializeContext->EnableRemoveReflection();
-    m_behaviorContext->EnableRemoveReflection();
-    TemplateEventTestHandler<AZ::Uuid>::Reflect(m_serializeContext);
-    TemplateEventTestHandler<AZ::Uuid>::Reflect(m_behaviorContext);
-    m_serializeContext->DisableRemoveReflection();
-    m_behaviorContext->DisableRemoveReflection();
-}
-
 void ReflectSignCorrectly()
 {
     AZ::BehaviorContext* behaviorContext(nullptr);
diff --git a/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Core.cpp b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Core.cpp
index b365a939e8..9e4252a4f2 100644
--- a/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Core.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Core.cpp
@@ -407,38 +407,6 @@ TEST_F(ScriptCanvasTestFixture, ValueTypes)
     GTEST_SUCCEED();
 }
 
-
-namespace
-{
-    using namespace ScriptCanvas;
-    using namespace ScriptCanvas::Nodes;
-
-    bool GraphHasVectorWithValue(const ScriptCanvas::Graph& graph, const AZ::Vector3& vector)
-    {
-        for (auto nodeId : graph.GetNodes())
-        {
-            AZ::Entity* entity{};
-            AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationRequests::FindEntity, nodeId);
-
-            if (entity)
-            {
-                if (auto node = AZ::EntityUtils::FindFirstDerivedComponent<Core::BehaviorContextObjectNode>(entity))
-                {
-                    if (auto candidate = node->GetInput_UNIT_TEST<AZ::Vector3>("Set"))
-                    {
-                        if (*candidate == vector)
-                        {
-                            return true;
-                        }
-                    }
-                }
-            }
-        }
-
-        return false;
-    }
-}
-
 TEST_F(ScriptCanvasTestFixture, Contracts)
 {    
     using namespace ScriptCanvas;
@@ -502,336 +470,15 @@ TEST_F(ScriptCanvasTestFixture, Contracts)
     graph->GetEntity()->Deactivate();
     delete graph->GetEntity();
 }
-// 
-// TEST_F(ScriptCanvasTestFixture, BinaryOperationTest)
-// {
-//     
-//     using namespace ScriptCanvas::Nodes;
-//     using namespace ScriptCanvas::Nodes::Comparison;
-// 
-//     TestBehaviorContextObject::Reflect(m_serializeContext);
-//     TestBehaviorContextObject::Reflect(m_behaviorContext);
-// 
-//     BinaryOpTest<EqualTo>(1, 1, true);
-//     BinaryOpTest<EqualTo>(1, 0, false);
-//     BinaryOpTest<EqualTo>(0, 1, false);
-//     BinaryOpTest<EqualTo>(0, 0, true);
-// 
-//     BinaryOpTest<NotEqualTo>(1, 1, false);
-//     BinaryOpTest<NotEqualTo>(1, 0, true);
-//     BinaryOpTest<NotEqualTo>(0, 1, true);
-//     BinaryOpTest<NotEqualTo>(0, 0, false);
-// 
-//     BinaryOpTest<Greater>(1, 1, false);
-//     BinaryOpTest<Greater>(1, 0, true);
-//     BinaryOpTest<Greater>(0, 1, false);
-//     BinaryOpTest<Greater>(0, 0, false);
-// 
-//     BinaryOpTest<GreaterEqual>(1, 1, true);
-//     BinaryOpTest<GreaterEqual>(1, 0, true);
-//     BinaryOpTest<GreaterEqual>(0, 1, false);
-//     BinaryOpTest<GreaterEqual>(0, 0, true);
-// 
-//     BinaryOpTest<Less>(1, 1, false);
-//     BinaryOpTest<Less>(1, 0, false);
-//     BinaryOpTest<Less>(0, 1, true);
-//     BinaryOpTest<Less>(0, 0, false);
-// 
-//     BinaryOpTest<LessEqual>(1, 1, true);
-//     BinaryOpTest<LessEqual>(1, 0, false);
-//     BinaryOpTest<LessEqual>(0, 1, true);
-//     BinaryOpTest<LessEqual>(0, 0, true);
-// 
-//     BinaryOpTest<EqualTo>(true, true, true);
-//     BinaryOpTest<EqualTo>(true, false, false);
-//     BinaryOpTest<EqualTo>(false, true, false);
-//     BinaryOpTest<EqualTo>(false, false, true);
-// 
-//     BinaryOpTest<NotEqualTo>(true, true, false);
-//     BinaryOpTest<NotEqualTo>(true, false, true);
-//     BinaryOpTest<NotEqualTo>(false, true, true);
-//     BinaryOpTest<NotEqualTo>(false, false, false);
-// 
-//     AZStd::string string0("a string");
-//     AZStd::string string1("b string");
-// 
-//     BinaryOpTest<EqualTo>(string1, string1, true);
-//     BinaryOpTest<EqualTo>(string1, string0, false);
-//     BinaryOpTest<EqualTo>(string0, string1, false);
-//     BinaryOpTest<EqualTo>(string0, string0, true);
-// 
-//     BinaryOpTest<NotEqualTo>(string1, string1, false);
-//     BinaryOpTest<NotEqualTo>(string1, string0, true);
-//     BinaryOpTest<NotEqualTo>(string0, string1, true);
-//     BinaryOpTest<NotEqualTo>(string0, string0, false);
-// 
-//     BinaryOpTest<Greater>(string1, string1, false);
-//     BinaryOpTest<Greater>(string1, string0, true);
-//     BinaryOpTest<Greater>(string0, string1, false);
-//     BinaryOpTest<Greater>(string0, string0, false);
-// 
-//     BinaryOpTest<GreaterEqual>(string1, string1, true);
-//     BinaryOpTest<GreaterEqual>(string1, string0, true);
-//     BinaryOpTest<GreaterEqual>(string0, string1, false);
-//     BinaryOpTest<GreaterEqual>(string0, string0, true);
-// 
-//     BinaryOpTest<Less>(string1, string1, false);
-//     BinaryOpTest<Less>(string1, string0, false);
-//     BinaryOpTest<Less>(string0, string1, true);
-//     BinaryOpTest<Less>(string0, string0, false);
-// 
-//     BinaryOpTest<LessEqual>(string1, string1, true);
-//     BinaryOpTest<LessEqual>(string1, string0, false);
-//     BinaryOpTest<LessEqual>(string0, string1, true);
-//     BinaryOpTest<LessEqual>(string0, string0, true);
-// 
-//     const AZ::Vector3 vectorOne(1.0f, 1.0f, 1.0f);
-//     const AZ::Vector3 vectorZero(0.0f, 0.0f, 0.0f);
-// 
-//     BinaryOpTest<EqualTo>(vectorOne, vectorOne, true);
-//     BinaryOpTest<EqualTo>(vectorOne, vectorZero, false);
-//     BinaryOpTest<EqualTo>(vectorZero, vectorOne, false);
-//     BinaryOpTest<EqualTo>(vectorZero, vectorZero, true);
-// 
-//     BinaryOpTest<NotEqualTo>(vectorOne, vectorOne, false);
-//     BinaryOpTest<NotEqualTo>(vectorOne, vectorZero, true);
-//     BinaryOpTest<NotEqualTo>(vectorZero, vectorOne, true);
-//     BinaryOpTest<NotEqualTo>(vectorZero, vectorZero, false);
-// 
-//     const TestBehaviorContextObject zero(0);
-//     const TestBehaviorContextObject one(1);
-//     const TestBehaviorContextObject otherOne(1);
-// 
-//     BinaryOpTest<EqualTo>(one, one, true);
-//     BinaryOpTest<EqualTo>(one, zero, false);
-//     BinaryOpTest<EqualTo>(zero, one, false);
-//     BinaryOpTest<EqualTo>(zero, zero, true);
-// 
-//     BinaryOpTest<NotEqualTo>(one, one, false);
-//     BinaryOpTest<NotEqualTo>(one, zero, true);
-//     BinaryOpTest<NotEqualTo>(zero, one, true);
-//     BinaryOpTest<NotEqualTo>(zero, zero, false);
-// 
-//     BinaryOpTest<Greater>(one, one, false);
-//     BinaryOpTest<Greater>(one, zero, true);
-//     BinaryOpTest<Greater>(zero, one, false);
-//     BinaryOpTest<Greater>(zero, zero, false);
-// 
-//     BinaryOpTest<GreaterEqual>(one, one, true);
-//     BinaryOpTest<GreaterEqual>(one, zero, true);
-//     BinaryOpTest<GreaterEqual>(zero, one, false);
-//     BinaryOpTest<GreaterEqual>(zero, zero, true);
-// 
-//     BinaryOpTest<Less>(one, one, false);
-//     BinaryOpTest<Less>(one, zero, false);
-//     BinaryOpTest<Less>(zero, one, true);
-//     BinaryOpTest<Less>(zero, zero, false);
-// 
-//     BinaryOpTest<LessEqual>(one, one, true);
-//     BinaryOpTest<LessEqual>(one, zero, false);
-//     BinaryOpTest<LessEqual>(zero, one, true);
-//     BinaryOpTest<LessEqual>(zero, zero, true);
-// 
-//     BinaryOpTest<EqualTo>(one, otherOne, true);
-//     BinaryOpTest<EqualTo>(otherOne, one, true);
-// 
-//     BinaryOpTest<NotEqualTo>(one, otherOne, false);
-//     BinaryOpTest<NotEqualTo>(otherOne, one, false);
-// 
-//     BinaryOpTest<Greater>(one, otherOne, false);
-//     BinaryOpTest<Greater>(otherOne, one, false);
-// 
-//     BinaryOpTest<GreaterEqual>(one, otherOne, true);
-//     BinaryOpTest<GreaterEqual>(otherOne, one, true);
-// 
-//     BinaryOpTest<Less>(one, otherOne, false);
-//     BinaryOpTest<Less>(otherOne, one, false);
-// 
-//     BinaryOpTest<LessEqual>(one, otherOne, true);
-//     BinaryOpTest<LessEqual>(otherOne, one, true);
-// 
-//     // force failures, to verify crash proofiness
-//     BinaryOpTest<EqualTo>(one, zero, false, true);
-//     BinaryOpTest<NotEqualTo>(one, zero, true, true);
-//     BinaryOpTest<Greater>(one, zero, true, true);
-//     BinaryOpTest<GreaterEqual>(one, zero, true, true);
-//     BinaryOpTest<Less>(one, zero, false, true);
-//     BinaryOpTest<LessEqual>(one, zero, false, true);
-// 
-//     m_serializeContext->EnableRemoveReflection();
-//     m_behaviorContext->EnableRemoveReflection();
-//     TestBehaviorContextObject::Reflect(m_serializeContext);
-//     TestBehaviorContextObject::Reflect(m_behaviorContext);
-//     m_serializeContext->DisableRemoveReflection();
-//     m_behaviorContext->DisableRemoveReflection();
-// }
-
-TEST_F(ScriptCanvasTestFixture, EntityRefTest)
-{
-    
-
-    using namespace ScriptCanvas;
-    using namespace ScriptCanvas::Nodes;
-
-    // Fake "world" entities
-    AZ::Entity first("First");
-    first.CreateComponent<ScriptCanvasTests::TestComponent>();
-    first.Init();
-    first.Activate();
-
-    AZ::Entity second("Second");
-    second.CreateComponent<ScriptCanvasTests::TestComponent>();
-    second.Init();
-    second.Activate();
-
-    // Script Canvas ScriptCanvas::Graph
-    ScriptCanvas::Graph* graph = nullptr;
-    SystemRequestBus::BroadcastResult(graph, &SystemRequests::MakeGraph);
-    EXPECT_TRUE(graph != nullptr);
-
-    m_entityContext.AddEntity(first.GetId());
-    m_entityContext.AddEntity(second.GetId());
-    m_entityContext.AddEntity(graph->GetEntityId());
-
-    graph->GetEntity()->SetName("ScriptCanvas::Graph Owner Entity");
-
-    graph->GetEntity()->CreateComponent<ScriptCanvasTests::TestComponent>();
-    graph->GetEntity()->Init();
-
-    const ScriptCanvasId& graphUniqueId = graph->GetScriptCanvasId();
-
-    AZ::EntityId startID;
-    CreateTestNode<ScriptCanvas::Nodes::Core::Start>(graphUniqueId, startID);
-
-    // EntityRef node to some specific entity #1
-    AZ::EntityId selfEntityIdNode;
-    auto selfEntityRef = CreateTestNode<ScriptCanvas::Nodes::Entity::EntityRef>(graphUniqueId, selfEntityIdNode);
-    selfEntityRef->SetEntityRef(first.GetId());
-
-    // EntityRef node to some specific entity #2
-    AZ::EntityId otherEntityIdNode;
-    auto otherEntityRef = CreateTestNode<ScriptCanvas::Nodes::Entity::EntityRef>(graphUniqueId, otherEntityIdNode);
-    otherEntityRef->SetEntityRef(second.GetId());
-
-    // Explicitly set an EntityRef node with this graph's entity Id.
-    AZ::EntityId graphEntityIdNode;
-    auto graphEntityRef = CreateTestNode<ScriptCanvas::Nodes::Entity::EntityRef>(graphUniqueId, graphEntityIdNode);
-    graphEntityRef->SetEntityRef(graph->GetEntity()->GetId());
-
-    // First test: directly set an entity Id on the EntityID: 0 slot
-    AZ::EntityId eventAid;
-    ScriptCanvas::Nodes::Core::Method* nodeA = CreateTestNode<ScriptCanvas::Nodes::Core::Method>(graphUniqueId, eventAid);
-    nodeA->InitializeEvent({ {} }, "EntityRefTestEventBus", "TestEvent");
-    if (auto entityId = nodeA->ModInput_UNIT_TEST<AZ::EntityId>("EntityID: 0"))
-    {
-        *entityId = first.GetId();
-    }
-
-    // Second test: Will connect the slot to an EntityRef node
-    AZ::EntityId eventBid;
-    ScriptCanvas::Nodes::Core::Method* nodeB = CreateTestNode<ScriptCanvas::Nodes::Core::Method>(graphUniqueId, eventBid);
-    nodeB->InitializeEvent({ {} }, "EntityRefTestEventBus", "TestEvent");
-
-    // Third test: Set the slot's EntityId: 0 to SelfReferenceId, this should result in the same Id as graph->GetEntityId()
-    AZ::EntityId eventCid;
-    ScriptCanvas::Nodes::Core::Method* nodeC = CreateTestNode<ScriptCanvas::Nodes::Core::Method>(graphUniqueId, eventCid);
-    nodeC->InitializeEvent({ {} }, "EntityRefTestEventBus", "TestEvent");
-    if (auto entityId = nodeC->ModInput_UNIT_TEST<AZ::EntityId>("EntityID: 0"))
-    {
-        *entityId = ScriptCanvas::GraphOwnerId;
-    }
-
-    // True 
-    AZ::EntityId trueNodeId;
-    CreateDataNode<Data::BooleanType>(graphUniqueId, true, trueNodeId);
-
-    // False
-    AZ::EntityId falseNodeId;
-    CreateDataNode<Data::BooleanType>(graphUniqueId, false, falseNodeId);
-
-    // Start            -> TestEvent
-    //                   O EntityId: 0    (not connected, it was set directly on the slot)
-    // EntityRef: first -O EntityId: 1
-    // False            -O Boolean: 2
-    EXPECT_TRUE(Connect(*graph, startID, "Out", eventAid, "In"));
-    EXPECT_TRUE(Connect(*graph, eventAid, "EntityID: 1", selfEntityIdNode, "Get"));
-    EXPECT_TRUE(Connect(*graph, eventAid, "Boolean: 2", falseNodeId, "Get"));
-
-    // Start            -> TestEvent
-    // EntityRef: second -O EntityId: 0 
-    // EntityRef: second -O EntityId: 1
-    // False             -O Boolean: 2
-    EXPECT_TRUE(Connect(*graph, startID, "Out", eventBid, "In"));
-    EXPECT_TRUE(Connect(*graph, eventBid, "EntityID: 0", otherEntityIdNode, "Get"));
-    EXPECT_TRUE(Connect(*graph, eventBid, "EntityID: 1", otherEntityIdNode, "Get"));
-    EXPECT_TRUE(Connect(*graph, eventBid, "Boolean: 2", falseNodeId, "Get"));
-
-    // Start            -> TestEvent
-    //                   -O EntityId: 0  (not connected, slot is set to SelfReferenceId)
-    // graphEntityIdNode -O EntityId: 1
-    // True              -O Boolean: 2
-    EXPECT_TRUE(Connect(*graph, startID, "Out", eventCid, "In"));
-    EXPECT_TRUE(Connect(*graph, eventCid, "EntityID: 1", graphEntityIdNode, "Get"));
-    EXPECT_TRUE(Connect(*graph, eventCid, "Boolean: 2", trueNodeId, "Get"));
-
-    // Execute the graph
-
-    {
-        ScriptCanvasEditor::ScopedOutputSuppression suppressOutput;
-        graph->GetEntity()->Activate();
-    }
-
-    ReportErrors(graph);
-    delete graph->GetEntity();
-
-}
 
 const int k_executionCount = 998;
 
-TEST_F(ScriptCanvasTestFixture, ExecutionLength)
-{
-    
-    using namespace ScriptCanvas;
-
-    ScriptCanvas::Graph* graph(nullptr);
-    SystemRequestBus::BroadcastResult(graph, &SystemRequests::MakeGraph);
-    EXPECT_TRUE(graph != nullptr);
-    graph->GetEntity()->Init();
-
-    const ScriptCanvasId& graphUniqueId = graph->GetScriptCanvasId();
-
-    AZ::EntityId startID;
-    CreateTestNode<ScriptCanvas::Nodes::Core::Start>(graphUniqueId, startID);
-
-    AZ::EntityId previousID = startID;
-
-    for (int i = 0; i < k_executionCount; ++i)
-    {
-        AZ::EntityId printNodeID;
-        TestResult* printNode = CreateTestNode<TestResult>(graphUniqueId, printNodeID);
-        printNode->SetInput_UNIT_TEST<int>("Value", i);
-        EXPECT_TRUE(Connect(*graph, previousID, "Out", printNodeID, "In"));
-        previousID = printNodeID;
-    }
-
-    AZ::Entity* graphEntity = graph->GetEntity();
-    {
-        ScriptCanvasEditor::ScopedOutputSuppression suppressOutput;
-        graphEntity->Activate();        
-    }
-
-    ReportErrors(graph);
-
-    graphEntity->Deactivate();
-    delete graphEntity;
-}
-
 TEST_F(ScriptCanvasTestFixture, While)
 {
-    RunUnitTestGraph("LY_SC_UnitTest_While", ExecutionMode::Interpreted);
+    RunUnitTestGraph("LY_SC_UnitTest_While", ScriptCanvas::ExecutionMode::Interpreted);
 }
 
 TEST_F(ScriptCanvasTestFixture, WhileBreak)
 {
-    RunUnitTestGraph("LY_SC_UnitTest_WhileBreak", ExecutionMode::Interpreted);
+    RunUnitTestGraph("LY_SC_UnitTest_WhileBreak", ScriptCanvas::ExecutionMode::Interpreted);
 }
diff --git a/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Math.cpp b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Math.cpp
index 65236a7c92..71f0a42b03 100644
--- a/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Math.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Math.cpp
@@ -17,76 +17,6 @@
 using namespace ScriptCanvasTests;
 using namespace ScriptCanvas;
 
-template<typename t_Node>
-AZStd::vector<ScriptCanvas::Datum> TestMathFunction(std::initializer_list<AZStd::string_view> inputNamesList, std::initializer_list<ScriptCanvas::Datum> inputList, std::initializer_list<AZStd::string_view> outputNamesList, std::initializer_list<ScriptCanvas::Datum> outputList)
-{
-    AZStd::vector<AZStd::string_view> inputNames(inputNamesList);
-    AZStd::vector<Datum> input(inputList);
-    AZStd::vector<AZStd::string_view> outputNames(outputNamesList);
-    AZStd::vector<Datum> output(outputList);
-
-    AZ_Assert(inputNames.size() == input.size(), "Size mismatch");
-    AZ_Assert(outputNames.size() == output.size(), "Size mismatch");
-
-    AZ::Entity graphEntity("Graph");
-    graphEntity.Init();
-    SystemRequestBus::Broadcast(&SystemRequests::CreateGraphOnEntity, &graphEntity);
-    auto graph = graphEntity.FindComponent<Graph>();
-    EXPECT_NE(nullptr, graph);
-
-    const AZ::EntityId& graphEntityId = graph->GetEntityId();
-    const ScriptCanvasId& graphUniqueId = graph->GetScriptCanvasId();
-
-    AZ::EntityId startID;
-    CreateTestNode<ScriptCanvas::Nodes::Core::Start>(graphUniqueId, startID);
-    AZ::EntityId functionID;
-    CreateTestNode<t_Node>(graphUniqueId, functionID);
-    EXPECT_TRUE(Connect(*graph, startID, "Out", functionID, "In"));
-
-    AZStd::vector<Node*> inputNodes;
-    AZStd::vector<AZ::EntityId> inputNodeIDs;
-    AZStd::vector<Node*> outputNodes;
-    AZStd::vector<AZ::EntityId> outputNodeIDs;
-
-    for (int i = 0; i < input.size(); ++i)
-    {
-        AZ::EntityId inputNodeID;
-        auto node = CreateDataNodeByType(graphUniqueId, input[i].GetType(), inputNodeID);
-        inputNodeIDs.push_back(inputNodeID);
-        inputNodes.push_back(node);
-        node->SetInput_UNIT_TEST(PureData::k_setThis, input[i]);
-    }
-
-    for (int i = 0; i < output.size(); ++i)
-    {
-        AZ::EntityId outputNodeID;
-        auto node = CreateDataNodeByType(graphUniqueId, output[i].GetType(), outputNodeID);
-        outputNodeIDs.push_back(outputNodeID);
-        outputNodes.push_back(node);
-    }
-
-    for (int i = 0; i < inputNames.size(); ++i)
-    {
-        EXPECT_TRUE(Connect(*graph, inputNodeIDs[i], "Get", functionID, inputNames[i].data()));
-    }
-
-    for (int i = 0; i < output.size(); ++i)
-    {
-        EXPECT_TRUE(Connect(*graph, functionID, outputNames[i].data(), outputNodeIDs[i], PureData::k_setThis));
-    }
-
-    graph->GetEntity()->Activate();
-
-    for (int i = 0; i < output.size(); ++i)
-    {
-        output[i] = *outputNodes[i]->GetInput_UNIT_TEST(PureData::k_setThis);
-    }
-
-    graph->GetEntity()->Deactivate();
-    delete graph;
-    return output;
-}
-
 TEST_F(ScriptCanvasTestFixture, MathOperations_Graph)
 {
     RunUnitTestGraph("LY_SC_UnitTest_MathOperations", ExecutionMode::Interpreted);
diff --git a/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_NodeGenerics.cpp b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_NodeGenerics.cpp
index a1e48a4637..e74aa8e641 100644
--- a/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_NodeGenerics.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_NodeGenerics.cpp
@@ -163,906 +163,5 @@ TEST_F(ScriptCanvasTestFixture, NodeGenerics)
     delete graph->GetEntity();
 }
 
-TEST_F(ScriptCanvasTestFixture, NodeGenericsByValue)
-{
-    using namespace ScriptCanvas;
-    using namespace ScriptCanvas::Nodes;
-
-    RegisterComponentDescriptor<MaxReturnByValueNode>();
-
-    TestBehaviorContextObject::Reflect(m_serializeContext);
-    TestBehaviorContextObject::Reflect(m_behaviorContext);
-
-    TestBehaviorContextObject::ResetCounts();
-
-    UnitTestEventsHandler unitTestHandler;
-    unitTestHandler.BusConnect();
-
-    Graph* graph = nullptr;
-    SystemRequestBus::BroadcastResult(graph, &SystemRequests::MakeGraph);
-    EXPECT_TRUE(graph != nullptr);
-    graph->GetEntity()->Init();
-
-    const ScriptCanvasId& graphUniqueId = graph->GetScriptCanvasId();
-
-    AZ::EntityId startID;
-    CreateTestNode<ScriptCanvas::Nodes::Core::Start>(graphUniqueId, startID);
-
-    AZ::EntityId maxByValueID;
-    CreateTestNode<MaxReturnByValueNode>(graphUniqueId, maxByValueID);
-
-    AZ::EntityId valueID1, valueID2, valueID3, valueID4, valueID5;
-
-    Core::BehaviorContextObjectNode* valueNode1 = CreateTestNode<Core::BehaviorContextObjectNode>(graphUniqueId, valueID1);
-    valueNode1->InitializeObject(azrtti_typeid<TestBehaviorContextObject>());
-    valueNode1->ModInput_UNIT_TEST<TestBehaviorContextObject>("Set")->SetValue(1);
-    EXPECT_EQ(1, valueNode1->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set")->GetValue());
-
-    Core::BehaviorContextObjectNode* valueNode2 = CreateTestNode<Core::BehaviorContextObjectNode>(graphUniqueId, valueID2);
-    valueNode2->InitializeObject(azrtti_typeid<TestBehaviorContextObject>());
-    valueNode2->ModInput_UNIT_TEST<TestBehaviorContextObject>("Set")->SetValue(2);
-    EXPECT_EQ(2, valueNode2->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set")->GetValue());
-
-    Core::BehaviorContextObjectNode* valueNode3 = CreateTestNode<Core::BehaviorContextObjectNode>(graphUniqueId, valueID3);
-    valueNode3->InitializeObject(azrtti_typeid<TestBehaviorContextObject>());
-    valueNode3->ModInput_UNIT_TEST<TestBehaviorContextObject>("Set")->SetValue(3);
-    EXPECT_EQ(3, valueNode3->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set")->GetValue());
-
-    Core::BehaviorContextObjectNode* valueNode4 = CreateTestNode<Core::BehaviorContextObjectNode>(graphUniqueId, valueID4);
-    valueNode4->InitializeObject(azrtti_typeid<TestBehaviorContextObject>());
-    valueNode4->ModInput_UNIT_TEST<TestBehaviorContextObject>("Set")->SetValue(4);
-    EXPECT_EQ(4, valueNode4->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set")->GetValue());
-
-    Core::BehaviorContextObjectNode* valueNode5 = CreateTestNode<Core::BehaviorContextObjectNode>(graphUniqueId, valueID5);
-    valueNode5->InitializeObject(azrtti_typeid<TestBehaviorContextObject>());
-    valueNode5->ModInput_UNIT_TEST<TestBehaviorContextObject>("Set")->SetValue(5);
-    EXPECT_EQ(5, valueNode5->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set")->GetValue());
-
-    auto value1 = valueNode1->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
-    auto value2 = valueNode2->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
-    auto value3 = valueNode3->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
-    auto value4 = valueNode4->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
-    auto value5 = valueNode5->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
-
-    EXPECT_NE(value1, value2);
-    EXPECT_NE(value1, value3);
-    EXPECT_NE(value1, value4);
-    EXPECT_NE(value1, value5);
-    EXPECT_NE(value2, value3);
-    EXPECT_NE(value2, value4);
-    EXPECT_NE(value2, value5);
-    EXPECT_NE(value3, value4);
-    EXPECT_NE(value3, value5);
-    EXPECT_NE(value4, value5);
-
-    // data
-    EXPECT_TRUE(Connect(*graph, valueID1, "Get", maxByValueID, "TestBehaviorContextObject: 0"));
-    EXPECT_TRUE(Connect(*graph, valueID2, "Get", maxByValueID, "TestBehaviorContextObject: 1"));
-    EXPECT_TRUE(Connect(*graph, maxByValueID, "Result: TestBehaviorContextObject", valueID3, "Set"));
-    EXPECT_TRUE(Connect(*graph, valueID3, "Get", valueID4, "Set"));
-    EXPECT_TRUE(Connect(*graph, maxByValueID, "Result: TestBehaviorContextObject", valueID5, "Set"));
-
-    delete graph->GetEntity();
-
-    m_serializeContext->EnableRemoveReflection();
-    m_behaviorContext->EnableRemoveReflection();
-    TestBehaviorContextObject::Reflect(m_serializeContext);
-    TestBehaviorContextObject::Reflect(m_behaviorContext);
-    m_serializeContext->DisableRemoveReflection();
-    m_behaviorContext->DisableRemoveReflection();
-}
-
-TEST_F(ScriptCanvasTestFixture, NodeGenericsByPointer)
-{
-    using namespace ScriptCanvas;
-    using namespace ScriptCanvas::Nodes;
-
-    RegisterComponentDescriptor<MaxReturnByPointerNode>();
-
-    TestBehaviorContextObject::Reflect(m_serializeContext);
-    TestBehaviorContextObject::Reflect(m_behaviorContext);
-
-    TestBehaviorContextObject::ResetCounts();
-
-    UnitTestEventsHandler unitTestHandler;
-    unitTestHandler.BusConnect();
-
-    Graph* graph = nullptr;
-    SystemRequestBus::BroadcastResult(graph, &SystemRequests::MakeGraph);
-    EXPECT_TRUE(graph != nullptr);
-    graph->GetEntity()->Init();
-
-    const ScriptCanvasId& graphUniqueId = graph->GetScriptCanvasId();
-
-    AZ::EntityId startID;
-    CreateTestNode<ScriptCanvas::Nodes::Core::Start>(graphUniqueId, startID);
-
-    AZ::EntityId maxByValueID;
-    CreateTestNode<MaxReturnByPointerNode>(graphUniqueId, maxByValueID);
-
-    AZ::EntityId valueID1, valueID2, valueID3, valueID4, valueID5;
-
-    Core::BehaviorContextObjectNode* valueNode1 = CreateTestNode<Core::BehaviorContextObjectNode>(graphUniqueId, valueID1);
-    valueNode1->InitializeObject(azrtti_typeid<TestBehaviorContextObject>());
-    valueNode1->ModInput_UNIT_TEST<TestBehaviorContextObject>("Set")->SetValue(1);
-    EXPECT_EQ(1, valueNode1->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set")->GetValue());
-
-    Core::BehaviorContextObjectNode* valueNode2 = CreateTestNode<Core::BehaviorContextObjectNode>(graphUniqueId, valueID2);
-    valueNode2->InitializeObject(azrtti_typeid<TestBehaviorContextObject>());
-    valueNode2->ModInput_UNIT_TEST<TestBehaviorContextObject>("Set")->SetValue(2);
-    EXPECT_EQ(2, valueNode2->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set")->GetValue());
-
-    Core::BehaviorContextObjectNode* valueNode3 = CreateTestNode<Core::BehaviorContextObjectNode>(graphUniqueId, valueID3);
-    valueNode3->InitializeObject(azrtti_typeid<TestBehaviorContextObject>());
-    valueNode3->ModInput_UNIT_TEST<TestBehaviorContextObject>("Set")->SetValue(3);
-    EXPECT_EQ(3, valueNode3->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set")->GetValue());
-
-    Core::BehaviorContextObjectNode* valueNode4 = CreateTestNode<Core::BehaviorContextObjectNode>(graphUniqueId, valueID4);
-    valueNode4->InitializeObject(azrtti_typeid<TestBehaviorContextObject>());
-    valueNode4->ModInput_UNIT_TEST<TestBehaviorContextObject>("Set")->SetValue(4);
-    EXPECT_EQ(4, valueNode4->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set")->GetValue());
-
-    Core::BehaviorContextObjectNode* valueNode5 = CreateTestNode<Core::BehaviorContextObjectNode>(graphUniqueId, valueID5);
-    valueNode5->InitializeObject(azrtti_typeid<TestBehaviorContextObject>());
-    valueNode5->ModInput_UNIT_TEST<TestBehaviorContextObject>("Set")->SetValue(5);
-    EXPECT_EQ(5, valueNode5->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set")->GetValue());
-
-    auto value1 = valueNode1->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
-    auto value2 = valueNode2->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
-    auto value3 = valueNode3->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
-    auto value4 = valueNode4->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
-    auto value5 = valueNode5->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
-
-    EXPECT_NE(value1, value2);
-    EXPECT_NE(value1, value3);
-    EXPECT_NE(value1, value4);
-    EXPECT_NE(value1, value5);
-    EXPECT_NE(value2, value3);
-    EXPECT_NE(value2, value4);
-    EXPECT_NE(value2, value5);
-    EXPECT_NE(value3, value4);
-    EXPECT_NE(value3, value5);
-    EXPECT_NE(value4, value5);
-
-    // data
-    EXPECT_TRUE(Connect(*graph, valueID1, "Get", maxByValueID, "TestBehaviorContextObject: 0"));
-    EXPECT_TRUE(Connect(*graph, valueID2, "Get", maxByValueID, "TestBehaviorContextObject: 1"));
-    EXPECT_TRUE(Connect(*graph, maxByValueID, "Result: TestBehaviorContextObject", valueID3, "Set"));
-    EXPECT_TRUE(Connect(*graph, valueID3, "Get", valueID4, "Set"));
-    EXPECT_TRUE(Connect(*graph, maxByValueID, "Result: TestBehaviorContextObject", valueID5, "Set"));
-
-    // execution
-    EXPECT_TRUE(Connect(*graph, startID, "Out", maxByValueID, "In"));
-
-    delete graph->GetEntity();
-
-    m_serializeContext->EnableRemoveReflection();
-    m_behaviorContext->EnableRemoveReflection();
-    TestBehaviorContextObject::Reflect(m_serializeContext);
-    TestBehaviorContextObject::Reflect(m_behaviorContext);
-    m_serializeContext->DisableRemoveReflection();
-    m_behaviorContext->DisableRemoveReflection();
-}
-
-TEST_F(ScriptCanvasTestFixture, NodeGenericsByReference)
-{
-    using namespace ScriptCanvas;
-    using namespace ScriptCanvas::Nodes;
-
-    RegisterComponentDescriptor<MaxReturnByReferenceNode>();
-
-    TestBehaviorContextObject::Reflect(m_serializeContext);
-    TestBehaviorContextObject::Reflect(m_behaviorContext);
-
-    TestBehaviorContextObject::ResetCounts();
-
-    UnitTestEventsHandler unitTestHandler;
-    unitTestHandler.BusConnect();
-
-    Graph* graph = nullptr;
-    SystemRequestBus::BroadcastResult(graph, &SystemRequests::MakeGraph);
-    EXPECT_TRUE(graph != nullptr);
-    graph->GetEntity()->Init();
-
-    const ScriptCanvasId& graphUniqueId = graph->GetScriptCanvasId();
-
-    AZ::EntityId startID;
-    CreateTestNode<ScriptCanvas::Nodes::Core::Start>(graphUniqueId, startID);
-
-    AZ::EntityId maxByValueID;
-    CreateTestNode<MaxReturnByReferenceNode>(graphUniqueId, maxByValueID);
-
-    AZ::EntityId valueID1, valueID2, valueID3, valueID4, valueID5;
-
-    Core::BehaviorContextObjectNode* valueNode1 = CreateTestNode<Core::BehaviorContextObjectNode>(graphUniqueId, valueID1);
-    valueNode1->InitializeObject(azrtti_typeid<TestBehaviorContextObject>());
-    valueNode1->ModInput_UNIT_TEST<TestBehaviorContextObject>("Set")->SetValue(1);
-    EXPECT_EQ(1, valueNode1->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set")->GetValue());
-
-    Core::BehaviorContextObjectNode* valueNode2 = CreateTestNode<Core::BehaviorContextObjectNode>(graphUniqueId, valueID2);
-    valueNode2->InitializeObject(azrtti_typeid<TestBehaviorContextObject>());
-    valueNode2->ModInput_UNIT_TEST<TestBehaviorContextObject>("Set")->SetValue(2);
-    EXPECT_EQ(2, valueNode2->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set")->GetValue());
-
-    Core::BehaviorContextObjectNode* valueNode3 = CreateTestNode<Core::BehaviorContextObjectNode>(graphUniqueId, valueID3);
-    valueNode3->InitializeObject(azrtti_typeid<TestBehaviorContextObject>());
-    valueNode3->ModInput_UNIT_TEST<TestBehaviorContextObject>("Set")->SetValue(3);
-    EXPECT_EQ(3, valueNode3->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set")->GetValue());
-
-    Core::BehaviorContextObjectNode* valueNode4 = CreateTestNode<Core::BehaviorContextObjectNode>(graphUniqueId, valueID4);
-    valueNode4->InitializeObject(azrtti_typeid<TestBehaviorContextObject>());
-    valueNode4->ModInput_UNIT_TEST<TestBehaviorContextObject>("Set")->SetValue(4);
-    EXPECT_EQ(4, valueNode4->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set")->GetValue());
-
-    Core::BehaviorContextObjectNode* valueNode5 = CreateTestNode<Core::BehaviorContextObjectNode>(graphUniqueId, valueID5);
-    valueNode5->InitializeObject(azrtti_typeid<TestBehaviorContextObject>());
-    valueNode5->ModInput_UNIT_TEST<TestBehaviorContextObject>("Set")->SetValue(5);
-    EXPECT_EQ(5, valueNode5->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set")->GetValue());
-
-    auto value1 = valueNode1->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
-    auto value2 = valueNode2->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
-    auto value3 = valueNode3->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
-    auto value4 = valueNode4->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
-    auto value5 = valueNode5->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
-
-    EXPECT_NE(value1, value2);
-    EXPECT_NE(value1, value3);
-    EXPECT_NE(value1, value4);
-    EXPECT_NE(value1, value5);
-    EXPECT_NE(value2, value3);
-    EXPECT_NE(value2, value4);
-    EXPECT_NE(value2, value5);
-    EXPECT_NE(value3, value4);
-    EXPECT_NE(value3, value5);
-    EXPECT_NE(value4, value5);
-
-    // data
-    EXPECT_TRUE(Connect(*graph, valueID1, "Get", maxByValueID, "TestBehaviorContextObject: 0"));
-    EXPECT_TRUE(Connect(*graph, valueID2, "Get", maxByValueID, "TestBehaviorContextObject: 1"));
-    EXPECT_TRUE(Connect(*graph, maxByValueID, "Result: TestBehaviorContextObject", valueID3, "Set"));
-    EXPECT_TRUE(Connect(*graph, valueID3, "Get", valueID4, "Set"));
-    EXPECT_TRUE(Connect(*graph, maxByValueID, "Result: TestBehaviorContextObject", valueID5, "Set"));
-
-    delete graph->GetEntity();
-
-    m_serializeContext->EnableRemoveReflection();
-    m_behaviorContext->EnableRemoveReflection();
-    TestBehaviorContextObject::Reflect(m_serializeContext);
-    TestBehaviorContextObject::Reflect(m_behaviorContext);
-    m_serializeContext->DisableRemoveReflection();
-    m_behaviorContext->DisableRemoveReflection();
-}
-
-TEST_F(ScriptCanvasTestFixture, NodeGenericsByValueInteger)
-{
-    using namespace ScriptCanvas;
-    using namespace ScriptCanvas::Nodes;
-
-    RegisterComponentDescriptor<MaxReturnByValueIntegerNode>();
-
-    TestBehaviorContextObject::Reflect(m_serializeContext);
-    TestBehaviorContextObject::Reflect(m_behaviorContext);    
-
-    TestBehaviorContextObject::ResetCounts();
-
-    UnitTestEventsHandler unitTestHandler;
-    unitTestHandler.BusConnect();
-
-    Graph* graph = nullptr;
-    SystemRequestBus::BroadcastResult(graph, &SystemRequests::MakeGraph);
-    EXPECT_TRUE(graph != nullptr);
-    graph->GetEntity()->Init();
-
-    const AZ::EntityId graphEntityId = graph->GetEntityId();
-    const ScriptCanvasId& graphUniqueId = graph->GetScriptCanvasId();
-
-    AZ::EntityId startID;
-    CreateTestNode<ScriptCanvas::Nodes::Core::Start>(graphUniqueId, startID);
-
-    AZ::EntityId maxByValueID;
-    CreateTestNode<MaxReturnByValueIntegerNode>(graphUniqueId, maxByValueID);
-
-    AZ::EntityId valueID1, valueID2, valueID3, valueID4, valueID5;
-
-    Node* valueNode1 = CreateDataNode<Data::NumberType>(graphUniqueId, 1, valueID1);
-    EXPECT_EQ(1, *valueNode1->GetInput_UNIT_TEST<Data::NumberType>("Set"));
-
-    Node* valueNode2 = CreateDataNode<Data::NumberType>(graphUniqueId, 2, valueID2);
-    EXPECT_EQ(2, *valueNode2->GetInput_UNIT_TEST<Data::NumberType>("Set"));
-
-    Node* valueNode3 = CreateDataNode<Data::NumberType>(graphUniqueId, 3, valueID3);
-    EXPECT_EQ(3, *valueNode3->GetInput_UNIT_TEST<Data::NumberType>("Set"));
-
-    Node* valueNode4 = CreateDataNode<Data::NumberType>(graphUniqueId, 4, valueID4);
-    EXPECT_EQ(4, *valueNode4->GetInput_UNIT_TEST<Data::NumberType>("Set"));
-
-    Node* valueNode5 = CreateDataNode<Data::NumberType>(graphUniqueId, 5, valueID5);
-    EXPECT_EQ(5, *valueNode5->GetInput_UNIT_TEST<Data::NumberType>("Set"));
-
-    auto value1 = valueNode1->GetInput_UNIT_TEST<Data::NumberType>("Set");
-    auto value2 = valueNode2->GetInput_UNIT_TEST<Data::NumberType>("Set");
-    auto value3 = valueNode3->GetInput_UNIT_TEST<Data::NumberType>("Set");
-    auto value4 = valueNode4->GetInput_UNIT_TEST<Data::NumberType>("Set");
-    auto value5 = valueNode5->GetInput_UNIT_TEST<Data::NumberType>("Set");
-
-    EXPECT_NE(value1, value2);
-    EXPECT_NE(value1, value3);
-    EXPECT_NE(value1, value4);
-    EXPECT_NE(value1, value5);
-    EXPECT_NE(value2, value3);
-    EXPECT_NE(value2, value4);
-    EXPECT_NE(value2, value5);
-    EXPECT_NE(value3, value4);
-    EXPECT_NE(value3, value5);
-    EXPECT_NE(value4, value5);
-
-    // data
-    EXPECT_TRUE(Connect(*graph, valueID1, "Get", maxByValueID, "Number: 0"));
-    EXPECT_TRUE(Connect(*graph, valueID2, "Get", maxByValueID, "Number: 1"));
-    EXPECT_TRUE(Connect(*graph, maxByValueID, "Result: Number", valueID3, "Set"));
-    EXPECT_TRUE(Connect(*graph, valueID3, "Get", valueID4, "Set"));
-    EXPECT_TRUE(Connect(*graph, maxByValueID, "Result: Number", valueID5, "Set"));
-
-    delete graph->GetEntity();
-
-    m_serializeContext->EnableRemoveReflection();
-    m_behaviorContext->EnableRemoveReflection();
-    TestBehaviorContextObject::Reflect(m_serializeContext);
-    TestBehaviorContextObject::Reflect(m_behaviorContext);
-    m_serializeContext->DisableRemoveReflection();
-    m_behaviorContext->DisableRemoveReflection();
-}
-
-TEST_F(ScriptCanvasTestFixture, NodeGenericsByPointerInteger)
-{
-    using namespace ScriptCanvas;
-    using namespace ScriptCanvas::Nodes;
-
-    RegisterComponentDescriptor<MaxReturnByPointerIntegerNode>();
-
-    TestBehaviorContextObject::Reflect(m_serializeContext);
-    TestBehaviorContextObject::Reflect(m_behaviorContext);    
-
-    TestBehaviorContextObject::ResetCounts();
-
-    UnitTestEventsHandler unitTestHandler;
-    unitTestHandler.BusConnect();
-
-    Graph* graph = nullptr;
-    SystemRequestBus::BroadcastResult(graph, &SystemRequests::MakeGraph);
-    EXPECT_TRUE(graph != nullptr);
-    graph->GetEntity()->Init();
-
-    const ScriptCanvasId& graphUniqueId = graph->GetScriptCanvasId();
-
-    AZ::EntityId startID;
-    CreateTestNode<ScriptCanvas::Nodes::Core::Start>(graphUniqueId, startID);
-
-    AZ::EntityId maxByValueID;
-    CreateTestNode<MaxReturnByPointerIntegerNode>(graphUniqueId, maxByValueID);
-
-    AZ::EntityId valueID1, valueID2, valueID3, valueID4, valueID5;
-
-    Node* valueNode1 = CreateDataNode<Data::NumberType>(graphUniqueId, 1, valueID1);
-    EXPECT_EQ(1, *valueNode1->GetInput_UNIT_TEST<Data::NumberType>("Set"));
-
-    Node* valueNode2 = CreateDataNode<Data::NumberType>(graphUniqueId, 2, valueID2);
-    EXPECT_EQ(2, *valueNode2->GetInput_UNIT_TEST<Data::NumberType>("Set"));
-
-    Node* valueNode3 = CreateDataNode<Data::NumberType>(graphUniqueId, 3, valueID3);
-    EXPECT_EQ(3, *valueNode3->GetInput_UNIT_TEST<Data::NumberType>("Set"));
-
-    Node* valueNode4 = CreateDataNode<Data::NumberType>(graphUniqueId, 4, valueID4);
-    EXPECT_EQ(4, *valueNode4->GetInput_UNIT_TEST<Data::NumberType>("Set"));
-
-    Node* valueNode5 = CreateDataNode<Data::NumberType>(graphUniqueId, 5, valueID5);
-    EXPECT_EQ(5, *valueNode5->GetInput_UNIT_TEST<Data::NumberType>("Set"));
-
-    auto value1 = valueNode1->GetInput_UNIT_TEST<Data::NumberType>("Set");
-    auto value2 = valueNode2->GetInput_UNIT_TEST<Data::NumberType>("Set");
-    auto value3 = valueNode3->GetInput_UNIT_TEST<Data::NumberType>("Set");
-    auto value4 = valueNode4->GetInput_UNIT_TEST<Data::NumberType>("Set");
-    auto value5 = valueNode5->GetInput_UNIT_TEST<Data::NumberType>("Set");
-
-    EXPECT_NE(value1, value2);
-    EXPECT_NE(value1, value3);
-    EXPECT_NE(value1, value4);
-    EXPECT_NE(value1, value5);
-    EXPECT_NE(value2, value3);
-    EXPECT_NE(value2, value4);
-    EXPECT_NE(value2, value5);
-    EXPECT_NE(value3, value4);
-    EXPECT_NE(value3, value5);
-    EXPECT_NE(value4, value5);
-
-    // data
-    EXPECT_TRUE(Connect(*graph, valueID1, "Get", maxByValueID, "Number: 0"));
-    EXPECT_TRUE(Connect(*graph, valueID2, "Get", maxByValueID, "Number: 1"));
-    EXPECT_TRUE(Connect(*graph, maxByValueID, "Result: Number", valueID3, "Set"));
-    EXPECT_TRUE(Connect(*graph, valueID3, "Get", valueID4, "Set"));
-    EXPECT_TRUE(Connect(*graph, maxByValueID, "Result: Number", valueID5, "Set"));
-
-    EXPECT_TRUE(Connect(*graph, startID, "Out", maxByValueID, "In"));
-
-    delete graph->GetEntity();
-
-    m_serializeContext->EnableRemoveReflection();
-    m_behaviorContext->EnableRemoveReflection();
-    TestBehaviorContextObject::Reflect(m_serializeContext);
-    TestBehaviorContextObject::Reflect(m_behaviorContext);
-    m_serializeContext->DisableRemoveReflection();
-    m_behaviorContext->DisableRemoveReflection();
-}
-
-TEST_F(ScriptCanvasTestFixture, NodeGenericsByReferenceInteger)
-{
-    using namespace ScriptCanvas;
-    using namespace ScriptCanvas::Nodes;
-
-    RegisterComponentDescriptor<MaxReturnByReferenceIntegerNode>();
-
-    TestBehaviorContextObject::Reflect(m_serializeContext);
-    TestBehaviorContextObject::Reflect(m_behaviorContext);
-
-    TestBehaviorContextObject::ResetCounts();
-
-    UnitTestEventsHandler unitTestHandler;
-    unitTestHandler.BusConnect();
-
-    Graph* graph = nullptr;
-    SystemRequestBus::BroadcastResult(graph, &SystemRequests::MakeGraph);
-    EXPECT_TRUE(graph != nullptr);
-    graph->GetEntity()->Init();
-
-    const ScriptCanvasId& graphUniqueId = graph->GetScriptCanvasId();
-
-    AZ::EntityId startID;
-    CreateTestNode<ScriptCanvas::Nodes::Core::Start>(graphUniqueId, startID);
-
-    AZ::EntityId maxByValueID;
-    CreateTestNode<MaxReturnByReferenceIntegerNode>(graphUniqueId, maxByValueID);
-
-    AZ::EntityId valueID1, valueID2, valueID3, valueID4, valueID5;
-
-    Node* valueNode1 = CreateDataNode<Data::NumberType>(graphUniqueId, 1, valueID1);
-    EXPECT_EQ(1, *valueNode1->GetInput_UNIT_TEST<Data::NumberType>("Set"));
-
-    Node* valueNode2 = CreateDataNode<Data::NumberType>(graphUniqueId, 2, valueID2);
-    EXPECT_EQ(2, *valueNode2->GetInput_UNIT_TEST<Data::NumberType>("Set"));
-
-    Node* valueNode3 = CreateDataNode<Data::NumberType>(graphUniqueId, 3, valueID3);
-    EXPECT_EQ(3, *valueNode3->GetInput_UNIT_TEST<Data::NumberType>("Set"));
-
-    Node* valueNode4 = CreateDataNode<Data::NumberType>(graphUniqueId, 4, valueID4);
-    EXPECT_EQ(4, *valueNode4->GetInput_UNIT_TEST<Data::NumberType>("Set"));
-
-    Node* valueNode5 = CreateDataNode<Data::NumberType>(graphUniqueId, 5, valueID5);
-    EXPECT_EQ(5, *valueNode5->GetInput_UNIT_TEST<Data::NumberType>("Set"));
-
-    auto value1 = valueNode1->GetInput_UNIT_TEST<Data::NumberType>("Set");
-    auto value2 = valueNode2->GetInput_UNIT_TEST<Data::NumberType>("Set");
-    auto value3 = valueNode3->GetInput_UNIT_TEST<Data::NumberType>("Set");
-    auto value4 = valueNode4->GetInput_UNIT_TEST<Data::NumberType>("Set");
-    auto value5 = valueNode5->GetInput_UNIT_TEST<Data::NumberType>("Set");
-
-    EXPECT_NE(value1, value2);
-    EXPECT_NE(value1, value3);
-    EXPECT_NE(value1, value4);
-    EXPECT_NE(value1, value5);
-    EXPECT_NE(value2, value3);
-    EXPECT_NE(value2, value4);
-    EXPECT_NE(value2, value5);
-    EXPECT_NE(value3, value4);
-    EXPECT_NE(value3, value5);
-    EXPECT_NE(value4, value5);
-
-    // data
-    EXPECT_TRUE(Connect(*graph, valueID1, "Get", maxByValueID, "Number: 0"));
-    EXPECT_TRUE(Connect(*graph, valueID2, "Get", maxByValueID, "Number: 1"));
-    EXPECT_TRUE(Connect(*graph, maxByValueID, "Result: Number", valueID3, "Set"));
-    EXPECT_TRUE(Connect(*graph, valueID3, "Get", valueID4, "Set"));
-    EXPECT_TRUE(Connect(*graph, maxByValueID, "Result: Number", valueID5, "Set"));
-
-    EXPECT_TRUE(Connect(*graph, startID, "Out", maxByValueID, "In"));
-
-    delete graph->GetEntity();
-
-    m_serializeContext->EnableRemoveReflection();
-    m_behaviorContext->EnableRemoveReflection();
-    TestBehaviorContextObject::Reflect(m_serializeContext);
-    TestBehaviorContextObject::Reflect(m_behaviorContext);    
-    m_serializeContext->DisableRemoveReflection();
-    m_behaviorContext->DisableRemoveReflection();
-}
-
-TEST_F(ScriptCanvasTestFixture, NodeGenericsByValueMulti)
-{
-    using namespace ScriptCanvas;
-    using namespace ScriptCanvas::Nodes;
-
-    RegisterComponentDescriptor<MaxReturnByValueMultiNode>();
-
-    TestBehaviorContextObject::Reflect(m_serializeContext);
-    TestBehaviorContextObject::Reflect(m_behaviorContext);
-
-    TestBehaviorContextObject::ResetCounts();
-
-    UnitTestEventsHandler unitTestHandler;
-    unitTestHandler.BusConnect();
-
-    Graph* graph = nullptr;
-    SystemRequestBus::BroadcastResult(graph, &SystemRequests::MakeGraph);
-    EXPECT_TRUE(graph != nullptr);
-    graph->GetEntity()->Init();
-
-    const ScriptCanvasId& graphUniqueId = graph->GetScriptCanvasId();
-
-    AZ::EntityId startID;
-    CreateTestNode<ScriptCanvas::Nodes::Core::Start>(graphUniqueId, startID);
-
-    AZ::EntityId maxByValueID;
-    CreateTestNode<MaxReturnByValueMultiNode>(graphUniqueId, maxByValueID);
-    AZ::EntityId valueID1, valueID2, valueID3, valueID4, valueID5;
-
-    Core::BehaviorContextObjectNode* valueNode1 = CreateTestNode<Core::BehaviorContextObjectNode>(graphUniqueId, valueID1);
-    valueNode1->InitializeObject(azrtti_typeid<TestBehaviorContextObject>());
-    valueNode1->ModInput_UNIT_TEST<TestBehaviorContextObject>("Set")->SetValue(1);
-    EXPECT_EQ(1, valueNode1->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set")->GetValue());
-
-    Core::BehaviorContextObjectNode* valueNode2 = CreateTestNode<Core::BehaviorContextObjectNode>(graphUniqueId, valueID2);
-    valueNode2->InitializeObject(azrtti_typeid<TestBehaviorContextObject>());
-    valueNode2->ModInput_UNIT_TEST<TestBehaviorContextObject>("Set")->SetValue(2);
-    EXPECT_EQ(2, valueNode2->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set")->GetValue());
-
-    Core::BehaviorContextObjectNode* valueNode3 = CreateTestNode<Core::BehaviorContextObjectNode>(graphUniqueId, valueID3);
-    valueNode3->InitializeObject(azrtti_typeid<TestBehaviorContextObject>());
-    valueNode3->ModInput_UNIT_TEST<TestBehaviorContextObject>("Set")->SetValue(3);
-    EXPECT_EQ(3, valueNode3->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set")->GetValue());
-
-    Core::BehaviorContextObjectNode* valueNode4 = CreateTestNode<Core::BehaviorContextObjectNode>(graphUniqueId, valueID4);
-    valueNode4->InitializeObject(azrtti_typeid<TestBehaviorContextObject>());
-    valueNode4->ModInput_UNIT_TEST<TestBehaviorContextObject>("Set")->SetValue(4);
-    EXPECT_EQ(4, valueNode4->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set")->GetValue());
-
-    Core::BehaviorContextObjectNode* valueNode5 = CreateTestNode<Core::BehaviorContextObjectNode>(graphUniqueId, valueID5);
-    valueNode5->InitializeObject(azrtti_typeid<TestBehaviorContextObject>());
-    valueNode5->ModInput_UNIT_TEST<TestBehaviorContextObject>("Set")->SetValue(5);
-    EXPECT_EQ(5, valueNode5->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set")->GetValue());
-
-    auto value1 = valueNode1->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
-    auto value2 = valueNode2->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
-    auto value3 = valueNode3->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
-    auto value4 = valueNode4->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
-    auto value5 = valueNode5->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
-
-    EXPECT_NE(value1, value2);
-    EXPECT_NE(value1, value3);
-    EXPECT_NE(value1, value4);
-    EXPECT_NE(value1, value5);
-    EXPECT_NE(value2, value3);
-    EXPECT_NE(value2, value4);
-    EXPECT_NE(value2, value5);
-    EXPECT_NE(value3, value4);
-    EXPECT_NE(value3, value5);
-    EXPECT_NE(value4, value5);
-
-    AZ::EntityId valueIntegerID1, valueIntegerID2, valueIntegerID3, valueIntegerID4, valueIntegerID5;
-
-    Node* valueIntegerNode1 = CreateDataNode<Data::NumberType>(graphUniqueId, 1, valueIntegerID1);
-    EXPECT_EQ(1, *valueIntegerNode1->GetInput_UNIT_TEST<Data::NumberType>("Set"));
-
-    Node* valueIntegerNode2 = CreateDataNode<Data::NumberType>(graphUniqueId, 2, valueIntegerID2);
-    EXPECT_EQ(2, *valueIntegerNode2->GetInput_UNIT_TEST<Data::NumberType>("Set"));
-
-    Node* valueIntegerNode3 = CreateDataNode<Data::NumberType>(graphUniqueId, 3, valueIntegerID3);
-    EXPECT_EQ(3, *valueIntegerNode3->GetInput_UNIT_TEST<Data::NumberType>("Set"));
-
-    Node* valueIntegerNode4 = CreateDataNode<Data::NumberType>(graphUniqueId, 4, valueIntegerID4);
-    EXPECT_EQ(4, *valueIntegerNode4->GetInput_UNIT_TEST<Data::NumberType>("Set"));
-
-    Node* valueIntegerNode5 = CreateDataNode<Data::NumberType>(graphUniqueId, 5, valueIntegerID5);
-    EXPECT_EQ(5, *valueIntegerNode5->GetInput_UNIT_TEST<Data::NumberType>("Set"));
-
-    auto valueInteger1 = valueIntegerNode1->GetInput_UNIT_TEST<Data::NumberType>("Set");
-    auto valueInteger2 = valueIntegerNode2->GetInput_UNIT_TEST<Data::NumberType>("Set");
-    auto valueInteger3 = valueIntegerNode3->GetInput_UNIT_TEST<Data::NumberType>("Set");
-    auto valueInteger4 = valueIntegerNode4->GetInput_UNIT_TEST<Data::NumberType>("Set");
-    auto valueInteger5 = valueIntegerNode5->GetInput_UNIT_TEST<Data::NumberType>("Set");
-
-    EXPECT_NE(valueInteger1, valueInteger2);
-    EXPECT_NE(valueInteger1, valueInteger3);
-    EXPECT_NE(valueInteger1, valueInteger4);
-    EXPECT_NE(valueInteger1, valueInteger5);
-    EXPECT_NE(valueInteger2, valueInteger3);
-    EXPECT_NE(valueInteger2, valueInteger4);
-    EXPECT_NE(valueInteger2, valueInteger5);
-    EXPECT_NE(valueInteger3, valueInteger4);
-    EXPECT_NE(valueInteger3, valueInteger5);
-    EXPECT_NE(valueInteger4, valueInteger5);
-
-    // data
-    EXPECT_TRUE(Connect(*graph, valueID1, "Get", maxByValueID, "TestBehaviorContextObject: 0"));
-    EXPECT_TRUE(Connect(*graph, valueID2, "Get", maxByValueID, "TestBehaviorContextObject: 1"));
-    EXPECT_TRUE(Connect(*graph, maxByValueID, "Result: TestBehaviorContextObject", valueID3, "Set"));
-    EXPECT_TRUE(Connect(*graph, valueID3, "Get", valueID4, "Set"));
-    EXPECT_TRUE(Connect(*graph, maxByValueID, "Result: TestBehaviorContextObject", valueID5, "Set"));
-
-    EXPECT_TRUE(Connect(*graph, valueIntegerID1, "Get", maxByValueID, "Number: 0"));
-    EXPECT_TRUE(Connect(*graph, valueIntegerID2, "Get", maxByValueID, "Number: 1"));
-    EXPECT_TRUE(Connect(*graph, maxByValueID, "Result: Number", valueIntegerID3, "Set"));
-    EXPECT_TRUE(Connect(*graph, valueIntegerID3, "Get", valueIntegerID4, "Set"));
-    EXPECT_TRUE(Connect(*graph, maxByValueID, "Result: Number", valueIntegerID5, "Set"));
-
-    EXPECT_TRUE(Connect(*graph, startID, "Out", maxByValueID, "In"));
-
-    delete graph->GetEntity();
-
-    m_serializeContext->EnableRemoveReflection();
-    m_behaviorContext->EnableRemoveReflection();
-    TestBehaviorContextObject::Reflect(m_serializeContext);
-    TestBehaviorContextObject::Reflect(m_behaviorContext);
-    m_serializeContext->DisableRemoveReflection();
-    m_behaviorContext->DisableRemoveReflection();
-}
-
-TEST_F(ScriptCanvasTestFixture, NodeGenericsByReferenceMulti)
-{
-    using namespace ScriptCanvas;
-    using namespace ScriptCanvas::Nodes;
-
-    RegisterComponentDescriptor<MaxReturnByReferenceMultiNode>();
-
-    TestBehaviorContextObject::Reflect(m_serializeContext);
-    TestBehaviorContextObject::Reflect(m_behaviorContext);
-
-    TestBehaviorContextObject::ResetCounts();
-
-    UnitTestEventsHandler unitTestHandler;
-    unitTestHandler.BusConnect();
-
-    Graph* graph = nullptr;
-    SystemRequestBus::BroadcastResult(graph, &SystemRequests::MakeGraph);
-    EXPECT_TRUE(graph != nullptr);
-    graph->GetEntity()->Init();
-
-    const ScriptCanvasId& graphUniqueId = graph->GetScriptCanvasId();
-
-    AZ::EntityId startID;
-    CreateTestNode<ScriptCanvas::Nodes::Core::Start>(graphUniqueId, startID);
-
-    AZ::EntityId maxByReferenceID;
-    CreateTestNode<MaxReturnByReferenceMultiNode>(graphUniqueId, maxByReferenceID);
-    AZ::EntityId valueID1, valueID2, valueID3, valueID4, valueID5;
-
-    Core::BehaviorContextObjectNode* valueNode1 = CreateTestNode<Core::BehaviorContextObjectNode>(graphUniqueId, valueID1);
-    valueNode1->InitializeObject(azrtti_typeid<TestBehaviorContextObject>());
-    valueNode1->ModInput_UNIT_TEST<TestBehaviorContextObject>("Set")->SetValue(1);
-    EXPECT_EQ(1, valueNode1->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set")->GetValue());
-
-    Core::BehaviorContextObjectNode* valueNode2 = CreateTestNode<Core::BehaviorContextObjectNode>(graphUniqueId, valueID2);
-    valueNode2->InitializeObject(azrtti_typeid<TestBehaviorContextObject>());
-    valueNode2->ModInput_UNIT_TEST<TestBehaviorContextObject>("Set")->SetValue(2);
-    EXPECT_EQ(2, valueNode2->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set")->GetValue());
-
-    Core::BehaviorContextObjectNode* valueNode3 = CreateTestNode<Core::BehaviorContextObjectNode>(graphUniqueId, valueID3);
-    valueNode3->InitializeObject(azrtti_typeid<TestBehaviorContextObject>());
-    valueNode3->ModInput_UNIT_TEST<TestBehaviorContextObject>("Set")->SetValue(3);
-    EXPECT_EQ(3, valueNode3->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set")->GetValue());
-
-    Core::BehaviorContextObjectNode* valueNode4 = CreateTestNode<Core::BehaviorContextObjectNode>(graphUniqueId, valueID4);
-    valueNode4->InitializeObject(azrtti_typeid<TestBehaviorContextObject>());
-    valueNode4->ModInput_UNIT_TEST<TestBehaviorContextObject>("Set")->SetValue(4);
-    EXPECT_EQ(4, valueNode4->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set")->GetValue());
-
-    Core::BehaviorContextObjectNode* valueNode5 = CreateTestNode<Core::BehaviorContextObjectNode>(graphUniqueId, valueID5);
-    valueNode5->InitializeObject(azrtti_typeid<TestBehaviorContextObject>());
-    valueNode5->ModInput_UNIT_TEST<TestBehaviorContextObject>("Set")->SetValue(5);
-    EXPECT_EQ(5, valueNode5->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set")->GetValue());
-
-    auto value1 = valueNode1->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
-    auto value2 = valueNode2->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
-    auto value3 = valueNode3->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
-    auto value4 = valueNode4->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
-    auto value5 = valueNode5->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
-
-    EXPECT_NE(value1, value2);
-    EXPECT_NE(value1, value3);
-    EXPECT_NE(value1, value4);
-    EXPECT_NE(value1, value5);
-    EXPECT_NE(value2, value3);
-    EXPECT_NE(value2, value4);
-    EXPECT_NE(value2, value5);
-    EXPECT_NE(value3, value4);
-    EXPECT_NE(value3, value5);
-    EXPECT_NE(value4, value5);
-
-    AZ::EntityId valueIntegerID1, valueIntegerID2, valueIntegerID3, valueIntegerID4, valueIntegerID5;
-
-    Node* valueIntegerNode1 = CreateDataNode<Data::NumberType>(graphUniqueId, 1, valueIntegerID1);
-    EXPECT_EQ(1, *valueIntegerNode1->GetInput_UNIT_TEST<Data::NumberType>("Set"));
-
-    Node* valueIntegerNode2 = CreateDataNode<Data::NumberType>(graphUniqueId, 2, valueIntegerID2);
-    EXPECT_EQ(2, *valueIntegerNode2->GetInput_UNIT_TEST<Data::NumberType>("Set"));
-
-    Node* valueIntegerNode3 = CreateDataNode<Data::NumberType>(graphUniqueId, 3, valueIntegerID3);
-    EXPECT_EQ(3, *valueIntegerNode3->GetInput_UNIT_TEST<Data::NumberType>("Set"));
-
-    Node* valueIntegerNode4 = CreateDataNode<Data::NumberType>(graphUniqueId, 4, valueIntegerID4);
-    EXPECT_EQ(4, *valueIntegerNode4->GetInput_UNIT_TEST<Data::NumberType>("Set"));
-
-    Node* valueIntegerNode5 = CreateDataNode<Data::NumberType>(graphUniqueId, 5, valueIntegerID5);
-    EXPECT_EQ(5, *valueIntegerNode5->GetInput_UNIT_TEST<Data::NumberType>("Set"));
-
-    auto valueInteger1 = valueIntegerNode1->GetInput_UNIT_TEST<Data::NumberType>("Set");
-    auto valueInteger2 = valueIntegerNode2->GetInput_UNIT_TEST<Data::NumberType>("Set");
-    auto valueInteger3 = valueIntegerNode3->GetInput_UNIT_TEST<Data::NumberType>("Set");
-    auto valueInteger4 = valueIntegerNode4->GetInput_UNIT_TEST<Data::NumberType>("Set");
-    auto valueInteger5 = valueIntegerNode5->GetInput_UNIT_TEST<Data::NumberType>("Set");
-
-    EXPECT_NE(valueInteger1, valueInteger2);
-    EXPECT_NE(valueInteger1, valueInteger3);
-    EXPECT_NE(valueInteger1, valueInteger4);
-    EXPECT_NE(valueInteger1, valueInteger5);
-    EXPECT_NE(valueInteger2, valueInteger3);
-    EXPECT_NE(valueInteger2, valueInteger4);
-    EXPECT_NE(valueInteger2, valueInteger5);
-    EXPECT_NE(valueInteger3, valueInteger4);
-    EXPECT_NE(valueInteger3, valueInteger5);
-    EXPECT_NE(valueInteger4, valueInteger5);
-
-    // data
-    EXPECT_TRUE(Connect(*graph, valueID1, "Get", maxByReferenceID, "TestBehaviorContextObject: 0"));
-    EXPECT_TRUE(Connect(*graph, valueID2, "Get", maxByReferenceID, "TestBehaviorContextObject: 1"));
-    EXPECT_TRUE(Connect(*graph, maxByReferenceID, "Result: TestBehaviorContextObject", valueID3, "Set"));
-    EXPECT_TRUE(Connect(*graph, valueID3, "Get", valueID4, "Set"));
-    EXPECT_TRUE(Connect(*graph, maxByReferenceID, "Result: TestBehaviorContextObject", valueID5, "Set"));
-
-    EXPECT_TRUE(Connect(*graph, valueIntegerID1, "Get", maxByReferenceID, "Number: 0"));
-    EXPECT_TRUE(Connect(*graph, valueIntegerID2, "Get", maxByReferenceID, "Number: 1"));
-    EXPECT_TRUE(Connect(*graph, maxByReferenceID, "Result: Number", valueIntegerID3, "Set"));
-    EXPECT_TRUE(Connect(*graph, valueIntegerID3, "Get", valueIntegerID4, "Set"));
-    EXPECT_TRUE(Connect(*graph, maxByReferenceID, "Result: Number", valueIntegerID5, "Set"));
-
-    EXPECT_TRUE(Connect(*graph, startID, "Out", maxByReferenceID, "In"));
-
-    delete graph->GetEntity();
-
-    m_serializeContext->EnableRemoveReflection();
-    m_behaviorContext->EnableRemoveReflection();
-    TestBehaviorContextObject::Reflect(m_serializeContext);
-    TestBehaviorContextObject::Reflect(m_behaviorContext);
-    m_serializeContext->DisableRemoveReflection();
-    m_behaviorContext->DisableRemoveReflection();
-}
-
-TEST_F(ScriptCanvasTestFixture, NodeGenericsByPointerMulti)
-{
-    using namespace ScriptCanvas;
-    using namespace ScriptCanvas::Nodes;
-
-    RegisterComponentDescriptor<MaxReturnByPointerMultiNode>();
-
-    TestBehaviorContextObject::Reflect(m_serializeContext);
-    TestBehaviorContextObject::Reflect(m_behaviorContext);
-
-    TestBehaviorContextObject::ResetCounts();
-
-    UnitTestEventsHandler unitTestHandler;
-    unitTestHandler.BusConnect();
-
-    Graph* graph = nullptr;
-    SystemRequestBus::BroadcastResult(graph, &SystemRequests::MakeGraph);
-    EXPECT_TRUE(graph != nullptr);
-    graph->GetEntity()->Init();
-
-    const ScriptCanvasId& graphUniqueId = graph->GetScriptCanvasId();
-
-    AZ::EntityId startID;
-    CreateTestNode<ScriptCanvas::Nodes::Core::Start>(graphUniqueId, startID);
-
-    AZ::EntityId maxByPointerID;
-    CreateTestNode<MaxReturnByPointerMultiNode>(graphUniqueId, maxByPointerID);
-    AZ::EntityId valueID1, valueID2, valueID3, valueID4, valueID5;
-
-    Core::BehaviorContextObjectNode* valueNode1 = CreateTestNode<Core::BehaviorContextObjectNode>(graphUniqueId, valueID1);
-    valueNode1->InitializeObject(azrtti_typeid<TestBehaviorContextObject>());
-    valueNode1->ModInput_UNIT_TEST<TestBehaviorContextObject>("Set")->SetValue(1);
-    EXPECT_EQ(1, valueNode1->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set")->GetValue());
-
-    Core::BehaviorContextObjectNode* valueNode2 = CreateTestNode<Core::BehaviorContextObjectNode>(graphUniqueId, valueID2);
-    valueNode2->InitializeObject(azrtti_typeid<TestBehaviorContextObject>());
-    valueNode2->ModInput_UNIT_TEST<TestBehaviorContextObject>("Set")->SetValue(2);
-    EXPECT_EQ(2, valueNode2->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set")->GetValue());
-
-    Core::BehaviorContextObjectNode* valueNode3 = CreateTestNode<Core::BehaviorContextObjectNode>(graphUniqueId, valueID3);
-    valueNode3->InitializeObject(azrtti_typeid<TestBehaviorContextObject>());
-    valueNode3->ModInput_UNIT_TEST<TestBehaviorContextObject>("Set")->SetValue(3);
-    EXPECT_EQ(3, valueNode3->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set")->GetValue());
-
-    Core::BehaviorContextObjectNode* valueNode4 = CreateTestNode<Core::BehaviorContextObjectNode>(graphUniqueId, valueID4);
-    valueNode4->InitializeObject(azrtti_typeid<TestBehaviorContextObject>());
-    valueNode4->ModInput_UNIT_TEST<TestBehaviorContextObject>("Set")->SetValue(4);
-    EXPECT_EQ(4, valueNode4->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set")->GetValue());
-
-    Core::BehaviorContextObjectNode* valueNode5 = CreateTestNode<Core::BehaviorContextObjectNode>(graphUniqueId, valueID5);
-    valueNode5->InitializeObject(azrtti_typeid<TestBehaviorContextObject>());
-    valueNode5->ModInput_UNIT_TEST<TestBehaviorContextObject>("Set")->SetValue(5);
-    EXPECT_EQ(5, valueNode5->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set")->GetValue());
-
-    auto value1 = valueNode1->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
-    auto value2 = valueNode2->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
-    auto value3 = valueNode3->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
-    auto value4 = valueNode4->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
-    auto value5 = valueNode5->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
-
-    EXPECT_NE(value1, value2);
-    EXPECT_NE(value1, value3);
-    EXPECT_NE(value1, value4);
-    EXPECT_NE(value1, value5);
-    EXPECT_NE(value2, value3);
-    EXPECT_NE(value2, value4);
-    EXPECT_NE(value2, value5);
-    EXPECT_NE(value3, value4);
-    EXPECT_NE(value3, value5);
-    EXPECT_NE(value4, value5);
-
-    AZ::EntityId valueIntegerID1, valueIntegerID2, valueIntegerID3, valueIntegerID4, valueIntegerID5;
-
-    Node* valueIntegerNode1 = CreateDataNode<Data::NumberType>(graphUniqueId, 1, valueIntegerID1);
-    EXPECT_EQ(1, *valueIntegerNode1->GetInput_UNIT_TEST<Data::NumberType>("Set"));
-
-    Node* valueIntegerNode2 = CreateDataNode<Data::NumberType>(graphUniqueId, 2, valueIntegerID2);
-    EXPECT_EQ(2, *valueIntegerNode2->GetInput_UNIT_TEST<Data::NumberType>("Set"));
-
-    Node* valueIntegerNode3 = CreateDataNode<Data::NumberType>(graphUniqueId, 3, valueIntegerID3);
-    EXPECT_EQ(3, *valueIntegerNode3->GetInput_UNIT_TEST<Data::NumberType>("Set"));
-
-    Node* valueIntegerNode4 = CreateDataNode<Data::NumberType>(graphUniqueId, 4, valueIntegerID4);
-    EXPECT_EQ(4, *valueIntegerNode4->GetInput_UNIT_TEST<Data::NumberType>("Set"));
-
-    Node* valueIntegerNode5 = CreateDataNode<Data::NumberType>(graphUniqueId, 5, valueIntegerID5);
-    EXPECT_EQ(5, *valueIntegerNode5->GetInput_UNIT_TEST<Data::NumberType>("Set"));
-
-    auto valueInteger1 = valueIntegerNode1->GetInput_UNIT_TEST<Data::NumberType>("Set");
-    auto valueInteger2 = valueIntegerNode2->GetInput_UNIT_TEST<Data::NumberType>("Set");
-    auto valueInteger3 = valueIntegerNode3->GetInput_UNIT_TEST<Data::NumberType>("Set");
-    auto valueInteger4 = valueIntegerNode4->GetInput_UNIT_TEST<Data::NumberType>("Set");
-    auto valueInteger5 = valueIntegerNode5->GetInput_UNIT_TEST<Data::NumberType>("Set");
-
-    EXPECT_NE(valueInteger1, valueInteger2);
-    EXPECT_NE(valueInteger1, valueInteger3);
-    EXPECT_NE(valueInteger1, valueInteger4);
-    EXPECT_NE(valueInteger1, valueInteger5);
-    EXPECT_NE(valueInteger2, valueInteger3);
-    EXPECT_NE(valueInteger2, valueInteger4);
-    EXPECT_NE(valueInteger2, valueInteger5);
-    EXPECT_NE(valueInteger3, valueInteger4);
-    EXPECT_NE(valueInteger3, valueInteger5);
-    EXPECT_NE(valueInteger4, valueInteger5);
-
-    // data
-    EXPECT_TRUE(Connect(*graph, valueID1, "Get", maxByPointerID, "TestBehaviorContextObject: 0"));
-    EXPECT_TRUE(Connect(*graph, valueID2, "Get", maxByPointerID, "TestBehaviorContextObject: 1"));
-    EXPECT_TRUE(Connect(*graph, maxByPointerID, "Result: TestBehaviorContextObject", valueID3, "Set"));
-    EXPECT_TRUE(Connect(*graph, valueID3, "Get", valueID4, "Set"));
-    EXPECT_TRUE(Connect(*graph, maxByPointerID, "Result: TestBehaviorContextObject", valueID5, "Set"));
-
-    EXPECT_TRUE(Connect(*graph, valueIntegerID1, "Get", maxByPointerID, "Number: 0"));
-    EXPECT_TRUE(Connect(*graph, valueIntegerID2, "Get", maxByPointerID, "Number: 1"));
-    EXPECT_TRUE(Connect(*graph, maxByPointerID, "Result: Number", valueIntegerID3, "Set"));
-    EXPECT_TRUE(Connect(*graph, valueIntegerID3, "Get", valueIntegerID4, "Set"));
-    EXPECT_TRUE(Connect(*graph, maxByPointerID, "Result: Number", valueIntegerID5, "Set"));
-
-    EXPECT_TRUE(Connect(*graph, startID, "Out", maxByPointerID, "In"));
-
-    delete graph->GetEntity();
-
-    m_serializeContext->EnableRemoveReflection();
-    m_behaviorContext->EnableRemoveReflection();
-    TestBehaviorContextObject::Reflect(m_serializeContext);
-    TestBehaviorContextObject::Reflect(m_behaviorContext);
-    m_serializeContext->DisableRemoveReflection();
-    m_behaviorContext->DisableRemoveReflection();
-}
 
 #pragma warning( pop )
diff --git a/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_RuntimeInterpreted.cpp b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_RuntimeInterpreted.cpp
index e7657cff65..db3d2223d6 100644
--- a/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_RuntimeInterpreted.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_RuntimeInterpreted.cpp
@@ -14,8 +14,6 @@
 #include <ScriptCanvas/Core/Nodeable.h>
 #include <ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.h>
 #include <ScriptCanvas/Execution/NodeableOut/NodeableOutNative.h>
-#include <ScriptCanvas/Grammar/GrammarContext.h>
-#include <ScriptCanvas/Grammar/GrammarContextBus.h>
 #include <Source/Framework/ScriptCanvasTestFixture.h>
 #include <Source/Framework/ScriptCanvasTestNodes.h>
 #include <Source/Framework/ScriptCanvasTestUtilities.h>
@@ -85,6 +83,16 @@ public:
     }
 };
 
+TEST_F(ScriptCanvasTestFixture, ProveError)
+{
+    EXPECT_TRUE(false);
+}
+
+TEST_F(ScriptCanvasTestFixture, ParseErrorOnKnownNull)
+{
+    ExpectParseError("LY_SC_UnitTest_ParseErrorOnKnownNull");
+}
+
 TEST_F(ScriptCanvasTestFixture, UseBehaviorContextClassConstant)
 {
     RunUnitTestGraph("LY_SC_UnitTest_UseBehaviorContextClassConstant");
@@ -931,181 +939,3 @@ TEST_F(ScriptCanvasTestFixture, InterpretedExecutionOutPerformance)
 {
     RunUnitTestGraph("LY_SC_UnitTest_ExecutionOutPerformance", ExecutionMode::Interpreted);
 }
-
-#if defined(FUNCTION_LEGACY_SUPPORT_ENABLED)
-
-TEST_F(ScriptCanvasTestFixture, InterpretedSubgraph_UserNodeable)
-{
-    ExpectParse("LY_SC_UnitTest_Subgraph_UserNodeableD");
-}
-
-TEST_F(ScriptCanvasTestFixture, InterpretedSubgraph_UserNodeableLatent)
-{
-    ExpectParse("LY_SC_UnitTest_Subgraph_UserNodeableLatent");
-}
-
-TEST_F(ScriptCanvasTestFixture, InterpretedUseFunctionWithOnGraphStart)
-{
-    RunUnitTestGraph("LY_SC_UnitTest_UseFunctionWithOnGraphStart");
-}
-
-TEST_F(ScriptCanvasTestFixture, InterpretedUseSubgraphWithStartAndEBus)
-{
-    RunUnitTestGraph("LY_SC_UnitTests_UseSubgraphWithStartAndEBus");
-}
-
-TEST_F(ScriptCanvasTestFixture, InterpretedDeviousStateFunctionFixGraph)
-{
-    RunUnitTestGraph("LY_SC_UnitTest_DeviousStateFunctionFixGraph");
-}
-
-TEST_F(ScriptCanvasTestFixture, InterpretedCallFunctionLocalValues)
-{
-    RunUnitTestGraph("LY_SC_UnitTest_CallFunctionLocalValues");
-}
-
-TEST_F(ScriptCanvasTestFixture, ParseFunctionLocalObjects)
-{
-    ExpectParse("LY_SC_UnitTest_FunctionLocalObjects");
-}
-
-TEST_F(ScriptCanvasTestFixture, InterpretedFunctionLocalObjectsCall)
-{
-    RunUnitTestGraph("LY_SC_UnitTest_FunctionLocalObjectsCall", ExecutionMode::Interpreted, DurationSpec::Ticks(31));
-}
-
-TEST_F(ScriptCanvasTestFixture, ParseFunctionWithOnGraphStart)
-{
-    ExpectParse("LY_SC_UnitTest_FunctionWithOnGraphStart");
-}
-
-TEST_F(ScriptCanvasTestFixture, NodeableDurationSubgraphDirectionExposedOutWithOutput)
-{
-    RunUnitTestGraph("LY_SC_UnitTest_NodeableDurationSubgraphDirectionExposedOutWithOutput", ExecutionMode::Interpreted, DurationSpec::Ticks(3));
-}
-
-TEST_F(ScriptCanvasTestFixture, ParseOrderedSequencerFunction)
-{
-    ExpectParse("LY_SC_UnitTest_OrderedSequencerFunction");
-}
-
-TEST_F(ScriptCanvasTestFixture, ParseFunction_Names_With_Spaces)
-{
-    ExpectParse("LY_SC_UnitTest_Function Names With Spaces");
-}
-
-TEST_F(ScriptCanvasTestFixture, ParseFunctionNameEvilVersion)
-{
-    ExpectParse("LY_SC_UnitTest_Function Names(With) Random+Strings Evil~Version");
-}
-
-TEST_F(ScriptCanvasTestFixture, ParseFunctionNameEvilVersionInFolder)
-{
-    ExpectParse("TestFunction/LY_SC_UnitTest_Function Names(With) Random+Strings Evil~Version-In^Forder");
-}
-
-TEST_F(ScriptCanvasTestFixture, ParseNodeableDurationFunction)
-{
-    ExpectParse("LY_SC_UnitTest_NodeableDurationFunction");
-}
-
-TEST_F(ScriptCanvasTestFixture, ParseNodeableDurationFunctionDirectExposure)
-{
-    ExpectParse("LY_SC_UnitTest_NodeableDurationFunctionDirectExposure");
-}
-
-TEST_F(ScriptCanvasTestFixture, ParseNodeableDurationFunctionDirectExposureWithOutput)
-{
-    ExpectParse("LY_SC_UnitTest_NodeableDurationFunctionDirectExposureWithOutput");
-}
-
-
-TEST_F(ScriptCanvasTestFixture, ParseFunctionBranchSingleNamedOutJustReturns)
-{
-    ExpectParse("LY_SC_UnitTest_ParseFunctionBranchSingleNamedOutJustReturns");
-}
-
-TEST_F(ScriptCanvasTestFixture, ParseExposeAnyOut)
-{
-    ExpectParse("LY_SC_UnitTest_ExposeAnyOut");
-}
-
-TEST_F(ScriptCanvasTestFixture, ParseMultipleInputNoParseError)
-{
-    ExpectParse("LY_SC_UnitTest_MultipleInputNoParseError");
-}
-
-TEST_F(ScriptCanvasTestFixture, InterpretedSubgraphMultipleInError)
-{
-    ExpectParseError("LY_SC_UnitTest_InterpretedSubgraphMultipleInError");
-}
-
-TEST_F(ScriptCanvasTestFixture, InterpretedSubgraphMultipleOutError)
-{
-    ExpectParseError("LY_SC_UnitTest_InterpretedSubgraphMultipleOutError");
-}
-
-TEST_F(ScriptCanvasTestFixture, InterpretedSubgraphOutInLoop)
-{
-    ExpectParseError("LY_SC_UnitTest_InterpretedSubgraphOutInLoop");
-}
-
-TEST_F(ScriptCanvasTestFixture, InterpretedSubgraphOutMidCycleMissingSlots)
-{
-    ExpectParseError("LY_SC_UnitTest_InterpretedSubgraphOutMidCycleMissingSlots");
-}
-
-TEST_F(ScriptCanvasTestFixture, InterpretedSubgraphComplexityError)
-{
-    ExpectParseError("LY_SC_UnitTest_SubgraphComplexityError");
-}
-
-TEST_F(ScriptCanvasTestFixture, InterpretedSubgraphReturnValueFromIn)
-{
-    ExpectParseError("LY_SC_UnitTest_SubgraphReturnValueFromIn");
-}
-
-TEST_F(ScriptCanvasTestFixture, InterpretedSubgraphReturnValueFromInOut)
-{
-    ExpectParseError("LY_SC_UnitTest_SubgraphReturnValueFromInOut");
-}
-
-TEST_F(ScriptCanvasTestFixture, InterpretedVerifyByValueCorrectness)
-{
-    RunUnitTestGraph("LY_SC_UnitTest_VerifyByValueCorrectness", ExecutionMode::Interpreted);
-}
-
-TEST_F(ScriptCanvasTestFixture, InterpretedFunctionNoInputOneOutputCall)
-{
-    RunUnitTestGraph("LY_SC_UnitTest_FunctionNoInputOneOutputCall", ExecutionMode::Interpreted);
-}
-
-TEST_F(ScriptCanvasTestFixture, InterpretedFunctionAddVector3Call)
-{
-    RunUnitTestGraph("LY_SC_UnitTest_FunctionAddVector3Call", ExecutionMode::Interpreted);
-}
-TEST_F(ScriptCanvasTestFixture, InterpretedParseFunction)
-{
-    ExpectParse("LY_SC_UnitTest_ParseFunction");
-}
-
-TEST_F(ScriptCanvasTestFixture, InterpretedParseFunctionBranch)
-{
-    ExpectParse("LY_SC_UnitTest_ParseFunctionBranch");
-}
-
-TEST_F(ScriptCanvasTestFixture, InterpretedParseFunctionBranchDefaultOut)
-{
-    ExpectParse("LY_SC_UnitTest_ParseFunctionBranchDefaultOut");
-}
-
-TEST_F(ScriptCanvasTestFixture, InterpretedParseFunctionDefaultOut)
-{
-    ExpectParse("LY_SC_UnitTest_ParseFunctionDefaultOut");
-}
-
-TEST_F(ScriptCanvasTestFixture, InterpretedParseFunctionOut)
-{
-    ExpectParse("LY_SC_UnitTest_ParseFunctionOut");
-}
-#endif
diff --git a/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_VM.cpp b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_VM.cpp
index 0733101743..8c4983da0f 100644
--- a/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_VM.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_VM.cpp
@@ -14,8 +14,6 @@
 #include <ScriptCanvas/Core/Nodeable.h>
 #include <ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.h>
 #include <ScriptCanvas/Execution/NodeableOut/NodeableOutNative.h>
-#include <ScriptCanvas/Grammar/GrammarContext.h>
-#include <ScriptCanvas/Grammar/GrammarContextBus.h>
 #include <Source/Framework/ScriptCanvasTestFixture.h>
 #include <Source/Framework/ScriptCanvasTestNodes.h>
 #include <Source/Framework/ScriptCanvasTestUtilities.h>
diff --git a/Gems/ScriptCanvasTesting/Code/scriptcanvastestingeditor_tests_files.cmake b/Gems/ScriptCanvasTesting/Code/scriptcanvastestingeditor_tests_files.cmake
index 681a3c0ba1..b6ab617e26 100644
--- a/Gems/ScriptCanvasTesting/Code/scriptcanvastestingeditor_tests_files.cmake
+++ b/Gems/ScriptCanvasTesting/Code/scriptcanvastestingeditor_tests_files.cmake
@@ -15,7 +15,6 @@ set(FILES
     Source/Framework/ScriptCanvasTestApplication.h
     Source/Framework/EntityRefTests.h
     Tests/ScriptCanvasTestingTest.cpp
-    Tests/ScriptCanvas_Async.cpp
     Tests/ScriptCanvas_BehaviorContext.cpp
     Tests/ScriptCanvas_ContainerSupport.cpp
     Tests/ScriptCanvas_Core.cpp
diff --git a/Gems/StartingPointInput/Code/Source/InputNode.cpp b/Gems/StartingPointInput/Code/Source/InputNode.cpp
deleted file mode 100644
index e0f9de3657..0000000000
--- a/Gems/StartingPointInput/Code/Source/InputNode.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include <StartingPointInput_precompiled.h>
-#include <InputNode.h>
-
-#include <AzCore/EBus/EBus.h>
-#include <AzCore/RTTI/ReflectContext.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/Serialization/EditContext.h>
-#include <AzCore/Component/TickBus.h>
-#include <AzCore/RTTI/BehaviorContext.h>
-
-namespace StartingPointInput
-{
-    void InputNode::OnPostActivate()
-    {
-        //if (GetExecutionType() == ScriptCanvas::ExecutionType::Runtime)
-        //{
-        //    const ScriptCanvas::SlotId eventNameSlotId = InputNodeProperty::GetEventNameSlotId(this);
-
-        //    m_eventName = (*(FindDatum(eventNameSlotId)->GetAs<ScriptCanvas::Data::StringType>()));
-        //    InputEventNotificationBus::Handler::BusConnect(InputEventNotificationId(m_eventName.c_str()));
-        //}
-    }
-
-    void InputNode::OnDeactivate()
-    {
-        InputEventNotificationBus::Handler::BusDisconnect();
-    }
-
-    void InputNode::OnInputChanged(const ScriptCanvas::Datum& input, const ScriptCanvas::SlotId& slotId)
-    {
-        // we got a new event name, we need to drop our connection to the old and connect to the new event
-        const ScriptCanvas::SlotId eventNameSlotId = InputNodeProperty::GetEventNameSlotId(this);
-
-        if (slotId == eventNameSlotId)
-        {
-            InputEventNotificationBus::Handler::BusDisconnect();
-
-            m_eventName = (*input.GetAs<ScriptCanvas::Data::StringType>());
-            InputEventNotificationBus::Handler::BusConnect(InputEventNotificationId(m_eventName.c_str()));
-        }
-    }
-    
-    void InputNode::OnPressed(float value)
-    {
-        m_value = value;
-        const ScriptCanvas::Datum output = ScriptCanvas::Datum(m_value);
-        const ScriptCanvas::SlotId pressedSlotId = InputNodeProperty::GetPressedSlotId(this);
-        const ScriptCanvas::SlotId valueId = InputNodeProperty::GetValueSlotId(this);
-
-        if (auto* slot = GetSlot(valueId))
-        {
-            PushOutput(output, *slot);
-        }
-
-        SignalOutput(pressedSlotId);
-    }
-
-    void InputNode::OnHeld(float value)
-    {
-        m_value = value;
-        const ScriptCanvas::Datum output = ScriptCanvas::Datum(m_value);
-        const ScriptCanvas::SlotId heldSlotId = InputNodeProperty::GetHeldSlotId(this);
-        const ScriptCanvas::SlotId valueId = InputNodeProperty::GetValueSlotId(this);
-        if (auto* slot = GetSlot(valueId))
-        {
-            PushOutput(output, *slot);
-        }
-        SignalOutput(heldSlotId);
-    }
-
-    void InputNode::OnReleased(float value)
-    {
-        m_value = value;
-        const ScriptCanvas::Datum output = ScriptCanvas::Datum(m_value);
-        const ScriptCanvas::SlotId releasedSlotId = InputNodeProperty::GetReleasedSlotId(this);
-        const ScriptCanvas::SlotId valueId = InputNodeProperty::GetValueSlotId(this);
-
-        if (auto* slot = GetSlot(valueId))
-        {
-            PushOutput(output, *slot);
-        }
-        SignalOutput(releasedSlotId);
-    }
-}
diff --git a/Gems/StartingPointInput/Code/Source/InputNode.h b/Gems/StartingPointInput/Code/Source/InputNode.h
index d71c302f2b..c4e85f2a5b 100644
--- a/Gems/StartingPointInput/Code/Source/InputNode.h
+++ b/Gems/StartingPointInput/Code/Source/InputNode.h
@@ -10,18 +10,15 @@
 
 #include <ScriptCanvas/Core/Node.h>
 #include <ScriptCanvas/Core/Graph.h>
-
-#include <StartingPointInput/InputEventNotificationBus.h>
-
 #include <AzCore/RTTI/TypeInfo.h>
 
 namespace StartingPointInput
 {
     //////////////////////////////////////////////////////////////////////////
     /// Input handles raw input from any source and outputs Pressed, Held, and Released input events
+    /// This nodes id deprecated in favor of its nodeable counterpart.
     class InputNode
         : public ScriptCanvas::Node
-        , protected InputEventNotificationBus::Handler
     {
 
     public:
@@ -35,21 +32,5 @@ namespace StartingPointInput
 
         AZStd::string m_eventName;
         float m_value;
-
-        //////////////////////////////////////////////////////////////////////////
-        /// ScriptCanvas_Node
-        void OnInputChanged(const ScriptCanvas::Datum& input, const ScriptCanvas::SlotId& slotId) override;
-
-    protected:
-        //////////////////////////////////////////////////////////////////////////
-        /// Node
-        void OnPostActivate() override;
-        void OnDeactivate() override;
-
-        //////////////////////////////////////////////////////////////////////////
-        /// InputEventNotificationBus::Handler
-        void OnPressed(float value) override;
-        void OnHeld(float value) override;
-        void OnReleased(float value) override;
     };
 }
diff --git a/Gems/StartingPointInput/Code/startingpointinput_files.cmake b/Gems/StartingPointInput/Code/startingpointinput_files.cmake
index 933f32ec66..000c361b5b 100644
--- a/Gems/StartingPointInput/Code/startingpointinput_files.cmake
+++ b/Gems/StartingPointInput/Code/startingpointinput_files.cmake
@@ -17,7 +17,6 @@ set(FILES
     Source/InputLibrary.h
     Source/InputLibrary.cpp
     Source/InputNode.h
-    Source/InputNode.cpp
     Source/InputHandlerNodeable.h
     Source/InputHandlerNodeable.cpp
     Source/InputHandlerNodeable.ScriptCanvasNodeable.xml
diff --git a/Registry/AssetProcessorPlatformConfig.setreg b/Registry/AssetProcessorPlatformConfig.setreg
index 2147842da7..29c54a50ab 100644
--- a/Registry/AssetProcessorPlatformConfig.setreg
+++ b/Registry/AssetProcessorPlatformConfig.setreg
@@ -76,7 +76,8 @@
                     "animsettings": "i_caf",
                     "Animations/SkeletonList.xml": "i_caf",
                     "cbc": "abc",
-                    "fbx.assetinfo": "fbx"
+                    "fbx.assetinfo": "fbx",
+                    "stl.assetinfo": "stl"
                 },
 
                 // ---- add any folders to scan here.  The priority order is the order they appear here
diff --git a/Templates/DefaultGem/Template/CMakeLists.txt b/Templates/DefaultGem/Template/CMakeLists.txt
index d00a5f0128..5ea435a790 100644
--- a/Templates/DefaultGem/Template/CMakeLists.txt
+++ b/Templates/DefaultGem/Template/CMakeLists.txt
@@ -10,13 +10,7 @@ set(o3de_gem_json ${o3de_gem_path}/gem.json)
 o3de_read_json_key(o3de_gem_name ${o3de_gem_json} "gem_name")
 o3de_restricted_path(${o3de_gem_json} o3de_gem_restricted_path)
 
-# Currently we are in the DefaultProjectSource folder: ${CMAKE_CURRENT_LIST_DIR}
-# Get the platform specific folder ${pal_dir} for the current folder: ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME}
-# Note: ly_get_list_relative_pal_filename will take care of the details for us, as this may be a restricted platform
-#       in which case it will see if that platform is present here or in the restricted folder.
-#       i.e. It could here: DefaultProjectSource/Platform/<platorm_name>  or
-#            <restricted_folder>/<platform_name>/DefaultProjectSource
-ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME} ${o3de_gem_restricted_path} ${o3de_gem_path} ${o3de_gem_name})
+ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME} "${o3de_gem_restricted_path}" ${o3de_gem_path} ${o3de_gem_name})
 
 # Now that we have the platform abstraction layer (PAL) folder for this folder, thats where we will find the
 # project cmake for this platform.
diff --git a/Templates/DefaultProject/preview.png b/Templates/DefaultProject/preview.png
new file mode 100644
index 0000000000..78a2a735d2
--- /dev/null
+++ b/Templates/DefaultProject/preview.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6ae503ec99c8358991dc3c6e50737844d3602b81a49abbbed7d697d7238547c0
+size 28026
diff --git a/Templates/MinimalProject/preview.png b/Templates/MinimalProject/preview.png
new file mode 100644
index 0000000000..b94e84a348
--- /dev/null
+++ b/Templates/MinimalProject/preview.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1c14254e4c822fb50bfec42691c49f1089ab020a873c366f71168390d3705c6e
+size 17522
diff --git a/cmake/3rdParty/Platform/Mac/BuiltInPackages_mac.cmake b/cmake/3rdParty/Platform/Mac/BuiltInPackages_mac.cmake
index 59da804e82..b261f18035 100644
--- a/cmake/3rdParty/Platform/Mac/BuiltInPackages_mac.cmake
+++ b/cmake/3rdParty/Platform/Mac/BuiltInPackages_mac.cmake
@@ -42,5 +42,5 @@ ly_associate_package(PACKAGE_NAME mikkelsen-1.0.0.4-mac
 ly_associate_package(PACKAGE_NAME googletest-1.8.1-rev4-mac                         TARGETS googletest                  PACKAGE_HASH cbf020d5ef976c5db8b6e894c6c63151ade85ed98e7c502729dd20172acae5a8)
 ly_associate_package(PACKAGE_NAME googlebenchmark-1.5.0-rev2-mac                    TARGETS GoogleBenchmark             PACKAGE_HASH ad25de0146769c91e179953d845de2bec8ed4a691f973f47e3eb37639381f665)
 ly_associate_package(PACKAGE_NAME OpenSSL-1.1.1b-rev1-mac                           TARGETS OpenSSL                     PACKAGE_HASH 28adc1c0616ac0482b2a9d7b4a3a3635a1020e87b163f8aba687c501cf35f96c)
-ly_associate_package(PACKAGE_NAME qt-5.15.2-rev4-mac                                TARGETS Qt                          PACKAGE_HASH 08790d03a0e6ad808ad64cf25c3d75abd69a343f3d224fc39927e5c6e8738b98)
+ly_associate_package(PACKAGE_NAME qt-5.15.2-rev5-mac                                TARGETS Qt                          PACKAGE_HASH 9d25918351898b308ded3e9e571fff6f26311b2071aeafd00dd5b249fdf53f7e)
 ly_associate_package(PACKAGE_NAME libsamplerate-0.2.1-rev2-mac                      TARGETS libsamplerate               PACKAGE_HASH b912af40c0ac197af9c43d85004395ba92a6a859a24b7eacd920fed5854a97fe)
diff --git a/cmake/LYWrappers.cmake b/cmake/LYWrappers.cmake
index b6daf8b6d7..40bf6ef541 100644
--- a/cmake/LYWrappers.cmake
+++ b/cmake/LYWrappers.cmake
@@ -380,12 +380,14 @@ function(ly_delayed_target_link_libraries)
             cmake_parse_arguments(ly_delayed_target_link_libraries "" "" "${visibilities}" ${delayed_link})
 
             foreach(visibility ${visibilities})
-                foreach(item ${ly_delayed_target_link_libraries_${visibility}})
+                foreach(alias_item ${ly_delayed_target_link_libraries_${visibility}})
 
-                    if(TARGET ${item})
-                        get_target_property(item_type ${item} TYPE)
+                    if(TARGET ${alias_item})
+                        get_target_property(item_type ${alias_item} TYPE)
+                        ly_de_alias_target(${alias_item} item)
                     else()
                         unset(item_type)
+                        set(item ${alias_item})
                     endif()
 
                     if(item_type STREQUAL MODULE_LIBRARY)
diff --git a/cmake/PAL.cmake b/cmake/PAL.cmake
index 11541d395a..c51b39482f 100644
--- a/cmake/PAL.cmake
+++ b/cmake/PAL.cmake
@@ -29,7 +29,8 @@ function(o3de_restricted_id o3de_json_file restricted)
     ly_file_read(${o3de_json_file} json_data)
     string(JSON restricted_entry ERROR_VARIABLE json_error GET ${json_data} "restricted_name")
     if(json_error)
-        message(WARNING "Unable to read restricted from '${o3de_json_file}', error: ${json_error}")
+        # Restricted fields can never be a requirement so no warning is issued
+        return()
     endif()
     if(restricted_entry)
        set(${restricted} ${restricted_entry} PARENT_SCOPE)
@@ -148,86 +149,89 @@ function(ly_get_absolute_pal_filename out_name in_name)
     set(full_name ${in_name})
 
     if(${ARGC} GREATER 4)
-        # The user has supplied an object restricted path, the object path and the object name for consideration
-        set(object_restricted_path ${ARGV2})
-        set(object_path ${ARGV3})
+        # The object name is used to resolve ambiguities when a PAL directory is requested from
+        # two different external subdirectory root paths
+        # Such as if a PAL directory for two root object paths with same relative structure was requested to be Palified
+        # i.e <gem-root1>/Platform/<platform-name>/IO and <gem-root2>/Platform/<platform-name>/IO
+        # Normally the restricted PAL path for both gems would be "<restricted-root-path>/<platform-name>/IO".
+        # The object name can be used to make this path unique
+        # "<restricted-root-path>/<platform-name>/<custom-name1>/IO" for gem 1 and
+        # "<restricted-root-path>/<platform-name>/<custom-name2>/IO" for gem 2
         set(object_name ${ARGV4})
-
-        # if the file is not in the object path then we cannot determine a PAL file for it
-        file(RELATIVE_PATH relative_path ${object_path} ${full_name})
-        if (NOT (IS_ABSOLUTE relative_path OR relative_path MATCHES [[^(\.\./)+(.*)]]))
-            if (NOT EXISTS ${full_name})
-                string(REGEX MATCH "${object_path}/(.*)/Platform/([^/]*)/?(.*)$" match ${full_name})
-                if(NOT CMAKE_MATCH_1)
-                    string(REGEX MATCH "${object_path}/Platform/([^/]*)/?(.*)$" match ${full_name})
-                    set(full_name ${object_restricted_path}/${CMAKE_MATCH_1}/${object_name})
-                    if(CMAKE_MATCH_2)
-                        string(APPEND full_name "/" ${CMAKE_MATCH_2})
-                    endif()
-                elseif("${CMAKE_MATCH_2}" IN_LIST PAL_RESTRICTED_PLATFORMS)
-                    set(full_name ${object_restricted_path}/${CMAKE_MATCH_2}/${object_name}/${CMAKE_MATCH_1})
-                    if(CMAKE_MATCH_3)
-                        string(APPEND full_name "/" ${CMAKE_MATCH_3})
-                    endif()
-                endif()
-            endif()
-        endif()
-        set(${out_name} ${full_name} PARENT_SCOPE)
-
-    elseif(${ARGC} GREATER 3)
-        # The user has supplied an object restricted path, the object path for consideration
-        set(object_restricted_path ${ARGV2})
-        set(object_path ${ARGV3})
-
-        # if the file is not in the object path then we cannot determine a PAL file for it
-        file(RELATIVE_PATH relative_path ${object_path} ${full_name})
-        if (NOT (IS_ABSOLUTE relative_path OR relative_path MATCHES [[^(\.\./)+(.*)]]))
-            if (NOT EXISTS ${full_name})
-                string(REGEX MATCH "${object_path}/(.*)/Platform/([^/]*)/?(.*)$" match ${full_name})
-                if(NOT CMAKE_MATCH_1)
-                    string(REGEX MATCH "${object_path}/Platform/([^/]*)/?(.*)$" match ${full_name})
-                    set(full_name ${object_restricted_path}/${CMAKE_MATCH_1})
-                    if(CMAKE_MATCH_2)
-                        string(APPEND full_name "/" ${CMAKE_MATCH_2})
-                    endif()
-                elseif("${CMAKE_MATCH_2}" IN_LIST PAL_RESTRICTED_PLATFORMS)
-                    set(full_name ${object_restricted_path}/${CMAKE_MATCH_2}/${CMAKE_MATCH_1})
-                    if(CMAKE_MATCH_3)
-                        string(APPEND full_name "/" ${CMAKE_MATCH_3})
-                    endif()
-                endif()
-            endif()
-        endif()
-        set(${out_name} ${full_name} PARENT_SCOPE)
-
-    else()
-        # The user has not supplied any path so we must assume it is the o3de engine restricted and o3de engine path
-        # if the file is not in the o3de engine path then we cannot determine a PAL file for it
-        file(RELATIVE_PATH relative_path ${LY_ROOT_FOLDER} ${full_name})
-        if (NOT (IS_ABSOLUTE relative_path OR relative_path MATCHES [[^(\.\./)+(.*)]]))
-            if (NOT EXISTS ${full_name})
-                string(REGEX MATCH "${LY_ROOT_FOLDER}/(.*)/Platform/([^/]*)/?(.*)$" match ${full_name})
-                if(NOT CMAKE_MATCH_1)
-                    string(REGEX MATCH "${LY_ROOT_FOLDER}/Platform/([^/]*)/?(.*)$" match ${full_name})
-                    set(full_name ${O3DE_ENGINE_RESTRICTED_PATH}/${CMAKE_MATCH_1})
-                    if(CMAKE_MATCH_2)
-                        string(APPEND full_name "/" ${CMAKE_MATCH_2})
-                    endif()
-                elseif("${CMAKE_MATCH_2}" IN_LIST PAL_RESTRICTED_PLATFORMS)
-                    set(full_name ${O3DE_ENGINE_RESTRICTED_PATH}/${CMAKE_MATCH_2}/${CMAKE_MATCH_1})
-                    if(CMAKE_MATCH_3)
-                        string(APPEND full_name "/" ${CMAKE_MATCH_3})
-                    endif()
-                endif()
-            endif()
-        endif()
-        set(${out_name} ${full_name} PARENT_SCOPE)
     endif()
+
+    # The Default object path for path is the LY_ROOT_FOLDER
+    cmake_path(SET object_path NORMALIZE "${LY_ROOT_FOLDER}")
+    if(${ARGC} GREATER 3)
+        # The user has supplied an object restricted path, the object path for consideration
+        cmake_path(SET object_path NORMALIZE ${ARGV3})
+    endif()
+
+    # The Default restricted object path is the result of the read_engine_restricted_path function
+    cmake_path(SET object_restricted_path NORMALIZE "${O3DE_ENGINE_RESTRICTED_PATH}")
+    if(${ARGC} GREATER 2)
+        # The user has supplied an object restricted path
+        cmake_path(SET object_restricted_path NORMALIZE ${ARGV2})
+    endif()
+
+    # The input path must exist in order to form a PAL path
+    if (NOT EXISTS ${full_name})
+        # if the file is not in the object path then we cannot determine a PAL file for it
+        cmake_path(IS_PREFIX object_path ${full_name} is_input_path_in_root)
+        if(is_input_path_in_root)
+            cmake_path(RELATIVE_PATH full_name BASE_DIRECTORY ${object_path} OUTPUT_VARIABLE relative_object_path)
+            cmake_path(SET current_object_path ${relative_object_path})
+
+            # Remove one path segment from the end of the current_object_path and prepend it to the list path_segments
+            cmake_path(GET current_object_path PARENT_PATH parent_path)
+            cmake_path(GET current_object_path FILENAME path_segment)
+            list(PREPEND path_segments_visited path_segment)
+            cmake_path(COMPARE current_object_path NOT_EQUAL parent_path is_prev_path_segment)
+            cmake_path(SET current_object_path "${parent_path}")
+
+            while(is_prev_path_segment)
+                # The Path is in a PAL structure
+                # Decompose the path into sections before "Platform" and after "Platform"
+                if(path_segment STREQUAL "Platform")
+                    # The first path segment after the "<pre-platform-paths>/Platform/<post-platform-paths>"
+                    # is a potential platform name. Store it off for later checks
+                    list(GET path_segments_visited 0 candidate_platform_name)
+
+                    # Store off all the path segments iterated from the end in the post-"Platform" path
+                    cmake_path(APPEND post_platform_paths ${path_segments_visited})
+                    # The parent path is just the pre-"Platform" section of the path
+                    cmake_path(SET pre_platform_paths "${parent_path}")
+                    break()
+                endif()
+
+                # Remove one path segment from the end of the current_object_path and prepend it to the list path_segments
+                cmake_path(GET current_object_path PARENT_PATH parent_path)
+                cmake_path(GET current_object_path FILENAME path_segment)
+                list(PREPEND path_segments_visited path_segment)
+                cmake_path(COMPARE current_object_path NOT_EQUAL parent_path is_prev_path_segment)
+                cmake_path(SET current_object_path "${parent_path}")
+            endwhile()
+
+            # Compose a candidate restricted path and examine if it exists
+            cmake_path(APPEND object_restricted_path ${pre_platform_paths} "Platform" ${post_platform_paths}
+                OUTPUT_VARIABLE candidate_PAL_path)
+            if(NOT EXISTS ${candidate_PAL_path})
+                if("${candidate_platform_name}" IN_LIST PAL_RESTRICTED_PLATFORMS)
+                    cmake_path(APPEND object_restricted_path ${candidate_platform_name} ${object_name}
+                        ${pre_platform_paths} ${post_platform_paths} OUTPUT_VARIABLE candidate_PAL_path)
+                endif()
+            endif()
+            if(EXISTS ${candidate_PAL_path})
+                cmake_path(SET full_name ${candidate_PAL_path})
+            endif()
+        endif()
+    endif()
+    set(${out_name} ${full_name} PARENT_SCOPE)
 endfunction()
 
 function(ly_get_list_relative_pal_filename out_name in_name)
     ly_get_absolute_pal_filename(abs_name ${in_name} ${ARGN})
-    file(RELATIVE_PATH relative_name ${CMAKE_CURRENT_LIST_DIR} ${abs_name})
+    cmake_path(RELATIVE_PATH abs_name BASE_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} OUTPUT_VARIABLE relative_name)
     set(${out_name} ${relative_name} PARENT_SCOPE)
 endfunction()
 
diff --git a/cmake/Platform/Common/RuntimeDependencies_common.cmake b/cmake/Platform/Common/RuntimeDependencies_common.cmake
index 734dd94203..31c8191a57 100644
--- a/cmake/Platform/Common/RuntimeDependencies_common.cmake
+++ b/cmake/Platform/Common/RuntimeDependencies_common.cmake
@@ -254,7 +254,8 @@ function(ly_delayed_generate_runtime_dependencies)
 
         # Generate the output file
         set(target_file_dir "$<TARGET_FILE_DIR:${target}>")
-        file(READ ${LY_RUNTIME_DEPENDENCIES_TEMPLATE} template_file)
+        set(target_file "$<TARGET_FILE:${target}>")
+        ly_file_read(${LY_RUNTIME_DEPENDENCIES_TEMPLATE} template_file)
         string(CONFIGURE "${LY_COPY_COMMANDS}" LY_COPY_COMMANDS @ONLY)
         string(CONFIGURE "${template_file}" configured_template_file @ONLY)
         file(GENERATE
diff --git a/cmake/Platform/Common/runtime_dependencies_common.cmake.in b/cmake/Platform/Common/runtime_dependencies_common.cmake.in
index e2a85374b8..9d23a73a26 100644
--- a/cmake/Platform/Common/runtime_dependencies_common.cmake.in
+++ b/cmake/Platform/Common/runtime_dependencies_common.cmake.in
@@ -13,6 +13,7 @@ function(ly_copy source_file target_directory)
     if(NOT ${same_location})
         file(LOCK ${target_directory}/${target_filename}.lock GUARD FUNCTION TIMEOUT 300)
         if("${source_file}" IS_NEWER_THAN "${target_directory}/${target_filename}")
+            message(STATUS "Copying \"${source_file}\" to \"${target_directory}\"...")
             file(COPY "${source_file}" DESTINATION "${target_directory}" FILE_PERMISSIONS @LY_COPY_PERMISSIONS@ FOLLOW_SYMLINK_CHAIN)
         endif()
     endif()    
diff --git a/cmake/Platform/Mac/runtime_dependencies_mac.cmake.in b/cmake/Platform/Mac/runtime_dependencies_mac.cmake.in
index 92ad3514d4..9f9006c4c0 100644
--- a/cmake/Platform/Mac/runtime_dependencies_mac.cmake.in
+++ b/cmake/Platform/Mac/runtime_dependencies_mac.cmake.in
@@ -19,56 +19,96 @@ endfunction()
 include(BundleUtilities)
 
 cmake_policy(SET CMP0012 NEW) # new policy for the if that evaluates a boolean out of the LY_BUILD_FIXUP_BUNDLE expansion 
+cmake_policy(SET CMP0009 NEW) # do not traverse symlinks on GLOB_RECURSE
 
 set(anything_new FALSE)
 set(plugin_libs)
 set(plugin_dirs)
+set(depends_on_python FALSE)
+
+find_program(LY_INSTALL_NAME_TOOL install_name_tool)
+if (NOT LY_INSTALL_NAME_TOOL)
+    message(FATAL_ERROR "Unable to locate 'install_name_tool'")
+endif()
 
 function(ly_copy source_file target_directory)
     
     get_filename_component(target_filename "${source_file}" NAME)
     
-    # If source_file is a Framework and target_directory is a bundle
-    if("${source_file}" MATCHES "\\.[Ff]ramework[^\\.]" AND "${target_directory}" MATCHES "\\.app/Contents/MacOS")
+    # If target_directory is a bundle
+    if("${target_directory}" MATCHES "\\.app/Contents/MacOS")
 
-        if(NOT @LY_BUILD_FIXUP_BUNDLE@)
-            return()
-        endif()
+        set(target_is_bundle TRUE)
+        if("${source_file}" MATCHES "\\.[Ff]ramework[^\\.]")
 
-        # fixup origin to copy the whole Framework folder and change destination to Contents/Frameworks
-        string(REGEX REPLACE "(.*\\.[Ff]ramework).*" "\\1" source_file "${source_file}")
-        get_filename_component(source_file_folder "${source_file}" DIRECTORY)
+            if(NOT @LY_BUILD_FIXUP_BUNDLE@)
+                return()
+            endif()
+
+            # fixup origin to copy the whole Framework folder and change destination to Contents/Frameworks
+            string(REGEX REPLACE "(.*\\.[Ff]ramework).*" "\\1" source_file "${source_file}")
+            get_filename_component(source_file_folder "${source_file}" DIRECTORY)
+
+            # Python.framework produces a bug in BundleUtilities so it needs manual handling
+            # https://gitlab.kitware.com/cmake/cmake/-/issues/20165
+            if("${source_file}" MATCHES "Python.framework")
+                # fixup the destination so it ends up in Contents/Frameworks
+                string(REGEX REPLACE "(.*\\.app/Contents)/MacOS" "\\1/Frameworks" target_directory "${target_directory}")
+                set(local_plugin_dirs ${plugin_dirs})
+                list(APPEND local_plugin_dirs "${target_directory}/Python.framework")
+                set(target_filename Python.framework)
+                set(plugin_dirs ${local_plugin_dirs} PARENT_SCOPE)
+                set(depends_on_python TRUE PARENT_SCOPE)
+            else()
+                set(local_plugin_dirs ${plugin_dirs})
+                list(APPEND local_plugin_dirs "${source_file_folder}")
+                set(plugin_dirs ${local_plugin_dirs} PARENT_SCOPE)
+                return()
+            endif()
+
+        elseif("${source_file}" MATCHES "qt/plugins")
+
+            if(NOT @LY_BUILD_FIXUP_BUNDLE@)
+                return()
+            endif()
+
+            # fixup the destination so it ends up in Contents/Plugins
+            string(REGEX REPLACE "(.*\\.app/Contents)/MacOS" "\\1/plugins" target_directory "${target_directory}")
+
+            set(local_plugin_dirs ${plugin_dirs})
+            list(APPEND local_plugin_dirs "${target_directory}")
+            set(plugin_dirs ${local_plugin_dirs} PARENT_SCOPE)
+            set(local_plugin_libs ${plugin_libs})
+            list(APPEND local_plugin_libs "${target_directory}/${target_filename}")
+            set(plugin_libs ${local_plugin_libs} PARENT_SCOPE)
+
+        elseif("${source_file}" MATCHES "qt/translations")
+
+            return() # skip, is this used?
         
-        set(local_plugin_dirs ${plugin_dirs})
-        list(APPEND local_plugin_dirs "${source_file_folder}")
-        set(plugin_dirs ${local_plugin_dirs} PARENT_SCOPE)
-        return()
+        elseif("${source_file}" MATCHES ".dylib")
+            
+            set(local_plugin_dirs ${plugin_dirs})
+            list(APPEND local_plugin_dirs "${target_directory}")
+            set(plugin_dirs ${local_plugin_dirs} PARENT_SCOPE)
 
-    elseif("${source_file}" MATCHES "qt/plugins" AND "${target_directory}" MATCHES "\\.app/Contents/MacOS")
-
-        if(NOT @LY_BUILD_FIXUP_BUNDLE@)
-            return()
         endif()
-
-        # fixup the destination so it ends up in Contents/Plugins
-        string(REGEX REPLACE "(.*\\.app/Contents)/MacOS" "\\1/plugins" target_directory "${target_directory}")
-
-        set(local_plugin_dirs ${plugin_dirs})
-        list(APPEND local_plugin_dirs "${target_directory}")
-        set(plugin_dirs ${local_plugin_dirs} PARENT_SCOPE)
-        set(local_plugin_libs ${plugin_libs})
-        list(APPEND local_plugin_libs "${target_directory}/${target_filename}")
-        set(plugin_libs ${local_plugin_libs} PARENT_SCOPE)
-
-    elseif("${source_file}" MATCHES "qt/translations" AND "${target_directory}" MATCHES "\\.app/Contents/MacOS")
-
-        return() # skip, is this used?
     
-    elseif("${source_file}" MATCHES ".dylib")
+    else()
         
-        set(local_plugin_dirs ${plugin_dirs})
-        list(APPEND local_plugin_dirs "${target_directory}")
-        set(plugin_dirs ${local_plugin_dirs} PARENT_SCOPE)
+        # target is not a bundle
+        set(target_is_bundle FALSE)
+        if("${source_file}" MATCHES "\\.[Ff]ramework[^\\.]")
+
+            # fixup origin to copy the whole Framework folder
+            string(REGEX REPLACE "(.*\\.[Ff]ramework).*" "\\1" source_file "${source_file}")
+            get_filename_component(target_filename "${source_file}" NAME)
+
+            if("${source_file}" MATCHES "Python.framework")
+                set(depends_on_python TRUE PARENT_SCOPE)
+            endif()
+        
+        endif()
 
     endif()
 
@@ -79,6 +119,11 @@ function(ly_copy source_file target_directory)
         endif()
         if(NOT EXISTS "${target_directory}/${target_filename}" OR "${source_file}" IS_NEWER_THAN "${target_directory}/${target_filename}")
             message(STATUS "Copying \"${source_file}\" to \"${target_directory}\"...")
+            if(NOT target_is_bundle)
+                # if it is a bundle, there is no contention about the files in the destination, each bundle target will copy everything
+                # we dont want these files to invalidate the bundle and cause a new signature
+                file(LOCK ${target_directory}/${target_filename}.lock GUARD FUNCTION TIMEOUT 300)
+            endif()
             file(COPY "${source_file}" DESTINATION "${target_directory}" FILE_PERMISSIONS @LY_COPY_PERMISSIONS@ FOLLOW_SYMLINK_CHAIN)
             file(TOUCH ${target_directory}/${target_filename})
             set(anything_new TRUE PARENT_SCOPE)
@@ -93,6 +138,7 @@ if(NOT @LY_BUILD_FIXUP_BUNDLE@)
 endif()
 
 if(@target_file_dir@ MATCHES ".app/Contents/MacOS")
+
     string(REGEX REPLACE "(.*\\.app)/Contents/MacOS.*" "\\1" bundle_path "@target_file_dir@")
     set(fixup_timestamp_file "${bundle_path}.fixup.stamp")
     if(NOT anything_new)
@@ -106,31 +152,44 @@ if(@target_file_dir@ MATCHES ".app/Contents/MacOS")
         if(EXISTS ${bundle_path}/Contents/MacOS/Builders/DirectXShaderCompiler/bin/dxc-3.7)
             list(APPEND fixup_bundle_ignore dxc-3.7)
         endif()
-        # Python.framework being copied by fixup_bundle
-        #if(EXISTS ${bundle_path}/Contents/Frameworks/Python.framework)
-        #    # LYN-4502: Patch python bundle, it contains some windows executables, some files that fixup_bundle doesnt like and has
-        #    # duplicated binaries between Versions/3.7 and Versions/Current. 
-        #    file(GLOB exe_files 
-        #        ${bundle_path}/Contents/Frameworks/Python.framework/Versions/3.7/lib/python3.7/distutils/command/*.exe
-        #        ${bundle_path}/Contents/Frameworks/Python.framework/Versions/3.7/lib/python3.7/site-packages/pip/_vendor/distlib/*.exe
-        #        ${bundle_path}/Contents/Frameworks/Python.framework/Versions/3.7/lib/python3.7/site-packages/setuptools/*.exe
-        #    )
-        #    foreach(exe_file ${exe_files})
-        #        file(REMOVE ${exe_file})
-        #    endforeach()
-        #    file(REMOVE_RECURSE 
-        #        ${bundle_path}/Contents/Frameworks/Python.framework/Versions/3.7/lib/python3.7/test
-        #        ${bundle_path}/Contents/Frameworks/Python.framework/Versions/3.7/lib/python3.7/site-packages/scipy/io/tests
-        #        ${bundle_path}/Contents/Frameworks/Python.framework/Versions/3.7/Resources
-        #        ${bundle_path}/Contents/Frameworks/Python.framework/Python
-        #        ${bundle_path}/Contents/Frameworks/Python.framework/Resources/Python.app
-        #        ${bundle_path}/Contents/Frameworks/Python.framework/Versions/3.7/Python
-        #    )
-        #    file(REMOVE_RECURSE ${bundle_path}/Contents/Frameworks/Python.framework/Versions/Current)
-        #    execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink 3.7 Current
-        #        WORKING_DIRECTORY ${bundle_path}/Contents/Frameworks/Python.framework/Versions/
-        #    )
-        #endif()
+        # LYN-4502: Patch python bundle, it contains some windows executables, some files that fixup_bundle doesnt like and has
+        # other issues that produce signature problems
+        if(depends_on_python)
+            message(STATUS "Fixing ${bundle_path}/Contents/Frameworks/Python.framework...")
+            list(APPEND fixup_bundle_ignore Python python3.7m python3.7)
+            file(REMOVE_RECURSE
+                ${bundle_path}/Contents/Frameworks/Python.framework/Versions/Current
+                ${bundle_path}/Contents/Frameworks/Python.framework/Versions/3.7/Headers
+                ${bundle_path}/Contents/Frameworks/Python.framework/Versions/3.7/lib/Python
+                ${bundle_path}/Contents/Frameworks/Python.framework/Versions/3.7/lib/python3.7/test
+                ${bundle_path}/Contents/Frameworks/Python.framework/Versions/3.7/lib/python3.7/site-packages/scipy/io/tests
+                ${bundle_path}/Contents/Frameworks/Python.framework/Python
+                ${bundle_path}/Contents/Frameworks/Python.framework/Resources
+                ${bundle_path}/Contents/Frameworks/Python.framework/Headers
+            )
+            file(GLOB_RECURSE exe_file_list "${bundle_path}/Contents/Frameworks/Python.framework/**/*.exe")
+            if(exe_file_list)
+                file(REMOVE_RECURSE ${exe_file_list})
+            endif()
+            execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink include/python3.7m Headers
+                WORKING_DIRECTORY ${bundle_path}/Contents/Frameworks/Python.framework/Versions/3.7
+            )
+            execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink 3.7 Current
+                WORKING_DIRECTORY ${bundle_path}/Contents/Frameworks/Python.framework/Versions/
+            )
+            execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink Versions/Current/Python Python
+                WORKING_DIRECTORY ${bundle_path}/Contents/Frameworks/Python.framework
+            )
+            execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink Versions/Current/Headers Headers
+                WORKING_DIRECTORY ${bundle_path}/Contents/Frameworks/Python.framework
+            )
+            execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink Versions/Current/Resources Resources
+                WORKING_DIRECTORY ${bundle_path}/Contents/Frameworks/Python.framework
+            )
+            file(CHMOD ${bundle_path}/Contents/Frameworks/Python.framework/Versions/Current/Python 
+                PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_EXECUTE 
+            )
+        endif()
         list(REMOVE_DUPLICATES plugin_libs)
         list(REMOVE_DUPLICATES plugin_dirs)
         fixup_bundle("${bundle_path}" "${plugin_libs}" "${plugin_dirs}" IGNORE_ITEM ${fixup_bundle_ignore})
@@ -139,11 +198,27 @@ if(@target_file_dir@ MATCHES ".app/Contents/MacOS")
 
         # fixup bundle ends up removing the rpath of dxc (despite we exclude it)
         if(EXISTS ${bundle_path}/Contents/MacOS/Builders/DirectXShaderCompiler/bin/dxc-3.7)
-            find_program(LY_INSTALL_NAME_TOOL install_name_tool)
-            if (NOT LY_INSTALL_NAME_TOOL)
-                message(FATAL_ERROR "Unable to locate 'install_name_tool'")
-            endif()
             execute_process(COMMAND ${LY_INSTALL_NAME_TOOL} -add_rpath @executable_path/../lib ${bundle_path}/Contents/MacOS/Builders/DirectXShaderCompiler/bin/dxc-3.7)
         endif()
+
+        # misplaced .DS_Store files can cause signing to fail
+        # Interrupted signatures can leave cstemp files behind that fail next signature
+        file(GLOB_RECURSE remove_file_list 
+            "${bundle_path}/**/.DS_Store"
+            "${bundle_path/}**/*.cstemp"
+        )
+        if(remove_file_list)
+            file(REMOVE_RECURSE ${remove_file_list})
+        endif()
+
+
     endif()
+
+else() # Non-bundle case
+
+    if(depends_on_python)
+        # RPATH fix python
+        execute_process(COMMAND ${LY_INSTALL_NAME_TOOL} -change @rpath/Python @rpath/Python.framework/Versions/Current/Python @target_file@)
+    endif()
+
 endif()
diff --git a/cmake/Platform/Windows/Packaging/Shortcuts.wxs b/cmake/Platform/Windows/Packaging/Shortcuts.wxs
index 283a3c08ea..fefd15294a 100644
--- a/cmake/Platform/Windows/Packaging/Shortcuts.wxs
+++ b/cmake/Platform/Windows/Packaging/Shortcuts.wxs
@@ -26,10 +26,15 @@
         <DirectoryRef Id="DesktopFolder">
             <Component Id="DesktopShortcuts" Guid="{2600B54A-65FB-4507-A7CD-3CE4817C7173}">
 
-                <Shortcut Id="DesktopShortcut_Launcher"
+                <Shortcut Id="DesktopShortcut_Editor"
+                    Target="[root.bin.Windows.profile]Editor.exe"
+                    WorkingDirectory="root.bin.Windows.profile"
+                    Name="$(var.CPACK_PACKAGE_NAME) Editor" />
+
+                <Shortcut Id="DesktopShortcut_ProjectManager"
                     Target="[root.bin.Windows.profile]o3de.exe"
                     WorkingDirectory="root.bin.Windows.profile"
-                    Name="$(var.CPACK_PACKAGE_NAME) $(var.CPACK_PACKAGE_VERSION)" />
+                    Name="$(var.CPACK_PACKAGE_NAME) Project Manager" />
 
                 <RemoveFolder Id="DesktopFolder" On="uninstall"/>
 
diff --git a/cmake/Platform/Windows/PackagingPostBuild.cmake b/cmake/Platform/Windows/PackagingPostBuild.cmake
index 2d003d6062..70f8834207 100644
--- a/cmake/Platform/Windows/PackagingPostBuild.cmake
+++ b/cmake/Platform/Windows/PackagingPostBuild.cmake
@@ -105,39 +105,94 @@ file(TO_NATIVE_PATH "${_root_path}/python/python.cmd" _python_cmd)
 file(TO_NATIVE_PATH "${_root_path}/scripts/build/tools/upload_to_s3.py" _upload_script)
 file(TO_NATIVE_PATH "${_cpack_wix_out_dir}" _cpack_wix_out_dir)
 
-# strip the scheme and extract the bucket/key prefix from the URL
-string(REPLACE "s3://" "" _stripped_url ${CPACK_UPLOAD_URL})
-string(REPLACE "/" ";" _tokens ${_stripped_url})
+function(upload_to_s3 in_url in_local_path in_file_regex)
 
-list(POP_FRONT _tokens _bucket)
-string(JOIN "/" _prefix ${_tokens})
+    # strip the scheme and extract the bucket/key prefix from the URL
+    string(REPLACE "s3://" "" _stripped_url ${in_url})
+    string(REPLACE "/" ";" _tokens ${_stripped_url})
 
-set(_file_regex ".*(cab|exe|msi)$")
-set(_extra_args [[{"ACL":"bucket-owner-full-control"}]])
+    list(POP_FRONT _tokens _bucket)
+    string(JOIN "/" _prefix ${_tokens})
 
-set(_upload_command
-    ${_python_cmd} -s
-    -u ${_upload_script}
-    --base_dir ${_cpack_wix_out_dir}
-    --file_regex="${_file_regex}"
-    --bucket ${_bucket}
-    --key_prefix ${_prefix}
-    --extra_args ${_extra_args}
-)
+    set(_extra_args [[{"ACL":"bucket-owner-full-control"}]])
 
-if(CPACK_AWS_PROFILE)
-    list(APPEND _upload_command --profile ${CPACK_AWS_PROFILE})
-endif()
+    set(_upload_command
+        ${_python_cmd} -s
+        -u ${_upload_script}
+        --base_dir ${in_local_path}
+        --file_regex="${in_file_regex}"
+        --bucket ${_bucket}
+        --key_prefix ${_prefix}
+        --extra_args ${_extra_args}
+    )
+
+    if(CPACK_AWS_PROFILE)
+        list(APPEND _upload_command --profile ${CPACK_AWS_PROFILE})
+    endif()
+
+    execute_process(
+        COMMAND ${_upload_command}
+        RESULT_VARIABLE _upload_result
+        OUTPUT_VARIABLE _upload_output
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+
+    if (NOT ${_upload_result} EQUAL 0)
+        message(FATAL_ERROR "An error occurred uploading to s3.\nOutput:\n${_upload_output}")
+    endif()
+endfunction()
 
 message(STATUS "Uploading artifacts to ${CPACK_UPLOAD_URL}")
-execute_process(
-    COMMAND ${_upload_command}
-    RESULT_VARIABLE _upload_result
-    ERROR_VARIABLE _upload_errors
+upload_to_s3(
+    ${CPACK_UPLOAD_URL}
+    ${_cpack_wix_out_dir}
+    ".*(cab|exe|msi)$"
 )
+message(STATUS "Artifact uploading complete!")
 
-if (${_upload_result} EQUAL 0)
-    message(STATUS "Artifact uploading complete!")
-else()
-    message(FATAL_ERROR "An error occurred uploading artifacts.  ${_upload_errors}")
+# for auto tagged builds, we will also upload a second copy of just the boostrapper
+# to a special "Latest" folder under the branch in place of the commit date/hash
+if(CPACK_AUTO_GEN_TAG)
+    message(STATUS "Updating latest tagged build")
+
+    # make sure we can extra the commit info from the URL first
+    string(REGEX MATCH "([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]-[0-9a-zA-Z]+)"
+        _commit_info ${CPACK_UPLOAD_URL}
+    )
+    if(NOT _commit_info)
+        message(FATAL_ERROR "Failed to extract the build tag")
+    endif()
+
+    set(_temp_dir ${_cpack_wix_out_dir}/temp)
+    if(NOT EXISTS ${_temp_dir})
+        file(MAKE_DIRECTORY ${_temp_dir})
+    endif()
+
+    # strip the version number form the exe name in the one uploaded to latest
+    string(TOLOWER "${CPACK_PACKAGE_NAME}_installer.exe" _non_versioned_exe)
+    set(_temp_exe_copy ${_temp_dir}/${_non_versioned_exe})
+
+    file(COPY ${_bootstrap_output_file} DESTINATION ${_temp_dir})
+    file(RENAME "${_temp_dir}/${_bootstrap_filename}" ${_temp_exe_copy})
+
+    # include the commit info in a text file that will live next to the exe
+    set(_temp_info_file ${_temp_dir}/build_tag.txt)
+    file(WRITE ${_temp_info_file} ${_commit_info})
+
+    # update the URL and upload
+    string(REPLACE
+        ${_commit_info} "Latest"
+        _latest_upload_url ${CPACK_UPLOAD_URL}
+    )
+
+    upload_to_s3(
+        ${_latest_upload_url}
+        ${_temp_dir}
+        "(${_non_versioned_exe}|build_tag.txt)$"
+    )
+
+    # cleanup the temp files
+    file(REMOVE_RECURSE ${_temp_dir})
+
+    message(STATUS "Latest build update complete!")
 endif()
diff --git a/cmake/SettingsRegistry.cmake b/cmake/SettingsRegistry.cmake
index 0eae244c4f..934bae4e30 100644
--- a/cmake/SettingsRegistry.cmake
+++ b/cmake/SettingsRegistry.cmake
@@ -160,12 +160,6 @@ function(ly_delayed_generate_settings_registry)
 
             get_property(has_manually_added_dependencies TARGET ${gem_target} PROPERTY MANUALLY_ADDED_DEPENDENCIES SET)
             get_target_property(target_type ${gem_target} TYPE)
-            if (target_type STREQUAL "INTERFACE_LIBRARY" AND has_manually_added_dependencies)
-                # don't use interface libraries here, we only want ones which produce actual binaries unless the target
-                # is empty. We have still already recursed into their dependencies - they'll show up later.
-                # When the target has no dependencies however we want to add the gem root path to the generated setreg
-                continue()
-            endif()
 
 
             ly_get_gem_module_root(gem_module_root ${gem_target})
diff --git a/scripts/o3de/o3de/register.py b/scripts/o3de/o3de/register.py
index ff4ccdc0a6..9d1d6e3122 100644
--- a/scripts/o3de/o3de/register.py
+++ b/scripts/o3de/o3de/register.py
@@ -253,7 +253,8 @@ def add_engine_name_to_path(json_data: dict, engine_path: pathlib.Path, force: b
         logger.error(
             f'Attempting to register existing engine "{engine_name}" with a new path of {engine_path.as_posix()}.'
             f' The current path is {pathlib.Path(engines_path_json[engine_name]).as_posix()}.'
-            f' To force registration of a new engine path, specify the -f/--force option.')
+            f' To force registration of a new engine path, specify the -f/--force option.'
+            f'\nAlternatively the engine can be registered with a different name by changing the "engine_name" field in the engine.json.')
         return 1
     engines_path_json[engine_name] = engine_path.as_posix()
     return 0
@@ -665,7 +666,7 @@ def remove_invalid_o3de_projects(manifest_path: pathlib.Path = None) -> int:
 
     result = 0
 
-    for project in json_data['projects']:
+    for project in json_data.get('projects', []):
         if not validation.valid_o3de_project_json(pathlib.Path(project).resolve() / 'project.json'):
             logger.warn(f"Project path {project} is invalid.")
             # Attempt to unregister all invalid projects even if previous projects failed to unregister
@@ -677,36 +678,36 @@ def remove_invalid_o3de_projects(manifest_path: pathlib.Path = None) -> int:
 def remove_invalid_o3de_objects() -> None:
     json_data = manifest.load_o3de_manifest()
 
-    for engine_object in json_data['engines']:
-        engine_path = engine_object['path']
+    for engine_object in json_data.get('engines', []):
+        engine_path = engine_object.get('path', '')
         if not validation.valid_o3de_engine_json(pathlib.Path(engine_path).resolve() / 'engine.json'):
             logger.warn(f"Engine path {engine_path} is invalid.")
             register(engine_path=engine_path, remove=True)
 
     remove_invalid_o3de_projects()
 
-    for gem in json_data['gems']:
+    for gem in json_data.get('gems', []):
         if not validation.valid_o3de_gem_json(pathlib.Path(gem).resolve() / 'gem.json'):
             logger.warn(f"Gem path {gem} is invalid.")
             register(gem_path=gem, remove=True)
 
-    for external in json_data['external_subdirectories']:
+    for external in json_data.get('external_subdirectories', []):
         external = pathlib.Path(external).resolve()
         if not external.is_dir():
             logger.warn(f"External subdirectory {external} is invalid.")
             register(engine_path=engine_path, external_subdir_path=external, remove=True)
 
-    for template in json_data['templates']:
+    for template in json_data.get('templates', []):
         if not validation.valid_o3de_template_json(pathlib.Path(template).resolve() / 'template.json'):
             logger.warn(f"Template path {template} is invalid.")
             register(template_path=template, remove=True)
 
-    for restricted in json_data['restricted']:
+    for restricted in json_data.get('restricted', []):
         if not validation.valid_o3de_restricted_json(pathlib.Path(restricted).resolve() / 'restricted.json'):
             logger.warn(f"Restricted path {restricted} is invalid.")
             register(restricted_path=restricted, remove=True)
 
-    default_engines_folder = pathlib.Path(json_data['default_engines_folder']).resolve()
+    default_engines_folder = pathlib.Path(json_data.get('default_engines_folder', manifest.get_o3de_engines_folder())).resolve()
     if not default_engines_folder.is_dir():
         new_default_engines_folder = manifest.get_o3de_folder() / 'Engines'
         new_default_engines_folder.mkdir(parents=True, exist_ok=True)
@@ -714,7 +715,7 @@ def remove_invalid_o3de_objects() -> None:
             f"Default engines folder {default_engines_folder} is invalid. Set default {new_default_engines_folder}")
         register(default_engines_folder=new_default_engines_folder.as_posix())
 
-    default_projects_folder = pathlib.Path(json_data['default_projects_folder']).resolve()
+    default_projects_folder = pathlib.Path(json_data.get('default_projects_folder', manifest.get_o3de_projects_folder())).resolve()
     if not default_projects_folder.is_dir():
         new_default_projects_folder = manifest.get_o3de_folder() / 'Projects'
         new_default_projects_folder.mkdir(parents=True, exist_ok=True)
@@ -722,7 +723,7 @@ def remove_invalid_o3de_objects() -> None:
             f"Default projects folder {default_projects_folder} is invalid. Set default {new_default_projects_folder}")
         register(default_projects_folder=new_default_projects_folder.as_posix())
 
-    default_gems_folder = pathlib.Path(json_data['default_gems_folder']).resolve()
+    default_gems_folder = pathlib.Path(json_data.get('default_gems_folder', manifest.get_o3de_gems_folder())).resolve()
     if not default_gems_folder.is_dir():
         new_default_gems_folder = manifest.get_o3de_folder() / 'Gems'
         new_default_gems_folder.mkdir(parents=True, exist_ok=True)
@@ -730,7 +731,7 @@ def remove_invalid_o3de_objects() -> None:
                     f" Set default {new_default_gems_folder}")
         register(default_gems_folder=new_default_gems_folder.as_posix())
 
-    default_templates_folder = pathlib.Path(json_data['default_templates_folder']).resolve()
+    default_templates_folder = pathlib.Path(json_data.get('default_templates_folder', manifest.get_o3de_templates_folder())).resolve()
     if not default_templates_folder.is_dir():
         new_default_templates_folder = manifest.get_o3de_folder() / 'Templates'
         new_default_templates_folder.mkdir(parents=True, exist_ok=True)
@@ -739,7 +740,7 @@ def remove_invalid_o3de_objects() -> None:
             f" Set default {new_default_templates_folder}")
         register(default_templates_folder=new_default_templates_folder.as_posix())
 
-    default_restricted_folder = pathlib.Path(json_data['default_restricted_folder']).resolve()
+    default_restricted_folder = pathlib.Path(json_data.get('default_restricted_folder', manifest.get_o3de_restricted_folder())).resolve()
     if not default_restricted_folder.is_dir():
         default_restricted_folder = manifest.get_o3de_folder() / 'Restricted'
         default_restricted_folder.mkdir(parents=True, exist_ok=True)
@@ -748,7 +749,7 @@ def remove_invalid_o3de_objects() -> None:
             f" Set default {default_restricted_folder}")
         register(default_restricted_folder=default_restricted_folder.as_posix())
 
-    default_third_party_folder = pathlib.Path(json_data['default_third_party_folder']).resolve()
+    default_third_party_folder = pathlib.Path(json_data.get('default_third_party_folder', manifest.get_o3de_third_party_folder())).resolve()
     if not default_third_party_folder.is_dir():
         default_third_party_folder = manifest.get_o3de_folder() / '3rdParty'
         default_third_party_folder.mkdir(parents=True, exist_ok=True)