Drop underscore dependency

In case you're interested, here is another PR to drop underscore.