diff --git a/src/Umbraco.Abstractions/Umbraco.Abstractions.csproj b/src/Umbraco.Abstractions/Umbraco.Abstractions.csproj
index 144cdb33b6..fb5d256c95 100644
--- a/src/Umbraco.Abstractions/Umbraco.Abstractions.csproj
+++ b/src/Umbraco.Abstractions/Umbraco.Abstractions.csproj
@@ -26,7 +26,6 @@
     </ItemGroup>
 
     <ItemGroup>
-      <Folder Include="HealthCheck\NotificationMethods\" />
       <Folder Include="Logging\Viewer" />
       <Folder Include="Migrations\Upgrade\V_8_6_0" />
     </ItemGroup>
diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
index bb893ea1df..1717be98a4 100644
--- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
+++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
@@ -9,6 +9,7 @@
       <PackageReference Include="LightInject" Version="6.2.0" />
       <PackageReference Include="LightInject.Annotation" Version="1.1.0" />
       <PackageReference Include="LightInject.Web" Version="2.0.0" />
+      <PackageReference Include="Markdown" Version="2.2.1" />
       <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
       <PackageReference Include="Microsoft.Owin" Version="4.0.1" />
       <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19554-01" />
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 3c4ee26f0e..fe35e6de44 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -312,8 +312,6 @@
     <Compile Include="Editors\PreviewController.cs" />
     <Compile Include="Editors\TemplateController.cs" />
     <Compile Include="Editors\TourController.cs" />
-    <Compile Include="HealthCheck\Checks\Security\XssProtectionCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Security\HstsCheck.cs" />
     <Compile Include="Editors\UserEditorAuthorizationHelper.cs" />
     <Compile Include="Editors\Filters\UserGroupAuthorizationAttribute.cs" />
     <Compile Include="Editors\Filters\UserGroupEditorAuthorizationHelper.cs" />
@@ -323,15 +321,6 @@
     <Compile Include="Features\DisabledFeatures.cs" />
     <Compile Include="Features\EnabledFeatures.cs" />
     <Compile Include="Features\UmbracoFeatures.cs" />
-    <Compile Include="HealthCheck\HealthCheckCollection.cs" />
-    <Compile Include="HealthCheck\HealthCheckNotificationMethodAttribute.cs" />
-    <Compile Include="HealthCheck\HealthCheckNotificationMethodCollection.cs" />
-    <Compile Include="HealthCheck\HealthCheckNotificationMethodCollectionBuilder.cs" />
-    <Compile Include="HealthCheck\HealthCheckResults.cs" />
-    <Compile Include="HealthCheck\HeathCheckCollectionBuilder.cs" />
-    <Compile Include="HealthCheck\NotificationMethods\EmailNotificationMethod.cs" />
-    <Compile Include="HealthCheck\NotificationMethods\IHealthCheckNotificationMethod.cs" />
-    <Compile Include="HealthCheck\NotificationMethods\NotificationMethodBase.cs" />
     <Compile Include="HybridAccessorBase.cs" />
     <Compile Include="HybridUmbracoContextAccessor.cs" />
     <Compile Include="HttpContextUmbracoContextAccessor.cs" />
@@ -346,34 +335,10 @@
     <Compile Include="Composing\CompositionExtensions\Controllers.cs" />
     <Compile Include="Editors\EditorValidator.cs" />
     <Compile Include="Macros\MacroContent.cs" />
-    <Compile Include="HealthCheck\Checks\Config\AbstractConfigCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Config\AcceptableConfiguration.cs" />
-    <Compile Include="HealthCheck\Checks\Config\ConfigurationService.cs" />
-    <Compile Include="HealthCheck\Checks\Config\ConfigurationServiceResult.cs" />
     <Compile Include="Macros\MacroModel.cs" />
-    <Compile Include="HealthCheck\Checks\Config\MacroErrorsCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Config\NotificationEmailCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Config\TrySkipIisCustomErrorsCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Config\CustomErrorsCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Config\TraceCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Config\ValueComparisonType.cs" />
-    <Compile Include="HealthCheck\Checks\Config\CompilationDebugCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Security\BaseHttpHeaderCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Security\NoSniffCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Services\SmtpCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Permissions\FolderAndFilePermissionsCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Security\ExcessiveHeadersCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Security\ClickJackingCheck.cs" />
-    <Compile Include="HealthCheck\HealthCheckAction.cs" />
-    <Compile Include="HealthCheck\HealthCheckAttribute.cs" />
     <Compile Include="HealthCheck\HealthCheckController.cs" />
     <Compile Include="Macros\MacroPropertyModel.cs" />
     <Compile Include="Macros\MacroRenderer.cs" />
-    <Compile Include="HealthCheck\HealthCheckGroup.cs" />
-    <Compile Include="HealthCheck\HealthCheck.cs" />
-    <Compile Include="HealthCheck\HealthCheckStatus.cs" />
-    <Compile Include="HealthCheck\Checks\Security\HttpsCheck.cs" />
-    <Compile Include="HealthCheck\StatusResultType.cs" />
     <Compile Include="Editors\IEditorValidator.cs" />
     <Compile Include="Editors\EditorModelEventManager.cs" />
     <Compile Include="HtmlHelperBackOfficeExtensions.cs" />