remove unsupported with_shipping_method in master

Port of #44 to master branch