diff --git a/cmd/stackDeploy.go b/cmd/stackDeploy.go
index 15c1768..616eeb4 100644
--- a/cmd/stackDeploy.go
+++ b/cmd/stackDeploy.go
@@ -58,7 +58,6 @@ var stackDeployCmd = &cobra.Command{
 		logrus.WithFields(logrus.Fields{
 			"stack":    stackName,
 			"endpoint": endpointId,
-			"swarm":    endpointSwarmClusterId,
 		}).Debug("Getting stack")
 		retrievedStack, stackRetrievalErr := common.GetStackByName(stackName, endpointSwarmClusterId, uint32(endpointId))
 		switch stackRetrievalErr.(type) {
@@ -127,14 +126,12 @@ var stackDeployCmd = &cobra.Command{
 				logrus.WithFields(logrus.Fields{
 					"stack":    stackName,
 					"endpoint": endpointId,
-					"swarm":    endpointSwarmClusterId,
 				}).Info("Creating stack")
 				stack, deploymentErr := portainerClient.CreateSwarmStack(stackName, loadedEnvironmentVariables, stackFileContent, endpointSwarmClusterId, uint32(endpointId))
 				common.CheckError(deploymentErr)
 				logrus.WithFields(logrus.Fields{
 					"stack":    stack.Name,
 					"endpoint": stack.EndpointID,
-					"swarm":    stack.SwarmID,
 					"id":       stack.Id,
 				}).Info("Stack created")
 			} else {
diff --git a/cmd/stackList.go b/cmd/stackList.go
index dff60fc..cd96490 100644
--- a/cmd/stackList.go
+++ b/cmd/stackList.go
@@ -35,7 +35,6 @@ var stackListCmd = &cobra.Command{
 				// It's a swarm cluster
 				logrus.WithFields(logrus.Fields{
 					"endpoint": endpointId,
-					"swarm":    endpointSwarmClusterId,
 				}).Debug("Getting stacks")
 				stacks, err = portainerClient.GetStacks(endpointSwarmClusterId, uint32(endpointId))
 				common.CheckError(err)
@@ -78,17 +77,15 @@ var stackListCmd = &cobra.Command{
 				"NAME",
 				"TYPE",
 				"ENDPOINT ID",
-				"SWARM ID",
 			})
 			common.CheckError(err)
 			for _, s := range stacks {
 				_, err := fmt.Fprintln(writer, fmt.Sprintf(
-					"%v\t%s\t%v\t%v\t%s",
+					"%v\t%s\t%v\t%v",
 					s.Id,
 					s.Name,
 					s.GetTranslatedStackType(),
 					s.EndpointID,
-					s.SwarmID,
 				))
 				common.CheckError(err)
 			}
diff --git a/cmd/stackRemove.go b/cmd/stackRemove.go
index 2d8d3a2..7fc4fef 100644
--- a/cmd/stackRemove.go
+++ b/cmd/stackRemove.go
@@ -43,7 +43,6 @@ var stackRemoveCmd = &cobra.Command{
 			logrus.WithFields(logrus.Fields{
 				"stack":    stackName,
 				"endpoint": endpointId,
-				"swarm":    endpointSwarmClusterId,
 			}).Debug("Getting stack")
 			stack, stackRetrievalErr = common.GetStackByName(stackName, endpointSwarmClusterId, uint32(endpointId))
 		case *common.StackClusterNotFoundError: