diff --git a/server/site_tests/cheets_GTS/control.8.0_dev.waivers b/server/site_tests/cheets_GTS/control.8.0_dev.waivers
deleted file mode 100644
index dfecbcc..0000000
--- a/server/site_tests/cheets_GTS/control.8.0_dev.waivers
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_dev.waivers'
-ATTRIBUTES = 'suite:arc-gts, suite:arc-gts-qual'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run waived testcases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='8.0_dev.waivers',
-        test_name='cheets_GTS.8.0_dev.waivers',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--subplan', 'waivers', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='gts-dev',
-        target_plan='waivers',
-        load_waivers=False,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-Preview3-7012566.zip',
-        use_jdk9=True,
-        timeout=3600)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.waivers b/server/site_tests/cheets_GTS/control.waivers
deleted file mode 100644
index fb96823..0000000
--- a/server/site_tests/cheets_GTS/control.waivers
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.waivers'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run preview version of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='waivers',
-        test_name='cheets_GTS.waivers',
-        run_template=['run', 'commandAndExit', 'gts', '--subplan', 'waivers', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='gts-dev',
-        target_plan='waivers',
-        load_waivers=False,
-        uri='gs://chromeos-partner-gts/android-gts-8-R3-P-Preview3-7012566.zip',
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=3600)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.waivers-collect-tests-only b/server/site_tests/cheets_GTS/control.waivers-collect-tests-only
deleted file mode 100644
index e3ee3ad..0000000
--- a/server/site_tests/cheets_GTS/control.waivers-collect-tests-only
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.waivers-collect-tests-only'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run preview version of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=0,
-        tag='waivers-collect-tests-only',
-        test_name='cheets_GTS.waivers-collect-tests-only',
-        run_template=['run', 'commandAndExit', 'collect-tests-only', '--subplan', 'waivers', '--ignore-business-logic-failure', '--disable-reboot'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='gts-dev-collect',
-        target_plan='waivers',
-        load_waivers=False,
-        uri='gs://chromeos-partner-gts/android-gts-8-R3-P-Preview3-7012566.zip',
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/subplans/waivers.xml b/server/site_tests/cheets_GTS/subplans/waivers.xml
deleted file mode 100644
index f29acb9..0000000
--- a/server/site_tests/cheets_GTS/subplans/waivers.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no' ?>
-<SubPlan version="2.0">
-  <!--
-    Unless there's special reason, the entries can be removed only
-    when the DEV version bundle's provisional version number (like 9.0r13)
-    is incremented. Otherwise the computation for the canonical list
-    of test cases is confused. See b/151779432.
-  -->
-  <Entry include="GtsAssistantWorkProfileHostTestCases" />
-</SubPlan>
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_dev.waivers b/server/site_tests/cheets_GTS_R/control.8.0_dev.waivers
deleted file mode 100644
index 478dae3..0000000
--- a/server/site_tests/cheets_GTS_R/control.8.0_dev.waivers
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_dev.waivers'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts, suite:arc-gts-qual'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run waived testcases of the Android Google Test Suite (GTS) in ARC.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='8.0_dev.waivers',
-        test_name='cheets_GTS_R.8.0_dev.waivers',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--subplan', 'waivers', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='gts-dev',
-        target_plan='waivers',
-        load_waivers=False,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-R-Preview8-7269030.zip',
-        use_jdk9=True,
-        timeout=3600)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.waivers b/server/site_tests/cheets_GTS_R/control.waivers
deleted file mode 100644
index c39dc8b..0000000
--- a/server/site_tests/cheets_GTS_R/control.waivers
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.waivers'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run preview version of the Android Google Test Suite (GTS) in the ARC.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='waivers',
-        test_name='cheets_GTS_R.waivers',
-        run_template=['run', 'commandAndExit', 'gts', '--subplan', 'waivers', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='gts-dev',
-        target_plan='waivers',
-        load_waivers=False,
-        uri='gs://chromeos-partner-gts/android-gts-8-R4-R-Preview8-7269030.zip',
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=3600)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.waivers-collect-tests-only b/server/site_tests/cheets_GTS_R/control.waivers-collect-tests-only
deleted file mode 100644
index d3a993c..0000000
--- a/server/site_tests/cheets_GTS_R/control.waivers-collect-tests-only
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.waivers-collect-tests-only'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run preview version of the Android Google Test Suite (GTS) in ARC.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=0,
-        tag='waivers-collect-tests-only',
-        test_name='cheets_GTS_R.waivers-collect-tests-only',
-        run_template=['run', 'commandAndExit', 'collect-tests-only', '--subplan', 'waivers', '--ignore-business-logic-failure', '--disable-reboot'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='gts-dev-collect',
-        target_plan='waivers',
-        load_waivers=False,
-        uri='gs://chromeos-partner-gts/android-gts-8-R4-R-Preview8-7269030.zip',
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/subplans/waivers.xml b/server/site_tests/cheets_GTS_R/subplans/waivers.xml
deleted file mode 100644
index b2b739a..0000000
--- a/server/site_tests/cheets_GTS_R/subplans/waivers.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no' ?>
-<SubPlan version="2.0">
-  <!--
-    Unless there's special reason, the entries can be removed only
-    when the DEV version bundle's provisional version number (like 9.0r13)
-    is incremented. Otherwise the computation for the canonical list
-    of test cases is confused. See b/151779432.
-  -->
-  <Entry include="GtsPackageManagerHostTestCases com.google.android.pm.gts.PackageManagerHostTest#test169414761fixed" />
-  <Entry include="GtsSettingsTestCases com.google.android.settings.gts.LegalInformationTest#launchLegalInformation_shouldAlwaysShowGooglePlaySystemUpdateLicensesItem" />
-  <Entry include="GtsSettingsTestCases com.google.android.settings.gts.PrivacySettingsDisplayTest#launchPrivacy_shouldAlwaysShowGooglePrivacyItems" />
-</SubPlan>