Removed underscore, ensured lodash is being used