--- a/process/release.py
+++ b/process/release.py
@@ -1,17 +1,16 @@
 # The absolute_import directive looks firstly at what packages are available
 # on sys.path to avoid name collisions when we import release.* from elsewhere
 from __future__ import absolute_import
 
 from collections import defaultdict
 import os
 import re
 import hashlib
-from distutils.version import LooseVersion
 
 from buildbot.process.buildstep import regex_log_evaluator
 from buildbot.scheduler import Scheduler, Dependent
 from buildbot.status.mail import MailNotifier
 from buildbot.steps.trigger import Trigger
 from buildbot.status.builder import Results
 from buildbot.process.factory import BuildFactory
 
@@ -532,26 +531,16 @@ def generateReleaseBranchObjects(release
     if 'mozilla_dir' in releaseConfig:
         mozillaDir = releaseConfig['mozilla_dir']
     if 'mozilla_srcdir' in releaseConfig:
         mozillaSrcDir = releaseConfig['mozilla_srcdir']
 
     partialUpdates = releaseConfig.get('partialUpdates', {}).copy()
 
     for platform in releaseConfig['enUSPlatforms']:
-        # FIXME: the follwong hack can be removed when win64 has the same list
-        # of partial update as other platforms. Check mozilla-esr38 to be sure.
-        if platform in releaseConfig.get('HACK_first_released_version', {}):
-            partialUpdates_hacked = {
-                k: v for k, v in partialUpdates.iteritems() if
-                LooseVersion(k) >= LooseVersion(releaseConfig['HACK_first_released_version'][platform])
-            }
-        else:
-            partialUpdates_hacked = partialUpdates
-        # FIXME: end of hack
         # shorthand
         pf = branchConfig['platforms'][platform]
         mozconfig = '%s/%s/release' % (platform, sourceRepoInfo['name'])
         if platform in releaseConfig['talosTestPlatforms']:
             talosMasters = pf['talos_masters']
         else:
             talosMasters = None
 
@@ -604,17 +593,17 @@ def generateReleaseBranchObjects(release
                 # this will clean-up the mac build dirs, but not delete
                 # the entire thing
                 buildSpace=pf.get(
                     'build_space', branchConfig['default_build_space']),
                 productName=releaseConfig['productName'],
                 version=releaseConfig['version'],
                 appVersion=releaseConfig['appVersion'],
                 buildNumber=releaseConfig['buildNumber'],
-                partialUpdates=partialUpdates_hacked,  # FIXME: hack
+                partialUpdates=partialUpdates,
                 talosMasters=talosMasters,
                 packageTests=packageTests,
                 packageSDK=releaseConfig.get('packageSDK', False),
                 unittestMasters=unittestMasters,
                 unittestBranch=unittestBranch,
                 clobberURL=clobberer_url,
                 clobberBranch='release-%s' % sourceRepoInfo['name'],
                 triggerBuilds=True,
@@ -1032,21 +1021,16 @@ def generateReleaseBranchObjects(release
     for channel, updateConfig in updateChannels.iteritems():
         # If updates are fully disabled we should bail completely
         if releaseConfig.get("skip_updates"):
             break
         # If the current channel is disabled, we should only bail on it
         if not updateConfig.get("enabled", True):
             continue
         pf = branchConfig['platforms']['linux']
-        try:
-            moz_repo_path = releaseConfig[
-                'sourceRepositories']['mozilla']['path']
-        except KeyError:
-            moz_repo_path = sourceRepoInfo['path']
         balrog_credentials_file = releaseConfig.get('balrog_credentials_file',
                                                     branchConfig.get('balrog_credentials_file', None))
 
         updates_factory = ReleaseUpdatesFactory(
             hgHost=branchConfig['hghost'],
             repoPath=sourceRepoInfo['path'],
             buildToolsRepoPath=tools_repo_path,
             configRepoPath=branchConfig['config_repo_path'],
@@ -1727,30 +1711,16 @@ def generateReleaseBranchObjects(release
             extraRecipients=[recipient],
             extraHeaders={'Message-Id': email_message_id},
             branches=[sourceRepoInfo['path']],
             messageFormatter=createReleaseChangeMessage,
             changeIsImportant=lambda c:
             changeContainsProduct(c, releaseConfig['productName']) and
             changeContainsScriptRepoRevision(c, releaseTag)
         ))
-    for recipient in releaseConfig['ImportantRecipients']:
-        if hasPlatformSubstring(releaseConfig['enUSPlatforms'], 'android'):
-            # send a message when android signing is complete
-            status.append(ChangeNotifier(
-                fromaddr="release@mozilla.com",
-                sendToInterestedUsers=False,
-                extraRecipients=[recipient],
-                extraHeaders={'In-Reply-To': email_message_id,
-                              'References': email_message_id},
-                branches=[builderPrefix('android_post_signing')],
-                messageFormatter=createReleaseChangeMessage,
-                changeIsImportant=lambda c:
-                changeContainsProperties(c, dict(who=enUS_signed_apk_url))
-            ))
 
     non_ui_update_verify_builders = [b["name"] for b in builders[:] if "ui_update_verify" not in b["name"]]
     non_ui_update_verify_builders.extend([b["name"] for b in test_builders])
     for b in ui_update_tests_builders.values():
         if b in non_ui_update_verify_builders:
             non_ui_update_verify_builders.remove(b)
 
     # send all release messages