Remove potentiall problematic dependencies