--- a/release/patcher-configs/mozDevedition-branch-patcher2.cfg
+++ b/release/patcher-configs/mozDevedition-branch-patcher2.cfg
@@ -19,39 +19,17 @@
                     url   http://download.mozilla.org/?product=devedition-54.0b12-partial-54.0b11&os=%bouncer-platform%&lang=%locale%
                 </54.0b11>
             </partials>
             <rc>
             </rc>
             testchannel   betatest releasetest
             to   54.0b12
         </current-update>
-        past-update   54.0b10 54.0b11 betatest releasetest aurora
-        past-update   54.0b9 54.0b10 betatest releasetest aurora
         <release>
-            <54.0b10>
-                checksumsurl   http://archive.mozilla.org/pub/devedition/candidates/54.0b10-candidates/build1/%platform%/%locale%/firefox-54.0b10.checksums
-                completemarurl   http://archive.mozilla.org/pub/devedition/candidates/54.0b10-candidates/build1/update/%platform%/%locale%/firefox-54.0b10.complete.mar
-                <exceptions>
-                    ja   linux-i686, linux-x86_64, win32, win64
-                    ja-JP-mac   mac
-                </exceptions>
-                extension-version   54.0
-                locales   ach af an ar as ast az bg bn-BD bn-IN br bs ca cak cs cy da de dsb el en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM id is it ja ja-JP-mac ka kab kk km kn ko lij lt lv mai mk ml mr ms my nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te th tr uk ur uz vi xh zh-CN zh-TW
-                <platforms>
-                    linux-i686   20170523002428
-                    linux-x86_64   20170523002428
-                    mac   20170522172523
-                    win32   20170522172523
-                    win64   20170522172523
-                </platforms>
-                prettyVersion   54.0 Beta 10
-                schema   2
-                version   54.0
-            </54.0b10>
             <54.0b11>
                 checksumsurl   http://archive.mozilla.org/pub/devedition/candidates/54.0b11-candidates/build4/%platform%/%locale%/firefox-54.0b11.checksums
                 completemarurl   http://archive.mozilla.org/pub/devedition/candidates/54.0b11-candidates/build4/update/%platform%/%locale%/firefox-54.0b11.complete.mar
                 <exceptions>
                     ja   linux-i686, linux-x86_64, win32, win64
                     ja-JP-mac   mac
                 </exceptions>
                 extension-version   54.0
@@ -82,31 +60,11 @@
                     mac   20170529025115
                     win32   20170529025115
                     win64   20170529025115
                 </platforms>
                 prettyVersion   54.0 Beta 12
                 schema   2
                 version   54.0
             </54.0b12>
-            <54.0b9>
-                checksumsurl   http://archive.mozilla.org/pub/devedition/candidates/54.0b9-candidates/build1/%platform%/%locale%/firefox-54.0b9.checksums
-                completemarurl   http://archive.mozilla.org/pub/devedition/candidates/54.0b9-candidates/build1/update/%platform%/%locale%/firefox-54.0b9.complete.mar
-                <exceptions>
-                    ja   linux-i686, linux-x86_64, win32, win64
-                    ja-JP-mac   mac
-                </exceptions>
-                extension-version   54.0
-                locales   ach af an ar as ast az bg bn-BD bn-IN br bs ca cak cs cy da de dsb el en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM id is it ja ja-JP-mac ka kab kk km kn ko lij lt lv mai mk ml mr ms my nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te th tr uk ur uz vi xh zh-CN zh-TW
-                <platforms>
-                    linux-i686   20170518175637
-                    linux-x86_64   20170518175637
-                    mac   20170518105722
-                    win32   20170518105722
-                    win64   20170518105722
-                </platforms>
-                prettyVersion   54.0 Beta 9
-                schema   2
-                version   54.0
-            </54.0b9>
         </release>
     </Firefox>
 </app>

--- a/release/updates/aurora-devedition-linux.cfg
+++ b/release/updates/aurora-devedition-linux.cfg
@@ -1,5 +1,1 @@
 release="54.0" product="Firefox" platform="Linux_x86-gcc3" build_id="20170525225011" locales="ach af an ar as ast az bg bn-BD bn-IN br bs ca cak cs cy da de dsb el en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM id is it ja ka kab kk km kn ko lij lt lv mai mk ml mr ms my nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te th tr uk ur uz vi xh zh-CN zh-TW" channel="aurora-localtest" patch_types="complete partial" from="/devedition/releases/54.0b11/linux-i686/%locale%/firefox-54.0b11.tar.bz2" aus_server="https://aus5.mozilla.org" ftp_server_from="https://archive.mozilla.org/pub" ftp_server_to="https://archive.mozilla.org/pub" to="/devedition/candidates/54.0b12-candidates/build1/linux-i686/%locale%/firefox-54.0b12.tar.bz2" to_build_id="20170529095024" to_display_version="54.0 Beta 12" to_app_version="54.0"
