diff --git a/mozilla/tools/tinderbox-configs/sunbird/linux/mozconfig b/mozilla/tools/tinderbox-configs/sunbird/linux/mozconfig
index f5d22eb93f2..ace6814c546 100644
--- a/mozilla/tools/tinderbox-configs/sunbird/linux/mozconfig
+++ b/mozilla/tools/tinderbox-configs/sunbird/linux/mozconfig
@@ -3,7 +3,6 @@
 ## uname: Linux galactica.mozilla.org 2.4.21-32.0.1.ELsmp #1 SMP Tue May 17 17:52:23 EDT 2005 i686 i686 i386 GNU/Linux
 #
 
-mk_add_options MOZ_CO_PROJECT=mail,calendar
 mk_add_options MOZ_CO_PROJECT=calendar
 mk_add_options MOZ_MAKE_FLAGS="-j6"
 mk_add_options JS_READLINE=1
@@ -13,7 +12,6 @@ ac_add_options --disable-debug
 ac_add_options --enable-optimize
 ac_add_options --enable-static
 ac_add_options --disable-shared
-#ac_add_options --enable-extensions=lightning
 ac_add_options --disable-installer
 ac_add_options --disable-tests
 
diff --git a/mozilla/tools/tinderbox-configs/sunbird/macosx/mozconfig b/mozilla/tools/tinderbox-configs/sunbird/macosx/mozconfig
index e23d7a8e374..dde1cb90070 100755
--- a/mozilla/tools/tinderbox-configs/sunbird/macosx/mozconfig
+++ b/mozilla/tools/tinderbox-configs/sunbird/macosx/mozconfig
@@ -1,4 +1,3 @@
-#mk_add_options MOZ_CO_PROJECT=mail,calendar
 mk_add_options MOZ_CO_PROJECT=calendar
 mk_add_options MOZ_MAKE_FLAGS="-j6"
 mk_add_options JS_READLINE=1
@@ -8,7 +7,6 @@ ac_add_options --disable-debug
 ac_add_options --enable-optimize
 ac_add_options --enable-static
 ac_add_options --disable-shared
-#ac_add_options --enable-extensions=lightning
 ac_add_options --disable-installer
 ac_add_options --disable-tests
 ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.2.8.sdk
diff --git a/mozilla/tools/tinderbox-configs/sunbird/win32/mozconfig b/mozilla/tools/tinderbox-configs/sunbird/win32/mozconfig
index bf72cedb394..558f5b17ed1 100644
--- a/mozilla/tools/tinderbox-configs/sunbird/win32/mozconfig
+++ b/mozilla/tools/tinderbox-configs/sunbird/win32/mozconfig
@@ -5,7 +5,6 @@
 
 mk_add_options MOZ_CO_PROJECT=calendar
 mk_add_options MOZ_CO_MODULE=mozilla/tools/codesighs
-# ,mozilla/tools/trace-malloc
 mk_add_options MOZ_MAKE_FLAGS="-j6"
 mk_add_options JS_READLINE=1
 # mk_add_options MOZ_INSTALLER_USE_7ZIP=1
@@ -18,9 +17,7 @@ ac_add_options --disable-debug
 ac_add_options --enable-optimize
 ac_add_options --enable-static
 ac_add_options --disable-shared
-# ac_add_options --enable-extensions=lightning
 ac_add_options --enable-installer
 ac_add_options --disable-tests
 ac_add_options --enable-codesighs
-#ac_add_options --enable-trace-malloc
 ac_add_options --enable-official-branding