Removing more references to shipping_method#zone