Clean up dependency management.
12 files changed