diff --git a/configs/common/mozconfig b/configs/common/mozconfig
index 7949d1bdb..d4c149fe1 100644
--- a/configs/common/mozconfig
+++ b/configs/common/mozconfig
@@ -52,24 +52,15 @@ if test "$ZEN_RELEASE"; then
   ac_add_options --disable-debug-symbols
   ac_add_options --disable-debug-js-modules
   ac_add_options --disable-tests
-  ac_add_options --disable-js-shell
-
-  ac_add_options --disable-vtune
 
   ac_add_options --enable-rust-simd
   ac_add_options --enable-wasm-simd
 
   mk_add_options MOZ_PARALLEL_COMPILE=1
 
-  ac_add_options --enable-proxy-bypass-protection
-  ac_add_options --enable-hardening
-  ac_add_options --disable-profiling
-
   ac_add_options --disable-geckodriver
   ac_add_options --disable-rust-tests
 
-  ac_add_options --disable-default-browser-agent
-
   if ! test "$ZEN_DISABLE_LTO"; then
     # only enable full LTO when ZEN_RELEASE_BRANCH is 'release'
     if test "$ZEN_RELEASE_BRANCH" = "release"; then
@@ -99,6 +90,7 @@ if test "$ZEN_RELEASE"; then
 
   ac_add_options --enable-updater
 
+  ac_add_options --enable-js-shell
   export MOZ_PACKAGE_JSSHELL=1
 else
   ac_add_options --disable-crashreporter
diff --git a/configs/windows/mozconfig b/configs/windows/mozconfig
index 13e648476..408d8884e 100644
--- a/configs/windows/mozconfig
+++ b/configs/windows/mozconfig
@@ -22,8 +22,6 @@ if test "$ZEN_CROSS_COMPILING"; then
   fi
 fi
 
-#? https://bugzilla.mozilla.org/show_bug.cgi?id=1617793
-#? https://phabricator.services.mozilla.com/D170170
 ac_add_options --disable-maintenance-service
 ac_add_options --disable-bits-download
 
@@ -32,8 +30,6 @@ if test "$SURFER_COMPAT" = "x86_64"; then
   ac_add_options --target=x86_64-pc-windows-msvc
   ac_add_options --enable-eme=widevine,wmfcdm
 
-# ac_add_options --disable-jemalloc
-
   ac_add_options --enable-optimize="-O3 -w -ftree-vectorize -mfpmath=sse -mprfchw -msse3 -mcx16 -msahf"
 
   export LDFLAGS="-Wl,-O3"
@@ -55,8 +51,6 @@ elif test "$SURFER_COMPAT" = "aarch64"; then
   export RUSTFLAGS="-C target-feature=+v8.2a -Ctarget-cpu=cortex-a55"
 fi
 
-#export POLLY="-mllvm -polly -mllvm -polly-2nd-level-tiling -mllvm -polly-loopfusion-greedy -mllvm -polly-pattern-matching-based-opts -mllvm -polly-position=before-vectorizer -mllvm -polly-vectorizer=stripmine"
-
 if test "$ZEN_CROSS_COMPILING"; then
   if test "$ZEN_GA_GENERATE_PROFILE"; then
     export CXXFLAGS="$CXXFLAGS -fprofile-generate -mllvm -enable-name-compression=false -mllvm -pgo-temporal-instrumentation -fprofile-update=atomic"