diff --git a/toolkit/components/extensions/ExtensionChild.jsm b/toolkit/components/extensions/ExtensionChild.jsm
index 3e324ddf4b8b..e17ee4903c75 100644
--- a/toolkit/components/extensions/ExtensionChild.jsm
+++ b/toolkit/components/extensions/ExtensionChild.jsm
@@ -190,9 +190,7 @@ class ExtensionContext extends BaseContext {
       apiManager.global.initializeBackgroundPage(contentWindow);
     }
 
-    if (this.externallyVisible) {
-      this.extension.views.add(this);
-    }
+    this.extension.views.add(this);
   }
 
   get cloneScope() {
@@ -210,10 +208,6 @@ class ExtensionContext extends BaseContext {
     }
   }
 
-  get externallyVisible() {
-    return true;
-  }
-
   // Called when the extension shuts down.
   shutdown() {
     this.unload();
@@ -231,10 +225,7 @@ class ExtensionContext extends BaseContext {
 
     super.unload();
     this.childManager.close();
-
-    if (this.externallyVisible) {
-      this.extension.views.delete(this);
-    }
+    this.extension.views.delete(this);
   }
 }
 
diff --git a/toolkit/components/extensions/ext-backgroundPage.js b/toolkit/components/extensions/ext-backgroundPage.js
index 474004a0ce90..c1e84d66d351 100644
--- a/toolkit/components/extensions/ext-backgroundPage.js
+++ b/toolkit/components/extensions/ext-backgroundPage.js
@@ -26,10 +26,8 @@ function BackgroundPage(options, extension) {
   this.extension = extension;
   this.page = options.page || null;
   this.isGenerated = !!options.scripts;
-  this.contentWindow = null;
   this.windowlessBrowser = null;
   this.webNav = null;
-  this.context = null;
 }
 
 BackgroundPage.prototype = {
@@ -91,10 +89,9 @@ BackgroundPage.prototype = {
       });
     });
 
+    // TODO(robwu): This is not webext-oop compatible.
     this.webNav = browser.docShell.QueryInterface(Ci.nsIWebNavigation);
-
     let window = this.webNav.document.defaultView;
-    this.contentWindow = window;
 
 
     // Set the add-on's main debugger global, for use in the debugger