remove underscore dependency, shims instead