removed some excessive instrumentation
Merge remote-tracking branch 'github/master' into local092