Replaced lodash with underscore