Removed separated code
Removed underscore as a dependency