diff --git a/src/Umbraco.Cms.Api.Common/CompatibilitySuppressions.xml b/src/Umbraco.Cms.Api.Common/CompatibilitySuppressions.xml
deleted file mode 100644
index d864a9d227..0000000000
--- a/src/Umbraco.Cms.Api.Common/CompatibilitySuppressions.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>PKV006</DiagnosticId>
-    <Target>net7.0</Target>
-  </Suppression>
-</Suppressions>
\ No newline at end of file
diff --git a/src/Umbraco.Cms.Api.Delivery/CompatibilitySuppressions.xml b/src/Umbraco.Cms.Api.Delivery/CompatibilitySuppressions.xml
deleted file mode 100644
index d864a9d227..0000000000
--- a/src/Umbraco.Cms.Api.Delivery/CompatibilitySuppressions.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>PKV006</DiagnosticId>
-    <Target>net7.0</Target>
-  </Suppression>
-</Suppressions>
\ No newline at end of file
diff --git a/src/Umbraco.Cms.Imaging.ImageSharp/CompatibilitySuppressions.xml b/src/Umbraco.Cms.Imaging.ImageSharp/CompatibilitySuppressions.xml
deleted file mode 100644
index d864a9d227..0000000000
--- a/src/Umbraco.Cms.Imaging.ImageSharp/CompatibilitySuppressions.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>PKV006</DiagnosticId>
-    <Target>net7.0</Target>
-  </Suppression>
-</Suppressions>
\ No newline at end of file
diff --git a/src/Umbraco.Cms.Imaging.ImageSharp2/CompatibilitySuppressions.xml b/src/Umbraco.Cms.Imaging.ImageSharp2/CompatibilitySuppressions.xml
deleted file mode 100644
index d864a9d227..0000000000
--- a/src/Umbraco.Cms.Imaging.ImageSharp2/CompatibilitySuppressions.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>PKV006</DiagnosticId>
-    <Target>net7.0</Target>
-  </Suppression>
-</Suppressions>
\ No newline at end of file
diff --git a/src/Umbraco.Cms.Persistence.EFCore/CompatibilitySuppressions.xml b/src/Umbraco.Cms.Persistence.EFCore/CompatibilitySuppressions.xml
deleted file mode 100644
index d864a9d227..0000000000
--- a/src/Umbraco.Cms.Persistence.EFCore/CompatibilitySuppressions.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>PKV006</DiagnosticId>
-    <Target>net7.0</Target>
-  </Suppression>
-</Suppressions>
\ No newline at end of file
diff --git a/src/Umbraco.Cms.Persistence.SqlServer/CompatibilitySuppressions.xml b/src/Umbraco.Cms.Persistence.SqlServer/CompatibilitySuppressions.xml
deleted file mode 100644
index d864a9d227..0000000000
--- a/src/Umbraco.Cms.Persistence.SqlServer/CompatibilitySuppressions.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>PKV006</DiagnosticId>
-    <Target>net7.0</Target>
-  </Suppression>
-</Suppressions>
\ No newline at end of file
diff --git a/src/Umbraco.Cms.Persistence.Sqlite/CompatibilitySuppressions.xml b/src/Umbraco.Cms.Persistence.Sqlite/CompatibilitySuppressions.xml
deleted file mode 100644
index d864a9d227..0000000000
--- a/src/Umbraco.Cms.Persistence.Sqlite/CompatibilitySuppressions.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>PKV006</DiagnosticId>
-    <Target>net7.0</Target>
-  </Suppression>
-</Suppressions>
\ No newline at end of file
diff --git a/src/Umbraco.Cms.StaticAssets/CompatibilitySuppressions.xml b/src/Umbraco.Cms.StaticAssets/CompatibilitySuppressions.xml
deleted file mode 100644
index d864a9d227..0000000000
--- a/src/Umbraco.Cms.StaticAssets/CompatibilitySuppressions.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>PKV006</DiagnosticId>
-    <Target>net7.0</Target>
-  </Suppression>
-</Suppressions>
\ No newline at end of file
diff --git a/src/Umbraco.Examine.Lucene/CompatibilitySuppressions.xml b/src/Umbraco.Examine.Lucene/CompatibilitySuppressions.xml
deleted file mode 100644
index d864a9d227..0000000000
--- a/src/Umbraco.Examine.Lucene/CompatibilitySuppressions.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>PKV006</DiagnosticId>
-    <Target>net7.0</Target>
-  </Suppression>
-</Suppressions>
\ No newline at end of file
diff --git a/src/Umbraco.PublishedCache.NuCache/CompatibilitySuppressions.xml b/src/Umbraco.PublishedCache.NuCache/CompatibilitySuppressions.xml
deleted file mode 100644
index d864a9d227..0000000000
--- a/src/Umbraco.PublishedCache.NuCache/CompatibilitySuppressions.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>PKV006</DiagnosticId>
-    <Target>net7.0</Target>
-  </Suppression>
-</Suppressions>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.New/Umbraco.Web.UI.New.csproj b/src/Umbraco.Web.UI.New/Umbraco.Web.UI.New.csproj
index abd41a7d6b..4d9da1013d 100644
--- a/src/Umbraco.Web.UI.New/Umbraco.Web.UI.New.csproj
+++ b/src/Umbraco.Web.UI.New/Umbraco.Web.UI.New.csproj
@@ -39,10 +39,6 @@
     <_ContentIncludedByDefault Remove="umbraco\UmbracoBackOffice\Default.cshtml" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="umbraco\" />
-  </ItemGroup>
-
   <Target Name="CopyAppsettingsTemplate" BeforeTargets="Build" Condition="!Exists('appsettings.json')">
     <Message Text="Copying appsettings.template.json to appsettings.json because it doesn't exist" Importance="high" />
     <Copy SourceFiles="appsettings.template.json" DestinationFiles="appsettings.json" />
diff --git a/src/Umbraco.Web.Website/CompatibilitySuppressions.xml b/src/Umbraco.Web.Website/CompatibilitySuppressions.xml
deleted file mode 100644
index d864a9d227..0000000000
--- a/src/Umbraco.Web.Website/CompatibilitySuppressions.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>PKV006</DiagnosticId>
-    <Target>net7.0</Target>
-  </Suppression>
-</Suppressions>
\ No newline at end of file