Blocking bug in dependency graph generation.
Clean up for release.