partial cleanup of GraphSuite