cleaned up dependency mess