Removed underscore dependency for good