diff --git a/tools_webrtc/mb/mb_config.pyl b/tools_webrtc/mb/mb_config.pyl
index 5e9463d..ddfa666 100644
--- a/tools_webrtc/mb/mb_config.pyl
+++ b/tools_webrtc/mb/mb_config.pyl
@@ -11,9 +11,6 @@
 # configurations source-side instead of in the buildbot scripts. That makes it
 # easy to try different configurations of GN args in tryjob patches.
 
-# TODO(b/245249582): clean up after completing reclient migration.
-# - replace use_goma=true with use_remoteexec=true.
-# - remove '*_reclient' configs.
 {
   # This is a map of buildbot builder group names -> buildbot builder names ->
   # config names (where each config name is a key in the 'configs' dict,
@@ -34,7 +31,7 @@
     },
     'client.webrtc': {
       # Android
-      'Android32': 'android_release_bot_arm_reclient',
+      'Android32': 'android_release_bot_arm',
       'Android32 (dbg)': 'android_debug_static_bot_arm',
       'Android32 (more configs)': {
         'bwe_test_logging': 'bwe_test_logging_android_arm',
@@ -75,9 +72,9 @@
       'Linux64 Builder': 'pure_release_bot_x64',
       'Linux64 Debug': 'debug_bot_x64',
       'Linux64 Debug (ARM)': 'debug_bot_arm64',
-      'Linux64 Release': 'release_bot_x64_reclient',
+      'Linux64 Release': 'release_bot_x64',
       'Linux64 Release (ARM)': 'release_bot_arm64',
-      'Linux64 Release (Libfuzzer)': 'libfuzzer_asan_release_bot_x64_reclient',
+      'Linux64 Release (Libfuzzer)': 'libfuzzer_asan_release_bot_x64',
 
       # Mac
       'Mac Asan': 'mac_asan_clang_release_bot_x64',
@@ -182,7 +179,7 @@
       'linux_compile_x86_rel': 'pure_release_bot_x86',
       'linux_coverage': 'code_coverage_bot_x64',
       'linux_dbg': 'debug_bot_x64',
-      'linux_libfuzzer_rel': 'libfuzzer_asan_release_bot_x64_reclient',
+      'linux_libfuzzer_rel': 'libfuzzer_asan_release_bot_x64',
       'linux_more_configs': {
         'bwe_test_logging': 'bwe_test_logging_x64',
         'dummy_audio_file_devices_no_protobuf':
@@ -240,8 +237,6 @@
     'android_pure_release_bot_arm64': ['android', 'pure_release_bot', 'arm64'],
     'android_release_bot_arm': ['android', 'release_bot', 'arm'],
     'android_release_bot_arm64': ['android', 'release_bot', 'arm64'],
-    'android_release_bot_arm_reclient':
-    ['android', 'release_bot_reclient', 'arm'],
     'android_release_bot_x64': ['android', 'release_bot', 'x64'],
     'android_release_bot_x86': ['android', 'release_bot', 'x86'],
     'asan_lsan_clang_release_bot_x64':
@@ -285,9 +280,9 @@
     'ios_release_bot_arm64': [
       'ios', 'release_bot', 'arm64', 'no_ios_code_signing', 'xctest',
     ],
-    'libfuzzer_asan_release_bot_x64_reclient': [
+    'libfuzzer_asan_release_bot_x64': [
       'libfuzzer', 'asan', 'optimize_for_fuzzing', 'openh264',
-      'pure_release_bot_reclient', 'x64'
+      'pure_release_bot', 'x64'
     ],
     'mac_asan_clang_release_bot_x64': [
       'asan',
@@ -305,7 +300,6 @@
     'release_bot_arm64': ['openh264', 'release_bot', 'arm64'],
     'release_bot_x64': ['openh264', 'release_bot', 'x64'],
     'release_bot_x64_fuchsia': ['openh264', 'release_bot', 'x64', 'fuchsia'],
-    'release_bot_x64_reclient': ['openh264', 'release_bot_reclient', 'x64'],
     'release_bot_x86': ['openh264', 'release_bot', 'x86'],
     'rtti_no_sctp_android_arm':
     ['android', 'debug_static_bot', 'arm', 'rtti', 'no_sctp'],
@@ -396,10 +390,10 @@
       'gn_args': 'is_debug=true',
     },
     'debug_bot': {
-      'mixins': ['debug', 'goma'],
+      'mixins': ['debug', 'reclient'],
     },
     'debug_static_bot': {
-      'mixins': ['debug', 'minimal_symbols', 'goma'],
+      'mixins': ['debug', 'minimal_symbols', 'reclient'],
     },
     'dummy_audio_file_devices': {
       'gn_args': 'rtc_use_dummy_audio_file_devices=true',
@@ -410,9 +404,6 @@
     'full_symbols': {
       'gn_args': 'symbol_level=2',
     },
-    'goma': {
-      'gn_args': 'use_goma=true',
-    },
     'ios': {
       'gn_args': 'target_os="ios"',
     },
@@ -455,9 +446,6 @@
     # 100% release build without DCHECKs while 'release_bot' is a partial
     # release configs since `dcheck_always_on` is set to true.
     'pure_release_bot': {
-      'mixins': ['release', 'goma', 'dcheck_off'],
-    },
-    'pure_release_bot_reclient': {
       'mixins': ['release', 'reclient', 'dcheck_off'],
     },
     'reclient': {
@@ -469,9 +457,6 @@
     'release_bot': {
       'mixins': ['pure_release_bot', 'dcheck_always_on'],
     },
-    'release_bot_reclient': {
-      'mixins': ['pure_release_bot_reclient', 'dcheck_always_on'],
-    },
     'rtti': {
       'gn_args': 'use_rtti=true',
     },
