API consolidation
- remove an obsolete class (using inner class inside TeamInstance instead)
- mark two classes as @noinstantiate and @noextend.
3 files changed