--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -57,14 +57,14 @@ MOZ_EXTENSIONS_DEFAULT=" gnomevfs"
 # Changing either of these values requires a clobber to ensure correct results,
 # because branding dependencies are broken.
 MOZ_BRANDING_DIRECTORY=browser/branding/nightly
 MOZ_OFFICIAL_BRANDING_DIRECTORY=browser/branding/official
 MOZ_APP_ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 # This should usually be the same as the value MAR_CHANNEL_ID.
 # If more than one ID is needed, then you should use a comma separated list
 # of values.
-ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-beta,firefox-mozilla-release
+ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-release
 # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
-MAR_CHANNEL_ID=firefox-mozilla-beta
+MAR_CHANNEL_ID=firefox-mozilla-release
 MOZ_PROFILE_MIGRATOR=1
 MOZ_EXTENSION_MANAGER=1
 MOZ_APP_STATIC_INI=1

--- a/browser/locales/shipped-locales
+++ b/browser/locales/shipped-locales
@@ -40,28 +40,26 @@ hr
 hu
 hy-AM
 id
 is
 it
 ja linux win32
 ja-JP-mac osx
 kk
-km
 kn
 ko
 ku
 lg
 lij
 lt
 lv
 mai
 mk
 ml
-mn
 mr
 nb-NO
 nl
 nn-NO
 nso
 or
 pa-IN
 pl
@@ -72,17 +70,16 @@ ro
 ru
 si
 sk
 sl
 son
 sq
 sr
 sv-SE
-sw
 ta
 ta-LK
 te
 th
 tr
 uk
 vi
 zh-CN