Cleanup and Graph enhancements.