Get rid of underscore as a dependency