diff --git a/Code/Sandbox/Editor/IconManager.cpp b/Code/Sandbox/Editor/IconManager.cpp
index 3916ee7726..828a7cdfcc 100644
--- a/Code/Sandbox/Editor/IconManager.cpp
+++ b/Code/Sandbox/Editor/IconManager.cpp
@@ -114,13 +114,6 @@ int CIconManager::GetIconTexture(const char* iconName)
         return 0;
     }
 
-    ITexture* texture = GetIEditor()->GetRenderer() ? GetIEditor()->GetRenderer()->EF_LoadTexture(iconName) : nullptr;
-    if (texture)
-    {
-        id = texture->GetTextureID();
-        m_textures[iconName] = id;
-    }
-
     return id;
 }
 
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp
index b0dce80ec8..378bf3d4a1 100644
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp
+++ b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp
@@ -161,13 +161,6 @@ void SandboxIntegrationManager::Setup()
     AzToolsFramework::EditorEvents::Bus::Handler::BusConnect();
     AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusConnect();
     AzToolsFramework::SliceEditorEntityOwnershipServiceNotificationBus::Handler::BusConnect();
-    // turn on the this debug display request bus implementation if no other implementation is active
-    if( !(AzFramework::DebugDisplayRequestBus::HasHandlers()))
-    {
-        m_debugDisplayBusImplementationActive = true;
-        AzFramework::DebugDisplayRequestBus::Handler::BusConnect(
-            AzToolsFramework::ViewportInteraction::g_mainViewportEntityDebugDisplayId);
-    }
 
     AzFramework::DisplayContextRequestBus::Handler::BusConnect();
     SetupFileExtensionMap();
diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeEditorModule.cpp b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeEditorModule.cpp
index c955523d09..f2c2a6f5aa 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeEditorModule.cpp
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeEditorModule.cpp
@@ -13,7 +13,6 @@
 #include <AzCore/Memory/SystemAllocator.h>
 #include <AzCore/Module/Module.h>
 #include <AtomBridgeModule.h>
-#include <BuilderComponent.h>
 
 #include "./Editor/AssetCollectionAsyncLoaderTestComponent.h"
 
@@ -33,7 +32,6 @@ namespace AZ
             {
                 // Push results of [MyComponent]::CreateDescriptor() into m_descriptors here.
                 m_descriptors.insert(m_descriptors.end(), {
-                    BuilderComponent::CreateDescriptor(),
                     AssetCollectionAsyncLoaderTestComponent::CreateDescriptor(),
                     });
             }
diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/BuilderComponent.cpp b/Gems/AtomLyIntegration/AtomBridge/Code/Source/BuilderComponent.cpp
deleted file mode 100644
index 997b7c3b0c..0000000000
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/BuilderComponent.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <AzCore/Component/Entity.h>
-#include <AzCore/Serialization/EditContext.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/Interface/Interface.h>
-
-#include <BuilderComponent.h>
-
-#include <AssetBuilderSDK/AssetBuilderSDK.h>
-
-namespace AZ
-{
-    namespace AtomBridge
-    {
-        void BuilderComponent::Reflect(AZ::ReflectContext* context)
-        {
-            if (auto* serialize = azrtti_cast<AZ::SerializeContext*>(context))
-            {
-                serialize->Class<BuilderComponent, AZ::Component>()
-                    ->Version(0)
-                    ->Attribute(AZ::Edit::Attributes::SystemComponentTags, AZStd::vector<AZ::Crc32>({ AssetBuilderSDK::ComponentTags::AssetBuilder }))
-                ;
-            }
-        }
-
-        BuilderComponent::BuilderComponent()
-        {
-        }
-
-        BuilderComponent::~BuilderComponent()
-        {
-        }
-
-        void BuilderComponent::Activate()
-        {
-        }
-
-        void BuilderComponent::Deactivate()
-        {
-        }
-    } // namespace RPI
-} // namespace AZ
diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/BuilderComponent.h b/Gems/AtomLyIntegration/AtomBridge/Code/Source/BuilderComponent.h
deleted file mode 100644
index d6c462cc43..0000000000
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/BuilderComponent.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <AzCore/Component/Component.h>
-
-namespace AZ
-{
-    namespace AtomBridge
-    {
-        class BuilderComponent final
-            : public AZ::Component
-        {
-        public:
-            AZ_COMPONENT(BuilderComponent, "{D1FE015B-8431-4155-8FD0-8197F246901A}");
-            static void Reflect(AZ::ReflectContext* context);
-
-            BuilderComponent();
-            ~BuilderComponent() override;
-
-            // AZ::Component overrides...
-            void Activate() override;
-            void Deactivate() override;
-        };
-    } // namespace RPI
-} // namespace AZ
diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/atombridge_editor_files.cmake b/Gems/AtomLyIntegration/AtomBridge/Code/atombridge_editor_files.cmake
index f2cf8c6c14..55ed9f28a0 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/atombridge_editor_files.cmake
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/atombridge_editor_files.cmake
@@ -13,8 +13,6 @@ set(FILES
     Source/AtomBridgeEditorModule.cpp
     Source/AtomBridgeModule.cpp
     Source/AtomBridgeModule.h
-    Source/BuilderComponent.cpp
-    Source/BuilderComponent.h
     Source/Editor/AssetCollectionAsyncLoaderTestComponent.cpp
     Source/Editor/AssetCollectionAsyncLoaderTestComponent.h
 )