diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml
new file mode 100644
index 00000000..bf38e20d
--- /dev/null
+++ b/.github/workflows/cleanup.yml
@@ -0,0 +1,30 @@
+name: Cleanup deleted files from dev in main
+
+on:
+  workflow_dispatch:
+
+jobs:
+  merge-branch:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          ref: main
+      - name: Set Git config
+        run: |
+            git config --local user.email "actions@github.com"
+            git config --local user.name "Github Actions"
+      - name: Merge dev to main
+        run: |
+          git pull
+          git merge --allow-unrelated-histories $(git commit-tree -p main -m "[Automated] Cleanup" origin/dev^{tree})
+      - name: Use CHANGELOG and package.json from main
+        run: |
+          git checkout HEAD~2 CHANGELOG.md
+          git checkout HEAD~2 package.json
+          git commit --amend --no-edit
+      - name: Push
+        run: |
+          git push
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index 01b8bd1d..1fac34a9 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -20,6 +20,11 @@ jobs:
         run: |
           git pull
           git merge --no-ff --allow-unrelated-histories -X theirs origin/dev -m "[Automated] Merged dev into main"
+      - name: Use CHANGELOG and package.json from main
+        run: |
+          git checkout HEAD~1 CHANGELOG.md
+          git checkout HEAD~1 package.json
+          git commit --amend --no-edit
       - name: Push
         run: |
           git push
diff --git a/Editor/Utils/ProjectValidation.cs b/Editor/Utils/ProjectValidation.cs
new file mode 100644
index 00000000..34d6f410
--- /dev/null
+++ b/Editor/Utils/ProjectValidation.cs
@@ -0,0 +1,130 @@
+// Copyright (c) Meta Platforms, Inc. and affiliates.
+
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.Rendering;
+
+namespace Oculus.Movement.Utils
+{
+    /// <summary>
+    /// Validates various project settings for the samples to work correctly.
+    /// </summary>
+    [InitializeOnLoad]
+    public class ProjectValidation
+    {
+        private static readonly string[] _expectedLayers = { "Character", "MirroredCharacter", "HiddenMesh" };
+
+        static ProjectValidation()
+        {
+            if (!ShouldShowWindow())
+            {
+                return;
+            }
+
+            ProjectValidationWindow.ShowProjectValidationWindow();
+        }
+
+        /// <summary>
+        /// If all expected layers are in the project, returns true.
+        /// </summary>
+        /// <returns>True if all expected layers are in the project.</returns>
+        public static bool TestLayers()
+        {
+            bool allLayersArePresent = true;
+            foreach (var expectedLayer in _expectedLayers)
+            {
+                if (LayerMask.NameToLayer(expectedLayer) == -1)
+                {
+                    allLayersArePresent = false;
+                    break;
+                }
+            }
+            return allLayersArePresent;
+        }
+
+        /// <summary>
+        /// If the project is using URP, returns true if vulkan is set.
+        /// </summary>
+        /// <returns>True if vulkan is set and the project requires URP.</returns>
+        public static bool TestVulkan()
+        {
+            bool vulkanFoundOrNotRequired = GraphicsSettings.renderPipelineAsset == null
+                                            || SystemInfo.graphicsDeviceType == GraphicsDeviceType.Vulkan
+                                            || SystemInfo.graphicsDeviceType == GraphicsDeviceType.Direct3D11;
+            return vulkanFoundOrNotRequired;
+        }
+
+        private static bool ShouldShowWindow()
+        {
+            return !TestLayers() || !TestVulkan();
+        }
+    }
+
+    /// <summary>
+    /// Editor window that displays information about configuring the project.
+    /// </summary>
+    public class ProjectValidationWindow : EditorWindow
+    {
+        private static ProjectValidationWindow _projectValidationWindow;
+
+        /// <summary>
+        /// Shows the project validation window.
+        /// </summary>
+        public static void ShowProjectValidationWindow()
+        {
+            if (!HasOpenInstances<ProjectValidationWindow>())
+            {
+                _projectValidationWindow = GetWindow<ProjectValidationWindow>();
+                _projectValidationWindow.titleContent = new GUIContent("Movement Validation");
+                _projectValidationWindow.Focus();
+            }
+        }
+
+        private void OnEnable()
+        {
+            EditorWindow editorWindow = this;
+
+            Vector2 windowSize = new Vector2(600, 200);
+            editorWindow.minSize = windowSize;
+            editorWindow.maxSize = windowSize;
+        }
+
+        private void OnGUI()
+        {
+            bool layersValid = ProjectValidation.TestLayers();
+            bool vulkanValid = ProjectValidation.TestVulkan();
+            GUIStyle labelStyle = new GUIStyle (EditorStyles.label);
+            labelStyle.richText = true;
+            labelStyle.wordWrap = true;
+
+            GUILayout.BeginVertical();
+            {
+                GUI.enabled = !layersValid;
+                GUILayout.BeginVertical(EditorStyles.helpBox);
+                {
+                    GUILayout.Label("Layers", EditorStyles.boldLabel);
+                    GUILayout.Label(
+                        "For the sample scenes, the following layers must be present in the project: <b>Character (layer index 10), MirroredCharacter (layer index 11), and HiddenMesh</b>. \n\nImport the Layers preset in <b>Edit -> Project Settings -> Tags and Layers</b> by selecting the tiny settings icon located at the top right corner and choosing the <b>Layers</b> preset located in the <b>Samples/Shared/Presets</b> folder.",
+                        labelStyle);
+                    GUILayout.Space(5);
+                }
+                GUILayout.EndVertical();
+                GUI.enabled = true;
+
+                GUI.enabled = !vulkanValid;
+                GUILayout.BeginVertical(EditorStyles.helpBox);
+                {
+                    GUILayout.Label("Vulkan", EditorStyles.boldLabel);
+                    GUILayout.Label(
+                        "Set the primary graphics API to Vulkan in <b>Edit -> Project Settings -> Player -> Other Settings -> Graphics API</b>.",
+                        labelStyle);
+                    GUILayout.Space(5);
+                }
+                GUILayout.EndVertical();
+                GUI.enabled = true;
+            }
+            GUILayout.EndVertical();
+            GUILayout.Space(5);
+        }
+    }
+}
diff --git a/Runtime/Scripts/Validation/RuntimeUnitValidation.cs.meta b/Editor/Utils/ProjectValidation.cs.meta
similarity index 83%
rename from Runtime/Scripts/Validation/RuntimeUnitValidation.cs.meta
rename to Editor/Utils/ProjectValidation.cs.meta
index 14ed4129..25f81ec9 100644
--- a/Runtime/Scripts/Validation/RuntimeUnitValidation.cs.meta
+++ b/Editor/Utils/ProjectValidation.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ece8a276d469b05409b62ac493e2f1d7
+guid: 9a8dc731ade8f994cbc773ffa9ff1a6a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/README.md b/README.md
index f988c629..87461ae5 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Then, bring this package into the project.
 - In Package Manager, click on the add button below the window title and select **Add package from git URL…**, using this URL: https://github.com/oculus-samples/Unity-Movement.git
 - Alternatively, in package manager, click on the add button below the window title and select **Add package from disk...**, using the package.json located after unzipping one of the releases here: https://github.com/oculus-samples/Unity-Movement/releases
 
