--- a/testing/mozharness/configs/b2g/releng-emulator.py
+++ b/testing/mozharness/configs/b2g/releng-emulator.py
@@ -45,17 +45,16 @@ config = {
     },
     "manifest": {
         "upload_remote_host": "stage.mozilla.org",
         "upload_remote_basepath": "/pub/mozilla.org/b2g/manifests/nightly/%(version)s",
         "depend_upload_remote_basepath": "/pub/mozilla.org/b2g/manifests/depend/%(branch)s/%(platform)s/%(buildid)s",
         "ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
         "ssh_user": "b2gbld",
         "branches": {
-            'mozilla-b2g34_v2_1': '2.1.0',
             'mozilla-b2g37_v2_2': '2.2.0',
             'mozilla-central': '2.5.0',
         },
         "translate_hg_to_git": True,
         "translate_base_url": "http://cruncher.build.mozilla.org/mapper/{project}/{vcs}/{rev}",
     },
     "env": {
         "CCACHE_DIR": "/builds/ccache",

--- a/testing/mozharness/configs/b2g/releng-fota-eng.py
+++ b/testing/mozharness/configs/b2g/releng-fota-eng.py
@@ -44,17 +44,16 @@ config = {
     },
     "manifest": {
         "upload_remote_host": "stage.mozilla.org",
         "upload_remote_basepath": "/pub/mozilla.org/b2g/manifests/nightly/%(version)s",
         "depend_upload_remote_basepath": "/pub/mozilla.org/b2g/manifests/depend/%(branch)s/%(platform)s/%(buildid)s",
         "ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
         "ssh_user": "b2gbld",
         "branches": {
-            'mozilla-b2g34_v2_1': '2.1.0',
             'mozilla-b2g37_v2_2': '2.2.0',
             'mozilla-central': '2.5.0',
         },
         "translate_hg_to_git": True,
         "translate_base_url": "http://cruncher.build.mozilla.org/mapper/{project}/{vcs}/{rev}",
         "target_suffix": "-eng",
     },
     "env": {

--- a/testing/mozharness/configs/b2g/releng-fota-updates.py
+++ b/testing/mozharness/configs/b2g/releng-fota-updates.py
@@ -44,17 +44,16 @@ config = {
     },
     "manifest": {
         "upload_remote_host": "stage.mozilla.org",
         "upload_remote_basepath": "/pub/mozilla.org/b2g/manifests/nightly/%(version)s",
         "depend_upload_remote_basepath": "/pub/mozilla.org/b2g/manifests/depend/%(branch)s/%(platform)s/%(buildid)s",
         "ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
         "ssh_user": "b2gbld",
         "branches": {
-            'mozilla-b2g34_v2_1': '2.1.0',
             'mozilla-b2g37_v2_2': '2.2.0',
             'mozilla-central': '2.5.0',
         },
         "translate_hg_to_git": True,
         "translate_base_url": "http://cruncher.build.mozilla.org/mapper/{project}/{vcs}/{rev}",
     },
     "env": {
         "CCACHE_DIR": "/builds/ccache",

--- a/testing/mozharness/configs/b2g/releng-otoro-eng.py
+++ b/testing/mozharness/configs/b2g/releng-otoro-eng.py
@@ -44,17 +44,16 @@ config = {
     },
     "manifest": {
         "upload_remote_host": "stage.mozilla.org",
         "upload_remote_basepath": "/pub/mozilla.org/b2g/manifests/nightly/%(version)s",
         "depend_upload_remote_basepath": "/pub/mozilla.org/b2g/manifests/depend/%(branch)s/%(platform)s/%(buildid)s",
         "ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
         "ssh_user": "b2gbld",
         "branches": {
-            'mozilla-b2g34_v2_1': '2.1.0',
             'mozilla-b2g37_v2_2': '2.2.0',
             'mozilla-central': '2.5.0',
         },
         "translate_hg_to_git": True,
         "translate_base_url": "http://cruncher.build.mozilla.org/mapper/{project}/{vcs}/{rev}",
         "target_suffix": "-eng",
     },
     "env": {

--- a/testing/mozharness/configs/b2g/releng-otoro.py
+++ b/testing/mozharness/configs/b2g/releng-otoro.py
@@ -43,17 +43,16 @@ config = {
     },
     "manifest": {
         "upload_remote_host": "stage.mozilla.org",
         "upload_remote_basepath": "/pub/mozilla.org/b2g/manifests/nightly/%(version)s",
         "depend_upload_remote_basepath": "/pub/mozilla.org/b2g/manifests/depend/%(branch)s/%(platform)s/%(buildid)s",
         "ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
         "ssh_user": "b2gbld",
         "branches": {
-            'mozilla-b2g34_v2_1': '2.1.0',
             'mozilla-b2g37_v2_2': '2.2.0',
             'mozilla-central': '2.5.0',
         },
         "translate_hg_to_git": True,
         "translate_base_url": "http://cruncher.build.mozilla.org/mapper/{project}/{vcs}/{rev}",
     },
     "env": {
         "CCACHE_DIR": "/builds/ccache",

--- a/testing/mozharness/configs/b2g/releng-private-updates.py
+++ b/testing/mozharness/configs/b2g/releng-private-updates.py
@@ -44,17 +44,16 @@ config = {
     },
     "manifest": {
         "upload_remote_host": "stage.mozilla.org",
         "upload_remote_basepath": "/pub/mozilla.org/b2g/manifests/nightly/%(version)s",
         "depend_upload_remote_basepath": "/pub/mozilla.org/b2g/manifests/depend/%(branch)s/%(platform)s/%(buildid)s",
         "ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
         "ssh_user": "b2gbld",
         "branches": {
-            'mozilla-b2g34_v2_1': '2.1.0',
             'mozilla-b2g37_v2_2': '2.2.0',
             'mozilla-central': '2.5.0',
         },
         "translate_hg_to_git": True,
         "translate_base_url": "http://cruncher.build.mozilla.org/mapper/{project}/{vcs}/{rev}",
     },
     "env": {
         "CCACHE_DIR": "/builds/ccache",

deleted file mode 100644
--- a/testing/mozharness/configs/b2g_bumper/v2.1.py
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/usr/bin/env python
-config = {
-    "exes": {
-        # Get around the https warnings
-        "hg": ['/usr/local/bin/hg', "--config", "web.cacerts=/etc/pki/tls/certs/ca-bundle.crt"],
-        "hgtool.py": ["/usr/local/bin/hgtool.py"],
-        "gittool.py": ["/usr/local/bin/gittool.py"],
-    },
-    'gecko_pull_url': 'https://hg.mozilla.org/releases/mozilla-b2g34_v2_1/',
-    'gecko_push_url': 'ssh://hg.mozilla.org/releases/mozilla-b2g34_v2_1/',
-    'gecko_local_dir': 'mozilla-b2g34_v2_1',
-    'git_ref_cache': '/builds/b2g_bumper/git_ref_cache.json',
-
-    'manifests_repo': 'https://git.mozilla.org/b2g/b2g-manifest.git',
-    'manifests_revision': 'origin/v2.1',
-
-    'hg_user': 'B2G Bumper Bot <release+b2gbumper@mozilla.com>',
-    "ssh_key": "~/.ssh/ffxbld_rsa",
-    "ssh_user": "ffxbld",
-
-    'hgtool_base_bundle_urls': ['https://ftp-ssl.mozilla.org/pub/mozilla.org/firefox/bundles'],
-
-    'gaia_repo_url': 'https://hg.mozilla.org/integration/gaia-2_1',
-    'gaia_revision_file': 'b2g/config/gaia.json',
-    'gaia_max_revisions': 5,
-    # Which git branch this hg repo corresponds to
-    'gaia_git_branch': 'v2.1',
-    'gaia_git_repo': 'https://git.mozilla.org/releases/gaia.git',
-    'gaia_mapper_project': 'gaia',
-    'mapper_url': 'http://cruncher.build.mozilla.org/mapper/{project}/{vcs}/{rev}',
-
-    'devices': {
-        'dolphin': {
-            'ignore_projects': ['gecko'],
-            'ignore_groups': ['darwin'],
-        },
-        'emulator-kk': {
-            'ignore_projects': ['gecko'],
-            'ignore_groups': ['darwin'],
-        },
-        'emulator-jb': {
-            'ignore_projects': ['gecko'],
-            'ignore_groups': ['darwin'],
-        },
-        'emulator-ics': {
-            'ignore_projects': ['gecko'],
-            'ignore_groups': ['darwin'],
-            'manifest_file': 'emulator.xml',
-        },
-        # Equivalent to emulator-ics - see bug 916134
-        # Remove once the above bug resolved
-        'emulator': {
-            'ignore_projects': ['gecko'],
-            'ignore_groups': ['darwin'],
-            'manifest_file': 'emulator.xml',
-        },
-        'flame': {
-            'ignore_projects': ['gecko'],
-            'ignore_groups': ['darwin'],
-        },
-        'flame-kk': {
-            'ignore_projects': ['gecko'],
-            'ignore_groups': ['darwin'],
-        },
-        'nexus-4': {
-            'ignore_projects': ['gecko'],
-            'ignore_groups': ['darwin'],
-        },
-    },
-    'repo_remote_mappings': {
-        'https://android.googlesource.com/': 'https://git.mozilla.org/external/aosp',
-        'git://codeaurora.org/': 'https://git.mozilla.org/external/caf',
-        'git://github.com/mozilla-b2g/': 'https://git.mozilla.org/b2g',
-        'git://github.com/mozilla/': 'https://git.mozilla.org/b2g',
-        'https://git.mozilla.org/releases': 'https://git.mozilla.org/releases',
-        'http://android.git.linaro.org/git-ro/': 'https://git.mozilla.org/external/linaro',
-        'http://sprdsource.spreadtrum.com:8085/b2g/android': 'https://git.mozilla.org/external/sprd-aosp',
-        'git://github.com/apitrace/': 'https://git.mozilla.org/external/apitrace',
-        'git://github.com/t2m-foxfone/': 'https://git.mozilla.org/external/t2m-foxfone',
-        # Some mappings to ourself, we want to leave these as-is!
-        'https://git.mozilla.org/external/aosp': 'https://git.mozilla.org/external/aosp',
-        'https://git.mozilla.org/external/caf': 'https://git.mozilla.org/external/caf',
-        'https://git.mozilla.org/b2g': 'https://git.mozilla.org/b2g',
-        'https://git.mozilla.org/external/apitrace': 'https://git.mozilla.org/external/apitrace',
-        'https://git.mozilla.org/external/t2m-foxfone': 'https://git.mozilla.org/external/t2m-foxfone',
-    },
-}

--- a/testing/mozharness/configs/merge_day/b2g_tag.py
+++ b/testing/mozharness/configs/merge_day/b2g_tag.py
@@ -1,13 +1,9 @@
 LIVE_B2G_BRANCHES = {
-    "mozilla-b2g34_v2_1": {
-        "gaia_branch": "v2.1",
-        "tag_name": "B2G_2_1_%(DATE)s_MERGEDAY",
-    },
     "mozilla-b2g34_v2_1s": {
         "gaia_branch": "v2.1s",
         "tag_name": "B2G_2_1s_%(DATE)s_MERGEDAY",
     },
     "mozilla-b2g37_v2_2": {
         "gaia_branch": "v2.2",
         "tag_name": "B2G_2_2_%(DATE)s_MERGEDAY",
     },