Finish fixing cleaning up dependency management