more dependency graph cleanup