We should remove the graph_lock completely including where we create it and pass it in, in addition to these two lines that are removed.