Try to clear up dependency