From a25fa12d4edd4bd4be05f10f47e347faf5bf8320 Mon Sep 17 00:00:00 2001
From: Luka Debenjak <luka.debenjak@psi.ch>
Date: Mon, 18 Jul 2022 16:30:44 +0200
Subject: [PATCH] some clean-up

---
 X_X12SA_BPM-tools.json   |  2 +-
 X_X12SA_FE-tools.json    | 14 --------------
 X_X12SA_StripTool.json   |  9 ---------
 X_X12SA_expert-main.json |  4 ++--
 4 files changed, 3 insertions(+), 26 deletions(-)
 delete mode 100644 X_X12SA_StripTool.json

diff --git a/X_X12SA_BPM-tools.json b/X_X12SA_BPM-tools.json
index 75065c2..8b0dbad 100644
--- a/X_X12SA_BPM-tools.json
+++ b/X_X12SA_BPM-tools.json
@@ -50,7 +50,7 @@
         {
             "type": "cmd",
             "text": "XBPMs (FE)",
-            "command": "caqtdm -x -attach -macro \"XBPM1=X12SA-FE-XBPM1,XBPM1=X12SA-FE-XBPM1,XBPM2=X12SA-FE-XBPM2,AL1=X12SA-FE-XBPM1,AL2=X12SA-FE-XBPM2,XBPM=X12SA-FE-XBPM,BML=X12SA,P=X07MA-FE,BML=X12SA\" XBPM_pair_synoptic.ui"
+            "command": "caqtdm -x -attach -macro \"XBPM1=X12SA-FE-XBPM1,XBPM1=X12SA-FE-XBPM1,XBPM2=X12SA-FE-XBPM2,AL1=X12SA-FE-XBPM1,AL2=X12SA-FE-XBPM2,XBPM=X12SA-FE-XBPM,BML=X12SA,P=X07MA-FE,BML=X12SA,BEAM=X12SA-FE-VG1:CLOSE\" XBPM_pair_synoptic.ui"
         },
         {
             "type": "title",
diff --git a/X_X12SA_FE-tools.json b/X_X12SA_FE-tools.json
index ac710c3..98d2587 100644
--- a/X_X12SA_FE-tools.json
+++ b/X_X12SA_FE-tools.json
@@ -1,19 +1,5 @@
 {
     "menu": [
-        {
-            "type": "caqtdm",
-            "text": "Front End BPM1 Grid",
-            "panel": "X_X12SA_BPM.ui",
-            "macros": "BPM=BPM1",
-            "param": "-noMsg -attach"
-        },
-        {
-            "type": "caqtdm",
-            "text": "Front End BPM1 Grid",
-            "panel": "X_X12SA_BPM.ui",
-            "macros": "BPM=BPM2",
-            "param": "-noMsg -attach"
-        },
         {
             "type": "menu",
             "text": "Front End Motors",
diff --git a/X_X12SA_StripTool.json b/X_X12SA_StripTool.json
deleted file mode 100644
index fb5fe3b..0000000
--- a/X_X12SA_StripTool.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "menu": [
-        {
-            "type": "cmd",
-            "text": "StripTool",
-            "command": "jStripTool"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/X_X12SA_expert-main.json b/X_X12SA_expert-main.json
index a809454..d42c038 100644
--- a/X_X12SA_expert-main.json
+++ b/X_X12SA_expert-main.json
@@ -21,9 +21,9 @@
             "param": "-noMsg -attach"
         },
         {
-            "type": "menu",
+            "type": "cmd",
             "text": "StripTool",
-            "file": "X_X12SA_StripTool.json"
+            "command": "jStripTool"
         },
         {
             "type": "separator"