Cleanup cherry-pick