Remove dependency from tokenstore