Remove some cruft and speed up the graph rendering