Removing a delivery method as part of a separate refactoring will doom a pull request. Keep the scope of changes tight and clearly focused.