remove dependence on v1 tokens