Remove Maintainer subsectionstm/streamline_maintainers

Besides the platfrom ones, which require some touch up to the
maintenance policy.

Signed-off-by: Thom May <thom@chef.io>

2 files changed, 2 insertions, 60 deletions

diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 843c994df2..87f92de274 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -18,9 +18,7 @@ a maintainer, lieutenant, or the project lead.
 
 ## Chef Core
 
-Handles the core parts of the Chef DSL, base resource and provider
-infrastructure, the Chef applications and [omnibus-chef](https://github.com/chef/omnibus-chef). Includes anything not covered by
-another component.
+Maintainers for the Chef client, Ohai, mixlibs, ChefDK, ChefSpec, Foodcritic, chefstyle, and sundry others.
 
 To mention the team, use @chef/client-core
 
@@ -48,35 +46,6 @@ To mention the team, use @chef/client-core
 * [Tim Smith](https://github.com/tas50)
 * [Tyler Ball](https://github.com/tyler-ball)
 
-## Ohai
-
-To mention the team, use @chef/ohai
-
-### Lieutenant
-
-* [Claire McQuin](https://github.com/mcquin)
-
-### Maintainers
-
-* [Bryan McLellan](https://github.com/btm)
-* [Tim Smith](https://github.com/tas50)
-
-## Test Tools
-
-ChefSpec
-To mention the team, use @chef/client-test-tools
-
-### Lieutenant
-
-* [Seth Vargo](https://github.com/sethvargo)
-
-### Maintainers
-
-* [Joshua Timberman](https://github.com/jtimberman)
-* [Lamont Granquist](https://github.com/lamont-granquist)
-* [Tim Smith](https://github.com/tas50)
-* [Ranjib Dey](https://github.com/ranjib)
-
 ## Chef Provisioning
 
 Chef Provisioning and Drivers.  Supported Drivers are listed in the [README](https://github.com/chef/chef-provisioning/blob/master/README.md#chef-provisioning).
diff --git a/MAINTAINERS.toml b/MAINTAINERS.toml
index e5313283f7..1f577b4a24 100644
--- a/MAINTAINERS.toml
+++ b/MAINTAINERS.toml
@@ -28,9 +28,7 @@ a maintainer, lieutenant, or the project lead.
       title = "Chef Core"
       team = "client-core"
       text = """
-Handles the core parts of the Chef DSL, base resource and provider
-infrastructure, the Chef applications and [omnibus-chef](https://github.com/chef/omnibus-chef). Includes anything not covered by
-another component.
+Maintainers for the Chef client, Ohai, mixlibs, ChefDK, ChefSpec, Foodcritic, chefstyle, and sundry others.
 """
 
       lieutenant = "thommay"
@@ -55,31 +53,6 @@ another component.
         "tyler-ball"
       ]
 
-    [Org.Components.Ohai]
-      title = "Ohai"
-      team = "ohai"
-
-      lieutenant = "mcquin"
-
-      maintainers = [
-        "btm",
-        "tas50"
-      ]
-
-    [Org.Components.TestTools]
-      title = "Test Tools"
-      team = "client-test-tools"
-      text = "ChefSpec"
-
-      lieutenant = "sethvargo"
-
-      maintainers = [
-        "jtimberman",
-        "lamont-granquist",
-        "tas50",
-        "ranjib"
-      ]
-
     [Org.Components.Provisioning]
       title = "Chef Provisioning"
       team = "provisioning"