tracing cleanup