diff --git a/src/LegacyArtifacts/LegacyArtifacts.csproj b/src/LegacyArtifacts/LegacyArtifacts.csproj
new file mode 100644
index 0000000000..c43b9ad2c1
--- /dev/null
+++ b/src/LegacyArtifacts/LegacyArtifacts.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.Build.NoTargets/3.7.0">
+
+  <PropertyGroup>
+    <TargetFramework>net472</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!--
+    Manifest files from legacy transports/persistence are copied directly to the deploy directory,
+    while mimicking the same folder structure that exists in this project.
+    -->
+    <Artifact Include="**\*.manifest" DestinationFolder="$(ArtifactsPath)%(RecursiveDir)" />
+  </ItemGroup>
+</Project>
diff --git a/src/ServiceControl.Audit.Persistence.RavenDb/persistence.manifest b/src/LegacyArtifacts/Particular.ServiceControl.Audit/Persisters/RavenDB35/persistence.manifest
similarity index 100%
rename from src/ServiceControl.Audit.Persistence.RavenDb/persistence.manifest
rename to src/LegacyArtifacts/Particular.ServiceControl.Audit/Persisters/RavenDB35/persistence.manifest
diff --git a/src/ServiceControl.Persistence.RavenDb/persistence.manifest b/src/LegacyArtifacts/Particular.ServiceControl/Persisters/RavenDB35/persistence.manifest
similarity index 100%
rename from src/ServiceControl.Persistence.RavenDb/persistence.manifest
rename to src/LegacyArtifacts/Particular.ServiceControl/Persisters/RavenDB35/persistence.manifest
diff --git a/src/Persisters.Audit.Includes.props b/src/Persisters.Audit.Includes.props
index 1088673842..37dcec6c3f 100644
--- a/src/Persisters.Audit.Includes.props
+++ b/src/Persisters.Audit.Includes.props
@@ -1,7 +1,6 @@
 <Project>
   <ItemGroup Label="Persisters">
     <ProjectReference Include="..\ServiceControl.Audit.Persistence.InMemory\ServiceControl.Audit.Persistence.InMemory.csproj" ReferenceOutputAssembly="false" Private="false" />
-    <ProjectReference Include="..\ServiceControl.Audit.Persistence.RavenDb\ServiceControl.Audit.Persistence.RavenDb.csproj" ReferenceOutputAssembly="false" Private="false" />
     <ProjectReference Include="..\ServiceControl.Audit.Persistence.RavenDb5\ServiceControl.Audit.Persistence.RavenDb5.csproj" ReferenceOutputAssembly="false" Private="false" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Persisters.Primary.Includes.props b/src/Persisters.Primary.Includes.props
index ddc16fb034..1cdabb3928 100644
--- a/src/Persisters.Primary.Includes.props
+++ b/src/Persisters.Primary.Includes.props
@@ -1,6 +1,5 @@
 <Project>