-release="54.0" product="Firefox" platform="Linux_x86-gcc3" build_id="20170523002428" locales="de en-US ru" channel="aurora-localtest" patch_types="complete" from="/devedition/releases/54.0b10/linux-i686/%locale%/firefox-54.0b10.tar.bz2" ftp_server_from="https://archive.mozilla.org/pub" ftp_server_to="https://archive.mozilla.org/pub"
-release="54.0" product="Firefox" platform="Linux_x86-gcc3" build_id="20170523002428" locales="ach af an ar as ast az bg bn-BD bn-IN br bs ca cak cs cy da dsb el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM id is it ja ka kab kk km kn ko lij lt lv mai mk ml mr ms my nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro si sk sl son sq sr sv-SE ta te th tr uk ur uz vi xh zh-CN zh-TW" channel="aurora-localtest" patch_types="complete"
-release="54.0" product="Firefox" platform="Linux_x86-gcc3" build_id="20170518175637" locales="de en-US ru" channel="aurora-localtest" patch_types="complete" from="/devedition/releases/54.0b9/linux-i686/%locale%/firefox-54.0b9.tar.bz2" ftp_server_from="https://archive.mozilla.org/pub" ftp_server_to="https://archive.mozilla.org/pub"
-release="54.0" product="Firefox" platform="Linux_x86-gcc3" build_id="20170518175637" locales="ach af an ar as ast az bg bn-BD bn-IN br bs ca cak cs cy da dsb el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM id is it ja ka kab kk km kn ko lij lt lv mai mk ml mr ms my nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro si sk sl son sq sr sv-SE ta te th tr uk ur uz vi xh zh-CN zh-TW" channel="aurora-localtest" patch_types="complete"

--- a/release/updates/aurora-devedition-linux64.cfg
+++ b/release/updates/aurora-devedition-linux64.cfg
@@ -1,5 +1,1 @@
 release="54.0" product="Firefox" platform="Linux_x86_64-gcc3" build_id="20170525225011" locales="ach af an ar as ast az bg bn-BD bn-IN br bs ca cak cs cy da de dsb el en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM id is it ja ka kab kk km kn ko lij lt lv mai mk ml mr ms my nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te th tr uk ur uz vi xh zh-CN zh-TW" channel="aurora-localtest" patch_types="complete partial" from="/devedition/releases/54.0b11/linux-x86_64/%locale%/firefox-54.0b11.tar.bz2" aus_server="https://aus5.mozilla.org" ftp_server_from="https://archive.mozilla.org/pub" ftp_server_to="https://archive.mozilla.org/pub" to="/devedition/candidates/54.0b12-candidates/build1/linux-x86_64/%locale%/firefox-54.0b12.tar.bz2" to_build_id="20170529095024" to_display_version="54.0 Beta 12" to_app_version="54.0"
-release="54.0" product="Firefox" platform="Linux_x86_64-gcc3" build_id="20170523002428" locales="de en-US ru" channel="aurora-localtest" patch_types="complete" from="/devedition/releases/54.0b10/linux-x86_64/%locale%/firefox-54.0b10.tar.bz2" ftp_server_from="https://archive.mozilla.org/pub" ftp_server_to="https://archive.mozilla.org/pub"
-release="54.0" product="Firefox" platform="Linux_x86_64-gcc3" build_id="20170523002428" locales="ach af an ar as ast az bg bn-BD bn-IN br bs ca cak cs cy da dsb el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM id is it ja ka kab kk km kn ko lij lt lv mai mk ml mr ms my nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro si sk sl son sq sr sv-SE ta te th tr uk ur uz vi xh zh-CN zh-TW" channel="aurora-localtest" patch_types="complete"
-release="54.0" product="Firefox" platform="Linux_x86_64-gcc3" build_id="20170518175637" locales="de en-US ru" channel="aurora-localtest" patch_types="complete" from="/devedition/releases/54.0b9/linux-x86_64/%locale%/firefox-54.0b9.tar.bz2" ftp_server_from="https://archive.mozilla.org/pub" ftp_server_to="https://archive.mozilla.org/pub"
-release="54.0" product="Firefox" platform="Linux_x86_64-gcc3" build_id="20170518175637" locales="ach af an ar as ast az bg bn-BD bn-IN br bs ca cak cs cy da dsb el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM id is it ja ka kab kk km kn ko lij lt lv mai mk ml mr ms my nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro si sk sl son sq sr sv-SE ta te th tr uk ur uz vi xh zh-CN zh-TW" channel="aurora-localtest" patch_types="complete"

