[API] More graph cleanup.