-The sample scenes are located under the **Samples/../Scenes** folders.
+The sample scenes are located under the **Samples/../Scenes** folders. The Character (layer index 10), the MirroredCharacter (layer index 11), and the HiddenMesh layers must be present in the project.
 
 ## Samples
 The project contains several sample scenes. For more information about the samples, read [Aura Sample](https://developer.oculus.com/documentation/unity/move-sample-aura/), [Hip Pinning Sample](https://developer.oculus.com/documentation/unity/move-sample-hip-pinning/), and [High Fidelity Sample](https://developer.oculus.com/documentation/unity/move-high-fidelity/).
diff --git a/Runtime/Scripts/Validation.meta b/Runtime/Scripts/Validation.meta
deleted file mode 100644
index 6d5faf2a..00000000
--- a/Runtime/Scripts/Validation.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: ec9fe67cfec07e84685cfbca9f86c0b5
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Runtime/Scripts/Validation/LayerAndVulkanValidation.cs b/Runtime/Scripts/Validation/LayerAndVulkanValidation.cs
deleted file mode 100644
index df5d66aa..00000000
--- a/Runtime/Scripts/Validation/LayerAndVulkanValidation.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright (c) Meta Platforms, Inc. and affiliates.
-
-using UnityEngine;
-using UnityEngine.Rendering;
-
-namespace Oculus.Movement.Validation
-{
-    /// <summary>
-    /// Identify if layers are missing and identify incorrect graphics API.
-    /// </summary>
-    public class LayerAndVulkanValidation : RuntimeUnitValidation
-    {
-        /// <summary>
-        /// Layers expected in scene.
-        /// </summary>
-        [ContextMenuItem(nameof(Test), nameof(Test))]
-        [Tooltip(LayerAndVulkanValidationTooltips.ExpectedLayers)]
-        [SerializeField]
-        protected string[] _expectedLayers = { "HiddenMesh" };
-
-#if UNITY_EDITOR
-        /// <summary>
-        /// Unity Editor resets component on creation, or after using the vertical "..." button.
-        /// </summary>
-        public override void Reset()
-        {
-            TestCases.AddRange(new TestCase[]
-            {
-                new TestCase(this, nameof(TestLayers)),
-                new TestCase(this, nameof(TestVulkan)),
-            });
-            Transform errorList = transform.GetChild(0);
-            for (int i = 0; i < errorList.childCount; i++)
-            {
-                var errorObject = errorList.GetChild(i).gameObject;
-                const string goSetActive = nameof(GameObject.SetActive);
-                BindDelegateWithBool(TestCases[i].OnTrue, errorObject, goSetActive, false);
-                BindDelegateWithBool(TestCases[i].OnFalse, errorObject, goSetActive, true);
-            }
-        }
-#endif
-
-        /// <summary>
-        /// Will show test output object before tests; allows the test UI to be hidden at edit time.
-        /// </summary>
-        public override void Test()
-        {
-            transform.GetChild(0).gameObject.SetActive(true);
-            base.Test();
-        }
-
-        /// <summary>
-        /// The Movement scene has a few layers required for rendering (or not-rendering) objects.
-        /// </summary>
-        /// <param name="vulkanFoundCallback">Handler called when result is known.</param>
-        public void TestLayers(TestResultHandler layersFoundCallback)
-        {
-            bool allLayersArePresent = true;
-            for (int i = 0; i < _expectedLayers.Length; i++)
-            {
-                int number = LayerMask.NameToLayer(_expectedLayers[i]);
-                if (number == -1)
-                {
-                    allLayersArePresent = false;
-                }
-            }
-            layersFoundCallback.Invoke(allLayersArePresent);
-        }
-
-        /// <summary>
-        /// URP shaders and materials are only expected to work with the Vulkan graphics API.
-        /// OpenGLES3 (default rendering) should work too, as should DirectX11 (Unity Editor).
-        /// </summary>
-        /// /// <param name="vulkanFoundCallback">Handler called when result is known.</param>
-        public void TestVulkan(TestResultHandler vulkanFoundCallback)
-        {
-            bool vulkanFoundOrNotRequired = (GraphicsSettings.renderPipelineAsset == null)
-                || SystemInfo.graphicsDeviceType == GraphicsDeviceType.Vulkan
-                || SystemInfo.graphicsDeviceType == GraphicsDeviceType.Direct3D11;
-            vulkanFoundCallback.Invoke(vulkanFoundOrNotRequired);
-        }
-    }
-}
diff --git a/Runtime/Scripts/Validation/LayerAndVulkanValidation.cs.meta b/Runtime/Scripts/Validation/LayerAndVulkanValidation.cs.meta
deleted file mode 100644
index 95359f65..00000000
--- a/Runtime/Scripts/Validation/LayerAndVulkanValidation.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 367e10b9e50a2b245be7853051b78c64
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Runtime/Scripts/Validation/RuntimeUnitValidation.cs b/Runtime/Scripts/Validation/RuntimeUnitValidation.cs
deleted file mode 100644
index 0eae41fc..00000000
--- a/Runtime/Scripts/Validation/RuntimeUnitValidation.cs
+++ /dev/null
@@ -1,221 +0,0 @@
-// Copyright (c) Meta Platforms, Inc. and affiliates.
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.Events;
-#if UNITY_EDITOR
-using System.Reflection;
-using UnityEditor.Events;
-#endif
-
-namespace Oculus.Movement.Validation
-{
-    /// <summary>
-    /// For managing Unit Tests in Unity at runtime, for sample scenes and debugging/diagnostics.
-    /// <see cref="LayerAndVulkanValidation"/> is an example implementation of this base class.
-    /// </summary>
-    public class RuntimeUnitValidation : MonoBehaviour
-    {
-        /// <summary>
-        /// List of TestCases, which are functions that call a given result bool callback.
-        /// </summary>
-        [Tooltip(RuntimeUnitValidationTooltips.TestCases)]
-        [SerializeField]
-        protected List<TestCase> _testCases = new List<TestCase>();
-
-        /// <summary>
-        /// All test cases, where each test case accepts a <code>void method(bool)</code> delegate
-        /// to invoke once a test is complete with a success/failure result known.
-        /// </summary>
-        public List<TestCase> TestCases { get => _testCases; set => _testCases = value; }
-
-        /// <summary>
-        /// When the result of a test is known, the given callback will be called.
-        /// If the test algorithm fails, the callback may never be called.
-        /// </summary>
-        [Serializable]
-        public class TestEvent : UnityEvent<TestResultHandler> { }
-
-        /// <summary>
-        /// Template for a function to be called when the results of a test are known.
-        /// </summary>
-        /// <param name="testResult">if the test passed (true) or failed (false).</param>
-        public delegate void TestResultHandler(bool testResult);
-
-        [Serializable]
-        public class TestCase
-        {
-            /// <summary>
-            /// Metadata describing the test.
-            /// </summary>
-            [Tooltip(RuntimeUnitValidationTooltips.TestCase.Name)]
-            public string Name;
-
-            /// <summary>
-            /// Function that accepts a bool callback, giving it the test result.
-            /// </summary>
-            [Tooltip(RuntimeUnitValidationTooltips.TestCase.Test)]
-            public TestEvent Test = new TestEvent();
-
-            /// <summary>
-            /// Unity Editor can insert a response here to a true case from the test.
-            /// </summary>
-            [Tooltip(RuntimeUnitValidationTooltips.TestCase.OnTrue)]
-            public UnityEvent OnTrue = new UnityEvent();
-
-            /// <summary>
-            /// Unity Editor can insert a response here to a false case from the test.
-            /// </summary>
-            [Tooltip(RuntimeUnitValidationTooltips.TestCase.OnFalse)]
-            public UnityEvent OnFalse = new UnityEvent();
-
-            /// <summary>
-            /// Creates a validation test unit.
-            /// </summary>
-            /// <param name="target">Object with a <see cref="TestResultHandler"/>.</param>
-            /// <param name="testName">Name of the <see cref="TestResultHandler"/>.</param>
-            public TestCase(object target, string testName)
-            {
-#if UNITY_EDITOR
-                Name = testName;
-                BindDelegate(Test, target, testName);
-                Test.SetPersistentListenerState(0, UnityEventCallState.EditorAndRuntime);
-#endif
-            }
-
-            /// <summary>
-            /// Runs the test, then calls <see cref="OnTrue"/> or <see cref="OnFalse"/>.
-            /// </summary>
-            /// <param name="action">An additional result callback to use, null is fine.</param>
-            public void Evaluate(TestResultHandler action)
-            {
-                if (action == null)
-                {
-                    action = OnResultKnown;
-                }
-                else
-                {
-                    action += OnResultKnown;
-                }
-                Test.Invoke(action);
-            }
-
-            /// <summary>
-            /// Called when the result of the test is known.
-            /// </summary>
-            /// <param name="result">Result of the test.</param>
-            protected void OnResultKnown(bool result)
-            {
-                if (result)
-                {
-                    OnTrue.Invoke();
-                    return;
-                }
-                OnFalse.Invoke();
-            }
-        }
-
-        /// <summary>
-        /// Automatically run this test when this object starts in the scene.
-        /// </summary>
-        public virtual void Start()
-        {
-            Test();
-        }
-
-#if UNITY_EDITOR
-        /// <summary>
-        /// Reset methods are for Unity Editor data population and should not exist at runtime.
-        /// </summary>
-        public virtual void Reset()
-        {
-        }
-
-        /// <summary>
-        /// Helper function for binding <see cref="UnityEvent"/>s with C# scripts.
-        /// Calling this method should be limited to within the editor only since the C# reflection
-        /// used causes persistent performance penalties at runtime.
-        /// </summary>
-        /// <param name="event">A UnityEvent, editable by the Unity Editor at edit time.</param>
-        /// <param name="target">An object with a <code>void method()</code>.</param>
-        /// <param name="methodName"><code>nameof(method)</code>uses reflection.</param>
-        public static void BindSimpleDelegate(UnityEvent @event, object target, string methodName)
-        {
-            MethodInfo method =
-                UnityEvent.GetValidMethodInfo(target, methodName, Array.Empty<Type>());
-            UnityAction action =
-                Delegate.CreateDelegate(typeof(UnityAction), target, method, false) as UnityAction;
-            UnityEventTools.AddVoidPersistentListener(@event, action);
-        }
-
-        /// <summary>
-        /// Helper function for binding <see cref="UnityEvent"/>&lt;bool&gt;s with C# scripts.
-        /// Calling this method should be limited to within the editor only since the C# reflection
-        /// used causes persistent performance penalties at runtime.
-        /// </summary>
-        /// <param name="event">A UnityEvent, editable by the Unity Editor at edit time.</param>
-        /// <param name="target">An object with a <code>void method(bool)</code>.</param>
-        /// <param name="methodName"><code>nameof(method)</code>uses reflection.</param>
-        /// <param name="argument">Whether to pass true or false on the event.</param>
-        public static void BindDelegateWithBool
-            (UnityEvent @event, object target, string methodName, bool argument)
-        {
-            MethodInfo method = FindMethod(target, methodName, typeof(bool));
-            Type delegateType = typeof(UnityAction<bool>);
-            UnityAction<bool> action =
-                Delegate.CreateDelegate(delegateType, target, method, false) as UnityAction<bool>;
-            UnityEventTools.AddBoolPersistentListener(@event, action, argument);
-        }
-
-        /// <summary>
-        /// Helper function for binding <see cref="UnityEvent"/>&lt;T&gt;s with C# scripts.
-        /// Calling this method should be limited to within the editor only since the C# reflection
-        /// used causes persistent performance penalties at runtime.
-        /// </summary>
-        /// <param name="event">A UnityEvent, editable by the Unity Editor at edit time.</param>
-        /// <param name="target">An object with a <code>void method(T)</code>.</param>
-        /// <param name="methodName"><code>nameof(method)</code>uses reflection.</param>
-        /// <typeparam name="T"></typeparam>
-        public static void BindDelegate<T>(UnityEvent<T> @event, object target, string methodName)
-        {
-            MethodInfo method = FindMethod(target, methodName, typeof(T));
-            Type delegateType = typeof(UnityAction<T>);
-            UnityAction<T> action =
-                Delegate.CreateDelegate(delegateType, target, method, false) as UnityAction<T>;
-            UnityEventTools.AddPersistentListener(@event, action);
-        }
-
-        private static MethodInfo FindMethod(object target, string methodName, Type argType)
-        {
-            MethodInfo method =
-                UnityEvent.GetValidMethodInfo(target, methodName, new Type[] { argType });
-            if (method == null)
-            {
-                throw new Exception($"missing {methodName}({argType}) in {target.GetType()}");
-            }
-            return method;
-        }
-#endif
-
-        /// <summary>
-        /// Calls <see cref="TestCase"/>s, based on <see cref="TestCase.Test"/> evaluation, calls
-        /// <see cref="TestCase.OnTrue"/> or <see cref="TestCase.OnFalse"/>.
-        /// </summary>
-        public virtual void Test()
-        {
-            _testCases.ForEach(ExecuteTest);
-        }
-
-        private void ExecuteTest(TestCase test)
-        {
-            TestResultHandler extraResultCallback = null;
-            if (!Application.isPlaying)
-            {
-                extraResultCallback = (result) => { Debug.Log($"{test.Name} : {result}"); };
-            }
-            test.Evaluate(extraResultCallback);
-        }
-    }
-}
diff --git a/Samples/Aura/Scenes/MovementAura.unity b/Samples/Aura/Scenes/MovementAura.unity
index 91ffb5f5..86d0e339 100644
--- a/Samples/Aura/Scenes/MovementAura.unity
+++ b/Samples/Aura/Scenes/MovementAura.unity
@@ -189,155 +189,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &61640712
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 211743643720050171, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 211743643720050171, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 211743643720050171, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 211743643720050171, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1195925668280561999, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1195925668280561999, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1195925668280561999, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1195925668280561999, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3161869583469997041, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_RootOrder
-      value: 8
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 800
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 300
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0.25
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 90
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4135143995944558120, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4135143995944558120, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4234112923270133180, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4234112923270133180, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6936511427744063968, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_Name
-      value: RuntimeValidation
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
 --- !u!4 &184870002 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 3872187500534444957, guid: b7deeec84cfb5464f8178d08a689fcf0, type: 3}
