Remove Underscore dependency