diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Application/AzQtApplication.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Application/AzQtApplication.cpp
index 651a8f0430..1e3e559675 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Application/AzQtApplication.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Application/AzQtApplication.cpp
@@ -16,19 +16,8 @@
 
 namespace AzQtComponents
 {
-    /*
-    AZStd::string_view GetBuildTargetName()
-    {
-#if !defined(LY_CMAKE_TARGET)
-#error "LY_CMAKE_TARGET must be defined in order to add this source file to a CMake executable target"
-#endif
-        return AZStd::string_view { LY_CMAKE_TARGET };
-    }
-    */
-
      class AzQtApplication::Impl
          : private AZ::Debug::TraceMessageBus::Handler
-         //, public AzFramework::Application
     {
          friend class AzQtApplication;
 
@@ -57,7 +46,6 @@ namespace AzQtComponents
         : QApplication(argc, argv)
         , m_impl(new Impl(this))
     {
-         
          // Use a common Qt settings path for applications that don't register their own application name
          if (QApplication::applicationName().isEmpty())
          {
@@ -110,69 +98,6 @@ namespace AzQtComponents
         }
         return false;
     }
-
-    /*
-    bool ToolsApplication::AddDockWidget(const AZStd::string& name, QWidget* widget, uint32_t area, uint32_t orientation)
-    {
-        auto dockWidgetItr = m_dockWidgets.find(name);
-        if (dockWidgetItr != m_dockWidgets.end() || !widget)
-        {
-            return false;
-        }
-
-        auto dockWidget = new AzQtComponents::StyledDockWidget(name.c_str());
-        dockWidget->setObjectName(QString("%1_DockWidget").arg(name.c_str()));
-        dockWidget->setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetMovable);
-        widget->setObjectName(name.c_str());
-        widget->setParent(dockWidget);
-        widget->setMinimumSize(QSize(300, 300));
-        dockWidget->setWidget(widget);
-        //QMainWindow::addDockWidget(aznumeric_cast<Qt::DockWidgetArea>(area), dockWidget);
-        //QMainWindow::resizeDocks({ dockWidget }, { 400 }, aznumeric_cast<Qt::Orientation>(orientation));
-        m_dockWidgets[name] = dockWidget;
-        return true;
-    }
-
-    void ToolsApplication::RemoveDockWidget(const AZStd::string& name)
-    {
-        auto dockWidgetItr = m_dockWidgets.find(name);
-        if (dockWidgetItr != m_dockWidgets.end())
-        {
-            delete dockWidgetItr->second;
-            m_dockWidgets.erase(dockWidgetItr);
-        }
-    }
-
-    void ToolsApplication::SetDockWidgetVisible(const AZStd::string& name, bool visible)
-    {
-        auto dockWidgetItr = m_dockWidgets.find(name);
-        if (dockWidgetItr != m_dockWidgets.end())
-        {
-            dockWidgetItr->second->setVisible(visible);
-        }
-    }
-
-    bool ToolsApplication::IsDockWidgetVisible(const AZStd::string& name) const
-    {
-        auto dockWidgetItr = m_dockWidgets.find(name);
-        if (dockWidgetItr != m_dockWidgets.end())
-        {
-            return dockWidgetItr->second->isVisible();
-        }
-        return false;
-    }
-
-    AZStd::vector<AZStd::string> ToolsApplication::GetDockWidgetNames() const
-    {
-        AZStd::vector<AZStd::string> names;
-        names.reserve(m_dockWidgets.size());
-        for (const auto& dockWidgetPair : m_dockWidgets)
-        {
-            names.push_back(dockWidgetPair.first);
-        }
-        return names;
-    }
-    */
     
 } // namespace AzQtComponents
 
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Application/AzQtApplication.h b/Code/Framework/AzQtComponents/AzQtComponents/Application/AzQtApplication.h
index 40ea888887..c5d205bbec 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Application/AzQtApplication.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Application/AzQtApplication.h
@@ -64,20 +64,6 @@ namespace AzQtComponents
         class Impl;
         AZStd::unique_ptr<Impl> m_impl;
         AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-        //QTimer m_timer;
-        //void Tick(float deltaOverride = -1.f) override;
-
-
-        /*
-        bool AddDockWidget(const AZStd::string& name, QWidget* widget, uint32_t area, uint32_t orientation);
-        void RemoveDockWidget(const AZStd::string& name);
-        void SetDockWidgetVisible(const AZStd::string& name, bool visible);
-        bool IsDockWidgetVisible(const AZStd::string& name) const;
-        AZStd::vector<AZStd::string> GetDockWidgetNames() const;
-
-        AZStd::unordered_map<AZStd::string, AzQtComponents::StyledDockWidget*> m_dockWidgets;
-        */
     };
 } // namespace AzQtComponents
 
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.cpp
index cd9f2c9cfd..5681f45feb 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.cpp
@@ -74,8 +74,6 @@ namespace MaterialEditor
         : Application(argc, argv)
         , AzQtApplication(*argc, *argv)
     {
-        //AZ::Debug::TraceMessageBus::Handler::BusConnect();
-
         AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddBuildSystemTargetSpecialization(
             *AZ::SettingsRegistry::Get(), GetBuildTargetName());
 
@@ -88,7 +86,6 @@ namespace MaterialEditor
 
     MaterialEditorApplication::~MaterialEditorApplication()
     {
-        //AzToolsFramework::EditorPythonConsoleNotificationBus::Handler::BusDisconnect();
         AzToolsFramework::AssetDatabase::AssetDatabaseRequestsBus::Handler::BusDisconnect();
         MaterialEditorWindowNotificationBus::Handler::BusDisconnect();
         AZ::Debug::TraceMessageBus::Handler::BusDisconnect();
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.h
index 4f5085c91e..a3767a58fb 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.h
@@ -22,8 +22,6 @@
 #include <AzToolsFramework/API/EditorPythonConsoleBus.h>
 
 #include <AzQtComponents/Application/AzQtApplication.h>
-
-#include <QApplication>
 #include <QTimer>
 
 namespace MaterialEditor
diff --git a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/ShaderManagementConsoleApplication.h b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/ShaderManagementConsoleApplication.h
index 72dd689d56..2139db45a2 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/ShaderManagementConsoleApplication.h
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/ShaderManagementConsoleApplication.h
@@ -23,8 +23,6 @@
 #include <Atom/Window/ShaderManagementConsoleWindowNotificationBus.h>
 
 #include <AzQtComponents/Application/AzQtApplication.h>
-
-#include <QApplication>
 #include <QTimer>
 
 namespace ShaderManagementConsole