Instrumentation cleanup.