No longer need to reference token-store