diff --git a/etc/api/groupssettings/v1/groupssettings-api_overrides.json b/etc/api/groupssettings/v1/groupssettings-api_overrides.json
deleted file mode 100644
index 29329fe4bd..0000000000
--- a/etc/api/groupssettings/v1/groupssettings-api_overrides.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-	"name": "groupsSettings"
-}
\ No newline at end of file
diff --git a/etc/api/shared.yaml b/etc/api/shared.yaml
index f9272d5f3c..d669cf0923 100644
--- a/etc/api/shared.yaml
+++ b/etc/api/shared.yaml
@@ -25,7 +25,6 @@ api:
     - discovery # no oauth2
     - identitytoolkit # no oauth2
     - audit # no oauth2
-    - admin # ERROR
     - webfonts # no oauth2
     - customsearch # no oauth2
   base_path: "etc/api"
diff --git a/etc/api/sqladmin/v1beta4/sqladmin-api_overrides.json b/etc/api/sqladmin/v1beta4/sqladmin-api_overrides.json
deleted file mode 100644
index 58143b2191..0000000000
--- a/etc/api/sqladmin/v1beta4/sqladmin-api_overrides.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-	"activity_root": "sql"
-}
\ No newline at end of file
diff --git a/src/mako/lib/mbuild.mako b/src/mako/lib/mbuild.mako
index fdff33545d..d90645273d 100644
--- a/src/mako/lib/mbuild.mako
+++ b/src/mako/lib/mbuild.mako
@@ -32,7 +32,7 @@
 <%def name="new(resource, method, c)">\
 <% 
     hub_type_name = hub_type(util.canonical_name())
-    m = c.fqan_map[to_fqan(activity_root or name, resource, method)]
+    m = c.fqan_map[to_fqan(c.rtc_map[resource], resource, method)]
     # an identifier for a property. We prefix them to prevent clashes with the setters
     mb_tparams = mb_type_params_s(m)
     ThisType = mb_type(resource, method) + mb_tparams
diff --git a/src/mako/lib/rbuild.mako b/src/mako/lib/rbuild.mako
index 29ae08d380..50ba56c5d6 100644
--- a/src/mako/lib/rbuild.mako
+++ b/src/mako/lib/rbuild.mako
@@ -51,7 +51,7 @@ impl${rb_params} ResourceMethodsBuilder for ${ThisType} {}
 impl${rb_params} ${ThisType} {
     % for a in c.rta_map[resource]:
 <%
-    m = c.fqan_map[to_fqan(activity_root or name, resource, a)]
+    m = c.fqan_map[to_fqan(c.rtc_map[resource], resource, a)]
     RType = mb_type(resource, a)
 
     # skip part if we have a request resource. Only resources can have parts
diff --git a/src/mako/lib/util.py b/src/mako/lib/util.py
index e37d0af132..b419167c36 100644
--- a/src/mako/lib/util.py
+++ b/src/mako/lib/util.py
@@ -527,12 +527,12 @@ It should be used to handle progress information, and to implement a certain lev
 ## -- End Activity Utilities -- @}
 
 
-Context = collections.namedtuple('Context', ['sta_map', 'fqan_map', 'rta_map'])
+Context = collections.namedtuple('Context', ['sta_map', 'fqan_map', 'rta_map', 'rtc_map'])
 
 # return a newly build context from the given data
 def new_context(resources):
     if not resources:
-        return Context(dict(), dict(), dict())
+        return Context(dict(), dict(), dict(), dict())
     # Returns (A, B) where
     # A: { SchemaTypeName -> { fqan -> ['request'|'response', ...]}
     # B: { fqan -> activity_method_data }
@@ -564,7 +564,7 @@ def new_context(resources):
                 # delete: has no response or request
                 # getrating: response is a 'SomethingResult', which is still related to activities name
                 #            the latter is used to deduce the resource name
-                category, an, _ = activity_split(m.id)
+                _, an, _ = activity_split(m.id)
                 tn = activity_name_to_type_name(an)
                 info = res.setdefault(tn, dict())
                 if m.id not in info:
@@ -577,10 +577,12 @@ def new_context(resources):
 
     sta_map, fqan_map = build_activity_mappings(resources)
     rta_map = dict()
+    rtc_map = dict()
     for an in fqan_map:
         category, resource, activity = activity_split(an)
         rta_map.setdefault(resource, list()).append(activity)
-    return Context(sta_map, fqan_map, rta_map)
+        assert rtc_map.setdefault(resource, category) == category
+    return Context(sta_map, fqan_map, rta_map, rtc_map)
 
 # Expects v to be 'v\d+', throws otherwise
 def to_api_version(v):