Cleaned up GRC flowgraphs