@@ -582,7 +433,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 3140805194830035441, guid: b605c55374dd7cb41a35e0bfa7d02148, type: 3}
       propertyPath: m_RootOrder
-      value: 9
+      value: 8
       objectReference: {fileID: 0}
     - target: {fileID: 3140805194830035441, guid: b605c55374dd7cb41a35e0bfa7d02148, type: 3}
       propertyPath: m_LocalPosition.x
diff --git a/Samples/HighFidelity/Character/Scenes/MovementHighFidelity.unity b/Samples/HighFidelity/Character/Scenes/MovementHighFidelity.unity
index 21c6aa2f..1b10ea05 100644
--- a/Samples/HighFidelity/Character/Scenes/MovementHighFidelity.unity
+++ b/Samples/HighFidelity/Character/Scenes/MovementHighFidelity.unity
@@ -187,7 +187,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &217809098
 GameObject:
@@ -223,139 +223,6 @@ Transform:
   m_Father: {fileID: 928488986}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &268311456
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 211743643720050171, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 211743643720050171, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 211743643720050171, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 211743643720050171, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1195925668280561999, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1195925668280561999, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1195925668280561999, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1195925668280561999, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3161869583469997041, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_RootOrder
-      value: 7
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 800
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 300
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0.25
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4135143995944558120, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4135143995944558120, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4234112923270133180, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4234112923270133180, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6480094707529626900, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_PresetInfoIsWorld
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6936511427744063968, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_Name
-      value: RuntimeValidation
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
 --- !u!4 &367520452 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 8719327491783369479, guid: f14f608a9bdee1f4b94a92d813a9ea9d, type: 3}
