Cleaning up dependency management