cleanup according to new Graph resolution API