remove some instrumentation