remove traces from cherry-pick