--- a/release/updates/aurora-devedition-macosx64.cfg
+++ b/release/updates/aurora-devedition-macosx64.cfg
@@ -1,5 +1,1 @@
 release="54.0" product="Firefox" platform="Darwin_x86_64-gcc3-u-i386-x86_64" build_id="20170525155044" locales="ach af an ar as ast az bg bn-BD bn-IN br bs ca cak cs cy da de dsb el en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM id is it ja-JP-mac ka kab kk km kn ko lij lt lv mai mk ml mr ms my nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te th tr uk ur uz vi xh zh-CN zh-TW" channel="aurora-localtest" patch_types="complete partial" from="/devedition/releases/54.0b11/mac/%locale%/Firefox 54.0b11.dmg" aus_server="https://aus5.mozilla.org" ftp_server_from="https://archive.mozilla.org/pub" ftp_server_to="https://archive.mozilla.org/pub" to="/devedition/candidates/54.0b12-candidates/build1/mac/%locale%/Firefox 54.0b12.dmg" to_build_id="20170529025115" to_display_version="54.0 Beta 12" to_app_version="54.0"
-release="54.0" product="Firefox" platform="Darwin_x86_64-gcc3-u-i386-x86_64" build_id="20170522172523" locales="de en-US ru" channel="aurora-localtest" patch_types="complete" from="/devedition/releases/54.0b10/mac/%locale%/Firefox 54.0b10.dmg" ftp_server_from="https://archive.mozilla.org/pub" ftp_server_to="https://archive.mozilla.org/pub"
-release="54.0" product="Firefox" platform="Darwin_x86_64-gcc3-u-i386-x86_64" build_id="20170522172523" locales="ach af an ar as ast az bg bn-BD bn-IN br bs ca cak cs cy da dsb el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM id is it ja-JP-mac ka kab kk km kn ko lij lt lv mai mk ml mr ms my nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro si sk sl son sq sr sv-SE ta te th tr uk ur uz vi xh zh-CN zh-TW" channel="aurora-localtest" patch_types="complete"
-release="54.0" product="Firefox" platform="Darwin_x86_64-gcc3-u-i386-x86_64" build_id="20170518105722" locales="de en-US ru" channel="aurora-localtest" patch_types="complete" from="/devedition/releases/54.0b9/mac/%locale%/Firefox 54.0b9.dmg" ftp_server_from="https://archive.mozilla.org/pub" ftp_server_to="https://archive.mozilla.org/pub"
-release="54.0" product="Firefox" platform="Darwin_x86_64-gcc3-u-i386-x86_64" build_id="20170518105722" locales="ach af an ar as ast az bg bn-BD bn-IN br bs ca cak cs cy da dsb el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM id is it ja-JP-mac ka kab kk km kn ko lij lt lv mai mk ml mr ms my nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro si sk sl son sq sr sv-SE ta te th tr uk ur uz vi xh zh-CN zh-TW" channel="aurora-localtest" patch_types="complete"

--- a/release/updates/aurora-devedition-win32.cfg
+++ b/release/updates/aurora-devedition-win32.cfg
@@ -1,5 +1,1 @@
 release="54.0" product="Firefox" platform="WINNT_x86-msvc-x86" build_id="20170525155044" locales="ach af an ar as ast az bg bn-BD bn-IN br bs ca cak cs cy da de dsb el en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM id is it ja ka kab kk km kn ko lij lt lv mai mk ml mr ms my nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te th tr uk ur uz vi xh zh-CN zh-TW" channel="aurora-localtest" patch_types="complete partial" from="/devedition/releases/54.0b11/win32/%locale%/Firefox Setup 54.0b11.exe" aus_server="https://aus5.mozilla.org" ftp_server_from="https://archive.mozilla.org/pub" ftp_server_to="https://archive.mozilla.org/pub" to="/devedition/candidates/54.0b12-candidates/build1/win32/%locale%/Firefox Setup 54.0b12.exe" to_build_id="20170529025115" to_display_version="54.0 Beta 12" to_app_version="54.0"
