I'm inclined to agree. Unless there's an interesting angle they can conjure up that justifies it, I don't see the value of separating your champion from a piece of his act that has been a major part of him getting over.
Swerve is great and can stand on his own, but I wouldn't underestimate the...