Remove graph creation stuff again - wrong track.