Some cleanup before working on adding dataflow information to the graph