diff --git a/cros/test/usergroup_baseline.py b/cros/test/usergroup_baseline.py
index 7a37097..8e330ae 100644
--- a/cros/test/usergroup_baseline.py
+++ b/cros/test/usergroup_baseline.py
@@ -192,6 +192,7 @@
     GroupEntry(group='cups-proxy', gid=20136, users={'crosvm', 'cups-proxy',
                                                      'pluginvm'}),
     GroupEntry(group='usbprinter', gid=20155, users={'cups', 'saned'}),
+    GroupEntry(group='hotline', gid=20157, users={'hotline', 'hotlog'}),
 ))
 
 GROUP_BASELINE_LAKITU = dict((e.group, e) for e in (
@@ -232,10 +233,6 @@
     GroupEntry(group='lxd', gid=298, users={'lxd', 'chronos'}),
 ))
 
-GROUP_BASELINE_CFM = dict((e.group, e) for e in (
-    GroupEntry(group='hotline', gid=20157, users={'hotline', 'hotlog'}),
-))
-
 GROUP_BOARD_BASELINES = {
     'lakitu': GROUP_BASELINE_LAKITU,
     'lakitu-gpu': GROUP_BASELINE_LAKITU,
@@ -250,9 +247,4 @@
     'veyron_rialto': GROUP_BASELINE_RIALTO,
     'tael': GROUP_BASELINE_TERMINA,
     'tatl': GROUP_BASELINE_TERMINA,
-    'fizz': GROUP_BASELINE_CFM,
-    'fizz-cfm': GROUP_BASELINE_CFM,
-    'kalista': GROUP_BASELINE_CFM,
-    'kalista-cfm': GROUP_BASELINE_CFM,
-    'endeavour': GROUP_BASELINE_CFM,
 }