cherry-pick: tracing and cleaning