diff --git a/Code/Sandbox/Editor/CMakeLists.txt b/Code/Sandbox/Editor/CMakeLists.txt
index 58d5e86a2f..e1fce97067 100644
--- a/Code/Sandbox/Editor/CMakeLists.txt
+++ b/Code/Sandbox/Editor/CMakeLists.txt
@@ -13,8 +13,6 @@ if(NOT PAL_TRAIT_BUILD_HOST_TOOLS)
     return()
 endif()
 
-include(${CMAKE_CURRENT_SOURCE_DIR}/Platform/${PAL_PLATFORM_NAME}/PAL_${PAL_PLATFORM_NAME_LOWERCASE}.cmake)
-
 ly_add_target(
     NAME EditorCore SHARED
     NAMESPACE Legacy
@@ -161,7 +159,7 @@ ly_add_source_properties(
 # Editor
 ################################################################################
 ly_add_target(
-    NAME Editor ${PAL_TRAIT_BUILD_EDITOR_APPLICATION_TYPE} # Mac Editor is a bare executable on Atom until we can fix packaging of the shader compilers. DO NOT MERGE BACK TO MAINLINE
+    NAME Editor APPLICATION
     NAMESPACE Legacy
     AUTORCC
     FILES_CMAKE
diff --git a/Code/Sandbox/Editor/Platform/Linux/PAL_linux.cmake b/Code/Sandbox/Editor/Platform/Linux/PAL_linux.cmake
deleted file mode 100644
index 5181f4afb7..0000000000
--- a/Code/Sandbox/Editor/Platform/Linux/PAL_linux.cmake
+++ /dev/null
@@ -1,13 +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.
-#
-
-set (PAL_TRAIT_BUILD_EDITOR_APPLICATION_TYPE APPLICATION)
-
diff --git a/Code/Sandbox/Editor/Platform/Mac/PAL_mac.cmake b/Code/Sandbox/Editor/Platform/Mac/PAL_mac.cmake
deleted file mode 100644
index 5181f4afb7..0000000000
--- a/Code/Sandbox/Editor/Platform/Mac/PAL_mac.cmake
+++ /dev/null
@@ -1,13 +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.
-#
-
-set (PAL_TRAIT_BUILD_EDITOR_APPLICATION_TYPE APPLICATION)
-
diff --git a/Code/Sandbox/Editor/Platform/Windows/PAL_windows.cmake b/Code/Sandbox/Editor/Platform/Windows/PAL_windows.cmake
deleted file mode 100644
index 5181f4afb7..0000000000
--- a/Code/Sandbox/Editor/Platform/Windows/PAL_windows.cmake
+++ /dev/null
@@ -1,13 +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.
-#
-
-set (PAL_TRAIT_BUILD_EDITOR_APPLICATION_TYPE APPLICATION)
-