@@ -771,7 +638,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3925386263601755973, guid: 3f4ed02e98233244eb8b67eff35f6b77, type: 3}
       propertyPath: m_RootOrder
-      value: 3
+      value: 6
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 3f4ed02e98233244eb8b67eff35f6b77, type: 3}
@@ -784,7 +651,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 3140805194830035441, guid: b605c55374dd7cb41a35e0bfa7d02148, type: 3}
       propertyPath: m_RootOrder
-      value: 9
+      value: 8
       objectReference: {fileID: 0}
     - target: {fileID: 3140805194830035441, guid: b605c55374dd7cb41a35e0bfa7d02148, type: 3}
       propertyPath: m_LocalPosition.x
@@ -1035,7 +902,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2476541160599945763, guid: 9000778e46f7a85489200a07924d6fea, type: 3}
       propertyPath: m_RootOrder
-      value: 8
+      value: 7
       objectReference: {fileID: 0}
     - target: {fileID: 2476541160599945763, guid: 9000778e46f7a85489200a07924d6fea, type: 3}
       propertyPath: m_LocalPosition.x
@@ -1263,7 +1130,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 6
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
 --- !u!1 &2094724098
 GameObject:
diff --git a/Samples/HighFidelity/HipPinning/Scenes/MovementHipPinning.unity b/Samples/HighFidelity/HipPinning/Scenes/MovementHipPinning.unity
index 9f7b08ab..02c9397d 100644
--- a/Samples/HighFidelity/HipPinning/Scenes/MovementHipPinning.unity
+++ b/Samples/HighFidelity/HipPinning/Scenes/MovementHipPinning.unity
@@ -254,7 +254,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3925386263601755973, guid: 3f4ed02e98233244eb8b67eff35f6b77, type: 3}
       propertyPath: m_RootOrder
