Some cleanup when changing graphs mid-flight