diff --git a/Controls.DocumentViewer/DocumentViewer.vb b/Controls.DocumentViewer/DocumentViewer.vb
index 0e8e5cf5..81eeed8c 100644
--- a/Controls.DocumentViewer/DocumentViewer.vb
+++ b/Controls.DocumentViewer/DocumentViewer.vb
@@ -489,6 +489,7 @@ Public Class DocumentViewer
     End Sub
     Private Function DoLoadFile(FilePath As String) As Boolean
         Try
+            _logger.Debug($"Starting DoLoadFile with [{FilePath}] ...")
             Dim oFileInfo = New FileInfo(FilePath)
             Dim oExtension As String = oFileInfo.Extension.ToUpper
 
@@ -523,6 +524,7 @@ Public Class DocumentViewer
                     SpreadsheetControl1.Dock = DockStyle.Fill
 
                 Case Else
+                    _logger.Debug($"Loading GDViewer with extension [{oExtension}] ...")
                     GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
                     GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
                     GdViewer.ForceTemporaryMode = True
diff --git a/Controls.DocumentViewer/DocumentViewer.vbproj b/Controls.DocumentViewer/DocumentViewer.vbproj
index 00bd834b..41aa8e05 100644
--- a/Controls.DocumentViewer/DocumentViewer.vbproj
+++ b/Controls.DocumentViewer/DocumentViewer.vbproj
@@ -207,9 +207,6 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Deployment" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.Formats.Asn1, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Formats.Asn1.9.0.0\lib\net462\System.Formats.Asn1.dll</HintPath>
-    </Reference>
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.IO.Packaging, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.IO.Packaging.9.0.0\lib\net462\System.IO.Packaging.dll</HintPath>
diff --git a/Services.EmailService/EmailService.vb b/Services.EmailService/EmailService.vb
index d839b7df..07df6e39 100644
--- a/Services.EmailService/EmailService.vb
+++ b/Services.EmailService/EmailService.vb
@@ -14,7 +14,7 @@ Public Class EmailService
     Private _ConfigManager As ConfigManager(Of Config)
     Private _Config As Config
 
-    Private _Firebird As Firebird
+    ' Private _Firebird As Firebird
     Private _MSSQL As MSSQLServer
     Private _MSSQL_Test As MSSQLServer
     Private _Encryption As EncryptionLegacy
@@ -79,7 +79,7 @@ Public Class EmailService
                 End If
             End If
 
-            _AnyDatabaseInitialized = _Firebird?._DBInitialized Or _MSSQL?.DBInitialized Or _MSSQL_Test?.DBInitialized
+            _AnyDatabaseInitialized = _MSSQL?.DBInitialized Or _MSSQL_Test?.DBInitialized
             _TempFiles = New TempFiles(_LogConfig)
             _TempFiles.Create()
             ' === Initialize Email ===
@@ -198,9 +198,9 @@ Public Class EmailService
             Dim oAccounts As New List(Of EmailAccount)
 
             Select Case Database
-                Case DatabaseType.Firebird
-                    oSQL = "SELECT * FROM TBEDM_EMAIL_ACCOUNT WHERE ACTIVE = True"
-                    oEmailAccounts = _Firebird.GetDatatable(oSQL)
+                'Case DatabaseType.Firebird
+                '    oSQL = "SELECT * FROM TBEDM_EMAIL_ACCOUNT WHERE ACTIVE = True"
+                '    oEmailAccounts = _Firebird.GetDatatable(oSQL)
                 Case DatabaseType.MSSQL
                     oSQL = "SELECT * FROM TBDD_EMAIL_ACCOUNT WHERE ACTIVE = 1"
                     oEmailAccounts = MSSQLInstance.GetDatatable(oSQL)
@@ -292,9 +292,9 @@ Public Class EmailService
             End If
 
             Select Case Database
-                Case DatabaseType.Firebird
-                    oSQL = "SELECT * FROM TBEDM_EMAIL_QUEUE WHERE EMAIL_SENT IS NULL and EMAIL_TO <> ''"
-                    oEmailQueue = _Firebird.GetDatatable(oSQL)
+                'Case DatabaseType.Firebird
+                '    oSQL = "SELECT * FROM TBEDM_EMAIL_QUEUE WHERE EMAIL_SENT IS NULL and EMAIL_TO <> ''"
+                '    oEmailQueue = _Firebird.GetDatatable(oSQL)
                 Case DatabaseType.MSSQL
                     If My.Settings.MSSQL_SELECT <> String.Empty Then
                         _Logger.Debug("My.Settings.MSSQL_SELECT will be used..")
@@ -456,9 +456,9 @@ Public Class EmailService
                             oSuccessfulSent.Add(oEmailTo)
 
                             Select Case Database
-                                Case DatabaseType.Firebird
-                                    oSQL = GetFirebirdUpdateString(oComment, oGuid)
-                                    _Firebird.ExecuteNonQuery(oSQL)
+                                'Case DatabaseType.Firebird
+                                '    oSQL = GetFirebirdUpdateString(oComment, oGuid)
+                                '    _Firebird.ExecuteNonQuery(oSQL)
                                 Case DatabaseType.MSSQL
                                     oSQL = GetSQLUpdateString(oComment, oGuid)
                                     MSSQLInstance.ExecuteNonQuery(oSQL)