Completed move away from tree_json. Fixes #25