Remove dependency on underscore