-	<ItemGroup Label="Persisters">
-		<ProjectReference Include="..\ServiceControl.Persistence.RavenDb\ServiceControl.Persistence.RavenDb.csproj" ReferenceOutputAssembly="false" Private="false" />
-		<ProjectReference Include="..\ServiceControl.Persistence.RavenDb5\ServiceControl.Persistence.RavenDb5.csproj" ReferenceOutputAssembly="false" Private="false" />
-	</ItemGroup>
+  <ItemGroup Label="Persisters">
+    <ProjectReference Include="..\ServiceControl.Persistence.RavenDb5\ServiceControl.Persistence.RavenDb5.csproj" ReferenceOutputAssembly="false" Private="false" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/ServiceControl.Audit.Persistence.RavenDb/ServiceControl.Audit.Persistence.RavenDb.csproj b/src/ServiceControl.Audit.Persistence.RavenDb/ServiceControl.Audit.Persistence.RavenDb.csproj
deleted file mode 100644
index 7ac48850df..0000000000
--- a/src/ServiceControl.Audit.Persistence.RavenDb/ServiceControl.Audit.Persistence.RavenDb.csproj
+++ /dev/null
@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Update="persistence.manifest" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Artifact Include="$(OutputPath)" DestinationFolder="$(ArtifactsPath)Particular.ServiceControl.Audit\Persisters\RavenDB35" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/src/ServiceControl.Persistence.RavenDb/ServiceControl.Persistence.RavenDb.csproj b/src/ServiceControl.Persistence.RavenDb/ServiceControl.Persistence.RavenDb.csproj
deleted file mode 100644
index d5c621676d..0000000000
--- a/src/ServiceControl.Persistence.RavenDb/ServiceControl.Persistence.RavenDb.csproj
+++ /dev/null
@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Update="persistence.manifest" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Artifact Include="$(OutputPath)" DestinationFolder="$(ArtifactsPath)Particular.ServiceControl\Persisters\RavenDB35" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/src/ServiceControl.sln b/src/ServiceControl.sln
index 2f657d55c0..7155f379e0 100644
--- a/src/ServiceControl.sln
+++ b/src/ServiceControl.sln
@@ -175,11 +175,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceControl.Persistence.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceControl.AcceptanceTests.RavenDB5", "ServiceControl.AcceptanceTests.RavenDB5\ServiceControl.AcceptanceTests.RavenDB5.csproj", "{4F2CAFC7-113A-4D31-A365-6669AB4C7787}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Legacy", "Legacy", "{CFAF63BD-708E-4EB7-A55B-D80BCA67A589}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceControl.Audit.Persistence.RavenDb", "ServiceControl.Audit.Persistence.RavenDb\ServiceControl.Audit.Persistence.RavenDb.csproj", "{D6CE452A-1851-4F84-9880-0171000B04CD}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceControl.Persistence.RavenDb", "ServiceControl.Persistence.RavenDb\ServiceControl.Persistence.RavenDb.csproj", "{B50D94DF-3D25-4AFA-B58C-EC9441A759B6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LegacyArtifacts", "LegacyArtifacts\LegacyArtifacts.csproj", "{38147B68-13EE-48DC-BB38-4217889978AE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -979,30 +975,18 @@ Global
 		{4F2CAFC7-113A-4D31-A365-6669AB4C7787}.Release|x64.Build.0 = Release|Any CPU
 		{4F2CAFC7-113A-4D31-A365-6669AB4C7787}.Release|x86.ActiveCfg = Release|Any CPU
 		{4F2CAFC7-113A-4D31-A365-6669AB4C7787}.Release|x86.Build.0 = Release|Any CPU
-		{D6CE452A-1851-4F84-9880-0171000B04CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D6CE452A-1851-4F84-9880-0171000B04CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D6CE452A-1851-4F84-9880-0171000B04CD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D6CE452A-1851-4F84-9880-0171000B04CD}.Debug|x64.Build.0 = Debug|Any CPU
-		{D6CE452A-1851-4F84-9880-0171000B04CD}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D6CE452A-1851-4F84-9880-0171000B04CD}.Debug|x86.Build.0 = Debug|Any CPU
-		{D6CE452A-1851-4F84-9880-0171000B04CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D6CE452A-1851-4F84-9880-0171000B04CD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D6CE452A-1851-4F84-9880-0171000B04CD}.Release|x64.ActiveCfg = Release|Any CPU
-		{D6CE452A-1851-4F84-9880-0171000B04CD}.Release|x64.Build.0 = Release|Any CPU
-		{D6CE452A-1851-4F84-9880-0171000B04CD}.Release|x86.ActiveCfg = Release|Any CPU
-		{D6CE452A-1851-4F84-9880-0171000B04CD}.Release|x86.Build.0 = Release|Any CPU
-		{B50D94DF-3D25-4AFA-B58C-EC9441A759B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B50D94DF-3D25-4AFA-B58C-EC9441A759B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B50D94DF-3D25-4AFA-B58C-EC9441A759B6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B50D94DF-3D25-4AFA-B58C-EC9441A759B6}.Debug|x64.Build.0 = Debug|Any CPU
-		{B50D94DF-3D25-4AFA-B58C-EC9441A759B6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B50D94DF-3D25-4AFA-B58C-EC9441A759B6}.Debug|x86.Build.0 = Debug|Any CPU
-		{B50D94DF-3D25-4AFA-B58C-EC9441A759B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B50D94DF-3D25-4AFA-B58C-EC9441A759B6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B50D94DF-3D25-4AFA-B58C-EC9441A759B6}.Release|x64.ActiveCfg = Release|Any CPU
-		{B50D94DF-3D25-4AFA-B58C-EC9441A759B6}.Release|x64.Build.0 = Release|Any CPU
-		{B50D94DF-3D25-4AFA-B58C-EC9441A759B6}.Release|x86.ActiveCfg = Release|Any CPU
-		{B50D94DF-3D25-4AFA-B58C-EC9441A759B6}.Release|x86.Build.0 = Release|Any CPU
+		{38147B68-13EE-48DC-BB38-4217889978AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{38147B68-13EE-48DC-BB38-4217889978AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{38147B68-13EE-48DC-BB38-4217889978AE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{38147B68-13EE-48DC-BB38-4217889978AE}.Debug|x64.Build.0 = Debug|Any CPU
+		{38147B68-13EE-48DC-BB38-4217889978AE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{38147B68-13EE-48DC-BB38-4217889978AE}.Debug|x86.Build.0 = Debug|Any CPU
+		{38147B68-13EE-48DC-BB38-4217889978AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{38147B68-13EE-48DC-BB38-4217889978AE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{38147B68-13EE-48DC-BB38-4217889978AE}.Release|x64.ActiveCfg = Release|Any CPU
+		{38147B68-13EE-48DC-BB38-4217889978AE}.Release|x64.Build.0 = Release|Any CPU
+		{38147B68-13EE-48DC-BB38-4217889978AE}.Release|x86.ActiveCfg = Release|Any CPU
+		{38147B68-13EE-48DC-BB38-4217889978AE}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1082,9 +1066,7 @@ Global
 		{84627DC0-7B43-480D-80CF-A4DDA514A4EE} = {9B52418E-BF18-4D25-BE17-4B56D3FB1154}
 		{2EF143A5-E769-42FD-8B7E-7C01C381BC13} = {350F72AB-142D-4AAD-9EF1-1A83DC991D87}
 		{4F2CAFC7-113A-4D31-A365-6669AB4C7787} = {350F72AB-142D-4AAD-9EF1-1A83DC991D87}
-		{CFAF63BD-708E-4EB7-A55B-D80BCA67A589} = {55C388DD-2B39-4C2F-AEBD-AFD3444815F1}
-		{D6CE452A-1851-4F84-9880-0171000B04CD} = {CFAF63BD-708E-4EB7-A55B-D80BCA67A589}
-		{B50D94DF-3D25-4AFA-B58C-EC9441A759B6} = {CFAF63BD-708E-4EB7-A55B-D80BCA67A589}
+		{38147B68-13EE-48DC-BB38-4217889978AE} = {55C388DD-2B39-4C2F-AEBD-AFD3444815F1}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3B9E5B72-F580-465A-A22C-2D2148AF4EB4}
diff --git a/src/ServiceControlInstaller.Engine.UnitTests/Configuration/AuditInstanceTests.cs b/src/ServiceControlInstaller.Engine.UnitTests/Configuration/AuditInstanceTests.cs
index 5ce505c493..139339d31e 100644
--- a/src/ServiceControlInstaller.Engine.UnitTests/Configuration/AuditInstanceTests.cs
+++ b/src/ServiceControlInstaller.Engine.UnitTests/Configuration/AuditInstanceTests.cs
@@ -13,8 +13,8 @@
     [TestFixture]
     class AuditInstanceTests : InstallationFixture
     {
-        // TODO: Revisit this test once installer work is done to make Raven35 instances non-upgradeable
-        [Test]
+        // TODO: Revisit this test once installer work is done to make Raven35 instances non-upgradeable, and remove Ignore attribute
+        [Test, Ignore("Revisit when installer makes Raven35 instances non-upgradeable")]
         public void Should_default_to_raven35_when_no_config_entry_exists()
         {
             var newInstance = ServiceControlAuditNewInstance.CreateWithPersistence(ZipFileFolder.FullName, "RavenDB35");
diff --git a/src/ServiceControlInstaller.Packaging/ServiceControlInstaller.Packaging.csproj b/src/ServiceControlInstaller.Packaging/ServiceControlInstaller.Packaging.csproj
index 543409eae0..dab9e16cde 100644
--- a/src/ServiceControlInstaller.Packaging/ServiceControlInstaller.Packaging.csproj
+++ b/src/ServiceControlInstaller.Packaging/ServiceControlInstaller.Packaging.csproj
@@ -12,13 +12,11 @@
 
   <ItemGroup Label="Audit persisters">
     <ProjectReference Include="..\ServiceControl.Audit.Persistence.InMemory\ServiceControl.Audit.Persistence.InMemory.csproj" />
-    <ProjectReference Include="..\ServiceControl.Audit.Persistence.RavenDb\ServiceControl.Audit.Persistence.RavenDb.csproj" />
     <ProjectReference Include="..\ServiceControl.Audit.Persistence.RavenDb5\ServiceControl.Audit.Persistence.RavenDb5.csproj" />
   </ItemGroup>
 
   <ItemGroup Label="Primary persisters">
     <ProjectReference Include="..\ServiceControl.Persistence.RavenDb5\ServiceControl.Persistence.RavenDb5.csproj" />
-    <ProjectReference Include="..\ServiceControl.Persistence.RavenDb\ServiceControl.Persistence.RavenDb.csproj" />
   </ItemGroup>
 
   <ItemGroup Label="Transports">
@@ -32,6 +30,10 @@
     <ProjectReference Include="..\ServiceControl.Transports.SQS\ServiceControl.Transports.SQS.csproj" />
   </ItemGroup>
 
+  <ItemGroup Label="Manifests for removed stuff">
+    <ProjectReference Include="..\LegacyArtifacts\LegacyArtifacts.csproj" />
+  </ItemGroup>
+
   <ItemGroup>
     <!-- This ensures that all the project references listed above are configured to be build ordering references only.
     No assemblies or content are copied when these are set -->