Graph: misc clean up