remove dependence on v1 tokens

These changes proved necessary for my environment - wherein it is easy to obtain a V2 token but difficult to get a V1 admin token. Passing along.