cleanup after cherry-pick