Remove SubtypeSwitcher

Change-Id: Ic4def69a9f742f13c98bc3e518c406658b52797d
5 files changed