Shouldn't need the graph dependency any more