upstream changes: remove tree token and use JSON config