Simplify/update fs_graph.py