diff --git a/configs/common/mozconfig b/configs/common/mozconfig
index ae3c43b4c..78286f4ed 100644
--- a/configs/common/mozconfig
+++ b/configs/common/mozconfig
@@ -47,6 +47,8 @@ if test "$ZEN_RELEASE"; then
   # ac_add_options --enable-clang-plugin
   ac_add_options --enable-bootstrap=-sccache
 
+  ac_add_options --enable-optimize
+
   ac_add_options --enable-release
   ac_add_options --disable-debug
   ac_add_options --disable-debug-symbols
@@ -56,8 +58,6 @@ if test "$ZEN_RELEASE"; then
   ac_add_options --enable-rust-simd
   ac_add_options --enable-wasm-simd
 
-  mk_add_options MOZ_PARALLEL_COMPILE=1
-
   ac_add_options --disable-geckodriver
   ac_add_options --disable-rust-tests
 
@@ -73,8 +73,6 @@ if test "$ZEN_RELEASE"; then
     fi
   fi
 
-  ac_add_options --enable-jemalloc
-
   mk_add_options MOZILLA_OFFICIAL=1
   MOZILLA_OFFICIAL=1
   export MOZILLA_OFFICIAL=1
@@ -82,9 +80,6 @@ if test "$ZEN_RELEASE"; then
   mk_add_options AUTOCLOBBER=1
   export AUTOCLOBBER=1
 
-  ac_add_options --enable-updater
-
-  ac_add_options --enable-js-shell
   export MOZ_PACKAGE_JSSHELL=1
 
   ac_add_options --disable-crashreporter
diff --git a/configs/linux/mozconfig b/configs/linux/mozconfig
index ad14bfc88..20d28e59b 100644
--- a/configs/linux/mozconfig
+++ b/configs/linux/mozconfig
@@ -17,30 +17,16 @@ if test "$ZEN_RELEASE"; then
         ac_add_options --enable-eme=widevine
 
         # Enable Profile Guided Optimization
-        if test "$ZEN_GA_DISABLE_PGO"; then
-        export ZEN_DUMMY=1
-        else
-        export MOZ_PGO=1
-        ac_add_options MOZ_PGO=1
+        if ! test "$ZEN_GA_DISABLE_PGO"; then
+            export MOZ_PGO=1
+            ac_add_options MOZ_PGO=1
         fi
-
-        # Optimization flags for SURFER_COMPAT
-        ac_add_options --enable-optimize="-O3 -w -ftree-vectorize -mfpmath=sse -mprfchw -msse3 -mcx16 -msahf"
-
-        export LDFLAGS="$LDFLAGS -Wl,-O3"
     elif test "$SURFER_COMPAT" = "aarch64"; then
         ac_add_options --target=aarch64-linux-gnu
 
-        ac_add_options --enable-optimize="-O3"
-
         # override LTO settings
         export MOZ_LTO=cross,thin
         ac_add_options --enable-lto=cross,thin
-
-        export CFLAGS="$CFLAGS -O3"
-        export CPPFLAGS="$CPPFLAGS -O3"
-        export CXXFLAGS="$CXXFLAGS -O3"
-        export LDFLAGS="$LDFLAGS -Wl,-O3"
     fi
 
     # Disable DMD and ELF hacks, enable linker lld
diff --git a/configs/macos/mozconfig b/configs/macos/mozconfig
index c25e175a5..a2f794c6b 100644
--- a/configs/macos/mozconfig
+++ b/configs/macos/mozconfig
@@ -28,15 +28,12 @@ if test "$SURFER_COMPAT" = "x86_64"; then
 
   if test "$ZEN_RELEASE"; then
     ac_add_options --enable-wasm-avx
-    ac_add_options --enable-optimize="-march=nehalem -mtune=haswell -O2 -w"
   fi
 else
   ac_add_options --enable-clang-plugin
   ac_add_options --target=aarch64-apple-darwin
 
   if test "$ZEN_RELEASE"; then
-    ac_add_options --enable-optimize="-O2 -mcpu=apple-m1"
-
     # As of Clang 13, the default is -mcpu=apple-m1 when using a aarch64-apple-macos target,
     # but we're using apple64-apple-darwin, which defaults to -mcpu=apple-a7, which disables
     # a bunch of # performance-enabling CPU features.
diff --git a/configs/windows/mozconfig b/configs/windows/mozconfig
index 685d9605b..ed5175b0c 100644
--- a/configs/windows/mozconfig
+++ b/configs/windows/mozconfig
@@ -30,34 +30,19 @@ ac_add_options --disable-maintenance-service
 ac_add_options --disable-bits-download
 
 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 --enable-optimize="-O3 -w -ftree-vectorize -mfpmath=sse -mprfchw -msse3 -mcx16 -msahf"
-
-  export LDFLAGS="$LDFLAGS -Wl,-O3"
-  export RUSTFLAGS="$RUSTFLAGS -Clink-args=--icf=safe"
 elif test "$SURFER_COMPAT" = "aarch64"; then
   ac_add_options --target=aarch64-pc-windows-msvc
   ac_add_options --enable-eme=widevine
 
-  ac_add_options --enable-optimize="-O2 -mtune=cortex-a55 -march=armv8.2-a+simd"
-
   # override LTO settings
   export MOZ_LTO=cross,thin
   ac_add_options --enable-lto=cross,thin
-
-  export CFLAGS="-O2 -march=armv8.2-a+simd -mtune=cortex-a55"
-  export CPPFLAGS="-O2 -march=armv8.2-a+simd -mtune=cortex-a55"
-  export CXXFLAGS="-O2 -march=armv8.2-a+simd -mtune=cortex-a55"
-  export LDFLAGS="-Wl,-O2 -march=armv8.2-a+simd -mtune=cortex-a55"
-  export RUSTFLAGS="-C target-feature=+v8.2a -Ctarget-cpu=cortex-a55"
 fi
 
 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"
     mk_add_options "export MOZ_AUTOMATION_PACKAGE_GENERATED_SOURCES=0"
     ac_add_options --enable-profile-generate=cross
   elif test "$SURFER_COMPAT" = "x86_64"; then