Remove old instrumentation code