Remove unnecesary dependence on Underscore