Remove non wanted changes from cherry-pick