remove more references to 'graph'