removed calls to graph and table methods