diff --git a/ignore.list b/ignore.list
index 1914e25c..4c55fdf8 100644
--- a/ignore.list
+++ b/ignore.list
@@ -407,3 +407,23 @@
 // When browser.urlbar.autocomplete.enabled is false, the dropdown is disabled
 // Setting the preference to 0 effectively disables the Location Bar dropdown entirely
 user_pref("browser.urlbar.maxRichResults",			0);
+
+
+// privacy.clearOnShutdown.passwords was removed in Firefox 42
+// https://hg.mozilla.org/releases/mozilla-esr45/rev/fb4f42bbeb01
+"privacy.clearOnShutdown.passwords"
+
+// Old Firefox 3.1a2 pref
+// https://hg.mozilla.org/mozilla-central/rev/adb1ef78dd21
+"browser.sessionstore.enabled"
+
+// PREF: Enable Information Bar for Outdated Plugins (Firefox < 33)
+// http://forums.mozillazine.org/viewtopic.php?f=8&t=2490287
+// https://hg.mozilla.org/mozilla-central/rev/189803
+"plugins.hide_infobar_for_outdated_plugin"
+
+// PREF: Do not store POST data in saved sessions (Firefox < 29)
+// https://hg.mozilla.org/mozilla-central/rev/163997
+// http://kb.mozillazine.org/Browser.sessionstore.postdata
+// relates to CIS 2.5.7
+user_pref("browser.sessionstore.postdata",			0);
\ No newline at end of file
diff --git a/user.js b/user.js
index a103235e..2f6154be 100644
--- a/user.js
+++ b/user.js
@@ -364,11 +364,11 @@ user_pref("extensions.getAddons.cache.enabled",			false);
 // https://support.mozilla.org/t5/Firefox/how-do-I-prevent-autoamtic-updates-in-a-50-user-environment/td-p/144287
 user_pref("lightweightThemes.update.enabled",			false);
 
-// PREF: Flash Player plugin state - never activate
+// PREF: Disable Flash Player NPAPI plugin
 // http://kb.mozillazine.org/Flash_plugin
 user_pref("plugin.state.flash",					0);
 
-// PREF: Java plugin state - never activate
+// PREF: Disable Java NPAPI plugin
 user_pref("plugin.state.java",					0);
 
 // PREF: Disable sending Flash Player crash reports
@@ -386,7 +386,7 @@ user_pref("browser.safebrowsing.blockedURIs.enabled", true);
 // https://developer.mozilla.org/en-US/docs/Mozilla/Projects/Shumway
 pref("shumway.disabled", true);
 
-// PREF: Disable Gnome Shell Integration
+// PREF: Disable Gnome Shell Integration NPAPI plugin
 user_pref("plugin.state.libgnome-shell-browser-plugin",		0);
 
 // PREF: Disable the bundled OpenH264 video codec (disabled)
@@ -691,11 +691,6 @@ user_pref("network.cookie.thirdparty.sessionOnly",		true);
 // NOTICE: Disables "Containers" functionality (see below)
 user_pref("browser.privatebrowsing.autostart",			true);
 
-// PREF: Do not store POST data in saved sessions
-// http://kb.mozillazine.org/Browser.sessionstore.postdata
-// relates to CIS 2.5.7
-user_pref("browser.sessionstore.postdata",			0);
-
 // PREF: Do not download URLs for the offline cache
 // http://kb.mozillazine.org/Browser.cache.offline.enable
 user_pref("browser.cache.offline.enable",			false);
@@ -711,7 +706,6 @@ user_pref("privacy.clearOnShutdown.downloads",			true);
 user_pref("privacy.clearOnShutdown.formdata",			true);
 user_pref("privacy.clearOnShutdown.history",			true);
 user_pref("privacy.clearOnShutdown.offlineApps",		true);
-user_pref("privacy.clearOnShutdown.passwords",			true);
 user_pref("privacy.clearOnShutdown.sessions",			true);
 user_pref("privacy.clearOnShutdown.openWindows",		true);
 
@@ -842,15 +836,12 @@ user_pref("browser.newtab.preload",				false);
 user_pref("browser.newtabpage.directory.ping",			"");
 user_pref("browser.newtabpage.directory.source",		"data:text/plain,{}");
 
-// PREF: Enable Auto Notification of Outdated Plugins
+// PREF: Enable Auto Notification of Outdated Plugins (Firefox < 50)
 // https://wiki.mozilla.org/Firefox3.6/Plugin_Update_Awareness_Security_Review
 // CIS Version 1.2.0 October 21st, 2011 2.1.2
+// https://hg.mozilla.org/mozilla-central/rev/304560
 user_pref("plugins.update.notifyUser",				true);
 
-// PREF: Enable Information Bar for Outdated Plugins
-// http://forums.mozillazine.org/viewtopic.php?f=8&t=2490287
-// CIS Version 1.2.0 October 21st, 2011 2.1.3
-user_pref("plugins.hide_infobar_for_outdated_plugin",		false);
 
 // PREF: Force Punycode for Internationalized Domain Names
 // http://kb.mozillazine.org/Network.IDN_show_punycode