[VP] clean up and access token repo