Merge "[owners] Remove codycaldwell@google.com from acts/framework/acts/controllers/anritsu_lib/OWNERS" into main
diff --git a/OWNERS b/OWNERS
index 25372fa..4ef77c4 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,4 +1,3 @@
 dgoldfarb@google.com
 htellez@google.com
-markdr@google.com
 xianyuanjia@google.com
diff --git a/acts/framework/acts/controllers/OWNERS b/acts/framework/acts/controllers/OWNERS
index 9ed8088..b1eb9e7 100644
--- a/acts/framework/acts/controllers/OWNERS
+++ b/acts/framework/acts/controllers/OWNERS
@@ -1,4 +1,4 @@
 per-file asus_axe11000_ap.py = martschneider@google.com
 per-file fuchsia_device.py = chcl@google.com, dhobsd@google.com, haydennix@google.com, jmbrenna@google.com, mnck@google.com, nickchee@google.com, sbalana@google.com, silberst@google.com
-per-file cellular_simulator.py = iguarna@google.com, chaoyangf@google.com, codycaldwell@google.com, yixiang@google.com
+per-file cellular_simulator.py = iguarna@google.com, chaoyangf@google.com, yixiang@google.com
 per-file openwrt_ap.py = jerrypcchen@google.com, martschneider@google.com, gmoturu@google.com, mingchenchung@google.com, timhuang@google.com
diff --git a/acts/framework/acts/controllers/cellular_lib/OWNERS b/acts/framework/acts/controllers/cellular_lib/OWNERS
index f88a96c..1d5c066 100644
--- a/acts/framework/acts/controllers/cellular_lib/OWNERS
+++ b/acts/framework/acts/controllers/cellular_lib/OWNERS
@@ -5,4 +5,3 @@
 
 per-file PresetSimulation.py = hmtuan@google.com
 per-file PresetSimulation.py = harjani@google.com
-per-file PresetSimulation.py = jethier@google.com
\ No newline at end of file
diff --git a/acts/framework/acts/controllers/rohdeschwarz_lib/OWNERS b/acts/framework/acts/controllers/rohdeschwarz_lib/OWNERS
index e4010df..9230448 100644
--- a/acts/framework/acts/controllers/rohdeschwarz_lib/OWNERS
+++ b/acts/framework/acts/controllers/rohdeschwarz_lib/OWNERS
@@ -1,4 +1,3 @@
 iguarna@google.com
 chaoyangf@google.com
 yixiang@google.com
-codycaldwell@google.com
\ No newline at end of file
diff --git a/acts/framework/acts/controllers/uxm_lib/OWNERS b/acts/framework/acts/controllers/uxm_lib/OWNERS
index 0c40622..5876486 100644
--- a/acts/framework/acts/controllers/uxm_lib/OWNERS
+++ b/acts/framework/acts/controllers/uxm_lib/OWNERS
@@ -1,3 +1,2 @@
 jethier@google.com
-hmtuan@google.com
-harjani@google.com
\ No newline at end of file
+harjani@google.com
diff --git a/acts_tests/tests/OWNERS b/acts_tests/tests/OWNERS
index 2457eab..b95e305 100644
--- a/acts_tests/tests/OWNERS
+++ b/acts_tests/tests/OWNERS
@@ -9,11 +9,9 @@
 dvj@google.com
 gmoturu@google.com
 mrtyler@google.com
-codycaldwell@google.com
 chaoyangf@google.com
 wju@google.com
 albeed@google.com
-jethier@google.com
 
 # Pixel GTW
 jasonkmlu@google.com
@@ -28,7 +26,6 @@
 
 
 # Fuchsia
-belgum@google.com
 chcl@google.com
 dhobsd@google.com
 haydennix@google.com