Graphutilities cleanup (DO NOT MERGE)