Remove underscore dependencies where possible.