clean cherry-pick