diff --git a/EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj b/EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj
index 54e23c1b..6dbd310e 100644
--- a/EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj
+++ b/EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj
@@ -53,6 +53,7 @@
 
 	<ItemGroup>
 		<ProjectReference Include="..\EnvelopeGenerator.Application.VB\EnvelopeGenerator.Application.VB.vbproj" />
+		<ProjectReference Include="..\EnvelopeGenerator.CommonServices\EnvelopeGenerator.CommonServices.vbproj" />
 		<ProjectReference Include="..\EnvelopeGenerator.Domain\EnvelopeGenerator.Domain.csproj" />
 		<ProjectReference Include="..\EnvelopeGenerator.PdfEditor\EnvelopeGenerator.PdfEditor.csproj" />
 	</ItemGroup>
diff --git a/EnvelopeGenerator.CommonServices/EnvelopeGenerator.CommonServices.vbproj b/EnvelopeGenerator.CommonServices/EnvelopeGenerator.CommonServices.vbproj
index 1295363a..0e11ba2d 100644
--- a/EnvelopeGenerator.CommonServices/EnvelopeGenerator.CommonServices.vbproj
+++ b/EnvelopeGenerator.CommonServices/EnvelopeGenerator.CommonServices.vbproj
@@ -560,10 +560,6 @@
       <Project>{4f32a98d-e6f0-4a09-bd97-1cf26107e837}</Project>
       <Name>EnvelopeGenerator.Domain</Name>
     </ProjectReference>
-    <ProjectReference Include="..\EnvelopeGenerator.Infrastructure\EnvelopeGenerator.Infrastructure.csproj">
-      <Project>{63e32615-0eca-42dc-96e3-91037324b7c7}</Project>
-      <Name>EnvelopeGenerator.Infrastructure</Name>
-    </ProjectReference>
     <ProjectReference Include="..\EnvelopeGenerator.PdfEditor\EnvelopeGenerator.PdfEditor.csproj">
       <Project>{211619f5-ae25-4ba5-a552-bacafe0632d3}</Project>
       <Name>EnvelopeGenerator.PdfEditor</Name>
diff --git a/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentJob.vb b/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentJob.vb
index 5c091ceb..95c3ebca 100644
--- a/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentJob.vb
+++ b/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentJob.vb
@@ -69,29 +69,6 @@ Namespace Jobs
                 Dim oConnectionString As String = pContext.MergedJobDataMap.Item(Value.DATABASE)
                 Database = New MSSQLServer(LogConfig, MSSQLServer.DecryptConnectionString(oConnectionString))
 
-#Disable Warning BC40000 ' Type or member is obsolete
-                Factory.Shared _
-                .BehaveOnPostBuild(PostBuildBehavior.Ignore) _
-                .AddEGInfrastructureServices(
-                Sub(opt)
-                    opt.AddDbTriggerParams(
-                        Sub(triggers)
-                            triggers("Envelope") = New List(Of String) From {"TBSIG_ENVELOPE_AFT_INS"}
-                            triggers("History") = New List(Of String) From {"TBSIG_ENVELOPE_HISTORY_AFT_INS"}
-                            triggers("EmailOut") = New List(Of String) From {"TBEMLP_EMAIL_OUT_AFT_INS", "TBEMLP_EMAIL_OUT_AFT_UPD"}
-                            triggers("EnvelopeReceiverReadOnly") = New List(Of String) From {"TBSIG_ENVELOPE_RECEIVER_READ_ONLY_UPD"}
-                            triggers("Receiver") = New List(Of String)() ' no tigger
-                            triggers("EmailTemplate") = New List(Of String) From {"TBSIG_EMAIL_TEMPLATE_AFT_UPD"}
-                        End Sub)
-                    opt.AddDbContext(
-                        Sub(options)
-                            options.UseSqlServer(oConnectionString) _
-                                   .EnableSensitiveDataLogging() _
-                                   .EnableDetailedErrors()
-                        End Sub)
-                End Sub)
-#Enable Warning BC40000 ' Type or member is obsolete
-
                 Logger.Debug("Loading Models & Services")
                 Dim oState = GetState()
                 InitializeModels(oState)
diff --git a/EnvelopeGenerator.sln b/EnvelopeGenerator.sln
index 877d0012..f9b90e37 100644
--- a/EnvelopeGenerator.sln
+++ b/EnvelopeGenerator.sln
@@ -43,6 +43,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvelopeGenerator.Finalizer
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EnvelopeGenerator.Application.VB", "EnvelopeGenerator.Application.VB\EnvelopeGenerator.Application.VB.vbproj", "{9E123E6B-2A94-47C7-8BA1-ECDA5E1422C6}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvelopeGenerator.Application.Abstractions", "EnvelopeGenerator.Application.Abstractions\EnvelopeGenerator.Application.Abstractions.csproj", "{AC34E68D-B660-4E65-9875-4EB8ACAC43AE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -109,6 +111,10 @@ Global
 		{9E123E6B-2A94-47C7-8BA1-ECDA5E1422C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9E123E6B-2A94-47C7-8BA1-ECDA5E1422C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9E123E6B-2A94-47C7-8BA1-ECDA5E1422C6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AC34E68D-B660-4E65-9875-4EB8ACAC43AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AC34E68D-B660-4E65-9875-4EB8ACAC43AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AC34E68D-B660-4E65-9875-4EB8ACAC43AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AC34E68D-B660-4E65-9875-4EB8ACAC43AE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -132,6 +138,7 @@ Global
 		{B97DE7DD-3190-4A84-85E9-E57AD735BE61} = {E3C758DC-914D-4B7E-8457-0813F1FDB0CB}
 		{C4970E6C-DB2E-48C5-B3C5-2AF589405ED9} = {E3C758DC-914D-4B7E-8457-0813F1FDB0CB}
 		{9E123E6B-2A94-47C7-8BA1-ECDA5E1422C6} = {9943209E-1744-4944-B1BA-4F87FC1A0EEB}
+		{AC34E68D-B660-4E65-9875-4EB8ACAC43AE} = {9943209E-1744-4944-B1BA-4F87FC1A0EEB}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {73E60370-756D-45AD-A19A-C40A02DACCC7}