More tracing cleanup