Clean up and Fix Graphs