-      value: 5
+      value: 7
       objectReference: {fileID: 0}
     - target: {fileID: 3925386263601755973, guid: 3f4ed02e98233244eb8b67eff35f6b77, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -1162,7 +1162,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 6
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
 --- !u!114 &998163530 stripped
 MonoBehaviour:
@@ -1201,155 +1201,6 @@ PositionConstraint:
     weight: 1
   - sourceTransform: {fileID: 2038134770}
     weight: 0
---- !u!1001 &1148589709
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 211743643720050171, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 211743643720050171, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 211743643720050171, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 211743643720050171, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1195925668280561999, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1195925668280561999, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1195925668280561999, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1195925668280561999, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3161869583469997041, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_RootOrder
-      value: 10
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 800
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 300
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0.25
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 90
-      objectReference: {fileID: 0}
-    - target: {fileID: 3972710213487479045, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4135143995944558120, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4135143995944558120, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4234112923270133180, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4234112923270133180, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6936511427744063968, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
-      propertyPath: m_Name
-      value: RuntimeValidation
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 1116ea39a9aa9594eb9ea1a0718d0d40, type: 3}
 --- !u!1001 &1379030071
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1363,7 +1214,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2476541160599945763, guid: 9000778e46f7a85489200a07924d6fea, type: 3}
       propertyPath: m_RootOrder
-      value: 11
+      value: 8
       objectReference: {fileID: 0}
     - target: {fileID: 2476541160599945763, guid: 9000778e46f7a85489200a07924d6fea, type: 3}
       propertyPath: m_LocalPosition.x
@@ -1694,7 +1545,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8658488230205805794, guid: ae65d6748ee4f2c48bfebee743f8b12c, type: 3}
       propertyPath: m_RootOrder
-      value: 7
+      value: 6
       objectReference: {fileID: 0}
     - target: {fileID: 8658488230205805794, guid: ae65d6748ee4f2c48bfebee743f8b12c, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -1770,7 +1621,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 109264207228036931, guid: 926bcf9250e0f85499d39eadc58a7470, type: 3}
       propertyPath: m_RootOrder
