diff --git a/OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf b/OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf
index 928990b43d..d770c071cf 100644
--- a/OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf
+++ b/OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf
@@ -14,12 +14,6 @@
   VERSION_STRING                 = 1.0
   ENTRY_POINT                    = AcpiPlatformEntryPoint
 
-#
-# The following information is for reference only and not required by the build tools.
-#
-#  VALID_ARCHITECTURES           = X64 ARM AARCH64
-#
-
 [Sources]
   AcpiPlatform.c
   AcpiPlatform.h
diff --git a/OvmfPkg/Bhyve/SmbiosPlatformDxe/SmbiosPlatformDxe.inf b/OvmfPkg/Bhyve/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
index f6d7b5b305..f9dff152aa 100644
--- a/OvmfPkg/Bhyve/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
+++ b/OvmfPkg/Bhyve/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
@@ -18,12 +18,6 @@
 
   ENTRY_POINT                    = SmbiosTablePublishEntry
 
-#
-# The following information is for reference only and not required by the build tools.
-#
-#  VALID_ARCHITECTURES           = X64 EBC ARM AARCH64
-#
-
 [Sources]
   Bhyve.c
   SmbiosPlatformDxe.h
diff --git a/OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c b/OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c
index 0d116f60dd..9af8c21a21 100644
--- a/OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c
+++ b/OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c
@@ -428,7 +428,7 @@ PciHostBridgeGetRootBridges (
   } else {
     //
     // UEFI mandates a 1:1 virtual-to-physical mapping, so on a 32-bit
-    // architecture such as ARM, we will not be able to access 64-bit MMIO
+    // architecture, we will not be able to access 64-bit MMIO
     // BARs unless they are allocated below 4 GB. So ignore the range above
     // 4 GB in this case.
     //
diff --git a/OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf b/OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
index e610e3d03f..26b38b5966 100644
--- a/OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
+++ b/OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
@@ -16,13 +16,6 @@
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = PciHostBridgeLib
 
-#
-# The following information is for reference only and not required by the build
-# tools.
-#
-#  VALID_ARCHITECTURES           = AARCH64 ARM RISCV64
-#
-
 [Sources]
   FdtPciHostBridgeLib.c
 
diff --git a/OvmfPkg/Include/IndustryStandard/Xen/xen.h b/OvmfPkg/Include/IndustryStandard/Xen/xen.h
index fce87ffb58..7891ccc024 100644
--- a/OvmfPkg/Include/IndustryStandard/Xen/xen.h
+++ b/OvmfPkg/Include/IndustryStandard/Xen/xen.h
@@ -20,7 +20,7 @@
 
 #if defined (MDE_CPU_X64)
   #include "arch-x86/xen.h"
-#elif defined (__arm__) || defined (__aarch64__)
+#elif defined (__aarch64__)
   #include "arch-arm/xen.h"
 #else
   #error "Unsupported architecture"
diff --git a/OvmfPkg/Library/BaseCachingPciExpressLib/BaseCachingPciExpressLib.inf b/OvmfPkg/Library/BaseCachingPciExpressLib/BaseCachingPciExpressLib.inf
index 2017b75c6a..f3b25a1eca 100644
--- a/OvmfPkg/Library/BaseCachingPciExpressLib/BaseCachingPciExpressLib.inf
+++ b/OvmfPkg/Library/BaseCachingPciExpressLib/BaseCachingPciExpressLib.inf
@@ -20,10 +20,6 @@
   LIBRARY_CLASS                  = PciExpressLib|DXE_DRIVER UEFI_DRIVER UEFI_APPLICATION
   CONSTRUCTOR                    = PciExpressLibInitialize
 
-#
-#  VALID_ARCHITECTURES           = ARM AARCH64 RISCV64
-#
-
 [Sources]
   PciExpressLib.c
 
diff --git a/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.inf b/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.inf
index 727df4bdd0..83287e2099 100644
--- a/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.inf
+++ b/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.inf
@@ -19,13 +19,6 @@
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = PciHostBridgeUtilityLib
 
-#
-# The following information is for reference only and not required by the build
-# tools.
-#
-#  VALID_ARCHITECTURES           = X64 AARCH64 ARM
-#
-
 [Sources]
   PciHostBridgeUtilityLib.c
 
diff --git a/OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBootManagerLib.inf b/OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBootManagerLib.inf
index 6c5552da16..9e89556b14 100644
--- a/OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBootManagerLib.inf
+++ b/OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBootManagerLib.inf
@@ -20,7 +20,7 @@
 #
 # The following information is for reference only and not required by the build tools.
 #
-#  VALID_ARCHITECTURES           = ARM AARCH64
+#  VALID_ARCHITECTURES           = AARCH64
 #
 
 [Sources]
diff --git a/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf b/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf
index 0f32d8c838..8797748ef5 100644
--- a/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf
+++ b/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf
@@ -16,13 +16,6 @@
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = QemuBootOrderLib|DXE_DRIVER
 
-#
-# The following information is for reference only and not required by the build
-# tools.
-#
-#  VALID_ARCHITECTURES           = X64 EBC ARM AARCH64
-#
-
 [Sources]
   ExtraRootBusMap.c
   ExtraRootBusMap.h
diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgMmioDxeLib.inf b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgMmioDxeLib.inf
index 633053aaed..f107ac1540 100644
--- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgMmioDxeLib.inf
+++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgMmioDxeLib.inf
@@ -20,13 +20,6 @@
 
   CONSTRUCTOR                    = QemuFwCfgInitialize
 
-#
-# The following information is for reference only and not required by the build
-# tools.
-#
-#  VALID_ARCHITECTURES           = ARM AARCH64 RISCV64 LOONGARCH64
-#
-
 [Sources]
   QemuFwCfgLibMmio.c
   QemuFwCfgMmioDxe.c
diff --git a/OvmfPkg/Library/QemuFwCfgS3Lib/BaseQemuFwCfgS3LibNull.inf b/OvmfPkg/Library/QemuFwCfgS3Lib/BaseQemuFwCfgS3LibNull.inf
index c83b78d42f..194bff917e 100644
--- a/OvmfPkg/Library/QemuFwCfgS3Lib/BaseQemuFwCfgS3LibNull.inf
+++ b/OvmfPkg/Library/QemuFwCfgS3Lib/BaseQemuFwCfgS3LibNull.inf
@@ -19,13 +19,6 @@
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = QemuFwCfgS3Lib
 
-#
-# The following information is for reference only and not required by the build
-# tools.
-#
-#  VALID_ARCHITECTURES           = IA32 X64 ARM AARCH64 EBC
-#
-
 [Sources]
   QemuFwCfgS3Base.c
   QemuFwCfgS3BasePei.c
diff --git a/OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf b/OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf
index a552e3cef0..655e630232 100644
--- a/OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf
+++ b/OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf
@@ -15,13 +15,6 @@
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = QemuFwCfgS3Lib|DXE_DRIVER DXE_RUNTIME_DRIVER
 
-#
-# The following information is for reference only and not required by the build
-# tools.
-#
-#  VALID_ARCHITECTURES           = X64 ARM AARCH64 EBC
-#
-
 [Sources]
   QemuFwCfgS3Dxe.c
   QemuFwCfgS3PeiDxe.c
diff --git a/OvmfPkg/Library/QemuFwCfgS3Lib/PeiQemuFwCfgS3LibFwCfg.inf b/OvmfPkg/Library/QemuFwCfgS3Lib/PeiQemuFwCfgS3LibFwCfg.inf
index 8268828a76..2c531f256a 100644
--- a/OvmfPkg/Library/QemuFwCfgS3Lib/PeiQemuFwCfgS3LibFwCfg.inf
+++ b/OvmfPkg/Library/QemuFwCfgS3Lib/PeiQemuFwCfgS3LibFwCfg.inf
@@ -18,13 +18,6 @@
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = QemuFwCfgS3Lib|PEIM
 
-#
-# The following information is for reference only and not required by the build
-# tools.
-#
-#  VALID_ARCHITECTURES           = IA32 X64 ARM AARCH64 EBC
-#
-
 [Sources]
   QemuFwCfgS3BasePei.c
   QemuFwCfgS3Pei.c
diff --git a/OvmfPkg/Library/SmbiosVersionLib/DetectSmbiosVersionLib.inf b/OvmfPkg/Library/SmbiosVersionLib/DetectSmbiosVersionLib.inf
index 37ae827ec7..83cfbc105b 100644
--- a/OvmfPkg/Library/SmbiosVersionLib/DetectSmbiosVersionLib.inf
+++ b/OvmfPkg/Library/SmbiosVersionLib/DetectSmbiosVersionLib.inf
@@ -20,13 +20,6 @@
   LIBRARY_CLASS                  = SmbiosVersionLib|DXE_DRIVER
   CONSTRUCTOR                    = DetectSmbiosVersion
 
-#
-# The following information is for reference only and not required by the build
-# tools.
-#
-#  VALID_ARCHITECTURES           = X64 ARM AARCH64
-#
-
 [Sources]
   DetectSmbiosVersionLib.c
 
diff --git a/OvmfPkg/Library/TlsAuthConfigLib/TlsAuthConfigLib.inf b/OvmfPkg/Library/TlsAuthConfigLib/TlsAuthConfigLib.inf
index 94f8b94df1..08dc8c283a 100644
--- a/OvmfPkg/Library/TlsAuthConfigLib/TlsAuthConfigLib.inf
+++ b/OvmfPkg/Library/TlsAuthConfigLib/TlsAuthConfigLib.inf
@@ -24,7 +24,7 @@
 # The following information is for reference only and not required by the build
 # tools.
 #
-#  VALID_ARCHITECTURES           = X64 ARM AARCH64
+#  VALID_ARCHITECTURES           = X64 AARCH64
 #
 
 [Sources]
diff --git a/OvmfPkg/Library/XenHypercallLib/Arm/Hypercall.S b/OvmfPkg/Library/XenHypercallLib/Arm/Hypercall.S
deleted file mode 100644
index 06cf1e68a4..0000000000
--- a/OvmfPkg/Library/XenHypercallLib/Arm/Hypercall.S
+++ /dev/null
@@ -1,22 +0,0 @@
-/** @file
-  ARM (AArch32) implementation of XenHypercall2
-
-  Copyright (C) 2014, Linaro Ltd.
-
-  SPDX-License-Identifier: BSD-2-Clause-Patent
-
-**/
-
-#include <IndustryStandard/Xen/arch-arm/xen.h>
-
-  .text
-  .arch_extension virt
-
-GCC_ASM_EXPORT(XenHypercall2)
-
-ASM_PFX(XenHypercall2):
-  mov     r12, r0
-  mov     r0, r1
-  mov     r1, r2
-  hvc     #XEN_HYPERCALL_TAG
-  bx      lr
diff --git a/OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf b/OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf
index 4d1739660c..93fb0374f4 100644
--- a/OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf
+++ b/OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf
@@ -18,7 +18,7 @@
 #
 # The following information is for reference only and not required by the build tools.
 #
-#  VALID_ARCHITECTURES           = X64 ARM AARCH64
+#  VALID_ARCHITECTURES           = X64 AARCH64
 #
 
 [Sources.X64]
@@ -27,12 +27,9 @@
 [Sources.X64]
   X64/hypercall.nasm
 
-[Sources.ARM, Sources.AARCH64]
+[Sources.AARCH64]
   ArmXenHypercall.c
 
-[Sources.ARM]
-  Arm/Hypercall.S
-
 [Sources.AARCH64]
   AArch64/Hypercall.S
 
diff --git a/OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf b/OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
index e547e0018b..611de149af 100644
--- a/OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
+++ b/OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
@@ -19,10 +19,6 @@
   UNLOAD_IMAGE                   = LinuxInitrdDynamicShellCommandUnload
   UEFI_HII_RESOURCE_SECTION      = TRUE
 
-#
-#  VALID_ARCHITECTURES           = X64 ARM AARCH64 EBC
-#
-
 [Sources.common]
   LinuxInitrdDynamicShellCommand.c
   LinuxInitrdDynamicShellCommand.uni
diff --git a/OvmfPkg/PlatformCI/PlatformBuildLib.py b/OvmfPkg/PlatformCI/PlatformBuildLib.py
index 1a25487f1c..635da87761 100644
--- a/OvmfPkg/PlatformCI/PlatformBuildLib.py
+++ b/OvmfPkg/PlatformCI/PlatformBuildLib.py
@@ -54,7 +54,6 @@ class SettingsManager(UpdateSettingsManager, SetupSettingsManager, PrEvalSetting
         ret = RunCmd("git", "config --file .gitmodules --get-regexp path", workingdir=self.GetWorkspaceRoot(), outstream=result)
         # Cmd output is expected to look like:
         # submodule.CryptoPkg/Library/OpensslLib/openssl.path CryptoPkg/Library/OpensslLib/openssl
-        # submodule.SoftFloat.path ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3
         if ret == 0:
             for line in result.getvalue().splitlines():
                 _, _, path = line.partition(" ")
diff --git a/OvmfPkg/RiscVVirt/Feature/Capsule/GenerateCapsule/GenCapsule.py b/OvmfPkg/RiscVVirt/Feature/Capsule/GenerateCapsule/GenCapsule.py
index 1889328fb9..8f7e0da8e1 100644
--- a/OvmfPkg/RiscVVirt/Feature/Capsule/GenerateCapsule/GenCapsule.py
+++ b/OvmfPkg/RiscVVirt/Feature/Capsule/GenerateCapsule/GenCapsule.py
@@ -207,7 +207,7 @@ if __name__ == '__main__':
     parser.add_argument (
              '-a', '--arch', dest = 'Arch', nargs = '+', action = 'append',
              required = True,
-             help = '''ARCHS is one of list: IA32, X64, IPF, ARM, AARCH64, RISCV64
+             help = '''ARCHS is one of list: IA32, X64, IPF, AARCH64, RISCV64
                        or EBC, which overrides target.txt's TARGET_ARCH definition.
                        To specify more archs, please repeat this option.'''
              )
diff --git a/OvmfPkg/RiscVVirt/Feature/Capsule/Library/FmpDeviceLib/FmpDeviceLib.inf b/OvmfPkg/RiscVVirt/Feature/Capsule/Library/FmpDeviceLib/FmpDeviceLib.inf
index 0397e8523d..5bc91105e3 100644
--- a/OvmfPkg/RiscVVirt/Feature/Capsule/Library/FmpDeviceLib/FmpDeviceLib.inf
+++ b/OvmfPkg/RiscVVirt/Feature/Capsule/Library/FmpDeviceLib/FmpDeviceLib.inf
@@ -17,12 +17,6 @@
   VERSION_STRING  = 1.0
   LIBRARY_CLASS   = FmpDeviceLib|DXE_DRIVER UEFI_DRIVER
 
-#
-# The following information is for reference only and not required by the build tools.
-#
-#  VALID_ARCHITECTURES           = X64 ARM AARCH64 RISCV64
-#
-
 [Sources]
   FmpDeviceLib.c
 
diff --git a/OvmfPkg/SmbiosPlatformDxe/ArmXen.c b/OvmfPkg/SmbiosPlatformDxe/ArmXen.c
index 3dd849bbc0..8d66294b95 100644
--- a/OvmfPkg/SmbiosPlatformDxe/ArmXen.c
+++ b/OvmfPkg/SmbiosPlatformDxe/ArmXen.c
@@ -1,5 +1,5 @@
 /** @file
-  Detect Xen SMBIOS data on ARM / AARCH64.
+  Detect Xen SMBIOS data on AARCH64.
 
   Copyright (C) 2015, Red Hat, Inc.
   Copyright (c) 2011, Bei Guan <gbtju85@gmail.com>
diff --git a/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf b/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
index 0159282673..fa667496f9 100644
--- a/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
+++ b/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
@@ -17,12 +17,6 @@
 
   ENTRY_POINT                    = SmbiosTablePublishEntry
 
-#
-# The following information is for reference only and not required by the build tools.
-#
-#  VALID_ARCHITECTURES           = X64 EBC ARM AARCH64
-#
-
 [Sources]
   CloudHv.c
   EntryPoint.c
diff --git a/OvmfPkg/SmbiosPlatformDxe/XenSmbiosPlatformDxe.inf b/OvmfPkg/SmbiosPlatformDxe/XenSmbiosPlatformDxe.inf
index b0542a19d2..f69b8e60bf 100644
--- a/OvmfPkg/SmbiosPlatformDxe/XenSmbiosPlatformDxe.inf
+++ b/OvmfPkg/SmbiosPlatformDxe/XenSmbiosPlatformDxe.inf
@@ -21,7 +21,7 @@
 #
 # The following information is for reference only and not required by the build tools.
 #
-#  VALID_ARCHITECTURES           = X64 EBC ARM AARCH64
+#  VALID_ARCHITECTURES           = X64 EBC AARCH64
 #
 
 [Sources]
@@ -33,7 +33,7 @@
 [Sources.X64]
   X86Xen.c
 
-[Sources.ARM, Sources.AARCH64]
+[Sources.AARCH64]
   ArmXen.c
 
 [Packages]
diff --git a/OvmfPkg/Tcg/Tcg2Config/Tcg12ConfigPei.inf b/OvmfPkg/Tcg/Tcg2Config/Tcg12ConfigPei.inf
index e8e0b88e60..594eeb89b2 100644
--- a/OvmfPkg/Tcg/Tcg2Config/Tcg12ConfigPei.inf
+++ b/OvmfPkg/Tcg/Tcg2Config/Tcg12ConfigPei.inf
@@ -52,5 +52,5 @@
 [Depex.IA32, Depex.X64]
   gOvmfTpmMmioAccessiblePpiGuid
 
-[Depex.ARM, Depex.AARCH64]
+[Depex.AARCH64]
   gOvmfTpmDiscoveredPpiGuid
diff --git a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
index 0355df9609..a26f35b236 100644
--- a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
+++ b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
@@ -50,7 +50,7 @@
 [Depex.IA32, Depex.X64]
   gOvmfTpmMmioAccessiblePpiGuid
 
-[Depex.ARM, Depex.AARCH64]
+[Depex.AARCH64]
   gOvmfTpmDiscoveredPpiGuid
 
 [Depex.RISCV64]