diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp
index 82f0f63023..a558e5895d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp
@@ -440,13 +440,6 @@ namespace AzToolsFramework
             &ViewportUi::ViewportUiRequestBus::Events::RemoveCluster,
             clusterId);
     }
-  
-    static void RemoveComponentModeSwitcher(const ViewportUi::SwitcherId switcherId)
-    {
-        ViewportUi::ViewportUiRequestBus::Event(
-            ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::RemoveSwitcher,
-            switcherId);
-    }
 
     static void SetViewportUiClusterVisible(const ViewportUi::ClusterId clusterId, const bool visible)
     {
@@ -475,18 +468,6 @@ namespace AzToolsFramework
         return buttonId;
     }
 
-    static ViewportUi::ButtonId RegisterSwitcherButton(
-        const ViewportUi::SwitcherId switcherId, const char* iconPath, const char* buttonName)
-    {
-        ViewportUi::ButtonId buttonId;
-        ViewportUi::ViewportUiRequestBus::EventResult(
-            buttonId, ViewportUi::DefaultViewportId,
-            &ViewportUi::ViewportUiRequestBus::Events::CreateSwitcherButton, switcherId,
-            iconPath, buttonName);
-
-        return buttonId;
-    }
-
     // return either center or entity pivot
     static AZ::Vector3 CalculatePivotTranslation(
         const AZ::EntityId entityId, const EditorTransformComponentSelectionRequests::Pivot pivot)
@@ -1043,8 +1024,6 @@ namespace AzToolsFramework
         EditorEntityLockComponentNotificationBus::Router::BusRouterConnect();
         EditorManipulatorCommandUndoRedoRequestBus::Handler::BusConnect(entityContextId);
 
-        CreateComponentModeSwitcher();
-
         CreateTransformModeSelectionCluster();
         RegisterActions();
         SetupBoxSelect();
@@ -1059,8 +1038,6 @@ namespace AzToolsFramework
         DestroyTransformModeSelectionCluster(m_transformModeClusterId);
         UnregisterActions();
 
-        RemoveComponentModeSwitcher(m_testSwitcherId);
-
         m_pivotOverrideFrame.Reset();
 
         EditorManipulatorCommandUndoRedoRequestBus::Handler::BusDisconnect();
@@ -2584,55 +2561,6 @@ namespace AzToolsFramework
             m_transformModeSelectionHandler);
     }
 
-    void EditorTransformComponentSelection::CreateComponentModeSwitcher()
-    {
-        // Create the switcher
-        ViewportUi::ViewportUiRequestBus::EventResult(
-            m_testSwitcherId, ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::CreateSwitcher);
-
-        // Create and register the buttons
-        m_boxShapeButtonId =
-            RegisterSwitcherButton(m_testSwitcherId, AZStd::string::format("Editor/Icons/Switcher/%s.svg", "BoxShape").c_str(), "Box Shape");
-        m_physxColliderButtonId = RegisterSwitcherButton(
-            m_testSwitcherId, AZStd::string::format("Editor/Icons/Switcher/%s.svg", "PhysXCollider").c_str(), "PhysX Collider");
-        m_transformButtonId = RegisterSwitcherButton(
-            m_testSwitcherId, AZStd::string::format("Editor/Icons/Switcher/%s.svg", "Transform").c_str(), "Transform");
-
-        // Set the initial active button
-        ViewportUi::ViewportUiRequestBus::Event(
-            ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::SetSwitcherActiveButton, m_testSwitcherId,
-            m_physxColliderButtonId);
-
-        const auto onButtonClicked = [this](ViewportUi::ButtonId buttonId) {
-            if (buttonId == m_boxShapeButtonId)
-            {
-                ViewportUi::ViewportUiRequestBus::Event(
-                    ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::SetSwitcherActiveButton, m_testSwitcherId,
-                    m_boxShapeButtonId);
-                AZ_Printf("ViewportUi", "Box Shape");
-            }
-            else if (buttonId == m_physxColliderButtonId)
-            {
-                ViewportUi::ViewportUiRequestBus::Event(
-                    ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::SetSwitcherActiveButton, m_testSwitcherId,
-                    m_physxColliderButtonId);
-                AZ_Printf("ViewportUi", "PhysXCollider");
-            }
-            else if (buttonId == m_transformButtonId)
-            {
-                ViewportUi::ViewportUiRequestBus::Event(
-                    ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::SetSwitcherActiveButton, m_testSwitcherId,
-                    m_transformButtonId);
-                AZ_Printf("ViewportUi", "Transform");
-            }
-        };
-
-        m_testSwitcherHandler = AZ::Event<ViewportUi::ButtonId>::Handler(onButtonClicked);
-        ViewportUi::ViewportUiRequestBus::Event(
-            ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::RegisterSwitcherEventHandler, m_testSwitcherId,
-            m_testSwitcherHandler);
-    }
-
     EditorTransformComponentSelectionRequests::Mode EditorTransformComponentSelection::GetTransformMode()
     {
         return m_mode;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.h
index 561e0b4635..99265313fe 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.h
@@ -281,15 +281,6 @@ namespace AzToolsFramework
         ViewportUi::ButtonId m_rotateButtonId; ///< Id of the Viewport UI button for rotate mode.
         ViewportUi::ButtonId m_scaleButtonId; ///< Id of the Viewport UI button for scale mode.
         AZ::Event<ViewportUi::ButtonId>::Handler m_transformModeSelectionHandler; ///< Event handler for the Viewport UI cluster.
-
-        //! Create the Viewport UI Switcher. TEST
-        void CreateComponentModeSwitcher();
-
-        ViewportUi::SwitcherId m_testSwitcherId;
-        ViewportUi::ButtonId m_boxShapeButtonId;
-        ViewportUi::ButtonId m_physxColliderButtonId;
-        ViewportUi::ButtonId m_transformButtonId;
-        AZ::Event<ViewportUi::ButtonId>::Handler m_testSwitcherHandler; 
     };
 
     /// The ETCS (EntityTransformComponentSelection) namespace contains functions and data used exclusively by
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ButtonGroup.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ButtonGroup.cpp
index 6e05ef84b1..3aeb14ed46 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ButtonGroup.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ButtonGroup.cpp
@@ -13,9 +13,6 @@
 #include <AzToolsFramework/ViewportUi/Button.h>
 #include <AzToolsFramework/ViewportUi/ButtonGroup.h>
 
-#pragma optimize("", off)
-#pragma inline_depth(0)
-
 namespace AzToolsFramework::ViewportUi::Internal
 {
     ButtonGroup::ButtonGroup()