diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index f53af6a84..e3873c6d6 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -2886,11 +2886,8 @@ pref("svg.marker-improvements.enabled", true);
 // See https://svgwg.org/svg2-draft/single-page.html#types-SVGBoundingBoxOptions
 pref("svg.new-getBBox.enabled", false);
 
-#ifdef RELEASE_OR_BETA
-pref("svg.transform-box.enabled", false);
-#else
+// Is support for the transform-box property of SVG enabled?
 pref("svg.transform-box.enabled", true);
-#endif // RELEASE_OR_BETA
 
 // Default font types and sizes by locale
 pref("font.default.ar", "sans-serif");
@@ -4761,11 +4758,7 @@ pref("dom.abortController.enabled", true);
 
 // Push
 pref("dom.push.enabled", false);
-
 pref("dom.push.loglevel", "error");
-
-pref("dom.getRootNode.enabled", false);
-
 pref("dom.push.serverURL", "wss://push.services.mozilla.com/");
 pref("dom.push.userAgentID", "");
 
@@ -4802,6 +4795,9 @@ pref("dom.push.http2.reset_retry_count_after_ms", 60000);
 pref("dom.push.http2.maxRetries", 2);
 pref("dom.push.http2.retryInterval", 5000);
 
+// Whether WC getRootNode is available
+pref("dom.getRootNode.enabled", false);
+
 // WebNetworkStats
 pref("dom.mozNetworkStats.enabled", false);
 
@@ -4972,13 +4968,11 @@ pref("ui.touch_activation.duration_ms", 10);
 // actions when the fifo is written to.  Disable this in general.
 pref("memory_info_dumper.watch_fifo.enabled", false);
 
-#ifdef RELEASE_OR_BETA
-pref("dom.forms.inputmode", false);
-#else
+// Enable support for specifying inputmode for soft keyboards
 pref("dom.forms.inputmode", true);
-#endif
 
 // InputMethods for soft keyboards in B2G
+// XXX: is this still used?
 pref("dom.mozInputMethod.enabled", false);
 
 // Enable mapped array buffer by default.
@@ -5191,8 +5185,8 @@ pref("dom.presentation.discoverable.retry_ms", 5000);
 pref("dom.presentation.session_transport.data_channel.enable", false);
 
 #ifdef XP_MACOSX
-#if !defined(RELEASE_OR_BETA) || defined(DEBUG)
-// In non-release builds we crash by default on insecure text input (when a
+#if defined(DEBUG)
+// In debug builds we crash by default on insecure text input (when a
 // password editor has focus but secure event input isn't enabled).  The
 // following pref, when turned on, disables this behavior.  See bug 1188425.
 pref("intl.allow-insecure-text-input", false);
@@ -5398,24 +5392,18 @@ pref("media.default_volume", "1.0");
 
 pref("media.seekToNextFrame.enabled", true);
 
-// return the maximum number of cores that navigator.hardwareCurrency returns
+// return the maximum number of cores that navigator.hardwareConcurrency returns
 pref("dom.maxHardwareConcurrency", 16);
 
-// Shutdown the osfile worker if its no longer needed.
-#if !defined(RELEASE_OR_BETA)
+// Shutdown the async osfile worker if it's no longer needed.
 pref("osfile.reset_worker_delay", 30000);
-#endif
 
 #if !defined(MOZ_WIDGET_ANDROID)
 pref("dom.webkitBlink.dirPicker.enabled", true);
 pref("dom.webkitBlink.filesystem.enabled", true);
 #endif
 
-#ifdef NIGHTLY_BUILD
 pref("media.block-autoplay-until-in-foreground", true);
-#else
-pref("media.block-autoplay-until-in-foreground", false);
-#endif
 
 #ifdef MOZ_STYLO
 // Is the Servo-backed style system enabled?
@@ -5431,12 +5419,8 @@ pref("security.data_uri.block_toplevel_data_uri_navigations", true);
 // If true, all FTP subresource loads will be blocked.
 pref("security.block_ftp_subresources", true);
 
-// Disable Storage api in release builds.
-#ifdef NIGHTLY_BUILD
-pref("dom.storageManager.enabled", true);
-#else
+// Disable Storage api by default. This needs specific front-end parts to be usable.
 pref("dom.storageManager.enabled", false);
-#endif
 
 // DoS protection for HTTP Auth prompt spawning.
 // -1 = completely disable HTTP Auth prompting. (careful!)