Remove outdated cherrypicks