PMM-13054 remove redundant functionality

admin/commands/management/remove.go

@@ -20,7 +20,6 @@ import (
 
 	"github.com/percona/pmm/admin/agentlocal"
 	"github.com/percona/pmm/admin/commands"
-	"github.com/percona/pmm/admin/helpers"
 	inventoryClient "github.com/percona/pmm/api/inventory/v1/json/client"
 	services "github.com/percona/pmm/api/inventory/v1/json/client/services_service"
 	"github.com/percona/pmm/api/management/v1/json/client"
@@ -96,7 +95,7 @@ func (cmd *RemoveCommand) RunCmd() (commands.Result, error) {
 	}
 
 	params := &mservice.RemoveServiceParams{
-		ServiceID:   helpers.StripServiceIDPrefix(serviceID),
+		ServiceID:   serviceID,
 		ServiceType: cmd.serviceType(),
 		Context:     commands.Ctx,
 	}

admin/helpers/helpers.go

@@ -17,7 +17,6 @@ package helpers
 
 import (
 	"fmt"
-	"strings"
 
 	"github.com/pkg/errors"
 
@@ -31,7 +30,6 @@ var errNoNode = errors.New("no node available")
 // HAProxyMinPMMServerVersion contains minimum version for running HAProxy.
 const (
 	haProxyMinPMMServerVersion = "2.15.0"
-	serviceIDPrefix            = "/service_id"
 )
 
 // ServerVersionLessThan return if provided version is lower than server version.
@@ -96,8 +94,3 @@ func IsOnPmmServer() (bool, error) {
 
 	return status.NodeID == "pmm-server", nil
 }
-
-// StripServiceIDPrefix removes the prefix from the service ID if present.
-func StripServiceIDPrefix(serviceID string) string {
-	return strings.TrimPrefix(serviceID, serviceIDPrefix)
-}