Cleanup after cherry-pick