-release="54.0" product="Firefox" platform="WINNT_x86-msvc-x86" build_id="20170522172523" locales="de en-US ru" channel="aurora-localtest" patch_types="complete" from="/devedition/releases/54.0b10/win32/%locale%/Firefox Setup 54.0b10.exe" ftp_server_from="https://archive.mozilla.org/pub" ftp_server_to="https://archive.mozilla.org/pub"
-release="54.0" product="Firefox" platform="WINNT_x86-msvc-x86" build_id="20170522172523" locales="ach af an ar as ast az bg bn-BD bn-IN br bs ca cak cs cy da dsb el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM id is it ja ka kab kk km kn ko lij lt lv mai mk ml mr ms my nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro si sk sl son sq sr sv-SE ta te th tr uk ur uz vi xh zh-CN zh-TW" channel="aurora-localtest" patch_types="complete"
-release="54.0" product="Firefox" platform="WINNT_x86-msvc-x86" build_id="20170518105722" locales="de en-US ru" channel="aurora-localtest" patch_types="complete" from="/devedition/releases/54.0b9/win32/%locale%/Firefox Setup 54.0b9.exe" ftp_server_from="https://archive.mozilla.org/pub" ftp_server_to="https://archive.mozilla.org/pub"
-release="54.0" product="Firefox" platform="WINNT_x86-msvc-x86" build_id="20170518105722" locales="ach af an ar as ast az bg bn-BD bn-IN br bs ca cak cs cy da dsb el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM id is it ja ka kab kk km kn ko lij lt lv mai mk ml mr ms my nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro si sk sl son sq sr sv-SE ta te th tr uk ur uz vi xh zh-CN zh-TW" channel="aurora-localtest" patch_types="complete"

--- a/release/updates/aurora-devedition-win64.cfg
+++ b/release/updates/aurora-devedition-win64.cfg
@@ -1,5 +1,1 @@
 release="54.0" product="Firefox" platform="WINNT_x86_64-msvc-x64" build_id="20170525155044" locales="ach af an ar as ast az bg bn-BD bn-IN br bs ca cak cs cy da de dsb el en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM id is it ja ka kab kk km kn ko lij lt lv mai mk ml mr ms my nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te th tr uk ur uz vi xh zh-CN zh-TW" channel="aurora-localtest" patch_types="complete partial" from="/devedition/releases/54.0b11/win64/%locale%/Firefox Setup 54.0b11.exe" aus_server="https://aus5.mozilla.org" ftp_server_from="https://archive.mozilla.org/pub" ftp_server_to="https://archive.mozilla.org/pub" to="/devedition/candidates/54.0b12-candidates/build1/win64/%locale%/Firefox Setup 54.0b12.exe" to_build_id="20170529025115" to_display_version="54.0 Beta 12" to_app_version="54.0"
-release="54.0" product="Firefox" platform="WINNT_x86_64-msvc-x64" build_id="20170522172523" locales="de en-US ru" channel="aurora-localtest" patch_types="complete" from="/devedition/releases/54.0b10/win64/%locale%/Firefox Setup 54.0b10.exe" ftp_server_from="https://archive.mozilla.org/pub" ftp_server_to="https://archive.mozilla.org/pub"
-release="54.0" product="Firefox" platform="WINNT_x86_64-msvc-x64" build_id="20170522172523" locales="ach af an ar as ast az bg bn-BD bn-IN br bs ca cak cs cy da dsb el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM id is it ja ka kab kk km kn ko lij lt lv mai mk ml mr ms my nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro si sk sl son sq sr sv-SE ta te th tr uk ur uz vi xh zh-CN zh-TW" channel="aurora-localtest" patch_types="complete"
-release="54.0" product="Firefox" platform="WINNT_x86_64-msvc-x64" build_id="20170518105722" locales="de en-US ru" channel="aurora-localtest" patch_types="complete" from="/devedition/releases/54.0b9/win64/%locale%/Firefox Setup 54.0b9.exe" ftp_server_from="https://archive.mozilla.org/pub" ftp_server_to="https://archive.mozilla.org/pub"
-release="54.0" product="Firefox" platform="WINNT_x86_64-msvc-x64" build_id="20170518105722" locales="ach af an ar as ast az bg bn-BD bn-IN br bs ca cak cs cy da dsb el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM id is it ja ka kab kk km kn ko lij lt lv mai mk ml mr ms my nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro si sk sl son sq sr sv-SE ta te th tr uk ur uz vi xh zh-CN zh-TW" channel="aurora-localtest" patch_types="complete"