Cleaning up dependency hell