Might have to wait until next year for that to happen since he cleared all that up during last season. This season will end when Drew McIntyre drops the world title back to Roman sometime in late 2019 / early 2020. NPC Konnor will also still be active.
By then Dango will be back jobbing to fucking Bo Dallas or some other bum on the reg, ready for Season 32! Let's go Dango!