diff --git a/config/devicelab_staging_config.star b/config/devicelab_staging_config.star
index 863813e..3b24003 100644
--- a/config/devicelab_staging_config.star
+++ b/config/devicelab_staging_config.star
@@ -346,22 +346,12 @@
     )
 
     mac_arm64_tasks = [
-        "hot_mode_dev_cycle_macos_target__benchmark",
-        "flutter_gallery_ios__compile",
-        "hello_world_ios__compile",
         "native_ui_tests_macos",
-        "module_test_ios",
-        "build_ios_framework_module_test",
-        "plugin_lint_mac",
-        "run_release_test_macos",
         "ios_app_with_extensions_test",
-        "ios_content_validation_test",
-        "macos_chrome_dev_mode",
     ]
 
     arm64_ruby_list = [
         "ios_app_with_extensions_test",
-        "plugin_lint_mac",
     ]
 
     for task in mac_arm64_tasks:
@@ -406,7 +396,6 @@
         )
 
     mac_arm64_android_tasks = [
-        "build_aar_module_test",
         "integration_test_test",
         "hello_world_android__compile",
         "run_release_test",
diff --git a/config/generated/flutter/luci/cr-buildbucket.cfg b/config/generated/flutter/luci/cr-buildbucket.cfg
index cb66f33..81eda54 100644
--- a/config/generated/flutter/luci/cr-buildbucket.cfg
+++ b/config/generated/flutter/luci/cr-buildbucket.cfg
@@ -163907,91 +163907,6 @@
       }
     }
     builders {
-      name: "Mac_arm64_android_staging build_aar_module_test"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
-      dimensions: "device_os:N"
-      dimensions: "os:Mac-12"
-      dimensions: "pool:luci.flutter.staging"
-      exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$fuchsia/goma": {'
-        '    "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
-        '  },'
-        '  "$kitchen": {'
-        '    "emulate_gce": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": false,'
-        '  "dependencies": ['
-        '    {'
-        '      "dependency": "android_sdk",'
-        '      "version": "version:31v1"'
-        '    },'
-        '    {'
-        '      "dependency": "open_jdk",'
-        '      "version": "version:11"'
-        '    }'
-        '  ],'
-        '  "git_branch": "master",'
-        '  "gold_tryjob": false,'
-        '  "goma_jobs": "200",'
-        '  "mastername": "client.flutter",'
-        '  "recipe": "devicelab/devicelab_drone",'
-        '  "tags": ['
-        '    "android",'
-        '    "mac",'
-        '    "arm64"'
-        '  ],'
-        '  "task_name": "build_aar_module_test",'
-        '  "upload_metrics": true,'
-        '  "upload_packages": true,'
-        '  "use_cas": true'
-        '}'
-      execution_timeout_secs: 3600
-      caches {
-        name: "builder_mac_devicelab_staging"
-        path: "builder"
-      }
-      caches {
-        name: "flutter_sdk"
-        path: "flutter sdk"
-      }
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      caches {
-        name: "pub_cache"
-        path: ".pub-cache"
-      }
-      caches {
-        name: "xcode_binary"
-        path: "xcode_binary"
-      }
-      build_numbers: YES
-      service_account: "flutter-staging-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {}
-      experiments {
-        key: "luci.buildbucket.agent.cipd_installation"
-        value: 0
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
       name: "Mac_arm64_android_staging hello_world_android__compile"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
@@ -165087,362 +165002,6 @@
       }
     }
     builders {
-      name: "Mac_arm64_staging build_ios_framework_module_test"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
-      dimensions: "device_os:iOS-15"
-      dimensions: "os:Mac-12"
-      dimensions: "pool:luci.flutter.staging"
-      exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$flutter/devicelab_osx_sdk": {'
-        '    "sdk_version": "13f17a"'
-        '  },'
-        '  "$fuchsia/goma": {'
-        '    "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
-        '  },'
-        '  "$kitchen": {'
-        '    "emulate_gce": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": false,'
-        '  "dependencies": ['
-        '    {'
-        '      "dependency": "xcode"'
-        '    },'
-        '    {'
-        '      "dependency": "gems"'
-        '    },'
-        '    {'
-        '      "dependency": "apple_signing"'
-        '    }'
-        '  ],'
-        '  "git_branch": "master",'
-        '  "gold_tryjob": false,'
-        '  "goma_jobs": "200",'
-        '  "mastername": "client.flutter",'
-        '  "recipe": "devicelab/devicelab_drone",'
-        '  "tags": ['
-        '    "ios",'
-        '    "mac",'
-        '    "arm64"'
-        '  ],'
-        '  "task_name": "build_ios_framework_module_test",'
-        '  "upload_metrics": true,'
-        '  "upload_packages": true,'
-        '  "use_cas": true'
-        '}'
-      execution_timeout_secs: 3600
-      caches {
-        name: "builder_mac_devicelab_staging"
-        path: "builder"
-      }
-      caches {
-        name: "flutter_sdk"
-        path: "flutter sdk"
-      }
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      caches {
-        name: "pub_cache"
-        path: ".pub-cache"
-      }
-      caches {
-        name: "xcode_binary"
-        path: "xcode_binary"
-      }
-      build_numbers: YES
-      service_account: "flutter-staging-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {}
-      experiments {
-        key: "luci.buildbucket.agent.cipd_installation"
-        value: 0
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "Mac_arm64_staging flutter_gallery_ios__compile"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
-      dimensions: "device_os:iOS-15"
-      dimensions: "os:Mac-12"
-      dimensions: "pool:luci.flutter.staging"
-      exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$flutter/devicelab_osx_sdk": {'
-        '    "sdk_version": "13f17a"'
-        '  },'
-        '  "$fuchsia/goma": {'
-        '    "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
-        '  },'
-        '  "$kitchen": {'
-        '    "emulate_gce": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": false,'
-        '  "dependencies": ['
-        '    {'
-        '      "dependency": "xcode"'
-        '    },'
-        '    {'
-        '      "dependency": "gems"'
-        '    },'
-        '    {'
-        '      "dependency": "apple_signing"'
-        '    }'
-        '  ],'
-        '  "git_branch": "master",'
-        '  "gold_tryjob": false,'
-        '  "goma_jobs": "200",'
-        '  "mastername": "client.flutter",'
-        '  "recipe": "devicelab/devicelab_drone",'
-        '  "tags": ['
-        '    "ios",'
-        '    "mac",'
-        '    "arm64"'
-        '  ],'
-        '  "task_name": "flutter_gallery_ios__compile",'
-        '  "upload_metrics": true,'
-        '  "upload_packages": true,'
-        '  "use_cas": true'
-        '}'
-      execution_timeout_secs: 3600
-      caches {
-        name: "builder_mac_devicelab_staging"
-        path: "builder"
-      }
-      caches {
-        name: "flutter_sdk"
-        path: "flutter sdk"
-      }
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      caches {
-        name: "pub_cache"
-        path: ".pub-cache"
-      }
-      caches {
-        name: "xcode_binary"
-        path: "xcode_binary"
-      }
-      build_numbers: YES
-      service_account: "flutter-staging-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {}
-      experiments {
-        key: "luci.buildbucket.agent.cipd_installation"
-        value: 0
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "Mac_arm64_staging hello_world_ios__compile"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
-      dimensions: "device_os:iOS-15"
-      dimensions: "os:Mac-12"
-      dimensions: "pool:luci.flutter.staging"
-      exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$flutter/devicelab_osx_sdk": {'
-        '    "sdk_version": "13f17a"'
-        '  },'
-        '  "$fuchsia/goma": {'
-        '    "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
-        '  },'
-        '  "$kitchen": {'
-        '    "emulate_gce": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": false,'
-        '  "dependencies": ['
-        '    {'
-        '      "dependency": "xcode"'
-        '    },'
-        '    {'
-        '      "dependency": "gems"'
-        '    },'
-        '    {'
-        '      "dependency": "apple_signing"'
-        '    }'
-        '  ],'
-        '  "git_branch": "master",'
-        '  "gold_tryjob": false,'
-        '  "goma_jobs": "200",'
-        '  "mastername": "client.flutter",'
-        '  "recipe": "devicelab/devicelab_drone",'
-        '  "tags": ['
-        '    "ios",'
-        '    "mac",'
-        '    "arm64"'
-        '  ],'
-        '  "task_name": "hello_world_ios__compile",'
-        '  "upload_metrics": true,'
-        '  "upload_packages": true,'
-        '  "use_cas": true'
-        '}'
-      execution_timeout_secs: 3600
-      caches {
-        name: "builder_mac_devicelab_staging"
-        path: "builder"
-      }
-      caches {
-        name: "flutter_sdk"
-        path: "flutter sdk"
-      }
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      caches {
-        name: "pub_cache"
-        path: ".pub-cache"
-      }
-      caches {
-        name: "xcode_binary"
-        path: "xcode_binary"
-      }
-      build_numbers: YES
-      service_account: "flutter-staging-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {}
-      experiments {
-        key: "luci.buildbucket.agent.cipd_installation"
-        value: 0
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "Mac_arm64_staging hot_mode_dev_cycle_macos_target__benchmark"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
-      dimensions: "device_os:iOS-15"
-      dimensions: "os:Mac-12"
-      dimensions: "pool:luci.flutter.staging"
-      exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$flutter/devicelab_osx_sdk": {'
-        '    "sdk_version": "13f17a"'
-        '  },'
-        '  "$fuchsia/goma": {'
-        '    "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
-        '  },'
-        '  "$kitchen": {'
-        '    "emulate_gce": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": false,'
-        '  "dependencies": ['
-        '    {'
-        '      "dependency": "xcode"'
-        '    },'
-        '    {'
-        '      "dependency": "gems"'
-        '    },'
-        '    {'
-        '      "dependency": "apple_signing"'
-        '    }'
-        '  ],'
-        '  "git_branch": "master",'
-        '  "gold_tryjob": false,'
-        '  "goma_jobs": "200",'
-        '  "mastername": "client.flutter",'
-        '  "recipe": "devicelab/devicelab_drone",'
-        '  "tags": ['
-        '    "ios",'
-        '    "mac",'
-        '    "arm64"'
-        '  ],'
-        '  "task_name": "hot_mode_dev_cycle_macos_target__benchmark",'
-        '  "upload_metrics": true,'
-        '  "upload_packages": true,'
-        '  "use_cas": true'
-        '}'
-      execution_timeout_secs: 3600
-      caches {
-        name: "builder_mac_devicelab_staging"
-        path: "builder"
-      }
-      caches {
-        name: "flutter_sdk"
-        path: "flutter sdk"
-      }
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      caches {
-        name: "pub_cache"
-        path: ".pub-cache"
-      }
-      caches {
-        name: "xcode_binary"
-        path: "xcode_binary"
-      }
-      build_numbers: YES
-      service_account: "flutter-staging-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {}
-      experiments {
-        key: "luci.buildbucket.agent.cipd_installation"
-        value: 0
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
       name: "Mac_arm64_staging ios_app_with_extensions_test"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
@@ -165535,273 +165094,6 @@
       }
     }
     builders {
-      name: "Mac_arm64_staging ios_content_validation_test"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
-      dimensions: "device_os:iOS-15"
-      dimensions: "os:Mac-12"
-      dimensions: "pool:luci.flutter.staging"
-      exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$flutter/devicelab_osx_sdk": {'
-        '    "sdk_version": "13f17a"'
-        '  },'
-        '  "$fuchsia/goma": {'
-        '    "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
-        '  },'
-        '  "$kitchen": {'
-        '    "emulate_gce": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": false,'
-        '  "dependencies": ['
-        '    {'
-        '      "dependency": "xcode"'
-        '    },'
-        '    {'
-        '      "dependency": "gems"'
-        '    },'
-        '    {'
-        '      "dependency": "apple_signing"'
-        '    }'
-        '  ],'
-        '  "git_branch": "master",'
-        '  "gold_tryjob": false,'
-        '  "goma_jobs": "200",'
-        '  "mastername": "client.flutter",'
-        '  "recipe": "devicelab/devicelab_drone",'
-        '  "tags": ['
-        '    "ios",'
-        '    "mac",'
-        '    "arm64"'
-        '  ],'
-        '  "task_name": "ios_content_validation_test",'
-        '  "upload_metrics": true,'
-        '  "upload_packages": true,'
-        '  "use_cas": true'
-        '}'
-      execution_timeout_secs: 3600
-      caches {
-        name: "builder_mac_devicelab_staging"
-        path: "builder"
-      }
-      caches {
-        name: "flutter_sdk"
-        path: "flutter sdk"
-      }
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      caches {
-        name: "pub_cache"
-        path: ".pub-cache"
-      }
-      caches {
-        name: "xcode_binary"
-        path: "xcode_binary"
-      }
-      build_numbers: YES
-      service_account: "flutter-staging-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {}
-      experiments {
-        key: "luci.buildbucket.agent.cipd_installation"
-        value: 0
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "Mac_arm64_staging macos_chrome_dev_mode"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
-      dimensions: "device_os:iOS-15"
-      dimensions: "os:Mac-12"
-      dimensions: "pool:luci.flutter.staging"
-      exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$flutter/devicelab_osx_sdk": {'
-        '    "sdk_version": "13f17a"'
-        '  },'
-        '  "$fuchsia/goma": {'
-        '    "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
-        '  },'
-        '  "$kitchen": {'
-        '    "emulate_gce": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": false,'
-        '  "dependencies": ['
-        '    {'
-        '      "dependency": "xcode"'
-        '    },'
-        '    {'
-        '      "dependency": "gems"'
-        '    },'
-        '    {'
-        '      "dependency": "apple_signing"'
-        '    }'
-        '  ],'
-        '  "git_branch": "master",'
-        '  "gold_tryjob": false,'
-        '  "goma_jobs": "200",'
-        '  "mastername": "client.flutter",'
-        '  "recipe": "devicelab/devicelab_drone",'
-        '  "tags": ['
-        '    "ios",'
-        '    "mac",'
-        '    "arm64"'
-        '  ],'
-        '  "task_name": "macos_chrome_dev_mode",'
-        '  "upload_metrics": true,'
-        '  "upload_packages": true,'
-        '  "use_cas": true'
-        '}'
-      execution_timeout_secs: 3600
-      caches {
-        name: "builder_mac_devicelab_staging"
-        path: "builder"
-      }
-      caches {
-        name: "flutter_sdk"
-        path: "flutter sdk"
-      }
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      caches {
-        name: "pub_cache"
-        path: ".pub-cache"
-      }
-      caches {
-        name: "xcode_binary"
-        path: "xcode_binary"
-      }
-      build_numbers: YES
-      service_account: "flutter-staging-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {}
-      experiments {
-        key: "luci.buildbucket.agent.cipd_installation"
-        value: 0
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "Mac_arm64_staging module_test_ios"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
-      dimensions: "device_os:iOS-15"
-      dimensions: "os:Mac-12"
-      dimensions: "pool:luci.flutter.staging"
-      exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$flutter/devicelab_osx_sdk": {'
-        '    "sdk_version": "13f17a"'
-        '  },'
-        '  "$fuchsia/goma": {'
-        '    "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
-        '  },'
-        '  "$kitchen": {'
-        '    "emulate_gce": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": false,'
-        '  "dependencies": ['
-        '    {'
-        '      "dependency": "xcode"'
-        '    },'
-        '    {'
-        '      "dependency": "gems"'
-        '    },'
-        '    {'
-        '      "dependency": "apple_signing"'
-        '    }'
-        '  ],'
-        '  "git_branch": "master",'
-        '  "gold_tryjob": false,'
-        '  "goma_jobs": "200",'
-        '  "mastername": "client.flutter",'
-        '  "recipe": "devicelab/devicelab_drone",'
-        '  "tags": ['
-        '    "ios",'
-        '    "mac",'
-        '    "arm64"'
-        '  ],'
-        '  "task_name": "module_test_ios",'
-        '  "upload_metrics": true,'
-        '  "upload_packages": true,'
-        '  "use_cas": true'
-        '}'
-      execution_timeout_secs: 3600
-      caches {
-        name: "builder_mac_devicelab_staging"
-        path: "builder"
-      }
-      caches {
-        name: "flutter_sdk"
-        path: "flutter sdk"
-      }
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      caches {
-        name: "pub_cache"
-        path: ".pub-cache"
-      }
-      caches {
-        name: "xcode_binary"
-        path: "xcode_binary"
-      }
-      build_numbers: YES
-      service_account: "flutter-staging-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {}
-      experiments {
-        key: "luci.buildbucket.agent.cipd_installation"
-        value: 0
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
       name: "Mac_arm64_staging native_ui_tests_macos"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
@@ -165891,187 +165183,6 @@
       }
     }
     builders {
-      name: "Mac_arm64_staging plugin_lint_mac"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
-      dimensions: "device_os:iOS-15"
-      dimensions: "os:Mac-12"
-      dimensions: "pool:luci.flutter.staging"
-      exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$flutter/devicelab_osx_sdk": {'
-        '    "sdk_version": "13f17a"'
-        '  },'
-        '  "$fuchsia/goma": {'
-        '    "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
-        '  },'
-        '  "$kitchen": {'
-        '    "emulate_gce": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": false,'
-        '  "dependencies": ['
-        '    {'
-        '      "dependency": "xcode"'
-        '    },'
-        '    {'
-        '      "dependency": "gems"'
-        '    },'
-        '    {'
-        '      "dependency": "apple_signing"'
-        '    },'
-        '    {'
-        '      "dependency": "arm64ruby"'
-        '    }'
-        '  ],'
-        '  "git_branch": "master",'
-        '  "gold_tryjob": false,'
-        '  "goma_jobs": "200",'
-        '  "mastername": "client.flutter",'
-        '  "recipe": "devicelab/devicelab_drone",'
-        '  "tags": ['
-        '    "ios",'
-        '    "mac",'
-        '    "arm64"'
-        '  ],'
-        '  "task_name": "plugin_lint_mac",'
-        '  "upload_metrics": true,'
-        '  "upload_packages": true,'
-        '  "use_cas": true'
-        '}'
-      execution_timeout_secs: 3600
-      caches {
-        name: "builder_mac_devicelab_staging"
-        path: "builder"
-      }
-      caches {
-        name: "flutter_sdk"
-        path: "flutter sdk"
-      }
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      caches {
-        name: "pub_cache"
-        path: ".pub-cache"
-      }
-      caches {
-        name: "xcode_binary"
-        path: "xcode_binary"
-      }
-      build_numbers: YES
-      service_account: "flutter-staging-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {}
-      experiments {
-        key: "luci.buildbucket.agent.cipd_installation"
-        value: 0
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "Mac_arm64_staging run_release_test_macos"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
-      dimensions: "device_os:iOS-15"
-      dimensions: "os:Mac-12"
-      dimensions: "pool:luci.flutter.staging"
-      exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$flutter/devicelab_osx_sdk": {'
-        '    "sdk_version": "13f17a"'
-        '  },'
-        '  "$fuchsia/goma": {'
-        '    "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
-        '  },'
-        '  "$kitchen": {'
-        '    "emulate_gce": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": false,'
-        '  "dependencies": ['
-        '    {'
-        '      "dependency": "xcode"'
-        '    },'
-        '    {'
-        '      "dependency": "gems"'
-        '    },'
-        '    {'
-        '      "dependency": "apple_signing"'
-        '    }'
-        '  ],'
-        '  "git_branch": "master",'
-        '  "gold_tryjob": false,'
-        '  "goma_jobs": "200",'
-        '  "mastername": "client.flutter",'
-        '  "recipe": "devicelab/devicelab_drone",'
-        '  "tags": ['
-        '    "ios",'
-        '    "mac",'
-        '    "arm64"'
-        '  ],'
-        '  "task_name": "run_release_test_macos",'
-        '  "upload_metrics": true,'
-        '  "upload_packages": true,'
-        '  "use_cas": true'
-        '}'
-      execution_timeout_secs: 3600
-      caches {
-        name: "builder_mac_devicelab_staging"
-        path: "builder"
-      }
-      caches {
-        name: "flutter_sdk"
-        path: "flutter sdk"
-      }
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      caches {
-        name: "pub_cache"
-        path: ".pub-cache"
-      }
-      caches {
-        name: "xcode_binary"
-        path: "xcode_binary"
-      }
-      build_numbers: YES
-      service_account: "flutter-staging-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {}
-      experiments {
-        key: "luci.buildbucket.agent.cipd_installation"
-        value: 0
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
       name: "Mac_ios animation_with_microtasks_perf_ios__timeline_summary"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86"
diff --git a/config/generated/flutter/luci/luci-milo.cfg b/config/generated/flutter/luci/luci-milo.cfg
index 0766d1c..9e92ca6 100644
--- a/config/generated/flutter/luci/luci-milo.cfg
+++ b/config/generated/flutter/luci/luci-milo.cfg
@@ -318,66 +318,16 @@
     short_name: "pti"
   }
   builders {
-    name: "buildbucket/luci.flutter.staging/Mac_arm64_staging hot_mode_dev_cycle_macos_target__benchmark"
-    category: "Mac_arm64"
-    short_name: "hmdcm"
-  }
-  builders {
-    name: "buildbucket/luci.flutter.staging/Mac_arm64_staging flutter_gallery_ios__compile"
-    category: "Mac_arm64"
-    short_name: "fgic"
-  }
-  builders {
-    name: "buildbucket/luci.flutter.staging/Mac_arm64_staging hello_world_ios__compile"
-    category: "Mac_arm64"
-    short_name: "hwic"
-  }
-  builders {
     name: "buildbucket/luci.flutter.staging/Mac_arm64_staging native_ui_tests_macos"
     category: "Mac_arm64"
     short_name: "nutm"
   }
   builders {
-    name: "buildbucket/luci.flutter.staging/Mac_arm64_staging module_test_ios"
-    category: "Mac_arm64"
-    short_name: "mti"
-  }
-  builders {
-    name: "buildbucket/luci.flutter.staging/Mac_arm64_staging build_ios_framework_module_test"
-    category: "Mac_arm64"
-    short_name: "bifmt"
-  }
-  builders {
-    name: "buildbucket/luci.flutter.staging/Mac_arm64_staging plugin_lint_mac"
-    category: "Mac_arm64"
-    short_name: "plm"
-  }
-  builders {
-    name: "buildbucket/luci.flutter.staging/Mac_arm64_staging run_release_test_macos"
-    category: "Mac_arm64"
-    short_name: "rrtm"
-  }
-  builders {
     name: "buildbucket/luci.flutter.staging/Mac_arm64_staging ios_app_with_extensions_test"
     category: "Mac_arm64"
     short_name: "iawet"
   }
   builders {
-    name: "buildbucket/luci.flutter.staging/Mac_arm64_staging ios_content_validation_test"
-    category: "Mac_arm64"
-    short_name: "icvt"
-  }
-  builders {
-    name: "buildbucket/luci.flutter.staging/Mac_arm64_staging macos_chrome_dev_mode"
-    category: "Mac_arm64"
-    short_name: "mcdm"
-  }
-  builders {
-    name: "buildbucket/luci.flutter.staging/Mac_arm64_android_staging build_aar_module_test"
-    category: "Mac_arm64"
-    short_name: "bamt"
-  }
-  builders {
     name: "buildbucket/luci.flutter.staging/Mac_arm64_android_staging integration_test_test"
     category: "Mac_arm64"
     short_name: "itt"
diff --git a/config/generated/flutter/luci/luci-scheduler.cfg b/config/generated/flutter/luci/luci-scheduler.cfg
index 04b7bea..c3651f1 100644
--- a/config/generated/flutter/luci/luci-scheduler.cfg
+++ b/config/generated/flutter/luci/luci-scheduler.cfg
@@ -8168,21 +8168,6 @@
   }
 }
 job {
-  id: "Mac_arm64_android_staging build_aar_module_test"
-  realm: "staging"
-  acl_sets: "staging"
-  triggering_policy {
-    kind: GREEDY_BATCHING
-    max_concurrent_invocations: 1
-    max_batch_size: 20
-  }
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "staging"
-    builder: "Mac_arm64_android_staging build_aar_module_test"
-  }
-}
-job {
   id: "Mac_arm64_android_staging hello_world_android__compile"
   realm: "staging"
   acl_sets: "staging"
@@ -8348,66 +8333,6 @@
   }
 }
 job {
-  id: "Mac_arm64_staging build_ios_framework_module_test"
-  realm: "staging"
-  acl_sets: "staging"
-  triggering_policy {
-    kind: GREEDY_BATCHING
-    max_concurrent_invocations: 1
-    max_batch_size: 20
-  }
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "staging"
-    builder: "Mac_arm64_staging build_ios_framework_module_test"
-  }
-}
-job {
-  id: "Mac_arm64_staging flutter_gallery_ios__compile"
-  realm: "staging"
-  acl_sets: "staging"
-  triggering_policy {
-    kind: GREEDY_BATCHING
-    max_concurrent_invocations: 1
-    max_batch_size: 20
-  }
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "staging"
-    builder: "Mac_arm64_staging flutter_gallery_ios__compile"
-  }
-}
-job {
-  id: "Mac_arm64_staging hello_world_ios__compile"
-  realm: "staging"
-  acl_sets: "staging"
-  triggering_policy {
-    kind: GREEDY_BATCHING
-    max_concurrent_invocations: 1
-    max_batch_size: 20
-  }
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "staging"
-    builder: "Mac_arm64_staging hello_world_ios__compile"
-  }
-}
-job {
-  id: "Mac_arm64_staging hot_mode_dev_cycle_macos_target__benchmark"
-  realm: "staging"
-  acl_sets: "staging"
-  triggering_policy {
-    kind: GREEDY_BATCHING
-    max_concurrent_invocations: 1
-    max_batch_size: 20
-  }
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "staging"
-    builder: "Mac_arm64_staging hot_mode_dev_cycle_macos_target__benchmark"
-  }
-}
-job {
   id: "Mac_arm64_staging ios_app_with_extensions_test"
   realm: "staging"
   acl_sets: "staging"
@@ -8423,51 +8348,6 @@
   }
 }
 job {
-  id: "Mac_arm64_staging ios_content_validation_test"
-  realm: "staging"
-  acl_sets: "staging"
-  triggering_policy {
-    kind: GREEDY_BATCHING
-    max_concurrent_invocations: 1
-    max_batch_size: 20
-  }
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "staging"
-    builder: "Mac_arm64_staging ios_content_validation_test"
-  }
-}
-job {
-  id: "Mac_arm64_staging macos_chrome_dev_mode"
-  realm: "staging"
-  acl_sets: "staging"
-  triggering_policy {
-    kind: GREEDY_BATCHING
-    max_concurrent_invocations: 1
-    max_batch_size: 20
-  }
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "staging"
-    builder: "Mac_arm64_staging macos_chrome_dev_mode"
-  }
-}
-job {
-  id: "Mac_arm64_staging module_test_ios"
-  realm: "staging"
-  acl_sets: "staging"
-  triggering_policy {
-    kind: GREEDY_BATCHING
-    max_concurrent_invocations: 1
-    max_batch_size: 20
-  }
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "staging"
-    builder: "Mac_arm64_staging module_test_ios"
-  }
-}
-job {
   id: "Mac_arm64_staging native_ui_tests_macos"
   realm: "staging"
   acl_sets: "staging"
@@ -8483,36 +8363,6 @@
   }
 }
 job {
-  id: "Mac_arm64_staging plugin_lint_mac"
-  realm: "staging"
-  acl_sets: "staging"
-  triggering_policy {
-    kind: GREEDY_BATCHING
-    max_concurrent_invocations: 1
-    max_batch_size: 20
-  }
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "staging"
-    builder: "Mac_arm64_staging plugin_lint_mac"
-  }
-}
-job {
-  id: "Mac_arm64_staging run_release_test_macos"
-  realm: "staging"
-  acl_sets: "staging"
-  triggering_policy {
-    kind: GREEDY_BATCHING
-    max_concurrent_invocations: 1
-    max_batch_size: 20
-  }
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "staging"
-    builder: "Mac_arm64_staging run_release_test_macos"
-  }
-}
-job {
   id: "Mac_ios animation_with_microtasks_perf_ios__timeline_summary"
   realm: "prod"
   acl_sets: "prod"
@@ -12992,21 +12842,11 @@
   triggers: "Mac_android_staging integration_test_test"
   triggers: "Mac_android_staging integration_ui_frame_number"
   triggers: "Mac_android_staging run_release_test"
-  triggers: "Mac_arm64_android_staging build_aar_module_test"
   triggers: "Mac_arm64_android_staging hello_world_android__compile"
   triggers: "Mac_arm64_android_staging integration_test_test"
   triggers: "Mac_arm64_android_staging run_release_test"
-  triggers: "Mac_arm64_staging build_ios_framework_module_test"
-  triggers: "Mac_arm64_staging flutter_gallery_ios__compile"
-  triggers: "Mac_arm64_staging hello_world_ios__compile"
-  triggers: "Mac_arm64_staging hot_mode_dev_cycle_macos_target__benchmark"
   triggers: "Mac_arm64_staging ios_app_with_extensions_test"
-  triggers: "Mac_arm64_staging ios_content_validation_test"
-  triggers: "Mac_arm64_staging macos_chrome_dev_mode"
-  triggers: "Mac_arm64_staging module_test_ios"
   triggers: "Mac_arm64_staging native_ui_tests_macos"
-  triggers: "Mac_arm64_staging plugin_lint_mac"
-  triggers: "Mac_arm64_staging run_release_test_macos"
   triggers: "Mac_ios flutter_gallery__transition_perf_e2e_ios"
   triggers: "Mac_ios flutter_gallery_ios__transition_perf"
   triggers: "Mac_ios flutter_gallery_ios_sksl_warmup__transition_perf"