replaced clean calls with raw instrumentation