Started removing superKind.