diff --git a/Gems/ScriptCanvas/Code/Editor/Components/EditorGraph.cpp b/Gems/ScriptCanvas/Code/Editor/Components/EditorGraph.cpp
index f032bfe692..8741505030 100644
--- a/Gems/ScriptCanvas/Code/Editor/Components/EditorGraph.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Components/EditorGraph.cpp
@@ -1051,7 +1051,7 @@ namespace ScriptCanvasEditor
             auto graph = entity->CreateComponent<ScriptCanvasEditor::Graph>();
             entity->CreateComponent<EditorGraphVariableManagerComponent>(graph->GetScriptCanvasId());
 
-            if (ScriptCanvas::DataPtr data = AZStd::make_shared<ScriptCanvas::ScriptCanvasData>())
+            if (ScriptCanvas::DataPtr data = aznew ScriptCanvas::ScriptCanvasData())
             {
                 data->m_scriptCanvasEntity.reset(entity);
                 graph->MarkOwnership(*data);
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/FileSaver.cpp b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/FileSaver.cpp
index 47e43b19d3..57c0822b05 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/FileSaver.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/FileSaver.cpp
@@ -97,23 +97,15 @@ namespace ScriptCanvasEditor
             }
             else
             {
-                // #sc_editor_asset - skip save, narrow down the memory corruption
-                AZ::SystemTickBus::QueueFunction([this, tmpFileName]()
-                {
-                    FileSaveResult result;
-                    result.tempFileRemovalError = RemoveTempFile(tmpFileName);
-                    m_onComplete(result);
-                });
-                                
                 // the actual move attempt
-                /*
                 auto moveResult = AZ::IO::SmartMove(tmpFileName.c_str(), target.c_str());
                 if (moveResult.GetResultCode() == AZ::IO::ResultCode::Success)
                 {
                     auto streamer = AZ::Interface<AZ::IO::IStreamer>::Get();
                     AZ::IO::FileRequestPtr flushRequest = streamer->FlushCache(target.c_str());
                     // Bump the slice asset up in the asset processor's queue.
-                    AzFramework::AssetSystemRequestBus::Broadcast(&AzFramework::AssetSystem::AssetSystemRequests::EscalateAssetBySearchTerm, target.c_str());
+                    AzFramework::AssetSystemRequestBus::Broadcast
+                        (&AzFramework::AssetSystem::AssetSystemRequests::EscalateAssetBySearchTerm, target.c_str());
                     
                     AZ::SystemTickBus::QueueFunction([this, tmpFileName]()
                         {
@@ -124,17 +116,19 @@ namespace ScriptCanvasEditor
                 }
                 else
                 {
-                    AZ_Warning(ScriptCanvas::k_VersionExplorerWindow.data(), false, "moving converted file to tmpFileName destination failed: %s, trying again", target.c_str());
+                    AZ_Warning(ScriptCanvas::k_VersionExplorerWindow.data(), false
+                        , "moving converted file to tmpFileName destination failed: %s, trying again", target.c_str());
                     auto streamer = AZ::Interface<AZ::IO::IStreamer>::Get();
                     AZ::IO::FileRequestPtr flushRequest = streamer->FlushCache(target.c_str());
-                    streamer->SetRequestCompleteCallback(flushRequest, [this, tmpFileName, target, remainingAttempts]([[maybe_unused]] AZ::IO::FileRequestHandle request)
+                    streamer->SetRequestCompleteCallback(flushRequest
+                    , [this, tmpFileName, target, remainingAttempts]([[maybe_unused]] AZ::IO::FileRequestHandle request)
                     {
                         // Continue saving.
-                        AZ::SystemTickBus::QueueFunction([this, tmpFileName, target, remainingAttempts]() { PerformMove(tmpFileName, target, remainingAttempts - 1); });
+                        AZ::SystemTickBus::QueueFunction(
+                            [this, tmpFileName, target, remainingAttempts]() { PerformMove(tmpFileName, target, remainingAttempts - 1); });
                     });
                     streamer->QueueRequest(flushRequest);
                 }
-                **/
             }
         }