more dependency resolution cleanup.