Remove payment_gateway from gateway_fields