also cleaning up the graph somehow would be great