diff --git a/Elwig/Windows/ContextWindow.cs b/Elwig/Windows/ContextWindow.cs
index f255deb..a2f7e0c 100644
--- a/Elwig/Windows/ContextWindow.cs
+++ b/Elwig/Windows/ContextWindow.cs
@@ -39,18 +39,11 @@ namespace Elwig.Windows {
             await OnRenewContext();
         }
 
-        protected override void OnClosed(EventArgs evt) {
-            base.OnClosed(evt);
-            Context.Dispose();
-        }
-
         protected async Task RenewContext() {
             if (!_renewPending) return;
-            var old = Context;
             Context = new();
             await OnRenewContext();
             _renewPending = false;
-            old.Dispose();
         }
 
         abstract protected Task OnRenewContext();
diff --git a/Elwig/Windows/MailWindow.xaml.cs b/Elwig/Windows/MailWindow.xaml.cs
index 103bdf8..90fe602 100644
--- a/Elwig/Windows/MailWindow.xaml.cs
+++ b/Elwig/Windows/MailWindow.xaml.cs
@@ -273,7 +273,6 @@ namespace Elwig.Windows {
             if (RecipientsCustomInput.IsChecked == true) {
                 Recipients = MemberCustomInput.SelectedItems.Cast<Member>().ToList();
             } else {
-                // FIXME NOT WORKING ON SECOND OPENING OF WINDOW
                 var year = (!await Context.Deliveries.AnyAsync()) ? 0 : await Context.Deliveries.Select(d => d.Year).MaxAsync();
 
                 IQueryable<Member> query = Context.Members.Where(m => m.IsActive);