Remove instrumentation from public API surface

Fixes #1262