-      value: 12
+      value: 11
       objectReference: {fileID: 0}
     - target: {fileID: 109264207228036931, guid: 926bcf9250e0f85499d39eadc58a7470, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -2071,7 +1922,7 @@ PrefabInstance:
       objectReference: {fileID: 5041646639421274662}
     - target: {fileID: 2558818635499076924, guid: cfb8b4e1e7f47c94c898dbd66e0f8bb3, type: 3}
       propertyPath: m_RootOrder
-      value: 8
+      value: 9
       objectReference: {fileID: 0}
     - target: {fileID: 2558818635499076924, guid: cfb8b4e1e7f47c94c898dbd66e0f8bb3, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -2492,7 +2343,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5558038247458039740, guid: 5874c215342c2484a8d34f0c2439a7c4, type: 3}
       propertyPath: m_RootOrder
-      value: 9
+      value: 10
       objectReference: {fileID: 0}
     - target: {fileID: 5558038247458039740, guid: 5874c215342c2484a8d34f0c2439a7c4, type: 3}
       propertyPath: m_LocalPosition.x
diff --git a/Samples/HighFidelity/Retargeting/Scenes/MovementRetargeting.unity b/Samples/HighFidelity/Retargeting/Scenes/MovementRetargeting.unity
index 4c230179..ff8cd761 100644
--- a/Samples/HighFidelity/Retargeting/Scenes/MovementRetargeting.unity
+++ b/Samples/HighFidelity/Retargeting/Scenes/MovementRetargeting.unity
@@ -280,7 +280,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8658488230205805794, guid: ae65d6748ee4f2c48bfebee743f8b12c, type: 3}
       propertyPath: m_RootOrder
-      value: 5
+      value: 4
       objectReference: {fileID: 0}
     - target: {fileID: 8658488230205805794, guid: ae65d6748ee4f2c48bfebee743f8b12c, type: 3}
       propertyPath: m_LocalPosition.x
@@ -411,7 +411,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3925386263601755973, guid: 3f4ed02e98233244eb8b67eff35f6b77, type: 3}
       propertyPath: m_RootOrder
-      value: 3
+      value: 5
       objectReference: {fileID: 0}
     - target: {fileID: 3925386263601755973, guid: 3f4ed02e98233244eb8b67eff35f6b77, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -596,7 +596,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2476541160599945763, guid: 9000778e46f7a85489200a07924d6fea, type: 3}
       propertyPath: m_RootOrder
-      value: 7
+      value: 6
       objectReference: {fileID: 0}
     - target: {fileID: 2476541160599945763, guid: 9000778e46f7a85489200a07924d6fea, type: 3}
       propertyPath: m_LocalPosition.x
@@ -925,7 +925,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 3140805194830035441, guid: b605c55374dd7cb41a35e0bfa7d02148, type: 3}
       propertyPath: m_RootOrder
-      value: 6
+      value: 7
       objectReference: {fileID: 0}
     - target: {fileID: 3140805194830035441, guid: b605c55374dd7cb41a35e0bfa7d02148, type: 3}
       propertyPath: m_LocalPosition.x
@@ -1328,7 +1328,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
 --- !u!1 &2094724098
 GameObject:
