diff --git a/KeePassKit b/KeePassKit
index 0801b18e..30e720ee 160000
--- a/KeePassKit
+++ b/KeePassKit
@@ -1 +1 @@
-Subproject commit 0801b18e5fe9d0452bf73d9291beca9e694be24d
+Subproject commit 30e720eec2324bb08ae4c5750970ce6282a339f1
diff --git a/MacPass/MPEntryViewController.m b/MacPass/MPEntryViewController.m
index 817b2d7f..3883dbb7 100644
--- a/MacPass/MPEntryViewController.m
+++ b/MacPass/MPEntryViewController.m
@@ -118,7 +118,6 @@ NSString *const _MPTableSecurCellView = @"PasswordCell";
     _dataSource.viewController = self;
     _menuDelegate = [[MPEntryContextMenuDelegate alloc] init];
     _contextBarViewController = [[MPContextBarViewController alloc] init];
-    [self _updateExpirationDisplay];
   }
   return self;
 }
@@ -737,16 +736,4 @@ NSString *const _MPTableSecurCellView = @"PasswordCell";
       break;
   }
 }
-
-#pragma mark periodic UI Update
-
-- (void)_updateExpirationDisplay {
-  return;
-  /* items are all entries */
-  [[self.entryArrayController arrangedObjects] enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
-    [[obj timeInfo] isExpired];
-  }];
-  [self performSelector:@selector(_updateExpirationDisplay) withObject:nil afterDelay:EXPIRED_ENTRY_REFRESH_SECONDS];
-}
-
 @end
diff --git a/MacPass/MPOutlineViewController.m b/MacPass/MPOutlineViewController.m
index d38713c9..2e699be6 100644
--- a/MacPass/MPOutlineViewController.m
+++ b/MacPass/MPOutlineViewController.m
@@ -110,8 +110,6 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell";
     [self bind:NSStringFromSelector(@selector(databaseNameWrapper)) toObject:document.tree.metaData withKeyPath:NSStringFromSelector(@selector(databaseName)) options:nil];
     [_outlineView setDataSource:self.datasource];
     _bindingEstablished = YES;
-    [self _updateExpirationDisplay];
-    
   }
   NSTreeNode *node = [_outlineView itemAtRow:0];
   [self _expandItems:node];
@@ -299,14 +297,4 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell";
   return [node isKindOfClass:[KPKTree class]];
 }
 
-- (void)_updateExpirationDisplay {
-  return;
-  MPDocument *document = [[self windowController] document];
-  [document.root.timeInfo isExpired];
-  [[document.tree allGroups] enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
-    [[obj timeInfo] isExpired];
-  }];
-  [self performSelector:@selector(_updateExpirationDisplay) withObject:nil afterDelay:EXPIRED_GROUP_REFRESH_SECONDS];
-}
-
 @end
diff --git a/MacPass/MPViewController.m b/MacPass/MPViewController.m
index ba907119..536517b0 100644
--- a/MacPass/MPViewController.m
+++ b/MacPass/MPViewController.m
@@ -7,6 +7,7 @@
 //
 
 #import "MPViewController.h"
+#import "MPDocument.h"
 
 @implementation MPViewController
 
@@ -21,7 +22,7 @@
 }
 
 - (NSWindowController *)windowController {
-  return [self.view.window windowController];
+  return self.view.window.windowController;
 }
 
 #pragma mark Responder Chain