Redundant subclass info gets added to the parent class and messes up subclass yaml

[dandhlee]

We have a messed up toc.yaml file being processed after doc-templates processes the client library, as well as subclass yamls which looks jumbled.

There must be a mix up somewhere in the subclass <-> parent class linking process. toc.yml looks fine, but the subclass files echo their parent class info.