build graph cleaned up