starting to remove underscore dependency
removed underscore dependency