diff --git a/Samples/Shared/Prefabs/RuntimeValidation.prefab b/Samples/Shared/Prefabs/RuntimeValidation.prefab
deleted file mode 100644
index ef284ebc..00000000
--- a/Samples/Shared/Prefabs/RuntimeValidation.prefab
+++ /dev/null
@@ -1,766 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &273250959204919292
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1195925668280561999}
-  - component: {fileID: 5656330776720560811}
-  - component: {fileID: 2344040892100739475}
-  m_Layer: 5
-  m_Name: Vulkan Missing
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1195925668280561999
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 273250959204919292}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 4135143995944558120}
-  m_Father: {fileID: 3161869583469997041}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 400, y: -345}
-  m_SizeDelta: {x: 800, y: 170}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &5656330776720560811
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 273250959204919292}
-  m_CullTransparentMesh: 1
---- !u!114 &2344040892100739475
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 273250959204919292}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.392}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!1 &2088218812240249420
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 4135143995944558120}
-  - component: {fileID: 7481140020314155938}
-  - component: {fileID: 2294751816005663059}
-  - component: {fileID: 3305009470714473272}
-  m_Layer: 5
-  m_Name: Text (TMP)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &4135143995944558120
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2088218812240249420}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 1195925668280561999}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 6.23999, y: -5.5899963}
-  m_Pivot: {x: 0, y: 1}
---- !u!222 &7481140020314155938
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2088218812240249420}
-  m_CullTransparentMesh: 1
---- !u!114 &2294751816005663059
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2088218812240249420}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_text: 'Please set the primary graphics API to Vulkan in
-
-
-    Edit -> Project
-    Settings -> Player -> Other Settings
-
-    -> Graphics API'
-  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_fontSharedMaterials: []
-  m_fontMaterial: {fileID: 0}
-  m_fontMaterials: []
-  m_fontColor32:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
-  m_enableVertexGradient: 0
-  m_colorMode: 3
-  m_fontColorGradient:
-    topLeft: {r: 1, g: 1, b: 1, a: 1}
-    topRight: {r: 1, g: 1, b: 1, a: 1}
-    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
-    bottomRight: {r: 1, g: 1, b: 1, a: 1}
-  m_fontColorGradientPreset: {fileID: 0}
-  m_spriteAsset: {fileID: 0}
-  m_tintAllSprites: 0
-  m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: -1183493901
-  m_overrideHtmlColors: 0
-  m_faceColor:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontSize: 36
-  m_fontSizeBase: 36
-  m_fontWeight: 400
-  m_enableAutoSizing: 0
-  m_fontSizeMin: 18
-  m_fontSizeMax: 72
-  m_fontStyle: 0
-  m_HorizontalAlignment: 1
-  m_VerticalAlignment: 256
-  m_textAlignment: 65535
-  m_characterSpacing: 0
-  m_wordSpacing: 0
-  m_lineSpacing: 0
-  m_lineSpacingMax: 0
-  m_paragraphSpacing: 0
-  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
-  m_wordWrappingRatios: 0.4
-  m_overflowMode: 0
-  m_linkedTextComponent: {fileID: 0}
-  parentLinkedComponent: {fileID: 0}
-  m_enableKerning: 1
-  m_enableExtraPadding: 0
-  checkPaddingRequired: 0
-  m_isRichText: 1
-  m_parseCtrlCharacters: 1
-  m_isOrthographic: 1
-  m_isCullingEnabled: 0
-  m_horizontalMapping: 0
-  m_verticalMapping: 0
-  m_uvLineOffset: 0
-  m_geometrySortingOrder: 0
-  m_IsTextObjectScaleStatic: 0
-  m_VertexBufferAutoSizeReduction: 0
-  m_useMaxVisibleDescender: 1
-  m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
-  m_isUsingLegacyAnimationComponent: 0
-  m_isVolumetricText: 0
-  m_hasFontAssetChanged: 0
-  m_baseMaterial: {fileID: 0}
-  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!114 &3305009470714473272
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2088218812240249420}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
-  m_VerticalFit: 2
---- !u!1 &3045019015442983702
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 3161869583469997041}
-  - component: {fileID: 9118338572910923010}
-  - component: {fileID: 7429455398132070817}
-  - component: {fileID: 3004588536534044800}
-  m_Layer: 5
-  m_Name: List of errors
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &3161869583469997041
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3045019015442983702}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 211743643720050171}
-  - {fileID: 1195925668280561999}
-  m_Father: {fileID: 3972710213487479045}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 130}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &9118338572910923010
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3045019015442983702}
-  m_CullTransparentMesh: 1
---- !u!114 &7429455398132070817
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3045019015442983702}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Padding:
-    m_Left: 0
-    m_Right: 0
-    m_Top: 0
-    m_Bottom: 0
-  m_ChildAlignment: 0
-  m_Spacing: 10
-  m_ChildForceExpandWidth: 0
-  m_ChildForceExpandHeight: 0
-  m_ChildControlWidth: 0
-  m_ChildControlHeight: 0
-  m_ChildScaleWidth: 0
-  m_ChildScaleHeight: 0
-  m_ReverseArrangement: 0
---- !u!114 &3004588536534044800
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3045019015442983702}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalFit: 0
-  m_VerticalFit: 2
---- !u!1 &3494449034999876716
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 211743643720050171}
-  - component: {fileID: 2156909365706420958}
-  - component: {fileID: 7766881495290445742}
-  m_Layer: 5
-  m_Name: Layers Missing
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &211743643720050171
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3494449034999876716}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 4234112923270133180}
-  m_Father: {fileID: 3161869583469997041}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 400, y: -125}
-  m_SizeDelta: {x: 800, y: 250}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2156909365706420958
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3494449034999876716}
-  m_CullTransparentMesh: 1
---- !u!114 &7766881495290445742
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3494449034999876716}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.392}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!1 &5899278585320986745
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 4234112923270133180}
-  - component: {fileID: 1729658152858454532}
-  - component: {fileID: 3002296769663227997}
-  - component: {fileID: 2579197072250764085}
-  m_Layer: 5
-  m_Name: Text (TMP)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &4234112923270133180
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5899278585320986745}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 211743643720050171}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 734.24, y: 247.21}
-  m_Pivot: {x: 0, y: 1}
---- !u!222 &1729658152858454532
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5899278585320986745}
-  m_CullTransparentMesh: 1
---- !u!114 &3002296769663227997
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5899278585320986745}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_text: 'Missing required Layers. Please load layers in
-
-
-    Edit -> Project Settings
-    -> Tags and Layers
-
-
-    Select the tiny settings icon and chose the
-
-    extra
-    layers preset'
-  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_fontSharedMaterials: []
-  m_fontMaterial: {fileID: 0}
-  m_fontMaterials: []
-  m_fontColor32:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
-  m_enableVertexGradient: 0
-  m_colorMode: 3
-  m_fontColorGradient:
-    topLeft: {r: 1, g: 1, b: 1, a: 1}
-    topRight: {r: 1, g: 1, b: 1, a: 1}
-    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
-    bottomRight: {r: 1, g: 1, b: 1, a: 1}
-  m_fontColorGradientPreset: {fileID: 0}
-  m_spriteAsset: {fileID: 0}
-  m_tintAllSprites: 0
-  m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: -1183493901
-  m_overrideHtmlColors: 0
-  m_faceColor:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontSize: 36
-  m_fontSizeBase: 36
-  m_fontWeight: 400
-  m_enableAutoSizing: 0
-  m_fontSizeMin: 18
-  m_fontSizeMax: 72
-  m_fontStyle: 0
-  m_HorizontalAlignment: 1
-  m_VerticalAlignment: 256
-  m_textAlignment: 65535
-  m_characterSpacing: 0
-  m_wordSpacing: 0
-  m_lineSpacing: 0
-  m_lineSpacingMax: 0
-  m_paragraphSpacing: 0
-  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
-  m_wordWrappingRatios: 0.4
-  m_overflowMode: 0
-  m_linkedTextComponent: {fileID: 0}
-  parentLinkedComponent: {fileID: 0}
-  m_enableKerning: 1
-  m_enableExtraPadding: 0
-  checkPaddingRequired: 0
-  m_isRichText: 1
-  m_parseCtrlCharacters: 1
-  m_isOrthographic: 1
-  m_isCullingEnabled: 0
-  m_horizontalMapping: 0
-  m_verticalMapping: 0
-  m_uvLineOffset: 0
-  m_geometrySortingOrder: 0
-  m_IsTextObjectScaleStatic: 0
-  m_VertexBufferAutoSizeReduction: 0
-  m_useMaxVisibleDescender: 1
-  m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
-  m_isUsingLegacyAnimationComponent: 0
-  m_isVolumetricText: 0
-  m_hasFontAssetChanged: 0
-  m_baseMaterial: {fileID: 0}
-  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!114 &2579197072250764085
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5899278585320986745}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
-  m_VerticalFit: 2
---- !u!1 &6936511427744063968
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 3972710213487479045}
-  - component: {fileID: 8486849874527201223}
-  - component: {fileID: 6480094707529626900}
-  - component: {fileID: 9114875957574628979}
-  - component: {fileID: 1684870680118218311}
-  m_Layer: 5
-  m_Name: RuntimeValidation
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &3972710213487479045
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6936511427744063968}
-  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
-  m_LocalPosition: {x: 0, y: 0, z: 0.25}
-  m_LocalScale: {x: 0.001, y: 0.001, z: 0.001}
-  m_Children:
-  - {fileID: 3161869583469997041}
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 1, y: 1}
-  m_SizeDelta: {x: 800, y: 300}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!223 &8486849874527201223
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6936511427744063968}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 2
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 0
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_AdditionalShaderChannelsFlag: 25
-  m_SortingLayerID: 0
-  m_SortingOrder: 0
-  m_TargetDisplay: 0
---- !u!114 &6480094707529626900
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6936511427744063968}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
-  m_ReferencePixelsPerUnit: 100
-  m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 800, y: 600}
-  m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 0
-  m_PhysicalUnit: 3
-  m_FallbackScreenDPI: 96
-  m_DefaultSpriteDPI: 96
-  m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 1
---- !u!114 &9114875957574628979
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6936511427744063968}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreReversedGraphics: 1
-  m_BlockingObjects: 0
-  m_BlockingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
---- !u!114 &1684870680118218311
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6936511427744063968}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 367e10b9e50a2b245be7853051b78c64, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _testCases:
-  - Name: TestLayers
-    Test:
-      m_PersistentCalls:
-        m_Calls:
-        - m_Target: {fileID: 1684870680118218311}
-          m_TargetAssemblyTypeName: Oculus.Movement.Validation.LayerAndVulkanValidation,
-            Meta.Movement
-          m_MethodName: TestLayers
-          m_Mode: 0
-          m_Arguments:
-            m_ObjectArgument: {fileID: 0}
-            m_ObjectArgumentAssemblyTypeName: 
-            m_IntArgument: 0
-            m_FloatArgument: 0
-            m_StringArgument: 
-            m_BoolArgument: 0
-          m_CallState: 1
-    OnTrue:
-      m_PersistentCalls:
-        m_Calls:
-        - m_Target: {fileID: 3494449034999876716}
-          m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-          m_MethodName: SetActive
-          m_Mode: 6
-          m_Arguments:
-            m_ObjectArgument: {fileID: 0}
-            m_ObjectArgumentAssemblyTypeName: 
-            m_IntArgument: 0
-            m_FloatArgument: 0
-            m_StringArgument: 
-            m_BoolArgument: 0
-          m_CallState: 2
-    OnFalse:
-      m_PersistentCalls:
-        m_Calls:
-        - m_Target: {fileID: 3494449034999876716}
-          m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-          m_MethodName: SetActive
-          m_Mode: 6
-          m_Arguments:
-            m_ObjectArgument: {fileID: 0}
-            m_ObjectArgumentAssemblyTypeName: 
-            m_IntArgument: 0
-            m_FloatArgument: 0
-            m_StringArgument: 
-            m_BoolArgument: 1
-          m_CallState: 2
-  - Name: TestVulkan
-    Test:
-      m_PersistentCalls:
-        m_Calls:
-        - m_Target: {fileID: 1684870680118218311}
-          m_TargetAssemblyTypeName: Oculus.Movement.Validation.LayerAndVulkanValidation,
-            Meta.Movement
-          m_MethodName: TestVulkan
-          m_Mode: 0
-          m_Arguments:
-            m_ObjectArgument: {fileID: 0}
-            m_ObjectArgumentAssemblyTypeName: 
-            m_IntArgument: 0
-            m_FloatArgument: 0
-            m_StringArgument: 
-            m_BoolArgument: 0
-          m_CallState: 1
-    OnTrue:
-      m_PersistentCalls:
-        m_Calls:
-        - m_Target: {fileID: 273250959204919292}
-          m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-          m_MethodName: SetActive
-          m_Mode: 6
-          m_Arguments:
-            m_ObjectArgument: {fileID: 0}
-            m_ObjectArgumentAssemblyTypeName: 
-            m_IntArgument: 0
-            m_FloatArgument: 0
-            m_StringArgument: 
-            m_BoolArgument: 0
-          m_CallState: 2
-    OnFalse:
-      m_PersistentCalls:
-        m_Calls:
-        - m_Target: {fileID: 273250959204919292}
-          m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-          m_MethodName: SetActive
-          m_Mode: 6
-          m_Arguments:
-            m_ObjectArgument: {fileID: 0}
-            m_ObjectArgumentAssemblyTypeName: 
-            m_IntArgument: 0
-            m_FloatArgument: 0
-            m_StringArgument: 
-            m_BoolArgument: 1
-          m_CallState: 2
-  _expectedLayers:
-  - HiddenMesh
diff --git a/Samples/Shared/Prefabs/RuntimeValidation.prefab.meta b/Samples/Shared/Prefabs/RuntimeValidation.prefab.meta
deleted file mode 100644
index 04f594c8..00000000
--- a/Samples/Shared/Prefabs/RuntimeValidation.prefab.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 1116ea39a9aa9594eb9ea1a0718d0d40
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: