I think a Gladiator could be a mafia role too. Just narrows down the voting pool. Mind you, I will not unvote my previous vote because if it's nullified by the challenge, I shouldn't have to. And if it isn't, it stands.