Remove instrumentation around shortcutting