Remove underscore, bleeding-edge deps