diff --git a/api/payments/orchestrator/internal/server/internal/discovery_wrappers.go b/api/payments/orchestrator/internal/server/internal/discovery_wrappers.go
index 7652ad70..a9eb08e7 100644
--- a/api/payments/orchestrator/internal/server/internal/discovery_wrappers.go
+++ b/api/payments/orchestrator/internal/server/internal/discovery_wrappers.go
@@ -5,8 +5,6 @@ import (
 
 	oracleclient "github.com/tech/sendico/fx/oracle/client"
 	chainclient "github.com/tech/sendico/gateway/chain/client"
-	mntxclient "github.com/tech/sendico/gateway/mntx/client"
-	ledgerclient "github.com/tech/sendico/ledger/client"
 	"github.com/tech/sendico/pkg/merrors"
 	"github.com/tech/sendico/pkg/payments/rail"
 	feesv1 "github.com/tech/sendico/pkg/proto/billing/fees/v1"
@@ -263,7 +261,7 @@ func (c *discoveryMntxClient) Close() error {
 }
 
 type discoveryChainClient struct {
-	resolver *discoveryClientResolver
+	resolver  *discoveryClientResolver
 	invokeURI string
 }
 
diff --git a/api/payments/orchestrator/internal/service/orchestrator/options.go b/api/payments/orchestrator/internal/service/orchestrator/options.go
index 3503f10f..f7f192a5 100644
--- a/api/payments/orchestrator/internal/service/orchestrator/options.go
+++ b/api/payments/orchestrator/internal/service/orchestrator/options.go
@@ -58,10 +58,6 @@ type gatewayDependency struct {
 	resolver ChainGatewayResolver
 }
 
-func (g gatewayDependency) available() bool {
-	return g.resolver != nil
-}
-
 type railGatewayDependency struct {
 	byID             map[string]rail.RailGateway
 	byRail           map[model.Rail][]rail.RailGateway
@@ -233,10 +229,6 @@ type providerGatewayDependency struct {
 	resolver ChainGatewayResolver
 }
 
-func (p providerGatewayDependency) available() bool {
-	return p.resolver != nil
-}
-
 type staticChainGatewayResolver struct {
 	client chainclient.Client
 }
diff --git a/api/payments/orchestrator/internal/service/orchestrator/quote_engine.go b/api/payments/orchestrator/internal/service/orchestrator/quote_engine.go
index 0f44aef1..c64d8e03 100644
--- a/api/payments/orchestrator/internal/service/orchestrator/quote_engine.go
+++ b/api/payments/orchestrator/internal/service/orchestrator/quote_engine.go
@@ -8,6 +8,7 @@ import (
 
 	oracleclient "github.com/tech/sendico/fx/oracle/client"
 	"github.com/tech/sendico/payments/orchestrator/storage/model"
+	chainpkg "github.com/tech/sendico/pkg/chain"
 	"github.com/tech/sendico/pkg/merrors"
 	feesv1 "github.com/tech/sendico/pkg/proto/billing/fees/v1"
 	fxv1 "github.com/tech/sendico/pkg/proto/common/fx/v1"
@@ -159,7 +160,7 @@ func (s *Service) estimateNetworkFee(ctx context.Context, intent *orchestratorv1
 
 	network := ""
 	if req.Asset != nil {
-		network = strings.ToUpper(strings.TrimSpace(req.Asset.GetChain()))
+		network = chainpkg.NetworkName(req.Asset.GetChain())
 	}
 	instanceID := strings.TrimSpace(intent.GetSource().GetInstanceId())
 	if instanceID == "" {