Simplify token to match simplier use case