Revert "Updates how we send shipping method"

This reverts commit 3c32034bb6910d6ab92f16f3f661091941e6cac1.
Revert "Adds shipping method name to custom fields"

This reverts commit 45363c55745884940e772a3be56eb909c4af628d.