Removed dependence on lodash to all underscore