diff --git a/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverQuery.cs b/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverQuery.cs
index 887cb20a..bdfddd2b 100644
--- a/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverQuery.cs
+++ b/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverQuery.cs
@@ -95,6 +95,7 @@ public static class Extensions
     /// </summary>
     /// <param name="mediator"></param>
     /// <param name="key"></param>
+    /// <param name="cancel"></param>
     /// <returns></returns>
     public static Task<EnvelopeReceiverDto?> ReadEnvelopeReceiverAsync(this IMediator mediator, string key, CancellationToken cancel = default)
     {
diff --git a/EnvelopeGenerator.Web/Controllers/DocumentController.cs b/EnvelopeGenerator.Web/Controllers/DocumentController.cs
index 41e548f3..619b6cbb 100644
--- a/EnvelopeGenerator.Web/Controllers/DocumentController.cs
+++ b/EnvelopeGenerator.Web/Controllers/DocumentController.cs
@@ -27,8 +27,6 @@ public class DocumentController : BaseController
     [NonAction]
     public async Task<IActionResult> Get([FromRoute] string envelopeKey, [FromQuery] int index)
     {
-        EnvelopeReceiver response = await envelopeService.LoadEnvelope(envelopeKey);
-
         // Load document info
         var document = await envelopeService.GetDocument(index, envelopeKey);
 
diff --git a/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs b/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs
index 23328fa7..069cef38 100644
--- a/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs
+++ b/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs
@@ -10,6 +10,7 @@ using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Domain;
 using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Web.Extensions;
+using MediatR;
 
 namespace EnvelopeGenerator.Web.Controllers;
 
@@ -26,35 +27,21 @@ public class EnvelopeController : BaseController
     [Obsolete("Use MediatR")]
     private readonly IEnvelopeReceiverService _envRcvService;
 
+    private readonly IMediator _mediator;
+
     [Obsolete("Use MediatR")]
     public EnvelopeController(DatabaseService database,
         EnvelopeOldService envelope,
         ILogger<EnvelopeController> logger, UrlEncoder urlEncoder,
         IEnvelopeHistoryService envelopeHistoryService,
-        IEnvelopeReceiverService envelopeReceiverService) : base(database, logger)
+        IEnvelopeReceiverService envelopeReceiverService, IMediator mediator) : base(database, logger)
     {
         envelopeService = envelope;
         actionService = database?.Services?.actionService;
         _urlEncoder = urlEncoder;
         _histService = envelopeHistoryService;
         _envRcvService = envelopeReceiverService;
-    }
-
-    [NonAction]
-    [Obsolete("Use MediatR")]
-    public async Task<IActionResult> Get([FromRoute] string envelopeKey)
-    {
-        envelopeKey = _urlEncoder.Encode(envelopeKey);
-
-        EnvelopeReceiver response = await envelopeService.LoadEnvelope(envelopeKey);
-
-        if (envelopeService.ReceiverAlreadySigned(response.Envelope, response.Receiver.Id) == true)
-        {
-            return Problem(statusCode: 403);
-        }
-
-        _logger.LogInformation("Loaded envelope [{0}] for receiver [{1}]", response.Envelope.Id, response.Envelope.Id);
-        return Json(response);
+        _mediator = mediator;
     }
 
     [Authorize(Roles = ReceiverRole.FullyAuth)]