--- a/release/patcher-configs/mozEsr52-thunderbird-branch-patcher2.cfg
+++ b/release/patcher-configs/mozEsr52-thunderbird-branch-patcher2.cfg
@@ -7,55 +7,30 @@
                 betatest-url   http://archive.mozilla.org/pub/thunderbird/nightly/52.0.1-candidates/build3/update/%platform%/%locale%/thunderbird-52.0.1.complete.mar
                 esrtest-url   http://archive.mozilla.org/pub/thunderbird/nightly/52.0.1-candidates/build3/update/%platform%/%locale%/thunderbird-52.0.1.complete.mar
                 path   thunderbird/nightly/52.0.1-candidates/build3/update/%platform%/%locale%/thunderbird-52.0.1.complete.mar
                 url   http://download.mozilla.org/?product=thunderbird-52.0.1-complete&os=%bouncer-platform%&lang=%locale%
             </complete>
             details   http://live.mozillamessaging.com/thunderbird/releasenotes?locale=%locale%&platform=%platform%&version=%version%
             from   52.0
             <partials>
-                <45.8.0>
-                    betatest-url   http://archive.mozilla.org/pub/thunderbird/nightly/52.0.1-candidates/build3/update/%platform%/%locale%/thunderbird-45.8.0-52.0.1.partial.mar
-                    esrtest-url   http://archive.mozilla.org/pub/thunderbird/nightly/52.0.1-candidates/build3/update/%platform%/%locale%/thunderbird-45.8.0-52.0.1.partial.mar
-                    path   thunderbird/nightly/52.0.1-candidates/build3/update/%platform%/%locale%/thunderbird-45.8.0-52.0.1.partial.mar
-                    url   http://download.mozilla.org/?product=thunderbird-52.0.1-partial-45.8.0&os=%bouncer-platform%&lang=%locale%
-                </45.8.0>
                 <52.0>
                     betatest-url   http://archive.mozilla.org/pub/thunderbird/nightly/52.0.1-candidates/build3/update/%platform%/%locale%/thunderbird-52.0-52.0.1.partial.mar
                     esrtest-url   http://archive.mozilla.org/pub/thunderbird/nightly/52.0.1-candidates/build3/update/%platform%/%locale%/thunderbird-52.0-52.0.1.partial.mar
                     path   thunderbird/nightly/52.0.1-candidates/build3/update/%platform%/%locale%/thunderbird-52.0-52.0.1.partial.mar
                     url   http://download.mozilla.org/?product=thunderbird-52.0.1-partial-52.0&os=%bouncer-platform%&lang=%locale%
                 </52.0>
             </partials>
             <rc>
             </rc>
             testchannel   betatest releasetest
             to   52.0.1
         </current-update>
-        past-update   45.8.0 52.0 betatest releasetest release
+        past-update   52.0 betatest releasetest release
         <release>
-            <45.8.0>
-                checksumsurl   http://archive.mozilla.org/pub/thunderbird/candidates/45.8.0-candidates/build1/%platform%/%locale%/thunderbird-45.8.0.checksums
-                completemarurl   http://archive.mozilla.org/pub/thunderbird/candidates/45.8.0-candidates/build1/update/%platform%/%locale%/thunderbird-45.8.0.complete.mar
-                <exceptions>
-                    ja   linux-i686, linux-x86_64, win32
-                    ja-JP-mac   mac
-                </exceptions>
-                extension-version   45.8.0
-                locales   ar ast be bg bn-BD br ca cs cy da de dsb el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it ja ja-JP-mac ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW
-                <platforms>
-                    linux-i686   20170305125302
-                    linux-x86_64   20170305125302
-                    mac   20170305125302
-                    win32   20170305125302
-                </platforms>
-                prettyVersion   45.8.0
-                schema   2
-                version   45.8.0
-            </45.8.0>
             <52.0>
                 checksumsurl   http://archive.mozilla.org/pub/thunderbird/candidates/52.0-candidates/build4/%platform%/%locale%/thunderbird-52.0.checksums
                 completemarurl   http://archive.mozilla.org/pub/thunderbird/candidates/52.0-candidates/build4/update/%platform%/%locale%/thunderbird-52.0.complete.mar
                 <exceptions>
                     ja   linux-i686, linux-x86_64, win32
                     ja-JP-mac   mac
                 </exceptions>
                 extension-version   52.0

--- a/release/updates/comm-esr52-thunderbird-linux.cfg
+++ b/release/updates/comm-esr52-thunderbird-linux.cfg
@@ -1,2 +1,1 @@
 release="52.0" product="Thunderbird" platform="Linux_x86-gcc3" build_id="20170321161200" locales="ar ast be bg bn-BD br ca cs cy da de dsb el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it ja kab ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW" channel="release-localtest" patch_types="complete partial" from="/thunderbird/releases/52.0/linux-i686/%locale%/thunderbird-52.0.tar.bz2" aus_server="https://aus4.mozilla.org" ftp_server_from="http://archive.mozilla.org/pub/mozilla.org" ftp_server_to="http://archive.mozilla.org/pub/mozilla.org" to="/thunderbird/candidates/52.0.1-candidates/build3/linux-i686/%locale%/thunderbird-52.0.1.tar.bz2" to_build_id="20170413214957" to_display_version="52.0.1" to_app_version="52.0.1"
