diff --git a/CMakeLists.txt b/CMakeLists.txt
index 70860acb6435db6975bf1ed6a59dc7d9b3b69461..44f154d5511028ae2f1407d16290a794b947dd76 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,7 +89,6 @@ TSTInitUniqueNodeId.srv
 TSTMakeLocalCopy.srv
 TSTRemoveNode.srv
 TSTRemoveNodeWaitForFinished.srv
-TSTSetApprovedFlag.srv
 TSTSetTreeApprovedFlag.srv
 TSTSetConstraints.srv
 TSTSetExecInfo.srv
@@ -108,10 +107,7 @@ TSTSetNodeParameterString.srv
 TSTSetNodeParameterStrings.srv
 TSTSetFailReason.srv
 TSTSetStartExecutorFlag.srv
-TSTSetAbortExecutorFlag.srv
-TSTSetPauseExecutorFlag.srv
-TSTSetContinueExecutorFlag.srv
-TSTSetEnoughExecutorFlag.srv
+TSTSetUuidFlag.srv
 TSTSetTree.srv
 TSTSetTreeStartTime.srv
 TSTSetNodeStartTime.srv
@@ -132,6 +128,13 @@ TSTContinueTree.srv
 TSTExpandNodeFromJson.srv
 )
 
+# TSTSetAbortExecutorFlag.srv
+# TSTSetPauseExecutorFlag.srv
+# TSTSetContinueExecutorFlag.srv
+# TSTSetEnoughExecutorFlag.srv
+# TSTSetApprovedFlag.srv
+
+
 ## Generate actions in the 'action' folder
 # add_action_files(
 #   FILES
diff --git a/srv/TSTSetApprovedFlag.srv b/srv/TSTSetApprovedFlag.srv
deleted file mode 100644
index 24c6c1efd794eadb56d2e2398157dc898e9a719f..0000000000000000000000000000000000000000
--- a/srv/TSTSetApprovedFlag.srv
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Set the node flag approved to the value val.
-#
-
-string node_uuid   # Node uuid in the factory
-bool   val
----
-bool success
-int32 error
-string reason
diff --git a/srv/TSTSetContinueExecutorFlag.srv b/srv/TSTSetContinueExecutorFlag.srv
deleted file mode 100644
index 5209eecc5d53cf737043929266e3d49fce637269..0000000000000000000000000000000000000000
--- a/srv/TSTSetContinueExecutorFlag.srv
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Set the node flag abort_executor to the value val.
-#
-
-string node_uuid   # Node uuid in the factory
-bool   val
----
-string com_uuid
-bool success
-int32 error
-string reason
diff --git a/srv/TSTSetEnoughExecutorFlag.srv b/srv/TSTSetEnoughExecutorFlag.srv
deleted file mode 100644
index 08f1e958662979fd98bfd1228ae0b4a903966287..0000000000000000000000000000000000000000
--- a/srv/TSTSetEnoughExecutorFlag.srv
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Set the node flag enough_executor to the value val.
-#
-
-string node_uuid   # Node uuid in the factory
-bool   val
----
-string com_uuid
-bool success
-int32 error
-string reason
diff --git a/srv/TSTSetPauseExecutorFlag.srv b/srv/TSTSetPauseExecutorFlag.srv
deleted file mode 100644
index 5209eecc5d53cf737043929266e3d49fce637269..0000000000000000000000000000000000000000
--- a/srv/TSTSetPauseExecutorFlag.srv
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Set the node flag abort_executor to the value val.
-#
-
-string node_uuid   # Node uuid in the factory
-bool   val
----
-string com_uuid
-bool success
-int32 error
-string reason
diff --git a/srv/TSTSetAbortExecutorFlag.srv b/srv/TSTSetUuidFlag.srv
similarity index 62%
rename from srv/TSTSetAbortExecutorFlag.srv
rename to srv/TSTSetUuidFlag.srv
index 5209eecc5d53cf737043929266e3d49fce637269..1b8dedce085a27579f122b9d90a39811c1ea1223 100644
--- a/srv/TSTSetAbortExecutorFlag.srv
+++ b/srv/TSTSetUuidFlag.srv
@@ -1,5 +1,5 @@
 #
-# Set the node flag abort_executor to the value val.
+# Set the node flag to the value val for node with node-uuid node_uuid.
 #
 
 string node_uuid   # Node uuid in the factory