Remove underscore dependency
1.5.0