Removed w1 and w2 macros and removed lodash dependency
removed underscore dependency