Tracing updatd + clean up