feat!: Remove kind discriminator as per the 1.0 specification (#551)

feat!: Remove kind discriminator as per the 1.0 specification (#551) #387