Merge pull request #395 from google/flowgraph2

Flowgraph cleanup