Remove some instrumentation and add underscore as dependency.