-release="45.8.0" product="Thunderbird" platform="Linux_x86-gcc3" build_id="20170305125302" locales="ar ast be bg bn-BD br ca cs cy da de dsb el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW" channel="release-localtest" patch_types="complete partial" from="/thunderbird/releases/45.8.0/linux-i686/%locale%/thunderbird-45.8.0.tar.bz2" ftp_server_from="http://archive.mozilla.org/pub/mozilla.org" ftp_server_to="http://archive.mozilla.org/pub/mozilla.org"

--- a/release/updates/comm-esr52-thunderbird-linux64.cfg
+++ b/release/updates/comm-esr52-thunderbird-linux64.cfg
@@ -1,2 +1,1 @@
 release="52.0" product="Thunderbird" platform="Linux_x86_64-gcc3" build_id="20170321161200" locales="ar ast be bg bn-BD br ca cs cy da de dsb el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it ja kab ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW" channel="release-localtest" patch_types="complete partial" from="/thunderbird/releases/52.0/linux-x86_64/%locale%/thunderbird-52.0.tar.bz2" aus_server="https://aus4.mozilla.org" ftp_server_from="http://archive.mozilla.org/pub/mozilla.org" ftp_server_to="http://archive.mozilla.org/pub/mozilla.org" to="/thunderbird/candidates/52.0.1-candidates/build3/linux-x86_64/%locale%/thunderbird-52.0.1.tar.bz2" to_build_id="20170413214957" to_display_version="52.0.1" to_app_version="52.0.1"
-release="45.8.0" product="Thunderbird" platform="Linux_x86_64-gcc3" build_id="20170305125302" locales="ar ast be bg bn-BD br ca cs cy da de dsb el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW" channel="release-localtest" patch_types="complete partial" from="/thunderbird/releases/45.8.0/linux-x86_64/%locale%/thunderbird-45.8.0.tar.bz2" ftp_server_from="http://archive.mozilla.org/pub/mozilla.org" ftp_server_to="http://archive.mozilla.org/pub/mozilla.org"

--- a/release/updates/comm-esr52-thunderbird-mac64.cfg
+++ b/release/updates/comm-esr52-thunderbird-mac64.cfg
@@ -1,2 +1,1 @@
 release="52.0" product="Thunderbird" platform="Darwin_x86_64-gcc3-u-i386-x86_64" build_id="20170321161200" locales="ar ast be bg bn-BD br ca cs cy da de dsb el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it ja-JP-mac kab ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW" channel="release-localtest" patch_types="complete partial" from="/thunderbird/releases/52.0/mac/%locale%/Thunderbird 52.0.dmg" aus_server="https://aus4.mozilla.org" ftp_server_from="http://archive.mozilla.org/pub/mozilla.org" ftp_server_to="http://archive.mozilla.org/pub/mozilla.org" to="/thunderbird/candidates/52.0.1-candidates/build3/mac/%locale%/Thunderbird 52.0.1.dmg" to_build_id="20170413214957" to_display_version="52.0.1" to_app_version="52.0.1"
-release="45.8.0" product="Thunderbird" platform="Darwin_x86_64-gcc3-u-i386-x86_64" build_id="20170305125302" locales="ar ast be bg bn-BD br ca cs cy da de dsb el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it ja-JP-mac ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW" channel="release-localtest" patch_types="complete partial" from="/thunderbird/releases/45.8.0/mac/%locale%/Thunderbird 45.8.0.dmg" ftp_server_from="http://archive.mozilla.org/pub/mozilla.org" ftp_server_to="http://archive.mozilla.org/pub/mozilla.org"

--- a/release/updates/comm-esr52-thunderbird-win32.cfg
+++ b/release/updates/comm-esr52-thunderbird-win32.cfg
@@ -1,2 +1,1 @@
 release="52.0" product="Thunderbird" platform="WINNT_x86-msvc-x86" build_id="20170321161200" locales="ar ast be bg bn-BD br ca cs cy da de dsb el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it ja kab ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW" channel="release-localtest" patch_types="complete partial" from="/thunderbird/releases/52.0/win32/%locale%/Thunderbird Setup 52.0.exe" aus_server="https://aus4.mozilla.org" ftp_server_from="http://archive.mozilla.org/pub/mozilla.org" ftp_server_to="http://archive.mozilla.org/pub/mozilla.org" to="/thunderbird/candidates/52.0.1-candidates/build3/win32/%locale%/Thunderbird Setup 52.0.1.exe" to_build_id="20170413214957" to_display_version="52.0.1" to_app_version="52.0.1"
-release="45.8.0" product="Thunderbird" platform="WINNT_x86-msvc-x86" build_id="20170305125302" locales="ar ast be bg bn-BD br ca cs cy da de dsb el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW" channel="release-localtest" patch_types="complete partial" from="/thunderbird/releases/45.8.0/win32/%locale%/Thunderbird Setup 45.8.0.exe" ftp_server_from="http://archive.mozilla.org/pub/mozilla.org" ftp_server_to="http://archive.mozilla.org/pub/mozilla.org"