diff --git a/src/client/application/application-controller.vala b/src/client/application/application-controller.vala
index 14994d65..53d12ee9 100644
--- a/src/client/application/application-controller.vala
+++ b/src/client/application/application-controller.vala
@@ -98,9 +98,6 @@ internal class Application.Controller : Geary.BaseObject {
     // Track whether storage cleanup is running
     private bool storage_cleanup_running = false;
 
-    // Whether we're fully in the background
-    public bool all_windows_backgrounded { get; private set; default = false; }
-
 
     /**
      * Emitted when an account is added or is enabled.
@@ -1789,7 +1786,6 @@ internal class Application.Controller : Geary.BaseObject {
     private void on_unfocused_idle() {
         // Schedule later, catching cases where work should occur later while still in background
         this.all_windows_backgrounded_timeout.reset();
-        this.all_windows_backgrounded = true;
         window_focus_out();
 
         if (!storage_cleanup_running)
diff --git a/src/engine/imap-engine/imap-engine-generic-account.vala b/src/engine/imap-engine/imap-engine-generic-account.vala
index e221bfa3..30c0f072 100644
--- a/src/engine/imap-engine/imap-engine-generic-account.vala
+++ b/src/engine/imap-engine/imap-engine-generic-account.vala
@@ -551,9 +551,6 @@ private abstract class Geary.ImapEngine.GenericAccount : Geary.Account {
     // Continue backgrounded app cleanup work after the first phase,
     // old message detachment, has completed
     public void app_backgrounded_cleanup_continued(bool messages_detached, GLib.Cancellable? cancellable) {
-        // TODO bail on remaining work if we've returned from the background
-        // if (!application.controller.all_windows_backgrounded)
-        //    return;
 
         // Kick off GC, allowing vacuum and forcing reap if we've removed messages
         local.db.run_gc.begin(cancellable, messages_detached, this);