Isolate evalGraph, cleanup