Remove dependency to underscore