From fecc6e85902ca4058bd05d8e1aabfa90a0d40f5f Mon Sep 17 00:00:00 2001
From: Henrique Silva <henrique.silva@ess.eu>
Date: Thu, 26 Oct 2023 14:53:17 +0200
Subject: [PATCH] ICSHWI-15723: Remove PVs being archived by both clusters

---
 files/DTL-010_SC-IOC-102.archive       |  45 --
 files/DTL-020_SC-IOC-102.archive       |  45 --
 files/DTL-030_SC-IOC-102.archive       |  45 --
 files/DTL-040_SC-IOC-102.archive       |  45 --
 files/DTL-050_SC-IOC-102.archive       |  45 --
 files/DTL1FIM.archive                  |  30 --
 files/DTL3FIM.archive                  |  26 -
 files/DTL4FIM.archive                  |  29 --
 files/DTL5FIM.archive                  |  28 --
 files/HBL-010RFC_SC-IOC-102.archive    |  45 --
 files/HBL-010RFC_SC-IOC-202.archive    |  45 --
 files/HBL-010RFC_SC-IOC-302.archive    |  45 --
 files/HBL-010RFC_SC-IOC-306.archive    | 645 -------------------------
 files/HBL-010RFC_SC-IOC-402.archive    |  45 --
 files/HBL-020RFC_SC-IOC-102.archive    |  45 --
 files/HBL-020RFC_SC-IOC-202.archive    |  45 --
 files/HBL-020RFC_SC-IOC-302.archive    |  45 --
 files/HBL-020RFC_SC-IOC-402.archive    |  45 --
 files/MBL-010RFC_RFS-RFLPS-101.archive |  45 --
 files/MBL-010RFC_RFS-RFLPS-201.archive |  45 --
 files/MBL-010RFC_RFS-RFLPS-301.archive |  45 --
 files/MBL-010RFC_RFS-RFLPS-401.archive |  45 --
 files/MBL-010RFC_SC-IOC-102.archive    |  45 --
 files/MBL-010RFC_SC-IOC-202.archive    |  45 --
 files/MBL-010RFC_SC-IOC-302.archive    |  45 --
 files/MBL-010RFC_SC-IOC-402.archive    |  45 --
 files/MBL-050RFC_SC-IOC-202.archive    |  45 --
 files/MBL-060RFC_RFS-RFLPS-101.archive |  45 --
 files/MBL-060RFC_RFS-RFLPS-201.archive |  45 --
 files/MBL-060RFC_RFS-RFLPS-301.archive |  45 --
 files/MBL-060RFC_RFS-RFLPS-401.archive |  45 --
 files/MBL-060RFC_SC-IOC-102.archive    |  45 --
 files/MBL-060RFC_SC-IOC-202.archive    |  45 --
 files/MBL-060RFC_SC-IOC-302.archive    |  45 --
 files/MBL-060RFC_SC-IOC-402.archive    |  45 --
 files/MBL-070RFC_SC-IOC-102.archive    |  45 --
 files/MBL-070RFC_SC-IOC-202.archive    |  45 --
 files/MBL-070RFC_SC-IOC-302.archive    |  45 --
 files/MBL-070RFC_SC-IOC-402.archive    |  45 --
 files/MBL-080RFC_SC-IOC-102.archive    |  45 --
 files/MBL-080RFC_SC-IOC-202.archive    |  45 --
 files/MBL-080RFC_SC-IOC-302.archive    |  45 --
 files/MBL-080RFC_SC-IOC-402.archive    |  45 --
 files/MEBT-010_SC-IOC-102.archive      |  45 --
 files/MEBT-010_SC-IOC-202.archive      |  45 --
 files/MEBT-010_SC-IOC-302.archive      |  45 --
 files/RFQ-010_SC-IOC-002.archive       |  45 --
 files/RFQ-RFLPS.archive                |  41 --
 files/Spk-030RFC_RFS-RFLPS-101.archive |  45 --
 files/Spk-030RFC_RFS-RFLPS-201.archive |  45 --
 files/Spk-030RFC_SC-IOC-102.archive    |  45 --
 files/Spk-030RFC_SC-IOC-202.archive    |  45 --
 files/Spk-040RFC_SC-IOC-102.archive    |  45 --
 files/Spk-040RFC_SC-IOC-202.archive    |  45 --
 54 files changed, 2959 deletions(-)

diff --git a/files/DTL-010_SC-IOC-102.archive b/files/DTL-010_SC-IOC-102.archive
index 021df9a..5fefd33 100644
--- a/files/DTL-010_SC-IOC-102.archive
+++ b/files/DTL-010_SC-IOC-102.archive
@@ -2,12 +2,10 @@ DTL-010:RFS-ADG-110:IlckStatus-DIlckMode-RB
 DTL-010:RFS-ADG-110:IlckStatus-Ilck-RB
 DTL-010:RFS-ADG-110:IlckStatus-Input-RB
 DTL-010:RFS-ADG-110:IlckStatus-isFirstIlck
-DTL-010:RFS-ADG-110:IlckStatus-Wave-PM
 DTL-010:RFS-ADG-110:PwrFail-DIlckMode-RB
 DTL-010:RFS-ADG-110:PwrFail-Ilck-RB
 DTL-010:RFS-ADG-110:PwrFail-Input-RB
 DTL-010:RFS-ADG-110:PwrFail-isFirstIlck
-DTL-010:RFS-ADG-110:PwrFail-Wave-PM
 DTL-010:RFS-Cav-110:Fld-DevMonEval-RB
 DTL-010:RFS-Cav-110:Fld-DevMonFact-RB
 DTL-010:RFS-Cav-110:Fld-DevMonIlck-RB
@@ -46,7 +44,6 @@ DTL-010:RFS-Cav-110:Fld-Wave-Avg
 DTL-010:RFS-Cav-110:Fld-Wave-High
 DTL-010:RFS-Cav-110:Fld-Wave-Low
 DTL-010:RFS-Cav-110:Fld-Wave-Med
-DTL-010:RFS-Cav-110:Fld-Wave-PM
 DTL-010:RFS-Cav-110:PwrFwd-DevMonEval-RB
 DTL-010:RFS-Cav-110:PwrFwd-DevMonFact-RB
 DTL-010:RFS-Cav-110:PwrFwd-DevMonIlck-RB
@@ -85,7 +82,6 @@ DTL-010:RFS-Cav-110:PwrFwd-Wave-Avg
 DTL-010:RFS-Cav-110:PwrFwd-Wave-High
 DTL-010:RFS-Cav-110:PwrFwd-Wave-Low
 DTL-010:RFS-Cav-110:PwrFwd-Wave-Med
-DTL-010:RFS-Cav-110:PwrFwd-Wave-PM
 DTL-010:RFS-Cav-110:PwrRfl-DevMonEval-RB
 DTL-010:RFS-Cav-110:PwrRfl-DevMonFact-RB
 DTL-010:RFS-Cav-110:PwrRfl-DevMonIlck-RB
@@ -124,7 +120,6 @@ DTL-010:RFS-Cav-110:PwrRfl-Wave-Avg
 DTL-010:RFS-Cav-110:PwrRfl-Wave-High
 DTL-010:RFS-Cav-110:PwrRfl-Wave-Low
 DTL-010:RFS-Cav-110:PwrRfl-Wave-Med
-DTL-010:RFS-Cav-110:PwrRfl-Wave-PM
 DTL-010:RFS-Cav-120:PwrFwd-DevMonEval-RB
 DTL-010:RFS-Cav-120:PwrFwd-DevMonFact-RB
 DTL-010:RFS-Cav-120:PwrFwd-DevMonIlck-RB
@@ -163,7 +158,6 @@ DTL-010:RFS-Cav-120:PwrFwd-Wave-Avg
 DTL-010:RFS-Cav-120:PwrFwd-Wave-High
 DTL-010:RFS-Cav-120:PwrFwd-Wave-Low
 DTL-010:RFS-Cav-120:PwrFwd-Wave-Med
-DTL-010:RFS-Cav-120:PwrFwd-Wave-PM
 DTL-010:RFS-Cav-120:PwrRfl-DevMonEval-RB
 DTL-010:RFS-Cav-120:PwrRfl-DevMonFact-RB
 DTL-010:RFS-Cav-120:PwrRfl-DevMonIlck-RB
@@ -202,7 +196,6 @@ DTL-010:RFS-Cav-120:PwrRfl-Wave-Avg
 DTL-010:RFS-Cav-120:PwrRfl-Wave-High
 DTL-010:RFS-Cav-120:PwrRfl-Wave-Low
 DTL-010:RFS-Cav-120:PwrRfl-Wave-Med
-DTL-010:RFS-Cav-120:PwrRfl-Wave-PM
 DTL-010:RFS-EPR-110:Cur-DevMonEval-RB
 DTL-010:RFS-EPR-110:Cur-DevMonFact-RB
 DTL-010:RFS-EPR-110:Cur-DevMonIlck-RB
@@ -241,7 +234,6 @@ DTL-010:RFS-EPR-110:Cur-Wave-Avg
 DTL-010:RFS-EPR-110:Cur-Wave-High
 DTL-010:RFS-EPR-110:Cur-Wave-Low
 DTL-010:RFS-EPR-110:Cur-Wave-Med
-DTL-010:RFS-EPR-110:Cur-Wave-PM
 DTL-010:RFS-EPR-120:Cur-DevMonEval-RB
 DTL-010:RFS-EPR-120:Cur-DevMonFact-RB
 DTL-010:RFS-EPR-120:Cur-DevMonIlck-RB
@@ -280,7 +272,6 @@ DTL-010:RFS-EPR-120:Cur-Wave-Avg
 DTL-010:RFS-EPR-120:Cur-Wave-High
 DTL-010:RFS-EPR-120:Cur-Wave-Low
 DTL-010:RFS-EPR-120:Cur-Wave-Med
-DTL-010:RFS-EPR-120:Cur-Wave-PM
 DTL-010:RFS-FIM-101:AI10-DevMonEval-RB
 DTL-010:RFS-FIM-101:AI10-DevMonFact-RB
 DTL-010:RFS-FIM-101:AI10-DevMonIlck-RB
@@ -325,7 +316,6 @@ DTL-010:RFS-FIM-101:AI10-Wave-Avg
 DTL-010:RFS-FIM-101:AI10-Wave-High
 DTL-010:RFS-FIM-101:AI10-Wave-Low
 DTL-010:RFS-FIM-101:AI10-Wave-Med
-DTL-010:RFS-FIM-101:AI10-Wave-PM
 DTL-010:RFS-FIM-101:AI1-FastRst-IlckCnt
 DTL-010:RFS-FIM-101:AI1-HVON-En-RB
 DTL-010:RFS-FIM-101:AI1-HVON-Precond
@@ -412,7 +402,6 @@ DTL-010:RFS-FIM-101:AI8-Wave-Avg
 DTL-010:RFS-FIM-101:AI8-Wave-High
 DTL-010:RFS-FIM-101:AI8-Wave-Low
 DTL-010:RFS-FIM-101:AI8-Wave-Med
-DTL-010:RFS-FIM-101:AI8-Wave-PM
 DTL-010:RFS-FIM-101:AI9-DevMonEval-RB
 DTL-010:RFS-FIM-101:AI9-DevMonFact-RB
 DTL-010:RFS-FIM-101:AI9-DevMonIlck-RB
@@ -457,7 +446,6 @@ DTL-010:RFS-FIM-101:AI9-Wave-Avg
 DTL-010:RFS-FIM-101:AI9-Wave-High
 DTL-010:RFS-FIM-101:AI9-Wave-Low
 DTL-010:RFS-FIM-101:AI9-Wave-Med
-DTL-010:RFS-FIM-101:AI9-Wave-PM
 DTL-010:RFS-FIM-101:CD1-DevFactor-RB
 DTL-010:RFS-FIM-101:CD1-DevPeriod-RB
 DTL-010:RFS-FIM-101:CD1-FastRst-IlckCnt
@@ -479,7 +467,6 @@ DTL-010:RFS-FIM-101:CD1-RFON-En-RB
 DTL-010:RFS-FIM-101:CD1-RFON-Precond
 DTL-010:RFS-FIM-101:CD1-TrigSel-RB
 DTL-010:RFS-FIM-101:CD1-TrigThre-RB
-DTL-010:RFS-FIM-101:CD1-Wave-IlckPM
 DTL-010:RFS-FIM-101:CD2-DevFactor-RB
 DTL-010:RFS-FIM-101:CD2-DevPeriod-RB
 DTL-010:RFS-FIM-101:CD2-FastRst-IlckCnt
@@ -501,7 +488,6 @@ DTL-010:RFS-FIM-101:CD2-RFON-En-RB
 DTL-010:RFS-FIM-101:CD2-RFON-Precond
 DTL-010:RFS-FIM-101:CD2-TrigSel-RB
 DTL-010:RFS-FIM-101:CD2-TrigThre-RB
-DTL-010:RFS-FIM-101:CD2-Wave-IlckPM
 DTL-010:RFS-FIM-101:DI10-DIlckLatch-RB
 DTL-010:RFS-FIM-101:DI10-FastRst-IlckCnt
 DTL-010:RFS-FIM-101:DI10-HVON-En-RB
@@ -534,7 +520,6 @@ DTL-010:RFS-FIM-101:DI13-Input-RB
 DTL-010:RFS-FIM-101:DI13-isFirstIlck
 DTL-010:RFS-FIM-101:DI13-RFON-En-RB
 DTL-010:RFS-FIM-101:DI13-RFON-Precond
-DTL-010:RFS-FIM-101:DI13-Wave-PM
 DTL-010:RFS-FIM-101:DI14-DIlckLatch-RB
 DTL-010:RFS-FIM-101:DI14-DIlckMode-RB
 DTL-010:RFS-FIM-101:DI14-FastRst-IlckCnt
@@ -546,7 +531,6 @@ DTL-010:RFS-FIM-101:DI14-Input-RB
 DTL-010:RFS-FIM-101:DI14-isFirstIlck
 DTL-010:RFS-FIM-101:DI14-RFON-En-RB
 DTL-010:RFS-FIM-101:DI14-RFON-Precond
-DTL-010:RFS-FIM-101:DI14-Wave-PM
 DTL-010:RFS-FIM-101:DI15-DIlckLatch-RB
 DTL-010:RFS-FIM-101:DI15-FastRst-IlckCnt
 DTL-010:RFS-FIM-101:DI15-HVON-En-RB
@@ -572,7 +556,6 @@ DTL-010:RFS-FIM-101:DI17-Input-RB
 DTL-010:RFS-FIM-101:DI17-isFirstIlck
 DTL-010:RFS-FIM-101:DI17-RFON-En-RB
 DTL-010:RFS-FIM-101:DI17-RFON-Precond
-DTL-010:RFS-FIM-101:DI17-Wave-PM
 DTL-010:RFS-FIM-101:DI18-DIlckLatch-RB
 DTL-010:RFS-FIM-101:DI18-DIlckMode-RB
 DTL-010:RFS-FIM-101:DI18-FastRst-IlckCnt
@@ -584,7 +567,6 @@ DTL-010:RFS-FIM-101:DI18-Input-RB
 DTL-010:RFS-FIM-101:DI18-isFirstIlck
 DTL-010:RFS-FIM-101:DI18-RFON-En-RB
 DTL-010:RFS-FIM-101:DI18-RFON-Precond
-DTL-010:RFS-FIM-101:DI18-Wave-PM
 DTL-010:RFS-FIM-101:DI19-DIlckLatch-RB
 DTL-010:RFS-FIM-101:DI19-DIlckMode-RB
 DTL-010:RFS-FIM-101:DI19-FastRst-IlckCnt
@@ -596,7 +578,6 @@ DTL-010:RFS-FIM-101:DI19-Input-RB
 DTL-010:RFS-FIM-101:DI19-isFirstIlck
 DTL-010:RFS-FIM-101:DI19-RFON-En-RB
 DTL-010:RFS-FIM-101:DI19-RFON-Precond
-DTL-010:RFS-FIM-101:DI19-Wave-PM
 DTL-010:RFS-FIM-101:DI1-DIlckLatch-RB
 DTL-010:RFS-FIM-101:DI1-FastRst-IlckCnt
 DTL-010:RFS-FIM-101:DI1-HVON-En-RB
@@ -615,7 +596,6 @@ DTL-010:RFS-FIM-101:DI20-Input-RB
 DTL-010:RFS-FIM-101:DI20-isFirstIlck
 DTL-010:RFS-FIM-101:DI20-RFON-En-RB
 DTL-010:RFS-FIM-101:DI20-RFON-Precond
-DTL-010:RFS-FIM-101:DI20-Wave-PM
 DTL-010:RFS-FIM-101:DI21-DIlckLatch-RB
 DTL-010:RFS-FIM-101:DI21-FastRst-IlckCnt
 DTL-010:RFS-FIM-101:DI21-HVON-En-RB
@@ -669,7 +649,6 @@ DTL-010:RFS-FIM-101:DI7-Input-RB
 DTL-010:RFS-FIM-101:DI7-isFirstIlck
 DTL-010:RFS-FIM-101:DI7-RFON-En-RB
 DTL-010:RFS-FIM-101:DI7-RFON-Precond
-DTL-010:RFS-FIM-101:DI7-Wave-PM
 DTL-010:RFS-FIM-101:DI8-DIlckLatch-RB
 DTL-010:RFS-FIM-101:DI8-DIlckMode-RB
 DTL-010:RFS-FIM-101:DI8-FastRst-IlckCnt
@@ -681,7 +660,6 @@ DTL-010:RFS-FIM-101:DI8-Input-RB
 DTL-010:RFS-FIM-101:DI8-isFirstIlck
 DTL-010:RFS-FIM-101:DI8-RFON-En-RB
 DTL-010:RFS-FIM-101:DI8-RFON-Precond
-DTL-010:RFS-FIM-101:DI8-Wave-PM
 DTL-010:RFS-FIM-101:DI9-DIlckLatch-RB
 DTL-010:RFS-FIM-101:DI9-FastRst-IlckCnt
 DTL-010:RFS-FIM-101:DI9-HVON-En-RB
@@ -775,7 +753,6 @@ DTL-010:RFS-FIM-101:RP1-RFON-En-RB
 DTL-010:RFS-FIM-101:RP1-RFON-Precond
 DTL-010:RFS-FIM-101:RP1-TrigSel-RB
 DTL-010:RFS-FIM-101:RP1-TrigThre-RB
-DTL-010:RFS-FIM-101:RP1-Wave-IlckPM
 DTL-010:RFS-FIM-101:RP2-FastRst-IlckCnt
 DTL-010:RFS-FIM-101:RP2-HVON-En-RB
 DTL-010:RFS-FIM-101:RP2-HVON-Precond
@@ -795,7 +772,6 @@ DTL-010:RFS-FIM-101:RP2-RFON-En-RB
 DTL-010:RFS-FIM-101:RP2-RFON-Precond
 DTL-010:RFS-FIM-101:RP2-TrigSel-RB
 DTL-010:RFS-FIM-101:RP2-TrigThre-RB
-DTL-010:RFS-FIM-101:RP2-Wave-IlckPM
 DTL-010:RFS-FIM-101:SoftIlck-HVtoRF
 DTL-010:RFS-FIM-101:SoftIlck-HVToRFPreCond
 DTL-010:RFS-FIM-101:SoftIlck-IDLEtoHV
@@ -848,7 +824,6 @@ DTL-010:RFS-Kly-110:PwrFwd-Wave-Avg
 DTL-010:RFS-Kly-110:PwrFwd-Wave-High
 DTL-010:RFS-Kly-110:PwrFwd-Wave-Low
 DTL-010:RFS-Kly-110:PwrFwd-Wave-Med
-DTL-010:RFS-Kly-110:PwrFwd-Wave-PM
 DTL-010:RFS-Kly-110:PwrRfl-DevMonEval-RB
 DTL-010:RFS-Kly-110:PwrRfl-DevMonFact-RB
 DTL-010:RFS-Kly-110:PwrRfl-DevMonIlck-RB
@@ -887,12 +862,10 @@ DTL-010:RFS-Kly-110:PwrRfl-Wave-Avg
 DTL-010:RFS-Kly-110:PwrRfl-Wave-High
 DTL-010:RFS-Kly-110:PwrRfl-Wave-Low
 DTL-010:RFS-Kly-110:PwrRfl-Wave-Med
-DTL-010:RFS-Kly-110:PwrRfl-Wave-PM
 DTL-010:RFS-LLRF-101:Status-DIlckMode-RB
 DTL-010:RFS-LLRF-101:Status-Ilck-RB
 DTL-010:RFS-LLRF-101:Status-Input-RB
 DTL-010:RFS-LLRF-101:Status-isFirstIlck
-DTL-010:RFS-LLRF-101:Status-Wave-PM
 DTL-010:RFS-Load-120:PwrFwd-DevMonEval-RB
 DTL-010:RFS-Load-120:PwrFwd-DevMonFact-RB
 DTL-010:RFS-Load-120:PwrFwd-DevMonIlck-RB
@@ -931,7 +904,6 @@ DTL-010:RFS-Load-120:PwrFwd-Wave-Avg
 DTL-010:RFS-Load-120:PwrFwd-Wave-High
 DTL-010:RFS-Load-120:PwrFwd-Wave-Low
 DTL-010:RFS-Load-120:PwrFwd-Wave-Med
-DTL-010:RFS-Load-120:PwrFwd-Wave-PM
 DTL-010:RFS-Load-130:PwrFwd-DevMonEval-RB
 DTL-010:RFS-Load-130:PwrFwd-DevMonFact-RB
 DTL-010:RFS-Load-130:PwrFwd-DevMonIlck-RB
@@ -970,7 +942,6 @@ DTL-010:RFS-Load-130:PwrFwd-Wave-Avg
 DTL-010:RFS-Load-130:PwrFwd-Wave-High
 DTL-010:RFS-Load-130:PwrFwd-Wave-Low
 DTL-010:RFS-Load-130:PwrFwd-Wave-Med
-DTL-010:RFS-Load-130:PwrFwd-Wave-PM
 DTL-010:RFS-Mod-110:Cur-DevMonEval-RB
 DTL-010:RFS-Mod-110:Cur-DevMonFact-RB
 DTL-010:RFS-Mod-110:Cur-DevMonIlck-RB
@@ -1009,17 +980,14 @@ DTL-010:RFS-Mod-110:Cur-Wave-Avg
 DTL-010:RFS-Mod-110:Cur-Wave-High
 DTL-010:RFS-Mod-110:Cur-Wave-Low
 DTL-010:RFS-Mod-110:Cur-Wave-Med
-DTL-010:RFS-Mod-110:Cur-Wave-PM
 DTL-010:RFS-Mod-110:PCcon-DIlckMode-RB
 DTL-010:RFS-Mod-110:PCcon-Ilck-RB
 DTL-010:RFS-Mod-110:PCcon-Input-RB
 DTL-010:RFS-Mod-110:PCcon-isFirstIlck
-DTL-010:RFS-Mod-110:PCcon-Wave-PM
 DTL-010:RFS-Mod-110:Ready-DIlckMode-RB
 DTL-010:RFS-Mod-110:Ready-Ilck-RB
 DTL-010:RFS-Mod-110:Ready-Input-RB
 DTL-010:RFS-Mod-110:Ready-isFirstIlck
-DTL-010:RFS-Mod-110:Ready-Wave-PM
 DTL-010:RFS-Mod-110:Vol-DevMonEval-RB
 DTL-010:RFS-Mod-110:Vol-DevMonFact-RB
 DTL-010:RFS-Mod-110:Vol-DevMonIlck-RB
@@ -1058,7 +1026,6 @@ DTL-010:RFS-Mod-110:Vol-Wave-Avg
 DTL-010:RFS-Mod-110:Vol-Wave-High
 DTL-010:RFS-Mod-110:Vol-Wave-Low
 DTL-010:RFS-Mod-110:Vol-Wave-Med
-DTL-010:RFS-Mod-110:Vol-Wave-PM
 DTL-010:RFS-PAmp-110:PwrFwd-DevMonEval-RB
 DTL-010:RFS-PAmp-110:PwrFwd-DevMonFact-RB
 DTL-010:RFS-PAmp-110:PwrFwd-DevMonIlck-RB
@@ -1097,17 +1064,14 @@ DTL-010:RFS-PAmp-110:PwrFwd-Wave-Avg
 DTL-010:RFS-PAmp-110:PwrFwd-Wave-High
 DTL-010:RFS-PAmp-110:PwrFwd-Wave-Low
 DTL-010:RFS-PAmp-110:PwrFwd-Wave-Med
-DTL-010:RFS-PAmp-110:PwrFwd-Wave-PM
 DTL-010:RFS-SIM-110:HvEna-DIlckMode-RB
 DTL-010:RFS-SIM-110:HvEna-Ilck-RB
 DTL-010:RFS-SIM-110:HvEna-Input-RB
 DTL-010:RFS-SIM-110:HvEna-isFirstIlck
-DTL-010:RFS-SIM-110:HvEna-Wave-PM
 DTL-010:RFS-SIM-110:RfEna-DIlckMode-RB
 DTL-010:RFS-SIM-110:RfEna-Ilck-RB
 DTL-010:RFS-SIM-110:RfEna-Input-RB
 DTL-010:RFS-SIM-110:RfEna-isFirstIlck
-DTL-010:RFS-SIM-110:RfEna-Wave-PM
 DTL-010:RFS-SolPS-110:Cur-DevMonEval-RB
 DTL-010:RFS-SolPS-110:Cur-DevMonFact-RB
 DTL-010:RFS-SolPS-110:Cur-DevMonIlck-RB
@@ -1146,7 +1110,6 @@ DTL-010:RFS-SolPS-110:Cur-Wave-Avg
 DTL-010:RFS-SolPS-110:Cur-Wave-High
 DTL-010:RFS-SolPS-110:Cur-Wave-Low
 DTL-010:RFS-SolPS-110:Cur-Wave-Med
-DTL-010:RFS-SolPS-110:Cur-Wave-PM
 DTL-010:RFS-SolPS-120:Cur-DevMonEval-RB
 DTL-010:RFS-SolPS-120:Cur-DevMonFact-RB
 DTL-010:RFS-SolPS-120:Cur-DevMonIlck-RB
@@ -1185,7 +1148,6 @@ DTL-010:RFS-SolPS-120:Cur-Wave-Avg
 DTL-010:RFS-SolPS-120:Cur-Wave-High
 DTL-010:RFS-SolPS-120:Cur-Wave-Low
 DTL-010:RFS-SolPS-120:Cur-Wave-Med
-DTL-010:RFS-SolPS-120:Cur-Wave-PM
 DTL-010:RFS-SolPS-130:Cur-DevMonEval-RB
 DTL-010:RFS-SolPS-130:Cur-DevMonFact-RB
 DTL-010:RFS-SolPS-130:Cur-DevMonIlck-RB
@@ -1224,34 +1186,27 @@ DTL-010:RFS-SolPS-130:Cur-Wave-Avg
 DTL-010:RFS-SolPS-130:Cur-Wave-High
 DTL-010:RFS-SolPS-130:Cur-Wave-Low
 DTL-010:RFS-SolPS-130:Cur-Wave-Med
-DTL-010:RFS-SolPS-130:Cur-Wave-PM
 DTL-010:RFS-VacMon-110:Status-DIlckMode-RB
 DTL-010:RFS-VacMon-110:Status-Ilck-RB
 DTL-010:RFS-VacMon-110:Status-Input-RB
 DTL-010:RFS-VacMon-110:Status-isFirstIlck
-DTL-010:RFS-VacMon-110:Status-Wave-PM
 DTL-010:RFS-VacMon-120:Status-DIlckMode-RB
 DTL-010:RFS-VacMon-120:Status-Ilck-RB
 DTL-010:RFS-VacMon-120:Status-Input-RB
 DTL-010:RFS-VacMon-120:Status-isFirstIlck
-DTL-010:RFS-VacMon-120:Status-Wave-PM
 DTL-010:RFS-VacMon-130:Status-DIlckMode-RB
 DTL-010:RFS-VacMon-130:Status-Ilck-RB
 DTL-010:RFS-VacMon-130:Status-Input-RB
 DTL-010:RFS-VacMon-130:Status-isFirstIlck
-DTL-010:RFS-VacMon-130:Status-Wave-PM
 DTL-010:RFS-VacMon-140:Status-DIlckMode-RB
 DTL-010:RFS-VacMon-140:Status-Ilck-RB
 DTL-010:RFS-VacMon-140:Status-Input-RB
 DTL-010:RFS-VacMon-140:Status-isFirstIlck
-DTL-010:RFS-VacMon-140:Status-Wave-PM
 DTL-010:RFS-VacPS-110:I-SP-DIlckMode-RB
 DTL-010:RFS-VacPS-110:I-SP-Ilck-RB
 DTL-010:RFS-VacPS-110:I-SP-Input-RB
 DTL-010:RFS-VacPS-110:I-SP-isFirstIlck
-DTL-010:RFS-VacPS-110:I-SP-Wave-PM
 DTL-010:RFS-VacPS-120:I-SP-DIlckMode-RB
 DTL-010:RFS-VacPS-120:I-SP-Ilck-RB
 DTL-010:RFS-VacPS-120:I-SP-Input-RB
 DTL-010:RFS-VacPS-120:I-SP-isFirstIlck
-DTL-010:RFS-VacPS-120:I-SP-Wave-PM
diff --git a/files/DTL-020_SC-IOC-102.archive b/files/DTL-020_SC-IOC-102.archive
index 73d4b57..e223abd 100644
--- a/files/DTL-020_SC-IOC-102.archive
+++ b/files/DTL-020_SC-IOC-102.archive
@@ -2,12 +2,10 @@ DTL-020:RFS-ADG-110:IlckStatus-DIlckMode-RB
 DTL-020:RFS-ADG-110:IlckStatus-Ilck-RB
 DTL-020:RFS-ADG-110:IlckStatus-Input-RB
 DTL-020:RFS-ADG-110:IlckStatus-isFirstIlck
-DTL-020:RFS-ADG-110:IlckStatus-Wave-PM
 DTL-020:RFS-ADG-110:PwrFail-DIlckMode-RB
 DTL-020:RFS-ADG-110:PwrFail-Ilck-RB
 DTL-020:RFS-ADG-110:PwrFail-Input-RB
 DTL-020:RFS-ADG-110:PwrFail-isFirstIlck
-DTL-020:RFS-ADG-110:PwrFail-Wave-PM
 DTL-020:RFS-Cav-110:Fld-DevMonEval-RB
 DTL-020:RFS-Cav-110:Fld-DevMonFact-RB
 DTL-020:RFS-Cav-110:Fld-DevMonIlck-RB
@@ -46,7 +44,6 @@ DTL-020:RFS-Cav-110:Fld-Wave-Avg
 DTL-020:RFS-Cav-110:Fld-Wave-High
 DTL-020:RFS-Cav-110:Fld-Wave-Low
 DTL-020:RFS-Cav-110:Fld-Wave-Med
-DTL-020:RFS-Cav-110:Fld-Wave-PM
 DTL-020:RFS-Cav-110:PwrFwd-DevMonEval-RB
 DTL-020:RFS-Cav-110:PwrFwd-DevMonFact-RB
 DTL-020:RFS-Cav-110:PwrFwd-DevMonIlck-RB
@@ -85,7 +82,6 @@ DTL-020:RFS-Cav-110:PwrFwd-Wave-Avg
 DTL-020:RFS-Cav-110:PwrFwd-Wave-High
 DTL-020:RFS-Cav-110:PwrFwd-Wave-Low
 DTL-020:RFS-Cav-110:PwrFwd-Wave-Med
-DTL-020:RFS-Cav-110:PwrFwd-Wave-PM
 DTL-020:RFS-Cav-110:PwrRfl-DevMonEval-RB
 DTL-020:RFS-Cav-110:PwrRfl-DevMonFact-RB
 DTL-020:RFS-Cav-110:PwrRfl-DevMonIlck-RB
@@ -124,7 +120,6 @@ DTL-020:RFS-Cav-110:PwrRfl-Wave-Avg
 DTL-020:RFS-Cav-110:PwrRfl-Wave-High
 DTL-020:RFS-Cav-110:PwrRfl-Wave-Low
 DTL-020:RFS-Cav-110:PwrRfl-Wave-Med
-DTL-020:RFS-Cav-110:PwrRfl-Wave-PM
 DTL-020:RFS-Cav-120:PwrFwd-DevMonEval-RB
 DTL-020:RFS-Cav-120:PwrFwd-DevMonFact-RB
 DTL-020:RFS-Cav-120:PwrFwd-DevMonIlck-RB
@@ -163,7 +158,6 @@ DTL-020:RFS-Cav-120:PwrFwd-Wave-Avg
 DTL-020:RFS-Cav-120:PwrFwd-Wave-High
 DTL-020:RFS-Cav-120:PwrFwd-Wave-Low
 DTL-020:RFS-Cav-120:PwrFwd-Wave-Med
-DTL-020:RFS-Cav-120:PwrFwd-Wave-PM
 DTL-020:RFS-Cav-120:PwrRfl-DevMonEval-RB
 DTL-020:RFS-Cav-120:PwrRfl-DevMonFact-RB
 DTL-020:RFS-Cav-120:PwrRfl-DevMonIlck-RB
@@ -202,7 +196,6 @@ DTL-020:RFS-Cav-120:PwrRfl-Wave-Avg
 DTL-020:RFS-Cav-120:PwrRfl-Wave-High
 DTL-020:RFS-Cav-120:PwrRfl-Wave-Low
 DTL-020:RFS-Cav-120:PwrRfl-Wave-Med
-DTL-020:RFS-Cav-120:PwrRfl-Wave-PM
 DTL-020:RFS-FIM-101:AI10-DevMonEval-RB
 DTL-020:RFS-FIM-101:AI10-DevMonFact-RB
 DTL-020:RFS-FIM-101:AI10-DevMonIlck-RB
@@ -247,7 +240,6 @@ DTL-020:RFS-FIM-101:AI10-Wave-Avg
 DTL-020:RFS-FIM-101:AI10-Wave-High
 DTL-020:RFS-FIM-101:AI10-Wave-Low
 DTL-020:RFS-FIM-101:AI10-Wave-Med
-DTL-020:RFS-FIM-101:AI10-Wave-PM
 DTL-020:RFS-FIM-101:AI1-FastRst-IlckCnt
 DTL-020:RFS-FIM-101:AI1-HVON-En-RB
 DTL-020:RFS-FIM-101:AI1-HVON-Precond
@@ -322,7 +314,6 @@ DTL-020:RFS-FIM-101:AI6-Wave-Avg
 DTL-020:RFS-FIM-101:AI6-Wave-High
 DTL-020:RFS-FIM-101:AI6-Wave-Low
 DTL-020:RFS-FIM-101:AI6-Wave-Med
-DTL-020:RFS-FIM-101:AI6-Wave-PM
 DTL-020:RFS-FIM-101:AI7-DevMonEval-RB
 DTL-020:RFS-FIM-101:AI7-DevMonFact-RB
 DTL-020:RFS-FIM-101:AI7-DevMonIlck-RB
@@ -367,7 +358,6 @@ DTL-020:RFS-FIM-101:AI7-Wave-Avg
 DTL-020:RFS-FIM-101:AI7-Wave-High
 DTL-020:RFS-FIM-101:AI7-Wave-Low
 DTL-020:RFS-FIM-101:AI7-Wave-Med
-DTL-020:RFS-FIM-101:AI7-Wave-PM
 DTL-020:RFS-FIM-101:AI8-DevMonEval-RB
 DTL-020:RFS-FIM-101:AI8-DevMonFact-RB
 DTL-020:RFS-FIM-101:AI8-DevMonIlck-RB
@@ -412,7 +402,6 @@ DTL-020:RFS-FIM-101:AI8-Wave-Avg
 DTL-020:RFS-FIM-101:AI8-Wave-High
 DTL-020:RFS-FIM-101:AI8-Wave-Low
 DTL-020:RFS-FIM-101:AI8-Wave-Med
-DTL-020:RFS-FIM-101:AI8-Wave-PM
 DTL-020:RFS-FIM-101:AI9-DevMonEval-RB
 DTL-020:RFS-FIM-101:AI9-DevMonFact-RB
 DTL-020:RFS-FIM-101:AI9-DevMonIlck-RB
@@ -457,7 +446,6 @@ DTL-020:RFS-FIM-101:AI9-Wave-Avg
 DTL-020:RFS-FIM-101:AI9-Wave-High
 DTL-020:RFS-FIM-101:AI9-Wave-Low
 DTL-020:RFS-FIM-101:AI9-Wave-Med
-DTL-020:RFS-FIM-101:AI9-Wave-PM
 DTL-020:RFS-FIM-101:CD1-DevFactor-RB
 DTL-020:RFS-FIM-101:CD1-DevPeriod-RB
 DTL-020:RFS-FIM-101:CD1-FastRst-IlckCnt
@@ -479,7 +467,6 @@ DTL-020:RFS-FIM-101:CD1-RFON-En-RB
 DTL-020:RFS-FIM-101:CD1-RFON-Precond
 DTL-020:RFS-FIM-101:CD1-TrigSel-RB
 DTL-020:RFS-FIM-101:CD1-TrigThre-RB
-DTL-020:RFS-FIM-101:CD1-Wave-IlckPM
 DTL-020:RFS-FIM-101:CD2-DevFactor-RB
 DTL-020:RFS-FIM-101:CD2-DevPeriod-RB
 DTL-020:RFS-FIM-101:CD2-FastRst-IlckCnt
@@ -501,7 +488,6 @@ DTL-020:RFS-FIM-101:CD2-RFON-En-RB
 DTL-020:RFS-FIM-101:CD2-RFON-Precond
 DTL-020:RFS-FIM-101:CD2-TrigSel-RB
 DTL-020:RFS-FIM-101:CD2-TrigThre-RB
-DTL-020:RFS-FIM-101:CD2-Wave-IlckPM
 DTL-020:RFS-FIM-101:DI10-DIlckLatch-RB
 DTL-020:RFS-FIM-101:DI10-DIlckMode-RB
 DTL-020:RFS-FIM-101:DI10-FastRst-IlckCnt
@@ -513,7 +499,6 @@ DTL-020:RFS-FIM-101:DI10-Input-RB
 DTL-020:RFS-FIM-101:DI10-isFirstIlck
 DTL-020:RFS-FIM-101:DI10-RFON-En-RB
 DTL-020:RFS-FIM-101:DI10-RFON-Precond
-DTL-020:RFS-FIM-101:DI10-Wave-PM
 DTL-020:RFS-FIM-101:DI11-DIlckLatch-RB
 DTL-020:RFS-FIM-101:DI11-FastRst-IlckCnt
 DTL-020:RFS-FIM-101:DI11-HVON-En-RB
@@ -532,7 +517,6 @@ DTL-020:RFS-FIM-101:DI12-Input-RB
 DTL-020:RFS-FIM-101:DI12-isFirstIlck
 DTL-020:RFS-FIM-101:DI12-RFON-En-RB
 DTL-020:RFS-FIM-101:DI12-RFON-Precond
-DTL-020:RFS-FIM-101:DI12-Wave-PM
 DTL-020:RFS-FIM-101:DI13-DIlckLatch-RB
 DTL-020:RFS-FIM-101:DI13-DIlckMode-RB
 DTL-020:RFS-FIM-101:DI13-FastRst-IlckCnt
@@ -544,7 +528,6 @@ DTL-020:RFS-FIM-101:DI13-Input-RB
 DTL-020:RFS-FIM-101:DI13-isFirstIlck
 DTL-020:RFS-FIM-101:DI13-RFON-En-RB
 DTL-020:RFS-FIM-101:DI13-RFON-Precond
-DTL-020:RFS-FIM-101:DI13-Wave-PM
 DTL-020:RFS-FIM-101:DI14-DIlckLatch-RB
 DTL-020:RFS-FIM-101:DI14-DIlckMode-RB
 DTL-020:RFS-FIM-101:DI14-FastRst-IlckCnt
@@ -556,7 +539,6 @@ DTL-020:RFS-FIM-101:DI14-Input-RB
 DTL-020:RFS-FIM-101:DI14-isFirstIlck
 DTL-020:RFS-FIM-101:DI14-RFON-En-RB
 DTL-020:RFS-FIM-101:DI14-RFON-Precond
-DTL-020:RFS-FIM-101:DI14-Wave-PM
 DTL-020:RFS-FIM-101:DI15-DIlckLatch-RB
 DTL-020:RFS-FIM-101:DI15-FastRst-IlckCnt
 DTL-020:RFS-FIM-101:DI15-HVON-En-RB
@@ -582,7 +564,6 @@ DTL-020:RFS-FIM-101:DI17-Input-RB
 DTL-020:RFS-FIM-101:DI17-isFirstIlck
 DTL-020:RFS-FIM-101:DI17-RFON-En-RB
 DTL-020:RFS-FIM-101:DI17-RFON-Precond
-DTL-020:RFS-FIM-101:DI17-Wave-PM
 DTL-020:RFS-FIM-101:DI18-DIlckLatch-RB
 DTL-020:RFS-FIM-101:DI18-DIlckMode-RB
 DTL-020:RFS-FIM-101:DI18-FastRst-IlckCnt
@@ -594,7 +575,6 @@ DTL-020:RFS-FIM-101:DI18-Input-RB
 DTL-020:RFS-FIM-101:DI18-isFirstIlck
 DTL-020:RFS-FIM-101:DI18-RFON-En-RB
 DTL-020:RFS-FIM-101:DI18-RFON-Precond
-DTL-020:RFS-FIM-101:DI18-Wave-PM
 DTL-020:RFS-FIM-101:DI19-DIlckLatch-RB
 DTL-020:RFS-FIM-101:DI19-DIlckMode-RB
 DTL-020:RFS-FIM-101:DI19-FastRst-IlckCnt
@@ -606,7 +586,6 @@ DTL-020:RFS-FIM-101:DI19-Input-RB
 DTL-020:RFS-FIM-101:DI19-isFirstIlck
 DTL-020:RFS-FIM-101:DI19-RFON-En-RB
 DTL-020:RFS-FIM-101:DI19-RFON-Precond
-DTL-020:RFS-FIM-101:DI19-Wave-PM
 DTL-020:RFS-FIM-101:DI1-DIlckLatch-RB
 DTL-020:RFS-FIM-101:DI1-FastRst-IlckCnt
 DTL-020:RFS-FIM-101:DI1-HVON-En-RB
@@ -625,7 +604,6 @@ DTL-020:RFS-FIM-101:DI20-Input-RB
 DTL-020:RFS-FIM-101:DI20-isFirstIlck
 DTL-020:RFS-FIM-101:DI20-RFON-En-RB
 DTL-020:RFS-FIM-101:DI20-RFON-Precond
-DTL-020:RFS-FIM-101:DI20-Wave-PM
 DTL-020:RFS-FIM-101:DI21-DIlckLatch-RB
 DTL-020:RFS-FIM-101:DI21-FastRst-IlckCnt
 DTL-020:RFS-FIM-101:DI21-HVON-En-RB
@@ -679,7 +657,6 @@ DTL-020:RFS-FIM-101:DI7-Input-RB
 DTL-020:RFS-FIM-101:DI7-isFirstIlck
 DTL-020:RFS-FIM-101:DI7-RFON-En-RB
 DTL-020:RFS-FIM-101:DI7-RFON-Precond
-DTL-020:RFS-FIM-101:DI7-Wave-PM
 DTL-020:RFS-FIM-101:DI8-DIlckLatch-RB
 DTL-020:RFS-FIM-101:DI8-DIlckMode-RB
 DTL-020:RFS-FIM-101:DI8-FastRst-IlckCnt
@@ -691,7 +668,6 @@ DTL-020:RFS-FIM-101:DI8-Input-RB
 DTL-020:RFS-FIM-101:DI8-isFirstIlck
 DTL-020:RFS-FIM-101:DI8-RFON-En-RB
 DTL-020:RFS-FIM-101:DI8-RFON-Precond
-DTL-020:RFS-FIM-101:DI8-Wave-PM
 DTL-020:RFS-FIM-101:DI9-DIlckLatch-RB
 DTL-020:RFS-FIM-101:DI9-FastRst-IlckCnt
 DTL-020:RFS-FIM-101:DI9-HVON-En-RB
@@ -785,7 +761,6 @@ DTL-020:RFS-FIM-101:RP1-RFON-En-RB
 DTL-020:RFS-FIM-101:RP1-RFON-Precond
 DTL-020:RFS-FIM-101:RP1-TrigSel-RB
 DTL-020:RFS-FIM-101:RP1-TrigThre-RB
-DTL-020:RFS-FIM-101:RP1-Wave-IlckPM
 DTL-020:RFS-FIM-101:RP2-FastRst-IlckCnt
 DTL-020:RFS-FIM-101:RP2-HVON-En-RB
 DTL-020:RFS-FIM-101:RP2-HVON-Precond
@@ -805,7 +780,6 @@ DTL-020:RFS-FIM-101:RP2-RFON-En-RB
 DTL-020:RFS-FIM-101:RP2-RFON-Precond
 DTL-020:RFS-FIM-101:RP2-TrigSel-RB
 DTL-020:RFS-FIM-101:RP2-TrigThre-RB
-DTL-020:RFS-FIM-101:RP2-Wave-IlckPM
 DTL-020:RFS-FIM-101:SoftIlck-HVtoRF
 DTL-020:RFS-FIM-101:SoftIlck-HVToRFPreCond
 DTL-020:RFS-FIM-101:SoftIlck-IDLEtoHV
@@ -858,7 +832,6 @@ DTL-020:RFS-Kly-110:PwrFwd-Wave-Avg
 DTL-020:RFS-Kly-110:PwrFwd-Wave-High
 DTL-020:RFS-Kly-110:PwrFwd-Wave-Low
 DTL-020:RFS-Kly-110:PwrFwd-Wave-Med
-DTL-020:RFS-Kly-110:PwrFwd-Wave-PM
 DTL-020:RFS-Kly-110:PwrRfl-DevMonEval-RB
 DTL-020:RFS-Kly-110:PwrRfl-DevMonFact-RB
 DTL-020:RFS-Kly-110:PwrRfl-DevMonIlck-RB
@@ -897,12 +870,10 @@ DTL-020:RFS-Kly-110:PwrRfl-Wave-Avg
 DTL-020:RFS-Kly-110:PwrRfl-Wave-High
 DTL-020:RFS-Kly-110:PwrRfl-Wave-Low
 DTL-020:RFS-Kly-110:PwrRfl-Wave-Med
-DTL-020:RFS-Kly-110:PwrRfl-Wave-PM
 DTL-020:RFS-LLRF-101:Status-DIlckMode-RB
 DTL-020:RFS-LLRF-101:Status-Ilck-RB
 DTL-020:RFS-LLRF-101:Status-Input-RB
 DTL-020:RFS-LLRF-101:Status-isFirstIlck
-DTL-020:RFS-LLRF-101:Status-Wave-PM
 DTL-020:RFS-Load-120:PwrFwd-DevMonEval-RB
 DTL-020:RFS-Load-120:PwrFwd-DevMonFact-RB
 DTL-020:RFS-Load-120:PwrFwd-DevMonIlck-RB
@@ -941,7 +912,6 @@ DTL-020:RFS-Load-120:PwrFwd-Wave-Avg
 DTL-020:RFS-Load-120:PwrFwd-Wave-High
 DTL-020:RFS-Load-120:PwrFwd-Wave-Low
 DTL-020:RFS-Load-120:PwrFwd-Wave-Med
-DTL-020:RFS-Load-120:PwrFwd-Wave-PM
 DTL-020:RFS-Load-130:PwrFwd-DevMonEval-RB
 DTL-020:RFS-Load-130:PwrFwd-DevMonFact-RB
 DTL-020:RFS-Load-130:PwrFwd-DevMonIlck-RB
@@ -980,7 +950,6 @@ DTL-020:RFS-Load-130:PwrFwd-Wave-Avg
 DTL-020:RFS-Load-130:PwrFwd-Wave-High
 DTL-020:RFS-Load-130:PwrFwd-Wave-Low
 DTL-020:RFS-Load-130:PwrFwd-Wave-Med
-DTL-020:RFS-Load-130:PwrFwd-Wave-PM
 DTL-020:RFS-Mod-110:Cur-DevMonEval-RB
 DTL-020:RFS-Mod-110:Cur-DevMonFact-RB
 DTL-020:RFS-Mod-110:Cur-DevMonIlck-RB
@@ -1019,17 +988,14 @@ DTL-020:RFS-Mod-110:Cur-Wave-Avg
 DTL-020:RFS-Mod-110:Cur-Wave-High
 DTL-020:RFS-Mod-110:Cur-Wave-Low
 DTL-020:RFS-Mod-110:Cur-Wave-Med
-DTL-020:RFS-Mod-110:Cur-Wave-PM
 DTL-020:RFS-Mod-110:PCcon-DIlckMode-RB
 DTL-020:RFS-Mod-110:PCcon-Ilck-RB
 DTL-020:RFS-Mod-110:PCcon-Input-RB
 DTL-020:RFS-Mod-110:PCcon-isFirstIlck
-DTL-020:RFS-Mod-110:PCcon-Wave-PM
 DTL-020:RFS-Mod-110:Ready-DIlckMode-RB
 DTL-020:RFS-Mod-110:Ready-Ilck-RB
 DTL-020:RFS-Mod-110:Ready-Input-RB
 DTL-020:RFS-Mod-110:Ready-isFirstIlck
-DTL-020:RFS-Mod-110:Ready-Wave-PM
 DTL-020:RFS-Mod-110:Vol-DevMonEval-RB
 DTL-020:RFS-Mod-110:Vol-DevMonFact-RB
 DTL-020:RFS-Mod-110:Vol-DevMonIlck-RB
@@ -1068,7 +1034,6 @@ DTL-020:RFS-Mod-110:Vol-Wave-Avg
 DTL-020:RFS-Mod-110:Vol-Wave-High
 DTL-020:RFS-Mod-110:Vol-Wave-Low
 DTL-020:RFS-Mod-110:Vol-Wave-Med
-DTL-020:RFS-Mod-110:Vol-Wave-PM
 DTL-020:RFS-PAmp-110:PwrFwd-DevMonEval-RB
 DTL-020:RFS-PAmp-110:PwrFwd-DevMonFact-RB
 DTL-020:RFS-PAmp-110:PwrFwd-DevMonIlck-RB
@@ -1107,17 +1072,14 @@ DTL-020:RFS-PAmp-110:PwrFwd-Wave-Avg
 DTL-020:RFS-PAmp-110:PwrFwd-Wave-High
 DTL-020:RFS-PAmp-110:PwrFwd-Wave-Low
 DTL-020:RFS-PAmp-110:PwrFwd-Wave-Med
-DTL-020:RFS-PAmp-110:PwrFwd-Wave-PM
 DTL-020:RFS-SIM-110:HvEna-DIlckMode-RB
 DTL-020:RFS-SIM-110:HvEna-Ilck-RB
 DTL-020:RFS-SIM-110:HvEna-Input-RB
 DTL-020:RFS-SIM-110:HvEna-isFirstIlck
-DTL-020:RFS-SIM-110:HvEna-Wave-PM
 DTL-020:RFS-SIM-110:RfEna-DIlckMode-RB
 DTL-020:RFS-SIM-110:RfEna-Ilck-RB
 DTL-020:RFS-SIM-110:RfEna-Input-RB
 DTL-020:RFS-SIM-110:RfEna-isFirstIlck
-DTL-020:RFS-SIM-110:RfEna-Wave-PM
 DTL-020:RFS-SolPS-110:Cur-DevMonEval-RB
 DTL-020:RFS-SolPS-110:Cur-DevMonFact-RB
 DTL-020:RFS-SolPS-110:Cur-DevMonIlck-RB
@@ -1156,7 +1118,6 @@ DTL-020:RFS-SolPS-110:Cur-Wave-Avg
 DTL-020:RFS-SolPS-110:Cur-Wave-High
 DTL-020:RFS-SolPS-110:Cur-Wave-Low
 DTL-020:RFS-SolPS-110:Cur-Wave-Med
-DTL-020:RFS-SolPS-110:Cur-Wave-PM
 DTL-020:RFS-SolPS-120:Cur-DevMonEval-RB
 DTL-020:RFS-SolPS-120:Cur-DevMonFact-RB
 DTL-020:RFS-SolPS-120:Cur-DevMonIlck-RB
@@ -1195,7 +1156,6 @@ DTL-020:RFS-SolPS-120:Cur-Wave-Avg
 DTL-020:RFS-SolPS-120:Cur-Wave-High
 DTL-020:RFS-SolPS-120:Cur-Wave-Low
 DTL-020:RFS-SolPS-120:Cur-Wave-Med
-DTL-020:RFS-SolPS-120:Cur-Wave-PM
 DTL-020:RFS-SolPS-130:Cur-DevMonEval-RB
 DTL-020:RFS-SolPS-130:Cur-DevMonFact-RB
 DTL-020:RFS-SolPS-130:Cur-DevMonIlck-RB
@@ -1234,24 +1194,19 @@ DTL-020:RFS-SolPS-130:Cur-Wave-Avg
 DTL-020:RFS-SolPS-130:Cur-Wave-High
 DTL-020:RFS-SolPS-130:Cur-Wave-Low
 DTL-020:RFS-SolPS-130:Cur-Wave-Med
-DTL-020:RFS-SolPS-130:Cur-Wave-PM
 DTL-020:RFS-VacMon-110:Status-DIlckMode-RB
 DTL-020:RFS-VacMon-110:Status-Ilck-RB
 DTL-020:RFS-VacMon-110:Status-Input-RB
 DTL-020:RFS-VacMon-110:Status-isFirstIlck
-DTL-020:RFS-VacMon-110:Status-Wave-PM
 DTL-020:RFS-VacMon-130:Status-DIlckMode-RB
 DTL-020:RFS-VacMon-130:Status-Ilck-RB
 DTL-020:RFS-VacMon-130:Status-Input-RB
 DTL-020:RFS-VacMon-130:Status-isFirstIlck
-DTL-020:RFS-VacMon-130:Status-Wave-PM
 DTL-020:RFS-VacPS-110:I-SP-DIlckMode-RB
 DTL-020:RFS-VacPS-110:I-SP-Ilck-RB
 DTL-020:RFS-VacPS-110:I-SP-Input-RB
 DTL-020:RFS-VacPS-110:I-SP-isFirstIlck
-DTL-020:RFS-VacPS-110:I-SP-Wave-PM
 DTL-020:RFS-VacPS-120:I-SP-DIlckMode-RB
 DTL-020:RFS-VacPS-120:I-SP-Ilck-RB
 DTL-020:RFS-VacPS-120:I-SP-Input-RB
 DTL-020:RFS-VacPS-120:I-SP-isFirstIlck
-DTL-020:RFS-VacPS-120:I-SP-Wave-PM
diff --git a/files/DTL-030_SC-IOC-102.archive b/files/DTL-030_SC-IOC-102.archive
index 9163aec..86d7f8d 100644
--- a/files/DTL-030_SC-IOC-102.archive
+++ b/files/DTL-030_SC-IOC-102.archive
@@ -2,12 +2,10 @@ DTL-030:RFS-ADG-110:IlckStatus-DIlckMode-RB
 DTL-030:RFS-ADG-110:IlckStatus-Ilck-RB
 DTL-030:RFS-ADG-110:IlckStatus-Input-RB
 DTL-030:RFS-ADG-110:IlckStatus-isFirstIlck
-DTL-030:RFS-ADG-110:IlckStatus-Wave-PM
 DTL-030:RFS-ADG-110:PwrFail-DIlckMode-RB
 DTL-030:RFS-ADG-110:PwrFail-Ilck-RB
 DTL-030:RFS-ADG-110:PwrFail-Input-RB
 DTL-030:RFS-ADG-110:PwrFail-isFirstIlck
-DTL-030:RFS-ADG-110:PwrFail-Wave-PM
 DTL-030:RFS-Cav-110:Fld-DevMonEval-RB
 DTL-030:RFS-Cav-110:Fld-DevMonFact-RB
 DTL-030:RFS-Cav-110:Fld-DevMonIlck-RB
@@ -46,7 +44,6 @@ DTL-030:RFS-Cav-110:Fld-Wave-Avg
 DTL-030:RFS-Cav-110:Fld-Wave-High
 DTL-030:RFS-Cav-110:Fld-Wave-Low
 DTL-030:RFS-Cav-110:Fld-Wave-Med
-DTL-030:RFS-Cav-110:Fld-Wave-PM
 DTL-030:RFS-Cav-110:PwrFwd-DevMonEval-RB
 DTL-030:RFS-Cav-110:PwrFwd-DevMonFact-RB
 DTL-030:RFS-Cav-110:PwrFwd-DevMonIlck-RB
@@ -85,7 +82,6 @@ DTL-030:RFS-Cav-110:PwrFwd-Wave-Avg
 DTL-030:RFS-Cav-110:PwrFwd-Wave-High
 DTL-030:RFS-Cav-110:PwrFwd-Wave-Low
 DTL-030:RFS-Cav-110:PwrFwd-Wave-Med
-DTL-030:RFS-Cav-110:PwrFwd-Wave-PM
 DTL-030:RFS-Cav-110:PwrRfl-DevMonEval-RB
 DTL-030:RFS-Cav-110:PwrRfl-DevMonFact-RB
 DTL-030:RFS-Cav-110:PwrRfl-DevMonIlck-RB
@@ -124,7 +120,6 @@ DTL-030:RFS-Cav-110:PwrRfl-Wave-Avg
 DTL-030:RFS-Cav-110:PwrRfl-Wave-High
 DTL-030:RFS-Cav-110:PwrRfl-Wave-Low
 DTL-030:RFS-Cav-110:PwrRfl-Wave-Med
-DTL-030:RFS-Cav-110:PwrRfl-Wave-PM
 DTL-030:RFS-Cav-120:PwrFwd-DevMonEval-RB
 DTL-030:RFS-Cav-120:PwrFwd-DevMonFact-RB
 DTL-030:RFS-Cav-120:PwrFwd-DevMonIlck-RB
@@ -163,7 +158,6 @@ DTL-030:RFS-Cav-120:PwrFwd-Wave-Avg
 DTL-030:RFS-Cav-120:PwrFwd-Wave-High
 DTL-030:RFS-Cav-120:PwrFwd-Wave-Low
 DTL-030:RFS-Cav-120:PwrFwd-Wave-Med
-DTL-030:RFS-Cav-120:PwrFwd-Wave-PM
 DTL-030:RFS-Cav-120:PwrRfl-DevMonEval-RB
 DTL-030:RFS-Cav-120:PwrRfl-DevMonFact-RB
 DTL-030:RFS-Cav-120:PwrRfl-DevMonIlck-RB
@@ -202,7 +196,6 @@ DTL-030:RFS-Cav-120:PwrRfl-Wave-Avg
 DTL-030:RFS-Cav-120:PwrRfl-Wave-High
 DTL-030:RFS-Cav-120:PwrRfl-Wave-Low
 DTL-030:RFS-Cav-120:PwrRfl-Wave-Med
-DTL-030:RFS-Cav-120:PwrRfl-Wave-PM
 DTL-030:RFS-FIM-101:AI10-DevMonEval-RB
 DTL-030:RFS-FIM-101:AI10-DevMonFact-RB
 DTL-030:RFS-FIM-101:AI10-DevMonIlck-RB
@@ -247,7 +240,6 @@ DTL-030:RFS-FIM-101:AI10-Wave-Avg
 DTL-030:RFS-FIM-101:AI10-Wave-High
 DTL-030:RFS-FIM-101:AI10-Wave-Low
 DTL-030:RFS-FIM-101:AI10-Wave-Med
-DTL-030:RFS-FIM-101:AI10-Wave-PM
 DTL-030:RFS-FIM-101:AI1-FastRst-IlckCnt
 DTL-030:RFS-FIM-101:AI1-HVON-En-RB
 DTL-030:RFS-FIM-101:AI1-HVON-Precond
@@ -322,7 +314,6 @@ DTL-030:RFS-FIM-101:AI6-Wave-Avg
 DTL-030:RFS-FIM-101:AI6-Wave-High
 DTL-030:RFS-FIM-101:AI6-Wave-Low
 DTL-030:RFS-FIM-101:AI6-Wave-Med
-DTL-030:RFS-FIM-101:AI6-Wave-PM
 DTL-030:RFS-FIM-101:AI7-DevMonEval-RB
 DTL-030:RFS-FIM-101:AI7-DevMonFact-RB
 DTL-030:RFS-FIM-101:AI7-DevMonIlck-RB
@@ -367,7 +358,6 @@ DTL-030:RFS-FIM-101:AI7-Wave-Avg
 DTL-030:RFS-FIM-101:AI7-Wave-High
 DTL-030:RFS-FIM-101:AI7-Wave-Low
 DTL-030:RFS-FIM-101:AI7-Wave-Med
-DTL-030:RFS-FIM-101:AI7-Wave-PM
 DTL-030:RFS-FIM-101:AI8-DevMonEval-RB
 DTL-030:RFS-FIM-101:AI8-DevMonFact-RB
 DTL-030:RFS-FIM-101:AI8-DevMonIlck-RB
@@ -412,7 +402,6 @@ DTL-030:RFS-FIM-101:AI8-Wave-Avg
 DTL-030:RFS-FIM-101:AI8-Wave-High
 DTL-030:RFS-FIM-101:AI8-Wave-Low
 DTL-030:RFS-FIM-101:AI8-Wave-Med
-DTL-030:RFS-FIM-101:AI8-Wave-PM
 DTL-030:RFS-FIM-101:AI9-DevMonEval-RB
 DTL-030:RFS-FIM-101:AI9-DevMonFact-RB
 DTL-030:RFS-FIM-101:AI9-DevMonIlck-RB
@@ -457,7 +446,6 @@ DTL-030:RFS-FIM-101:AI9-Wave-Avg
 DTL-030:RFS-FIM-101:AI9-Wave-High
 DTL-030:RFS-FIM-101:AI9-Wave-Low
 DTL-030:RFS-FIM-101:AI9-Wave-Med
-DTL-030:RFS-FIM-101:AI9-Wave-PM
 DTL-030:RFS-FIM-101:CD1-DevFactor-RB
 DTL-030:RFS-FIM-101:CD1-DevPeriod-RB
 DTL-030:RFS-FIM-101:CD1-FastRst-IlckCnt
@@ -479,7 +467,6 @@ DTL-030:RFS-FIM-101:CD1-RFON-En-RB
 DTL-030:RFS-FIM-101:CD1-RFON-Precond
 DTL-030:RFS-FIM-101:CD1-TrigSel-RB
 DTL-030:RFS-FIM-101:CD1-TrigThre-RB
-DTL-030:RFS-FIM-101:CD1-Wave-IlckPM
 DTL-030:RFS-FIM-101:CD2-DevFactor-RB
 DTL-030:RFS-FIM-101:CD2-DevPeriod-RB
 DTL-030:RFS-FIM-101:CD2-FastRst-IlckCnt
@@ -501,7 +488,6 @@ DTL-030:RFS-FIM-101:CD2-RFON-En-RB
 DTL-030:RFS-FIM-101:CD2-RFON-Precond
 DTL-030:RFS-FIM-101:CD2-TrigSel-RB
 DTL-030:RFS-FIM-101:CD2-TrigThre-RB
-DTL-030:RFS-FIM-101:CD2-Wave-IlckPM
 DTL-030:RFS-FIM-101:DI10-DIlckLatch-RB
 DTL-030:RFS-FIM-101:DI10-DIlckMode-RB
 DTL-030:RFS-FIM-101:DI10-FastRst-IlckCnt
@@ -513,7 +499,6 @@ DTL-030:RFS-FIM-101:DI10-Input-RB
 DTL-030:RFS-FIM-101:DI10-isFirstIlck
 DTL-030:RFS-FIM-101:DI10-RFON-En-RB
 DTL-030:RFS-FIM-101:DI10-RFON-Precond
-DTL-030:RFS-FIM-101:DI10-Wave-PM
 DTL-030:RFS-FIM-101:DI11-DIlckLatch-RB
 DTL-030:RFS-FIM-101:DI11-FastRst-IlckCnt
 DTL-030:RFS-FIM-101:DI11-HVON-En-RB
@@ -532,7 +517,6 @@ DTL-030:RFS-FIM-101:DI12-Input-RB
 DTL-030:RFS-FIM-101:DI12-isFirstIlck
 DTL-030:RFS-FIM-101:DI12-RFON-En-RB
 DTL-030:RFS-FIM-101:DI12-RFON-Precond
-DTL-030:RFS-FIM-101:DI12-Wave-PM
 DTL-030:RFS-FIM-101:DI13-DIlckLatch-RB
 DTL-030:RFS-FIM-101:DI13-DIlckMode-RB
 DTL-030:RFS-FIM-101:DI13-FastRst-IlckCnt
@@ -544,7 +528,6 @@ DTL-030:RFS-FIM-101:DI13-Input-RB
 DTL-030:RFS-FIM-101:DI13-isFirstIlck
 DTL-030:RFS-FIM-101:DI13-RFON-En-RB
 DTL-030:RFS-FIM-101:DI13-RFON-Precond
-DTL-030:RFS-FIM-101:DI13-Wave-PM
 DTL-030:RFS-FIM-101:DI14-DIlckLatch-RB
 DTL-030:RFS-FIM-101:DI14-DIlckMode-RB
 DTL-030:RFS-FIM-101:DI14-FastRst-IlckCnt
@@ -556,7 +539,6 @@ DTL-030:RFS-FIM-101:DI14-Input-RB
 DTL-030:RFS-FIM-101:DI14-isFirstIlck
 DTL-030:RFS-FIM-101:DI14-RFON-En-RB
 DTL-030:RFS-FIM-101:DI14-RFON-Precond
-DTL-030:RFS-FIM-101:DI14-Wave-PM
 DTL-030:RFS-FIM-101:DI15-DIlckLatch-RB
 DTL-030:RFS-FIM-101:DI15-FastRst-IlckCnt
 DTL-030:RFS-FIM-101:DI15-HVON-En-RB
@@ -582,7 +564,6 @@ DTL-030:RFS-FIM-101:DI17-Input-RB
 DTL-030:RFS-FIM-101:DI17-isFirstIlck
 DTL-030:RFS-FIM-101:DI17-RFON-En-RB
 DTL-030:RFS-FIM-101:DI17-RFON-Precond
-DTL-030:RFS-FIM-101:DI17-Wave-PM
 DTL-030:RFS-FIM-101:DI18-DIlckLatch-RB
 DTL-030:RFS-FIM-101:DI18-DIlckMode-RB
 DTL-030:RFS-FIM-101:DI18-FastRst-IlckCnt
@@ -594,7 +575,6 @@ DTL-030:RFS-FIM-101:DI18-Input-RB
 DTL-030:RFS-FIM-101:DI18-isFirstIlck
 DTL-030:RFS-FIM-101:DI18-RFON-En-RB
 DTL-030:RFS-FIM-101:DI18-RFON-Precond
-DTL-030:RFS-FIM-101:DI18-Wave-PM
 DTL-030:RFS-FIM-101:DI19-DIlckLatch-RB
 DTL-030:RFS-FIM-101:DI19-DIlckMode-RB
 DTL-030:RFS-FIM-101:DI19-FastRst-IlckCnt
@@ -606,7 +586,6 @@ DTL-030:RFS-FIM-101:DI19-Input-RB
 DTL-030:RFS-FIM-101:DI19-isFirstIlck
 DTL-030:RFS-FIM-101:DI19-RFON-En-RB
 DTL-030:RFS-FIM-101:DI19-RFON-Precond
-DTL-030:RFS-FIM-101:DI19-Wave-PM
 DTL-030:RFS-FIM-101:DI1-DIlckLatch-RB
 DTL-030:RFS-FIM-101:DI1-FastRst-IlckCnt
 DTL-030:RFS-FIM-101:DI1-HVON-En-RB
@@ -625,7 +604,6 @@ DTL-030:RFS-FIM-101:DI20-Input-RB
 DTL-030:RFS-FIM-101:DI20-isFirstIlck
 DTL-030:RFS-FIM-101:DI20-RFON-En-RB
 DTL-030:RFS-FIM-101:DI20-RFON-Precond
-DTL-030:RFS-FIM-101:DI20-Wave-PM
 DTL-030:RFS-FIM-101:DI21-DIlckLatch-RB
 DTL-030:RFS-FIM-101:DI21-FastRst-IlckCnt
 DTL-030:RFS-FIM-101:DI21-HVON-En-RB
@@ -679,7 +657,6 @@ DTL-030:RFS-FIM-101:DI7-Input-RB
 DTL-030:RFS-FIM-101:DI7-isFirstIlck
 DTL-030:RFS-FIM-101:DI7-RFON-En-RB
 DTL-030:RFS-FIM-101:DI7-RFON-Precond
-DTL-030:RFS-FIM-101:DI7-Wave-PM
 DTL-030:RFS-FIM-101:DI8-DIlckLatch-RB
 DTL-030:RFS-FIM-101:DI8-DIlckMode-RB
 DTL-030:RFS-FIM-101:DI8-FastRst-IlckCnt
@@ -691,7 +668,6 @@ DTL-030:RFS-FIM-101:DI8-Input-RB
 DTL-030:RFS-FIM-101:DI8-isFirstIlck
 DTL-030:RFS-FIM-101:DI8-RFON-En-RB
 DTL-030:RFS-FIM-101:DI8-RFON-Precond
-DTL-030:RFS-FIM-101:DI8-Wave-PM
 DTL-030:RFS-FIM-101:DI9-DIlckLatch-RB
 DTL-030:RFS-FIM-101:DI9-FastRst-IlckCnt
 DTL-030:RFS-FIM-101:DI9-HVON-En-RB
@@ -785,7 +761,6 @@ DTL-030:RFS-FIM-101:RP1-RFON-En-RB
 DTL-030:RFS-FIM-101:RP1-RFON-Precond
 DTL-030:RFS-FIM-101:RP1-TrigSel-RB
 DTL-030:RFS-FIM-101:RP1-TrigThre-RB
-DTL-030:RFS-FIM-101:RP1-Wave-IlckPM
 DTL-030:RFS-FIM-101:RP2-FastRst-IlckCnt
 DTL-030:RFS-FIM-101:RP2-HVON-En-RB
 DTL-030:RFS-FIM-101:RP2-HVON-Precond
@@ -805,7 +780,6 @@ DTL-030:RFS-FIM-101:RP2-RFON-En-RB
 DTL-030:RFS-FIM-101:RP2-RFON-Precond
 DTL-030:RFS-FIM-101:RP2-TrigSel-RB
 DTL-030:RFS-FIM-101:RP2-TrigThre-RB
-DTL-030:RFS-FIM-101:RP2-Wave-IlckPM
 DTL-030:RFS-FIM-101:SoftIlck-HVtoRF
 DTL-030:RFS-FIM-101:SoftIlck-HVToRFPreCond
 DTL-030:RFS-FIM-101:SoftIlck-IDLEtoHV
@@ -858,7 +832,6 @@ DTL-030:RFS-Kly-110:PwrFwd-Wave-Avg
 DTL-030:RFS-Kly-110:PwrFwd-Wave-High
 DTL-030:RFS-Kly-110:PwrFwd-Wave-Low
 DTL-030:RFS-Kly-110:PwrFwd-Wave-Med
-DTL-030:RFS-Kly-110:PwrFwd-Wave-PM
 DTL-030:RFS-Kly-110:PwrRfl-DevMonEval-RB
 DTL-030:RFS-Kly-110:PwrRfl-DevMonFact-RB
 DTL-030:RFS-Kly-110:PwrRfl-DevMonIlck-RB
@@ -897,12 +870,10 @@ DTL-030:RFS-Kly-110:PwrRfl-Wave-Avg
 DTL-030:RFS-Kly-110:PwrRfl-Wave-High
 DTL-030:RFS-Kly-110:PwrRfl-Wave-Low
 DTL-030:RFS-Kly-110:PwrRfl-Wave-Med
-DTL-030:RFS-Kly-110:PwrRfl-Wave-PM
 DTL-030:RFS-LLRF-101:Status-DIlckMode-RB
 DTL-030:RFS-LLRF-101:Status-Ilck-RB
 DTL-030:RFS-LLRF-101:Status-Input-RB
 DTL-030:RFS-LLRF-101:Status-isFirstIlck
-DTL-030:RFS-LLRF-101:Status-Wave-PM
 DTL-030:RFS-Load-120:PwrFwd-DevMonEval-RB
 DTL-030:RFS-Load-120:PwrFwd-DevMonFact-RB
 DTL-030:RFS-Load-120:PwrFwd-DevMonIlck-RB
@@ -941,7 +912,6 @@ DTL-030:RFS-Load-120:PwrFwd-Wave-Avg
 DTL-030:RFS-Load-120:PwrFwd-Wave-High
 DTL-030:RFS-Load-120:PwrFwd-Wave-Low
 DTL-030:RFS-Load-120:PwrFwd-Wave-Med
-DTL-030:RFS-Load-120:PwrFwd-Wave-PM
 DTL-030:RFS-Load-130:PwrFwd-DevMonEval-RB
 DTL-030:RFS-Load-130:PwrFwd-DevMonFact-RB
 DTL-030:RFS-Load-130:PwrFwd-DevMonIlck-RB
@@ -980,7 +950,6 @@ DTL-030:RFS-Load-130:PwrFwd-Wave-Avg
 DTL-030:RFS-Load-130:PwrFwd-Wave-High
 DTL-030:RFS-Load-130:PwrFwd-Wave-Low
 DTL-030:RFS-Load-130:PwrFwd-Wave-Med
-DTL-030:RFS-Load-130:PwrFwd-Wave-PM
 DTL-030:RFS-Mod-110:Cur-DevMonEval-RB
 DTL-030:RFS-Mod-110:Cur-DevMonFact-RB
 DTL-030:RFS-Mod-110:Cur-DevMonIlck-RB
@@ -1019,17 +988,14 @@ DTL-030:RFS-Mod-110:Cur-Wave-Avg
 DTL-030:RFS-Mod-110:Cur-Wave-High
 DTL-030:RFS-Mod-110:Cur-Wave-Low
 DTL-030:RFS-Mod-110:Cur-Wave-Med
-DTL-030:RFS-Mod-110:Cur-Wave-PM
 DTL-030:RFS-Mod-110:PCcon-DIlckMode-RB
 DTL-030:RFS-Mod-110:PCcon-Ilck-RB
 DTL-030:RFS-Mod-110:PCcon-Input-RB
 DTL-030:RFS-Mod-110:PCcon-isFirstIlck
-DTL-030:RFS-Mod-110:PCcon-Wave-PM
 DTL-030:RFS-Mod-110:Ready-DIlckMode-RB
 DTL-030:RFS-Mod-110:Ready-Ilck-RB
 DTL-030:RFS-Mod-110:Ready-Input-RB
 DTL-030:RFS-Mod-110:Ready-isFirstIlck
-DTL-030:RFS-Mod-110:Ready-Wave-PM
 DTL-030:RFS-Mod-110:Vol-DevMonEval-RB
 DTL-030:RFS-Mod-110:Vol-DevMonFact-RB
 DTL-030:RFS-Mod-110:Vol-DevMonIlck-RB
@@ -1068,7 +1034,6 @@ DTL-030:RFS-Mod-110:Vol-Wave-Avg
 DTL-030:RFS-Mod-110:Vol-Wave-High
 DTL-030:RFS-Mod-110:Vol-Wave-Low
 DTL-030:RFS-Mod-110:Vol-Wave-Med
-DTL-030:RFS-Mod-110:Vol-Wave-PM
 DTL-030:RFS-PAmp-110:PwrFwd-DevMonEval-RB
 DTL-030:RFS-PAmp-110:PwrFwd-DevMonFact-RB
 DTL-030:RFS-PAmp-110:PwrFwd-DevMonIlck-RB
@@ -1107,17 +1072,14 @@ DTL-030:RFS-PAmp-110:PwrFwd-Wave-Avg
 DTL-030:RFS-PAmp-110:PwrFwd-Wave-High
 DTL-030:RFS-PAmp-110:PwrFwd-Wave-Low
 DTL-030:RFS-PAmp-110:PwrFwd-Wave-Med
-DTL-030:RFS-PAmp-110:PwrFwd-Wave-PM
 DTL-030:RFS-SIM-110:HvEna-DIlckMode-RB
 DTL-030:RFS-SIM-110:HvEna-Ilck-RB
 DTL-030:RFS-SIM-110:HvEna-Input-RB
 DTL-030:RFS-SIM-110:HvEna-isFirstIlck
-DTL-030:RFS-SIM-110:HvEna-Wave-PM
 DTL-030:RFS-SIM-110:RfEna-DIlckMode-RB
 DTL-030:RFS-SIM-110:RfEna-Ilck-RB
 DTL-030:RFS-SIM-110:RfEna-Input-RB
 DTL-030:RFS-SIM-110:RfEna-isFirstIlck
-DTL-030:RFS-SIM-110:RfEna-Wave-PM
 DTL-030:RFS-SolPS-110:Cur-DevMonEval-RB
 DTL-030:RFS-SolPS-110:Cur-DevMonFact-RB
 DTL-030:RFS-SolPS-110:Cur-DevMonIlck-RB
@@ -1156,7 +1118,6 @@ DTL-030:RFS-SolPS-110:Cur-Wave-Avg
 DTL-030:RFS-SolPS-110:Cur-Wave-High
 DTL-030:RFS-SolPS-110:Cur-Wave-Low
 DTL-030:RFS-SolPS-110:Cur-Wave-Med
-DTL-030:RFS-SolPS-110:Cur-Wave-PM
 DTL-030:RFS-SolPS-120:Cur-DevMonEval-RB
 DTL-030:RFS-SolPS-120:Cur-DevMonFact-RB
 DTL-030:RFS-SolPS-120:Cur-DevMonIlck-RB
@@ -1195,7 +1156,6 @@ DTL-030:RFS-SolPS-120:Cur-Wave-Avg
 DTL-030:RFS-SolPS-120:Cur-Wave-High
 DTL-030:RFS-SolPS-120:Cur-Wave-Low
 DTL-030:RFS-SolPS-120:Cur-Wave-Med
-DTL-030:RFS-SolPS-120:Cur-Wave-PM
 DTL-030:RFS-SolPS-130:Cur-DevMonEval-RB
 DTL-030:RFS-SolPS-130:Cur-DevMonFact-RB
 DTL-030:RFS-SolPS-130:Cur-DevMonIlck-RB
@@ -1234,24 +1194,19 @@ DTL-030:RFS-SolPS-130:Cur-Wave-Avg
 DTL-030:RFS-SolPS-130:Cur-Wave-High
 DTL-030:RFS-SolPS-130:Cur-Wave-Low
 DTL-030:RFS-SolPS-130:Cur-Wave-Med
-DTL-030:RFS-SolPS-130:Cur-Wave-PM
 DTL-030:RFS-VacMon-110:Status-DIlckMode-RB
 DTL-030:RFS-VacMon-110:Status-Ilck-RB
 DTL-030:RFS-VacMon-110:Status-Input-RB
 DTL-030:RFS-VacMon-110:Status-isFirstIlck
-DTL-030:RFS-VacMon-110:Status-Wave-PM
 DTL-030:RFS-VacMon-130:Status-DIlckMode-RB
 DTL-030:RFS-VacMon-130:Status-Ilck-RB
 DTL-030:RFS-VacMon-130:Status-Input-RB
 DTL-030:RFS-VacMon-130:Status-isFirstIlck
-DTL-030:RFS-VacMon-130:Status-Wave-PM
 DTL-030:RFS-VacPS-110:I-SP-DIlckMode-RB
 DTL-030:RFS-VacPS-110:I-SP-Ilck-RB
 DTL-030:RFS-VacPS-110:I-SP-Input-RB
 DTL-030:RFS-VacPS-110:I-SP-isFirstIlck
-DTL-030:RFS-VacPS-110:I-SP-Wave-PM
 DTL-030:RFS-VacPS-120:I-SP-DIlckMode-RB
 DTL-030:RFS-VacPS-120:I-SP-Ilck-RB
 DTL-030:RFS-VacPS-120:I-SP-Input-RB
 DTL-030:RFS-VacPS-120:I-SP-isFirstIlck
-DTL-030:RFS-VacPS-120:I-SP-Wave-PM
diff --git a/files/DTL-040_SC-IOC-102.archive b/files/DTL-040_SC-IOC-102.archive
index 4c08b27..19b6e19 100644
--- a/files/DTL-040_SC-IOC-102.archive
+++ b/files/DTL-040_SC-IOC-102.archive
@@ -2,12 +2,10 @@ DTL-040:RFS-ADG-110:IlckStatus-DIlckMode-RB
 DTL-040:RFS-ADG-110:IlckStatus-Ilck-RB
 DTL-040:RFS-ADG-110:IlckStatus-Input-RB
 DTL-040:RFS-ADG-110:IlckStatus-isFirstIlck
-DTL-040:RFS-ADG-110:IlckStatus-Wave-PM
 DTL-040:RFS-ADG-110:PwrFail-DIlckMode-RB
 DTL-040:RFS-ADG-110:PwrFail-Ilck-RB
 DTL-040:RFS-ADG-110:PwrFail-Input-RB
 DTL-040:RFS-ADG-110:PwrFail-isFirstIlck
-DTL-040:RFS-ADG-110:PwrFail-Wave-PM
 DTL-040:RFS-Cav-110:Fld-DevMonEval-RB
 DTL-040:RFS-Cav-110:Fld-DevMonFact-RB
 DTL-040:RFS-Cav-110:Fld-DevMonIlck-RB
@@ -46,7 +44,6 @@ DTL-040:RFS-Cav-110:Fld-Wave-Avg
 DTL-040:RFS-Cav-110:Fld-Wave-High
 DTL-040:RFS-Cav-110:Fld-Wave-Low
 DTL-040:RFS-Cav-110:Fld-Wave-Med
-DTL-040:RFS-Cav-110:Fld-Wave-PM
 DTL-040:RFS-Cav-110:PwrFwd-DevMonEval-RB
 DTL-040:RFS-Cav-110:PwrFwd-DevMonFact-RB
 DTL-040:RFS-Cav-110:PwrFwd-DevMonIlck-RB
@@ -85,7 +82,6 @@ DTL-040:RFS-Cav-110:PwrFwd-Wave-Avg
 DTL-040:RFS-Cav-110:PwrFwd-Wave-High
 DTL-040:RFS-Cav-110:PwrFwd-Wave-Low
 DTL-040:RFS-Cav-110:PwrFwd-Wave-Med
-DTL-040:RFS-Cav-110:PwrFwd-Wave-PM
 DTL-040:RFS-Cav-110:PwrRfl-DevMonEval-RB
 DTL-040:RFS-Cav-110:PwrRfl-DevMonFact-RB
 DTL-040:RFS-Cav-110:PwrRfl-DevMonIlck-RB
@@ -124,7 +120,6 @@ DTL-040:RFS-Cav-110:PwrRfl-Wave-Avg
 DTL-040:RFS-Cav-110:PwrRfl-Wave-High
 DTL-040:RFS-Cav-110:PwrRfl-Wave-Low
 DTL-040:RFS-Cav-110:PwrRfl-Wave-Med
-DTL-040:RFS-Cav-110:PwrRfl-Wave-PM
 DTL-040:RFS-Cav-120:PwrFwd-DevMonEval-RB
 DTL-040:RFS-Cav-120:PwrFwd-DevMonFact-RB
 DTL-040:RFS-Cav-120:PwrFwd-DevMonIlck-RB
@@ -163,7 +158,6 @@ DTL-040:RFS-Cav-120:PwrFwd-Wave-Avg
 DTL-040:RFS-Cav-120:PwrFwd-Wave-High
 DTL-040:RFS-Cav-120:PwrFwd-Wave-Low
 DTL-040:RFS-Cav-120:PwrFwd-Wave-Med
-DTL-040:RFS-Cav-120:PwrFwd-Wave-PM
 DTL-040:RFS-Cav-120:PwrRfl-DevMonEval-RB
 DTL-040:RFS-Cav-120:PwrRfl-DevMonFact-RB
 DTL-040:RFS-Cav-120:PwrRfl-DevMonIlck-RB
@@ -202,7 +196,6 @@ DTL-040:RFS-Cav-120:PwrRfl-Wave-Avg
 DTL-040:RFS-Cav-120:PwrRfl-Wave-High
 DTL-040:RFS-Cav-120:PwrRfl-Wave-Low
 DTL-040:RFS-Cav-120:PwrRfl-Wave-Med
-DTL-040:RFS-Cav-120:PwrRfl-Wave-PM
 DTL-040:RFS-FIM-101:AI10-DevMonEval-RB
 DTL-040:RFS-FIM-101:AI10-DevMonFact-RB
 DTL-040:RFS-FIM-101:AI10-DevMonIlck-RB
@@ -247,7 +240,6 @@ DTL-040:RFS-FIM-101:AI10-Wave-Avg
 DTL-040:RFS-FIM-101:AI10-Wave-High
 DTL-040:RFS-FIM-101:AI10-Wave-Low
 DTL-040:RFS-FIM-101:AI10-Wave-Med
-DTL-040:RFS-FIM-101:AI10-Wave-PM
 DTL-040:RFS-FIM-101:AI1-FastRst-IlckCnt
 DTL-040:RFS-FIM-101:AI1-HVON-En-RB
 DTL-040:RFS-FIM-101:AI1-HVON-Precond
@@ -322,7 +314,6 @@ DTL-040:RFS-FIM-101:AI6-Wave-Avg
 DTL-040:RFS-FIM-101:AI6-Wave-High
 DTL-040:RFS-FIM-101:AI6-Wave-Low
 DTL-040:RFS-FIM-101:AI6-Wave-Med
-DTL-040:RFS-FIM-101:AI6-Wave-PM
 DTL-040:RFS-FIM-101:AI7-DevMonEval-RB
 DTL-040:RFS-FIM-101:AI7-DevMonFact-RB
 DTL-040:RFS-FIM-101:AI7-DevMonIlck-RB
@@ -367,7 +358,6 @@ DTL-040:RFS-FIM-101:AI7-Wave-Avg
 DTL-040:RFS-FIM-101:AI7-Wave-High
 DTL-040:RFS-FIM-101:AI7-Wave-Low
 DTL-040:RFS-FIM-101:AI7-Wave-Med
-DTL-040:RFS-FIM-101:AI7-Wave-PM
 DTL-040:RFS-FIM-101:AI8-DevMonEval-RB
 DTL-040:RFS-FIM-101:AI8-DevMonFact-RB
 DTL-040:RFS-FIM-101:AI8-DevMonIlck-RB
@@ -412,7 +402,6 @@ DTL-040:RFS-FIM-101:AI8-Wave-Avg
 DTL-040:RFS-FIM-101:AI8-Wave-High
 DTL-040:RFS-FIM-101:AI8-Wave-Low
 DTL-040:RFS-FIM-101:AI8-Wave-Med
-DTL-040:RFS-FIM-101:AI8-Wave-PM
 DTL-040:RFS-FIM-101:AI9-DevMonEval-RB
 DTL-040:RFS-FIM-101:AI9-DevMonFact-RB
 DTL-040:RFS-FIM-101:AI9-DevMonIlck-RB
@@ -457,7 +446,6 @@ DTL-040:RFS-FIM-101:AI9-Wave-Avg
 DTL-040:RFS-FIM-101:AI9-Wave-High
 DTL-040:RFS-FIM-101:AI9-Wave-Low
 DTL-040:RFS-FIM-101:AI9-Wave-Med
-DTL-040:RFS-FIM-101:AI9-Wave-PM
 DTL-040:RFS-FIM-101:CD1-DevFactor-RB
 DTL-040:RFS-FIM-101:CD1-DevPeriod-RB
 DTL-040:RFS-FIM-101:CD1-FastRst-IlckCnt
@@ -479,7 +467,6 @@ DTL-040:RFS-FIM-101:CD1-RFON-En-RB
 DTL-040:RFS-FIM-101:CD1-RFON-Precond
 DTL-040:RFS-FIM-101:CD1-TrigSel-RB
 DTL-040:RFS-FIM-101:CD1-TrigThre-RB
-DTL-040:RFS-FIM-101:CD1-Wave-IlckPM
 DTL-040:RFS-FIM-101:CD2-DevFactor-RB
 DTL-040:RFS-FIM-101:CD2-DevPeriod-RB
 DTL-040:RFS-FIM-101:CD2-FastRst-IlckCnt
@@ -501,7 +488,6 @@ DTL-040:RFS-FIM-101:CD2-RFON-En-RB
 DTL-040:RFS-FIM-101:CD2-RFON-Precond
 DTL-040:RFS-FIM-101:CD2-TrigSel-RB
 DTL-040:RFS-FIM-101:CD2-TrigThre-RB
-DTL-040:RFS-FIM-101:CD2-Wave-IlckPM
 DTL-040:RFS-FIM-101:DI10-DIlckLatch-RB
 DTL-040:RFS-FIM-101:DI10-DIlckMode-RB
 DTL-040:RFS-FIM-101:DI10-FastRst-IlckCnt
@@ -513,7 +499,6 @@ DTL-040:RFS-FIM-101:DI10-Input-RB
 DTL-040:RFS-FIM-101:DI10-isFirstIlck
 DTL-040:RFS-FIM-101:DI10-RFON-En-RB
 DTL-040:RFS-FIM-101:DI10-RFON-Precond
-DTL-040:RFS-FIM-101:DI10-Wave-PM
 DTL-040:RFS-FIM-101:DI11-DIlckLatch-RB
 DTL-040:RFS-FIM-101:DI11-FastRst-IlckCnt
 DTL-040:RFS-FIM-101:DI11-HVON-En-RB
@@ -532,7 +517,6 @@ DTL-040:RFS-FIM-101:DI12-Input-RB
 DTL-040:RFS-FIM-101:DI12-isFirstIlck
 DTL-040:RFS-FIM-101:DI12-RFON-En-RB
 DTL-040:RFS-FIM-101:DI12-RFON-Precond
-DTL-040:RFS-FIM-101:DI12-Wave-PM
 DTL-040:RFS-FIM-101:DI13-DIlckLatch-RB
 DTL-040:RFS-FIM-101:DI13-DIlckMode-RB
 DTL-040:RFS-FIM-101:DI13-FastRst-IlckCnt
@@ -544,7 +528,6 @@ DTL-040:RFS-FIM-101:DI13-Input-RB
 DTL-040:RFS-FIM-101:DI13-isFirstIlck
 DTL-040:RFS-FIM-101:DI13-RFON-En-RB
 DTL-040:RFS-FIM-101:DI13-RFON-Precond
-DTL-040:RFS-FIM-101:DI13-Wave-PM
 DTL-040:RFS-FIM-101:DI14-DIlckLatch-RB
 DTL-040:RFS-FIM-101:DI14-DIlckMode-RB
 DTL-040:RFS-FIM-101:DI14-FastRst-IlckCnt
@@ -556,7 +539,6 @@ DTL-040:RFS-FIM-101:DI14-Input-RB
 DTL-040:RFS-FIM-101:DI14-isFirstIlck
 DTL-040:RFS-FIM-101:DI14-RFON-En-RB
 DTL-040:RFS-FIM-101:DI14-RFON-Precond
-DTL-040:RFS-FIM-101:DI14-Wave-PM
 DTL-040:RFS-FIM-101:DI15-DIlckLatch-RB
 DTL-040:RFS-FIM-101:DI15-FastRst-IlckCnt
 DTL-040:RFS-FIM-101:DI15-HVON-En-RB
@@ -582,7 +564,6 @@ DTL-040:RFS-FIM-101:DI17-Input-RB
 DTL-040:RFS-FIM-101:DI17-isFirstIlck
 DTL-040:RFS-FIM-101:DI17-RFON-En-RB
 DTL-040:RFS-FIM-101:DI17-RFON-Precond
-DTL-040:RFS-FIM-101:DI17-Wave-PM
 DTL-040:RFS-FIM-101:DI18-DIlckLatch-RB
 DTL-040:RFS-FIM-101:DI18-DIlckMode-RB
 DTL-040:RFS-FIM-101:DI18-FastRst-IlckCnt
@@ -594,7 +575,6 @@ DTL-040:RFS-FIM-101:DI18-Input-RB
 DTL-040:RFS-FIM-101:DI18-isFirstIlck
 DTL-040:RFS-FIM-101:DI18-RFON-En-RB
 DTL-040:RFS-FIM-101:DI18-RFON-Precond
-DTL-040:RFS-FIM-101:DI18-Wave-PM
 DTL-040:RFS-FIM-101:DI19-DIlckLatch-RB
 DTL-040:RFS-FIM-101:DI19-DIlckMode-RB
 DTL-040:RFS-FIM-101:DI19-FastRst-IlckCnt
@@ -606,7 +586,6 @@ DTL-040:RFS-FIM-101:DI19-Input-RB
 DTL-040:RFS-FIM-101:DI19-isFirstIlck
 DTL-040:RFS-FIM-101:DI19-RFON-En-RB
 DTL-040:RFS-FIM-101:DI19-RFON-Precond
-DTL-040:RFS-FIM-101:DI19-Wave-PM
 DTL-040:RFS-FIM-101:DI1-DIlckLatch-RB
 DTL-040:RFS-FIM-101:DI1-FastRst-IlckCnt
 DTL-040:RFS-FIM-101:DI1-HVON-En-RB
@@ -625,7 +604,6 @@ DTL-040:RFS-FIM-101:DI20-Input-RB
 DTL-040:RFS-FIM-101:DI20-isFirstIlck
 DTL-040:RFS-FIM-101:DI20-RFON-En-RB
 DTL-040:RFS-FIM-101:DI20-RFON-Precond
-DTL-040:RFS-FIM-101:DI20-Wave-PM
 DTL-040:RFS-FIM-101:DI21-DIlckLatch-RB
 DTL-040:RFS-FIM-101:DI21-FastRst-IlckCnt
 DTL-040:RFS-FIM-101:DI21-HVON-En-RB
@@ -679,7 +657,6 @@ DTL-040:RFS-FIM-101:DI7-Input-RB
 DTL-040:RFS-FIM-101:DI7-isFirstIlck
 DTL-040:RFS-FIM-101:DI7-RFON-En-RB
 DTL-040:RFS-FIM-101:DI7-RFON-Precond
-DTL-040:RFS-FIM-101:DI7-Wave-PM
 DTL-040:RFS-FIM-101:DI8-DIlckLatch-RB
 DTL-040:RFS-FIM-101:DI8-DIlckMode-RB
 DTL-040:RFS-FIM-101:DI8-FastRst-IlckCnt
@@ -691,7 +668,6 @@ DTL-040:RFS-FIM-101:DI8-Input-RB
 DTL-040:RFS-FIM-101:DI8-isFirstIlck
 DTL-040:RFS-FIM-101:DI8-RFON-En-RB
 DTL-040:RFS-FIM-101:DI8-RFON-Precond
-DTL-040:RFS-FIM-101:DI8-Wave-PM
 DTL-040:RFS-FIM-101:DI9-DIlckLatch-RB
 DTL-040:RFS-FIM-101:DI9-FastRst-IlckCnt
 DTL-040:RFS-FIM-101:DI9-HVON-En-RB
@@ -785,7 +761,6 @@ DTL-040:RFS-FIM-101:RP1-RFON-En-RB
 DTL-040:RFS-FIM-101:RP1-RFON-Precond
 DTL-040:RFS-FIM-101:RP1-TrigSel-RB
 DTL-040:RFS-FIM-101:RP1-TrigThre-RB
-DTL-040:RFS-FIM-101:RP1-Wave-IlckPM
 DTL-040:RFS-FIM-101:RP2-FastRst-IlckCnt
 DTL-040:RFS-FIM-101:RP2-HVON-En-RB
 DTL-040:RFS-FIM-101:RP2-HVON-Precond
@@ -805,7 +780,6 @@ DTL-040:RFS-FIM-101:RP2-RFON-En-RB
 DTL-040:RFS-FIM-101:RP2-RFON-Precond
 DTL-040:RFS-FIM-101:RP2-TrigSel-RB
 DTL-040:RFS-FIM-101:RP2-TrigThre-RB
-DTL-040:RFS-FIM-101:RP2-Wave-IlckPM
 DTL-040:RFS-FIM-101:SoftIlck-HVtoRF
 DTL-040:RFS-FIM-101:SoftIlck-HVToRFPreCond
 DTL-040:RFS-FIM-101:SoftIlck-IDLEtoHV
@@ -858,7 +832,6 @@ DTL-040:RFS-Kly-110:PwrFwd-Wave-Avg
 DTL-040:RFS-Kly-110:PwrFwd-Wave-High
 DTL-040:RFS-Kly-110:PwrFwd-Wave-Low
 DTL-040:RFS-Kly-110:PwrFwd-Wave-Med
-DTL-040:RFS-Kly-110:PwrFwd-Wave-PM
 DTL-040:RFS-Kly-110:PwrRfl-DevMonEval-RB
 DTL-040:RFS-Kly-110:PwrRfl-DevMonFact-RB
 DTL-040:RFS-Kly-110:PwrRfl-DevMonIlck-RB
@@ -897,12 +870,10 @@ DTL-040:RFS-Kly-110:PwrRfl-Wave-Avg
 DTL-040:RFS-Kly-110:PwrRfl-Wave-High
 DTL-040:RFS-Kly-110:PwrRfl-Wave-Low
 DTL-040:RFS-Kly-110:PwrRfl-Wave-Med
-DTL-040:RFS-Kly-110:PwrRfl-Wave-PM
 DTL-040:RFS-LLRF-101:Status-DIlckMode-RB
 DTL-040:RFS-LLRF-101:Status-Ilck-RB
 DTL-040:RFS-LLRF-101:Status-Input-RB
 DTL-040:RFS-LLRF-101:Status-isFirstIlck
-DTL-040:RFS-LLRF-101:Status-Wave-PM
 DTL-040:RFS-Load-120:PwrFwd-DevMonEval-RB
 DTL-040:RFS-Load-120:PwrFwd-DevMonFact-RB
 DTL-040:RFS-Load-120:PwrFwd-DevMonIlck-RB
@@ -941,7 +912,6 @@ DTL-040:RFS-Load-120:PwrFwd-Wave-Avg
 DTL-040:RFS-Load-120:PwrFwd-Wave-High
 DTL-040:RFS-Load-120:PwrFwd-Wave-Low
 DTL-040:RFS-Load-120:PwrFwd-Wave-Med
-DTL-040:RFS-Load-120:PwrFwd-Wave-PM
 DTL-040:RFS-Load-130:PwrFwd-DevMonEval-RB
 DTL-040:RFS-Load-130:PwrFwd-DevMonFact-RB
 DTL-040:RFS-Load-130:PwrFwd-DevMonIlck-RB
@@ -980,7 +950,6 @@ DTL-040:RFS-Load-130:PwrFwd-Wave-Avg
 DTL-040:RFS-Load-130:PwrFwd-Wave-High
 DTL-040:RFS-Load-130:PwrFwd-Wave-Low
 DTL-040:RFS-Load-130:PwrFwd-Wave-Med
-DTL-040:RFS-Load-130:PwrFwd-Wave-PM
 DTL-040:RFS-Mod-110:Cur-DevMonEval-RB
 DTL-040:RFS-Mod-110:Cur-DevMonFact-RB
 DTL-040:RFS-Mod-110:Cur-DevMonIlck-RB
@@ -1019,17 +988,14 @@ DTL-040:RFS-Mod-110:Cur-Wave-Avg
 DTL-040:RFS-Mod-110:Cur-Wave-High
 DTL-040:RFS-Mod-110:Cur-Wave-Low
 DTL-040:RFS-Mod-110:Cur-Wave-Med
-DTL-040:RFS-Mod-110:Cur-Wave-PM
 DTL-040:RFS-Mod-110:PCcon-DIlckMode-RB
 DTL-040:RFS-Mod-110:PCcon-Ilck-RB
 DTL-040:RFS-Mod-110:PCcon-Input-RB
 DTL-040:RFS-Mod-110:PCcon-isFirstIlck
-DTL-040:RFS-Mod-110:PCcon-Wave-PM
 DTL-040:RFS-Mod-110:Ready-DIlckMode-RB
 DTL-040:RFS-Mod-110:Ready-Ilck-RB
 DTL-040:RFS-Mod-110:Ready-Input-RB
 DTL-040:RFS-Mod-110:Ready-isFirstIlck
-DTL-040:RFS-Mod-110:Ready-Wave-PM
 DTL-040:RFS-Mod-110:Vol-DevMonEval-RB
 DTL-040:RFS-Mod-110:Vol-DevMonFact-RB
 DTL-040:RFS-Mod-110:Vol-DevMonIlck-RB
@@ -1068,7 +1034,6 @@ DTL-040:RFS-Mod-110:Vol-Wave-Avg
 DTL-040:RFS-Mod-110:Vol-Wave-High
 DTL-040:RFS-Mod-110:Vol-Wave-Low
 DTL-040:RFS-Mod-110:Vol-Wave-Med
-DTL-040:RFS-Mod-110:Vol-Wave-PM
 DTL-040:RFS-PAmp-110:PwrFwd-DevMonEval-RB
 DTL-040:RFS-PAmp-110:PwrFwd-DevMonFact-RB
 DTL-040:RFS-PAmp-110:PwrFwd-DevMonIlck-RB
@@ -1107,17 +1072,14 @@ DTL-040:RFS-PAmp-110:PwrFwd-Wave-Avg
 DTL-040:RFS-PAmp-110:PwrFwd-Wave-High
 DTL-040:RFS-PAmp-110:PwrFwd-Wave-Low
 DTL-040:RFS-PAmp-110:PwrFwd-Wave-Med
-DTL-040:RFS-PAmp-110:PwrFwd-Wave-PM
 DTL-040:RFS-SIM-110:HvEna-DIlckMode-RB
 DTL-040:RFS-SIM-110:HvEna-Ilck-RB
 DTL-040:RFS-SIM-110:HvEna-Input-RB
 DTL-040:RFS-SIM-110:HvEna-isFirstIlck
-DTL-040:RFS-SIM-110:HvEna-Wave-PM
 DTL-040:RFS-SIM-110:RfEna-DIlckMode-RB
 DTL-040:RFS-SIM-110:RfEna-Ilck-RB
 DTL-040:RFS-SIM-110:RfEna-Input-RB
 DTL-040:RFS-SIM-110:RfEna-isFirstIlck
-DTL-040:RFS-SIM-110:RfEna-Wave-PM
 DTL-040:RFS-SolPS-110:Cur-DevMonEval-RB
 DTL-040:RFS-SolPS-110:Cur-DevMonFact-RB
 DTL-040:RFS-SolPS-110:Cur-DevMonIlck-RB
@@ -1156,7 +1118,6 @@ DTL-040:RFS-SolPS-110:Cur-Wave-Avg
 DTL-040:RFS-SolPS-110:Cur-Wave-High
 DTL-040:RFS-SolPS-110:Cur-Wave-Low
 DTL-040:RFS-SolPS-110:Cur-Wave-Med
-DTL-040:RFS-SolPS-110:Cur-Wave-PM
 DTL-040:RFS-SolPS-120:Cur-DevMonEval-RB
 DTL-040:RFS-SolPS-120:Cur-DevMonFact-RB
 DTL-040:RFS-SolPS-120:Cur-DevMonIlck-RB
@@ -1195,7 +1156,6 @@ DTL-040:RFS-SolPS-120:Cur-Wave-Avg
 DTL-040:RFS-SolPS-120:Cur-Wave-High
 DTL-040:RFS-SolPS-120:Cur-Wave-Low
 DTL-040:RFS-SolPS-120:Cur-Wave-Med
-DTL-040:RFS-SolPS-120:Cur-Wave-PM
 DTL-040:RFS-SolPS-130:Cur-DevMonEval-RB
 DTL-040:RFS-SolPS-130:Cur-DevMonFact-RB
 DTL-040:RFS-SolPS-130:Cur-DevMonIlck-RB
@@ -1234,24 +1194,19 @@ DTL-040:RFS-SolPS-130:Cur-Wave-Avg
 DTL-040:RFS-SolPS-130:Cur-Wave-High
 DTL-040:RFS-SolPS-130:Cur-Wave-Low
 DTL-040:RFS-SolPS-130:Cur-Wave-Med
-DTL-040:RFS-SolPS-130:Cur-Wave-PM
 DTL-040:RFS-VacMon-110:Status-DIlckMode-RB
 DTL-040:RFS-VacMon-110:Status-Ilck-RB
 DTL-040:RFS-VacMon-110:Status-Input-RB
 DTL-040:RFS-VacMon-110:Status-isFirstIlck
-DTL-040:RFS-VacMon-110:Status-Wave-PM
 DTL-040:RFS-VacMon-130:Status-DIlckMode-RB
 DTL-040:RFS-VacMon-130:Status-Ilck-RB
 DTL-040:RFS-VacMon-130:Status-Input-RB
 DTL-040:RFS-VacMon-130:Status-isFirstIlck
-DTL-040:RFS-VacMon-130:Status-Wave-PM
 DTL-040:RFS-VacPS-110:I-SP-DIlckMode-RB
 DTL-040:RFS-VacPS-110:I-SP-Ilck-RB
 DTL-040:RFS-VacPS-110:I-SP-Input-RB
 DTL-040:RFS-VacPS-110:I-SP-isFirstIlck
-DTL-040:RFS-VacPS-110:I-SP-Wave-PM
 DTL-040:RFS-VacPS-120:I-SP-DIlckMode-RB
 DTL-040:RFS-VacPS-120:I-SP-Ilck-RB
 DTL-040:RFS-VacPS-120:I-SP-Input-RB
 DTL-040:RFS-VacPS-120:I-SP-isFirstIlck
-DTL-040:RFS-VacPS-120:I-SP-Wave-PM
diff --git a/files/DTL-050_SC-IOC-102.archive b/files/DTL-050_SC-IOC-102.archive
index 422f475..b35f3be 100644
--- a/files/DTL-050_SC-IOC-102.archive
+++ b/files/DTL-050_SC-IOC-102.archive
@@ -2,12 +2,10 @@ DTL-050:RFS-ADG-110:IlckStatus-DIlckMode-RB
 DTL-050:RFS-ADG-110:IlckStatus-Ilck-RB
 DTL-050:RFS-ADG-110:IlckStatus-Input-RB
 DTL-050:RFS-ADG-110:IlckStatus-isFirstIlck
-DTL-050:RFS-ADG-110:IlckStatus-Wave-PM
 DTL-050:RFS-ADG-110:PwrFail-DIlckMode-RB
 DTL-050:RFS-ADG-110:PwrFail-Ilck-RB
 DTL-050:RFS-ADG-110:PwrFail-Input-RB
 DTL-050:RFS-ADG-110:PwrFail-isFirstIlck
-DTL-050:RFS-ADG-110:PwrFail-Wave-PM
 DTL-050:RFS-Cav-110:Fld-DevMonEval-RB
 DTL-050:RFS-Cav-110:Fld-DevMonFact-RB
 DTL-050:RFS-Cav-110:Fld-DevMonIlck-RB
@@ -46,7 +44,6 @@ DTL-050:RFS-Cav-110:Fld-Wave-Avg
 DTL-050:RFS-Cav-110:Fld-Wave-High
 DTL-050:RFS-Cav-110:Fld-Wave-Low
 DTL-050:RFS-Cav-110:Fld-Wave-Med
-DTL-050:RFS-Cav-110:Fld-Wave-PM
 DTL-050:RFS-Cav-110:PwrFwd-DevMonEval-RB
 DTL-050:RFS-Cav-110:PwrFwd-DevMonFact-RB
 DTL-050:RFS-Cav-110:PwrFwd-DevMonIlck-RB
@@ -85,7 +82,6 @@ DTL-050:RFS-Cav-110:PwrFwd-Wave-Avg
 DTL-050:RFS-Cav-110:PwrFwd-Wave-High
 DTL-050:RFS-Cav-110:PwrFwd-Wave-Low
 DTL-050:RFS-Cav-110:PwrFwd-Wave-Med
-DTL-050:RFS-Cav-110:PwrFwd-Wave-PM
 DTL-050:RFS-Cav-110:PwrRfl-DevMonEval-RB
 DTL-050:RFS-Cav-110:PwrRfl-DevMonFact-RB
 DTL-050:RFS-Cav-110:PwrRfl-DevMonIlck-RB
@@ -124,7 +120,6 @@ DTL-050:RFS-Cav-110:PwrRfl-Wave-Avg
 DTL-050:RFS-Cav-110:PwrRfl-Wave-High
 DTL-050:RFS-Cav-110:PwrRfl-Wave-Low
 DTL-050:RFS-Cav-110:PwrRfl-Wave-Med
-DTL-050:RFS-Cav-110:PwrRfl-Wave-PM
 DTL-050:RFS-Cav-120:PwrFwd-DevMonEval-RB
 DTL-050:RFS-Cav-120:PwrFwd-DevMonFact-RB
 DTL-050:RFS-Cav-120:PwrFwd-DevMonIlck-RB
@@ -163,7 +158,6 @@ DTL-050:RFS-Cav-120:PwrFwd-Wave-Avg
 DTL-050:RFS-Cav-120:PwrFwd-Wave-High
 DTL-050:RFS-Cav-120:PwrFwd-Wave-Low
 DTL-050:RFS-Cav-120:PwrFwd-Wave-Med
-DTL-050:RFS-Cav-120:PwrFwd-Wave-PM
 DTL-050:RFS-Cav-120:PwrRfl-DevMonEval-RB
 DTL-050:RFS-Cav-120:PwrRfl-DevMonFact-RB
 DTL-050:RFS-Cav-120:PwrRfl-DevMonIlck-RB
@@ -202,7 +196,6 @@ DTL-050:RFS-Cav-120:PwrRfl-Wave-Avg
 DTL-050:RFS-Cav-120:PwrRfl-Wave-High
 DTL-050:RFS-Cav-120:PwrRfl-Wave-Low
 DTL-050:RFS-Cav-120:PwrRfl-Wave-Med
-DTL-050:RFS-Cav-120:PwrRfl-Wave-PM
 DTL-050:RFS-FIM-101:AI10-DevMonEval-RB
 DTL-050:RFS-FIM-101:AI10-DevMonFact-RB
 DTL-050:RFS-FIM-101:AI10-DevMonIlck-RB
@@ -247,7 +240,6 @@ DTL-050:RFS-FIM-101:AI10-Wave-Avg
 DTL-050:RFS-FIM-101:AI10-Wave-High
 DTL-050:RFS-FIM-101:AI10-Wave-Low
 DTL-050:RFS-FIM-101:AI10-Wave-Med
-DTL-050:RFS-FIM-101:AI10-Wave-PM
 DTL-050:RFS-FIM-101:AI1-FastRst-IlckCnt
 DTL-050:RFS-FIM-101:AI1-HVON-En-RB
 DTL-050:RFS-FIM-101:AI1-HVON-Precond
@@ -322,7 +314,6 @@ DTL-050:RFS-FIM-101:AI6-Wave-Avg
 DTL-050:RFS-FIM-101:AI6-Wave-High
 DTL-050:RFS-FIM-101:AI6-Wave-Low
 DTL-050:RFS-FIM-101:AI6-Wave-Med
-DTL-050:RFS-FIM-101:AI6-Wave-PM
 DTL-050:RFS-FIM-101:AI7-DevMonEval-RB
 DTL-050:RFS-FIM-101:AI7-DevMonFact-RB
 DTL-050:RFS-FIM-101:AI7-DevMonIlck-RB
@@ -367,7 +358,6 @@ DTL-050:RFS-FIM-101:AI7-Wave-Avg
 DTL-050:RFS-FIM-101:AI7-Wave-High
 DTL-050:RFS-FIM-101:AI7-Wave-Low
 DTL-050:RFS-FIM-101:AI7-Wave-Med
-DTL-050:RFS-FIM-101:AI7-Wave-PM
 DTL-050:RFS-FIM-101:AI8-DevMonEval-RB
 DTL-050:RFS-FIM-101:AI8-DevMonFact-RB
 DTL-050:RFS-FIM-101:AI8-DevMonIlck-RB
@@ -412,7 +402,6 @@ DTL-050:RFS-FIM-101:AI8-Wave-Avg
 DTL-050:RFS-FIM-101:AI8-Wave-High
 DTL-050:RFS-FIM-101:AI8-Wave-Low
 DTL-050:RFS-FIM-101:AI8-Wave-Med
-DTL-050:RFS-FIM-101:AI8-Wave-PM
 DTL-050:RFS-FIM-101:AI9-DevMonEval-RB
 DTL-050:RFS-FIM-101:AI9-DevMonFact-RB
 DTL-050:RFS-FIM-101:AI9-DevMonIlck-RB
@@ -457,7 +446,6 @@ DTL-050:RFS-FIM-101:AI9-Wave-Avg
 DTL-050:RFS-FIM-101:AI9-Wave-High
 DTL-050:RFS-FIM-101:AI9-Wave-Low
 DTL-050:RFS-FIM-101:AI9-Wave-Med
-DTL-050:RFS-FIM-101:AI9-Wave-PM
 DTL-050:RFS-FIM-101:CD1-DevFactor-RB
 DTL-050:RFS-FIM-101:CD1-DevPeriod-RB
 DTL-050:RFS-FIM-101:CD1-FastRst-IlckCnt
@@ -479,7 +467,6 @@ DTL-050:RFS-FIM-101:CD1-RFON-En-RB
 DTL-050:RFS-FIM-101:CD1-RFON-Precond
 DTL-050:RFS-FIM-101:CD1-TrigSel-RB
 DTL-050:RFS-FIM-101:CD1-TrigThre-RB
-DTL-050:RFS-FIM-101:CD1-Wave-IlckPM
 DTL-050:RFS-FIM-101:CD2-DevFactor-RB
 DTL-050:RFS-FIM-101:CD2-DevPeriod-RB
 DTL-050:RFS-FIM-101:CD2-FastRst-IlckCnt
@@ -501,7 +488,6 @@ DTL-050:RFS-FIM-101:CD2-RFON-En-RB
 DTL-050:RFS-FIM-101:CD2-RFON-Precond
 DTL-050:RFS-FIM-101:CD2-TrigSel-RB
 DTL-050:RFS-FIM-101:CD2-TrigThre-RB
-DTL-050:RFS-FIM-101:CD2-Wave-IlckPM
 DTL-050:RFS-FIM-101:DI10-DIlckLatch-RB
 DTL-050:RFS-FIM-101:DI10-DIlckMode-RB
 DTL-050:RFS-FIM-101:DI10-FastRst-IlckCnt
@@ -513,7 +499,6 @@ DTL-050:RFS-FIM-101:DI10-Input-RB
 DTL-050:RFS-FIM-101:DI10-isFirstIlck
 DTL-050:RFS-FIM-101:DI10-RFON-En-RB
 DTL-050:RFS-FIM-101:DI10-RFON-Precond
-DTL-050:RFS-FIM-101:DI10-Wave-PM
 DTL-050:RFS-FIM-101:DI11-DIlckLatch-RB
 DTL-050:RFS-FIM-101:DI11-FastRst-IlckCnt
 DTL-050:RFS-FIM-101:DI11-HVON-En-RB
@@ -532,7 +517,6 @@ DTL-050:RFS-FIM-101:DI12-Input-RB
 DTL-050:RFS-FIM-101:DI12-isFirstIlck
 DTL-050:RFS-FIM-101:DI12-RFON-En-RB
 DTL-050:RFS-FIM-101:DI12-RFON-Precond
-DTL-050:RFS-FIM-101:DI12-Wave-PM
 DTL-050:RFS-FIM-101:DI13-DIlckLatch-RB
 DTL-050:RFS-FIM-101:DI13-DIlckMode-RB
 DTL-050:RFS-FIM-101:DI13-FastRst-IlckCnt
@@ -544,7 +528,6 @@ DTL-050:RFS-FIM-101:DI13-Input-RB
 DTL-050:RFS-FIM-101:DI13-isFirstIlck
 DTL-050:RFS-FIM-101:DI13-RFON-En-RB
 DTL-050:RFS-FIM-101:DI13-RFON-Precond
-DTL-050:RFS-FIM-101:DI13-Wave-PM
 DTL-050:RFS-FIM-101:DI14-DIlckLatch-RB
 DTL-050:RFS-FIM-101:DI14-DIlckMode-RB
 DTL-050:RFS-FIM-101:DI14-FastRst-IlckCnt
@@ -556,7 +539,6 @@ DTL-050:RFS-FIM-101:DI14-Input-RB
 DTL-050:RFS-FIM-101:DI14-isFirstIlck
 DTL-050:RFS-FIM-101:DI14-RFON-En-RB
 DTL-050:RFS-FIM-101:DI14-RFON-Precond
-DTL-050:RFS-FIM-101:DI14-Wave-PM
 DTL-050:RFS-FIM-101:DI15-DIlckLatch-RB
 DTL-050:RFS-FIM-101:DI15-FastRst-IlckCnt
 DTL-050:RFS-FIM-101:DI15-HVON-En-RB
@@ -582,7 +564,6 @@ DTL-050:RFS-FIM-101:DI17-Input-RB
 DTL-050:RFS-FIM-101:DI17-isFirstIlck
 DTL-050:RFS-FIM-101:DI17-RFON-En-RB
 DTL-050:RFS-FIM-101:DI17-RFON-Precond
-DTL-050:RFS-FIM-101:DI17-Wave-PM
 DTL-050:RFS-FIM-101:DI18-DIlckLatch-RB
 DTL-050:RFS-FIM-101:DI18-DIlckMode-RB
 DTL-050:RFS-FIM-101:DI18-FastRst-IlckCnt
@@ -594,7 +575,6 @@ DTL-050:RFS-FIM-101:DI18-Input-RB
 DTL-050:RFS-FIM-101:DI18-isFirstIlck
 DTL-050:RFS-FIM-101:DI18-RFON-En-RB
 DTL-050:RFS-FIM-101:DI18-RFON-Precond
-DTL-050:RFS-FIM-101:DI18-Wave-PM
 DTL-050:RFS-FIM-101:DI19-DIlckLatch-RB
 DTL-050:RFS-FIM-101:DI19-DIlckMode-RB
 DTL-050:RFS-FIM-101:DI19-FastRst-IlckCnt
@@ -606,7 +586,6 @@ DTL-050:RFS-FIM-101:DI19-Input-RB
 DTL-050:RFS-FIM-101:DI19-isFirstIlck
 DTL-050:RFS-FIM-101:DI19-RFON-En-RB
 DTL-050:RFS-FIM-101:DI19-RFON-Precond
-DTL-050:RFS-FIM-101:DI19-Wave-PM
 DTL-050:RFS-FIM-101:DI1-DIlckLatch-RB
 DTL-050:RFS-FIM-101:DI1-FastRst-IlckCnt
 DTL-050:RFS-FIM-101:DI1-HVON-En-RB
@@ -625,7 +604,6 @@ DTL-050:RFS-FIM-101:DI20-Input-RB
 DTL-050:RFS-FIM-101:DI20-isFirstIlck
 DTL-050:RFS-FIM-101:DI20-RFON-En-RB
 DTL-050:RFS-FIM-101:DI20-RFON-Precond
-DTL-050:RFS-FIM-101:DI20-Wave-PM
 DTL-050:RFS-FIM-101:DI21-DIlckLatch-RB
 DTL-050:RFS-FIM-101:DI21-FastRst-IlckCnt
 DTL-050:RFS-FIM-101:DI21-HVON-En-RB
@@ -679,7 +657,6 @@ DTL-050:RFS-FIM-101:DI7-Input-RB
 DTL-050:RFS-FIM-101:DI7-isFirstIlck
 DTL-050:RFS-FIM-101:DI7-RFON-En-RB
 DTL-050:RFS-FIM-101:DI7-RFON-Precond
-DTL-050:RFS-FIM-101:DI7-Wave-PM
 DTL-050:RFS-FIM-101:DI8-DIlckLatch-RB
 DTL-050:RFS-FIM-101:DI8-DIlckMode-RB
 DTL-050:RFS-FIM-101:DI8-FastRst-IlckCnt
@@ -691,7 +668,6 @@ DTL-050:RFS-FIM-101:DI8-Input-RB
 DTL-050:RFS-FIM-101:DI8-isFirstIlck
 DTL-050:RFS-FIM-101:DI8-RFON-En-RB
 DTL-050:RFS-FIM-101:DI8-RFON-Precond
-DTL-050:RFS-FIM-101:DI8-Wave-PM
 DTL-050:RFS-FIM-101:DI9-DIlckLatch-RB
 DTL-050:RFS-FIM-101:DI9-FastRst-IlckCnt
 DTL-050:RFS-FIM-101:DI9-HVON-En-RB
@@ -785,7 +761,6 @@ DTL-050:RFS-FIM-101:RP1-RFON-En-RB
 DTL-050:RFS-FIM-101:RP1-RFON-Precond
 DTL-050:RFS-FIM-101:RP1-TrigSel-RB
 DTL-050:RFS-FIM-101:RP1-TrigThre-RB
-DTL-050:RFS-FIM-101:RP1-Wave-IlckPM
 DTL-050:RFS-FIM-101:RP2-FastRst-IlckCnt
 DTL-050:RFS-FIM-101:RP2-HVON-En-RB
 DTL-050:RFS-FIM-101:RP2-HVON-Precond
@@ -805,7 +780,6 @@ DTL-050:RFS-FIM-101:RP2-RFON-En-RB
 DTL-050:RFS-FIM-101:RP2-RFON-Precond
 DTL-050:RFS-FIM-101:RP2-TrigSel-RB
 DTL-050:RFS-FIM-101:RP2-TrigThre-RB
-DTL-050:RFS-FIM-101:RP2-Wave-IlckPM
 DTL-050:RFS-FIM-101:SoftIlck-HVtoRF
 DTL-050:RFS-FIM-101:SoftIlck-HVToRFPreCond
 DTL-050:RFS-FIM-101:SoftIlck-IDLEtoHV
@@ -858,7 +832,6 @@ DTL-050:RFS-Kly-110:PwrFwd-Wave-Avg
 DTL-050:RFS-Kly-110:PwrFwd-Wave-High
 DTL-050:RFS-Kly-110:PwrFwd-Wave-Low
 DTL-050:RFS-Kly-110:PwrFwd-Wave-Med
-DTL-050:RFS-Kly-110:PwrFwd-Wave-PM
 DTL-050:RFS-Kly-110:PwrRfl-DevMonEval-RB
 DTL-050:RFS-Kly-110:PwrRfl-DevMonFact-RB
 DTL-050:RFS-Kly-110:PwrRfl-DevMonIlck-RB
@@ -897,12 +870,10 @@ DTL-050:RFS-Kly-110:PwrRfl-Wave-Avg
 DTL-050:RFS-Kly-110:PwrRfl-Wave-High
 DTL-050:RFS-Kly-110:PwrRfl-Wave-Low
 DTL-050:RFS-Kly-110:PwrRfl-Wave-Med
-DTL-050:RFS-Kly-110:PwrRfl-Wave-PM
 DTL-050:RFS-LLRF-101:Status-DIlckMode-RB
 DTL-050:RFS-LLRF-101:Status-Ilck-RB
 DTL-050:RFS-LLRF-101:Status-Input-RB
 DTL-050:RFS-LLRF-101:Status-isFirstIlck
-DTL-050:RFS-LLRF-101:Status-Wave-PM
 DTL-050:RFS-Load-120:PwrFwd-DevMonEval-RB
 DTL-050:RFS-Load-120:PwrFwd-DevMonFact-RB
 DTL-050:RFS-Load-120:PwrFwd-DevMonIlck-RB
@@ -941,7 +912,6 @@ DTL-050:RFS-Load-120:PwrFwd-Wave-Avg
 DTL-050:RFS-Load-120:PwrFwd-Wave-High
 DTL-050:RFS-Load-120:PwrFwd-Wave-Low
 DTL-050:RFS-Load-120:PwrFwd-Wave-Med
-DTL-050:RFS-Load-120:PwrFwd-Wave-PM
 DTL-050:RFS-Load-130:PwrFwd-DevMonEval-RB
 DTL-050:RFS-Load-130:PwrFwd-DevMonFact-RB
 DTL-050:RFS-Load-130:PwrFwd-DevMonIlck-RB
@@ -980,7 +950,6 @@ DTL-050:RFS-Load-130:PwrFwd-Wave-Avg
 DTL-050:RFS-Load-130:PwrFwd-Wave-High
 DTL-050:RFS-Load-130:PwrFwd-Wave-Low
 DTL-050:RFS-Load-130:PwrFwd-Wave-Med
-DTL-050:RFS-Load-130:PwrFwd-Wave-PM
 DTL-050:RFS-Mod-110:Cur-DevMonEval-RB
 DTL-050:RFS-Mod-110:Cur-DevMonFact-RB
 DTL-050:RFS-Mod-110:Cur-DevMonIlck-RB
@@ -1019,17 +988,14 @@ DTL-050:RFS-Mod-110:Cur-Wave-Avg
 DTL-050:RFS-Mod-110:Cur-Wave-High
 DTL-050:RFS-Mod-110:Cur-Wave-Low
 DTL-050:RFS-Mod-110:Cur-Wave-Med
-DTL-050:RFS-Mod-110:Cur-Wave-PM
 DTL-050:RFS-Mod-110:PCcon-DIlckMode-RB
 DTL-050:RFS-Mod-110:PCcon-Ilck-RB
 DTL-050:RFS-Mod-110:PCcon-Input-RB
 DTL-050:RFS-Mod-110:PCcon-isFirstIlck
-DTL-050:RFS-Mod-110:PCcon-Wave-PM
 DTL-050:RFS-Mod-110:Ready-DIlckMode-RB
 DTL-050:RFS-Mod-110:Ready-Ilck-RB
 DTL-050:RFS-Mod-110:Ready-Input-RB
 DTL-050:RFS-Mod-110:Ready-isFirstIlck
-DTL-050:RFS-Mod-110:Ready-Wave-PM
 DTL-050:RFS-Mod-110:Vol-DevMonEval-RB
 DTL-050:RFS-Mod-110:Vol-DevMonFact-RB
 DTL-050:RFS-Mod-110:Vol-DevMonIlck-RB
@@ -1068,7 +1034,6 @@ DTL-050:RFS-Mod-110:Vol-Wave-Avg
 DTL-050:RFS-Mod-110:Vol-Wave-High
 DTL-050:RFS-Mod-110:Vol-Wave-Low
 DTL-050:RFS-Mod-110:Vol-Wave-Med
-DTL-050:RFS-Mod-110:Vol-Wave-PM
 DTL-050:RFS-PAmp-110:PwrFwd-DevMonEval-RB
 DTL-050:RFS-PAmp-110:PwrFwd-DevMonFact-RB
 DTL-050:RFS-PAmp-110:PwrFwd-DevMonIlck-RB
@@ -1107,17 +1072,14 @@ DTL-050:RFS-PAmp-110:PwrFwd-Wave-Avg
 DTL-050:RFS-PAmp-110:PwrFwd-Wave-High
 DTL-050:RFS-PAmp-110:PwrFwd-Wave-Low
 DTL-050:RFS-PAmp-110:PwrFwd-Wave-Med
-DTL-050:RFS-PAmp-110:PwrFwd-Wave-PM
 DTL-050:RFS-SIM-110:HvEna-DIlckMode-RB
 DTL-050:RFS-SIM-110:HvEna-Ilck-RB
 DTL-050:RFS-SIM-110:HvEna-Input-RB
 DTL-050:RFS-SIM-110:HvEna-isFirstIlck
-DTL-050:RFS-SIM-110:HvEna-Wave-PM
 DTL-050:RFS-SIM-110:RfEna-DIlckMode-RB
 DTL-050:RFS-SIM-110:RfEna-Ilck-RB
 DTL-050:RFS-SIM-110:RfEna-Input-RB
 DTL-050:RFS-SIM-110:RfEna-isFirstIlck
-DTL-050:RFS-SIM-110:RfEna-Wave-PM
 DTL-050:RFS-SolPS-110:Cur-DevMonEval-RB
 DTL-050:RFS-SolPS-110:Cur-DevMonFact-RB
 DTL-050:RFS-SolPS-110:Cur-DevMonIlck-RB
@@ -1156,7 +1118,6 @@ DTL-050:RFS-SolPS-110:Cur-Wave-Avg
 DTL-050:RFS-SolPS-110:Cur-Wave-High
 DTL-050:RFS-SolPS-110:Cur-Wave-Low
 DTL-050:RFS-SolPS-110:Cur-Wave-Med
-DTL-050:RFS-SolPS-110:Cur-Wave-PM
 DTL-050:RFS-SolPS-120:Cur-DevMonEval-RB
 DTL-050:RFS-SolPS-120:Cur-DevMonFact-RB
 DTL-050:RFS-SolPS-120:Cur-DevMonIlck-RB
@@ -1195,7 +1156,6 @@ DTL-050:RFS-SolPS-120:Cur-Wave-Avg
 DTL-050:RFS-SolPS-120:Cur-Wave-High
 DTL-050:RFS-SolPS-120:Cur-Wave-Low
 DTL-050:RFS-SolPS-120:Cur-Wave-Med
-DTL-050:RFS-SolPS-120:Cur-Wave-PM
 DTL-050:RFS-SolPS-130:Cur-DevMonEval-RB
 DTL-050:RFS-SolPS-130:Cur-DevMonFact-RB
 DTL-050:RFS-SolPS-130:Cur-DevMonIlck-RB
@@ -1234,24 +1194,19 @@ DTL-050:RFS-SolPS-130:Cur-Wave-Avg
 DTL-050:RFS-SolPS-130:Cur-Wave-High
 DTL-050:RFS-SolPS-130:Cur-Wave-Low
 DTL-050:RFS-SolPS-130:Cur-Wave-Med
-DTL-050:RFS-SolPS-130:Cur-Wave-PM
 DTL-050:RFS-VacMon-110:Status-DIlckMode-RB
 DTL-050:RFS-VacMon-110:Status-Ilck-RB
 DTL-050:RFS-VacMon-110:Status-Input-RB
 DTL-050:RFS-VacMon-110:Status-isFirstIlck
-DTL-050:RFS-VacMon-110:Status-Wave-PM
 DTL-050:RFS-VacMon-130:Status-DIlckMode-RB
 DTL-050:RFS-VacMon-130:Status-Ilck-RB
 DTL-050:RFS-VacMon-130:Status-Input-RB
 DTL-050:RFS-VacMon-130:Status-isFirstIlck
-DTL-050:RFS-VacMon-130:Status-Wave-PM
 DTL-050:RFS-VacPS-110:I-SP-DIlckMode-RB
 DTL-050:RFS-VacPS-110:I-SP-Ilck-RB
 DTL-050:RFS-VacPS-110:I-SP-Input-RB
 DTL-050:RFS-VacPS-110:I-SP-isFirstIlck
-DTL-050:RFS-VacPS-110:I-SP-Wave-PM
 DTL-050:RFS-VacPS-120:I-SP-DIlckMode-RB
 DTL-050:RFS-VacPS-120:I-SP-Ilck-RB
 DTL-050:RFS-VacPS-120:I-SP-Input-RB
 DTL-050:RFS-VacPS-120:I-SP-isFirstIlck
-DTL-050:RFS-VacPS-120:I-SP-Wave-PM
diff --git a/files/DTL1FIM.archive b/files/DTL1FIM.archive
index 905e847..030b80a 100644
--- a/files/DTL1FIM.archive
+++ b/files/DTL1FIM.archive
@@ -2895,33 +2895,3 @@ DTL-010:RFS-VacPS-120:I-SP-IlckRst
 DTL-010:RFS-VacPS-120:I-SP-Input-RB
 DTL-010:RFS-VacPS-120:I-SP-isFirstIlck
 
-DTL-010:RFS-PAmp-110:PwrFwd-Wave-PM
-DTL-010:RFS-Kly-110:PwrFwd-Wave-PM
-DTL-010:RFS-Load-130:PwrFwd-Wave-PM
-DTL-010:RFS-Kly-110:PwrRfl-Wave-PM
-DTL-010:RFS-Cav-110:PwrFwd-Wave-PM
-DTL-010:RFS-Cav-120:PwrFwd-Wave-PM
-DTL-010:RFS-Load-120:PwrFwd-Wave-PM
-DTL-010:RFS-Cav-110:Fld-Wave-PM
-DTL-010:RFS-Cav-110:PwrRfl-Wave-PM
-DTL-010:RFS-Cav-120:PwrRfl-Wave-PM
-DTL-010:RFS-Mod-110:Cur-Wave-PM
-DTL-010:RFS-Mod-110:Vol-Wave-PM
-DTL-010:RFS-SolPS-110:Cur-Wave-PM
-DTL-010:RFS-SolPS-120:Cur-Wave-PM
-DTL-010:RFS-SolPS-130:Cur-Wave-PM
-DTL-010:RFS-EPR-110:Cur-Wave-PM
-DTL-010:RFS-EPR-120:Cur-Wave-PM
-DTL-010:RFS-SIM-110:HvEna-Wave-PM
-DTL-010:RFS-SIM-110:RfEna-Wave-PM
-DTL-010:RFS-Mod-110:PCcon-Wave-PM
-DTL-010:RFS-Mod-110:Ready-Wave-PM
-DTL-010:RFS-VacPS-110:I-SP-Wave-PM
-DTL-010:RFS-VacPS-120:I-SP-Wave-PM
-DTL-010:RFS-VacMon-110:Status-Wave-PM
-DTL-010:RFS-VacMon-120:Status-Wave-PM
-DTL-010:RFS-VacMon-130:Status-Wave-PM
-DTL-010:RFS-VacMon-140:Status-Wave-PM
-DTL-010:RFS-ADG-110:IlckStatus-Wave-PM
-DTL-010:RFS-ADG-110:PwrFail-Wave-PM
-DTL-010:RFS-LLRF-101:Status-Wave-PM
diff --git a/files/DTL3FIM.archive b/files/DTL3FIM.archive
index 4b20a82..a48468f 100644
--- a/files/DTL3FIM.archive
+++ b/files/DTL3FIM.archive
@@ -3048,30 +3048,4 @@ REQMOD:dtl3-rflps-ifc1-21940:require_VER
 REQMOD:dtl3-rflps-ifc1-21940:sequencer_VER
 REQMOD:dtl3-rflps-ifc1-21940:sscan_VER
 
-DTL-030:RFS-PAmp-110:PwrFwd-Wave-PM
-DTL-030:RFS-Kly-110:PwrFwd-Wave-PM
-DTL-030:RFS-Load-130:PwrFwd-Wave-PM
-DTL-030:RFS-Kly-110:PwrRfl-Wave-PM
-DTL-030:RFS-Cav-110:PwrFwd-Wave-PM
-DTL-030:RFS-Cav-120:PwrFwd-Wave-PM
-DTL-030:RFS-Load-120:PwrFwd-Wave-PM
-DTL-030:RFS-Cav-110:Fld-Wave-PM
-DTL-030:RFS-Cav-110:PwrRfl-Wave-PM
-DTL-030:RFS-Cav-120:PwrRfl-Wave-PM
-DTL-030:RFS-Mod-110:Vol-Wave-PM
-DTL-030:RFS-Mod-110:Cur-Wave-PM
-DTL-030:RFS-SolPS-110:Cur-Wave-PM
-DTL-030:RFS-SolPS-120:Cur-Wave-PM
-DTL-030:RFS-SolPS-130:Cur-Wave-PM
-DTL-030:RFS-SIM-110:HvEna-Wave-PM
-DTL-030:RFS-SIM-110:RfEna-Wave-PM
-DTL-030:RFS-Mod-110:PCcon-Wave-PM
-DTL-030:RFS-Mod-110:Ready-Wave-PM
-DTL-030:RFS-VacPS-110:I-SP-Wave-PM
-DTL-030:RFS-VacPS-120:I-SP-Wave-PM
-DTL-030:RFS-VacMon-110:Status-Wave-PM
-DTL-030:RFS-VacMon-130:Status-Wave-PM
-DTL-030:RFS-ADG-110:IlckStatus-Wave-PM
-DTL-030:RFS-ADG-110:PwrFail-Wave-PM
-DTL-030:RFS-LLRF-101:Status-Wave-PM
 
diff --git a/files/DTL4FIM.archive b/files/DTL4FIM.archive
index 4197f46..acb19de 100644
--- a/files/DTL4FIM.archive
+++ b/files/DTL4FIM.archive
@@ -2957,32 +2957,3 @@ DTL-RFLPS4:Ctrl-IOC-002:TS_NTP_INET
 DTL-RFLPS4:Ctrl-IOC-002:TZ
 DTL-RFLPS4:Ctrl-IOC-002:UPTIME
 
-DTL-040:RFS-PAmp-110:PwrFwd-Wave-PM
-DTL-040:RFS-Kly-110:PwrFwd-Wave-PM
-DTL-040:RFS-Load-130:PwrFwd-Wave-PM
-DTL-040:RFS-Kly-110:PwrRfl-Wave-PM
-DTL-040:RFS-Cav-110:PwrFwd-Wave-PM
-DTL-040:RFS-Cav-120:PwrFwd-Wave-PM
-DTL-040:RFS-Load-120:PwrFwd-Wave-PM
-DTL-040:RFS-Cav-110:Fld-Wave-PM
-DTL-040:RFS-Cav-110:PwrRfl-Wave-PM
-DTL-040:RFS-Cav-120:PwrRfl-Wave-PM
-DTL-040:RFS-Mod-110:Vol-Wave-PM
-DTL-040:RFS-Mod-110:Cur-Wave-PM
-DTL-040:RFS-SolPS-110:Cur-Wave-PM
-DTL-040:RFS-SolPS-120:Cur-Wave-PM
-DTL-040:RFS-SolPS-130:Cur-Wave-PM
-DTL-040:RFS-SIM-110:HvEna-Wave-PM
-DTL-040:RFS-SIM-110:RfEna-Wave-PM
-DTL-040:RFS-Mod-110:PCcon-Wave-PM
-DTL-040:RFS-Mod-110:Ready-Wave-PM
-DTL-040:RFS-VacPS-110:I-SP-Wave-PM
-DTL-040:RFS-VacPS-120:I-SP-Wave-PM
-DTL-040:RFS-FIM-101:DI7-Wave-PM
-DTL-040:RFS-FIM-101:DI8-Wave-PM
-DTL-040:RFS-VacMon-110:Status-Wave-PM
-DTL-040:RFS-FIM-101:DI10-Wave-PM
-DTL-040:RFS-VacMon-130:Status-Wave-PM
-DTL-040:RFS-ADG-110:IlckStatus-Wave-PM
-DTL-040:RFS-ADG-110:PwrFail-Wave-PM
-DTL-040:RFS-LLRF-101:Status-Wave-PM
diff --git a/files/DTL5FIM.archive b/files/DTL5FIM.archive
index 81d9cf8..423045b 100644
--- a/files/DTL5FIM.archive
+++ b/files/DTL5FIM.archive
@@ -3046,31 +3046,3 @@ REQMOD:dtl5-rflps-ifc1-5072:recsync_VER
 REQMOD:dtl5-rflps-ifc1-5072:require_VER
 REQMOD:dtl5-rflps-ifc1-5072:sequencer_VER
 REQMOD:dtl5-rflps-ifc1-5072:sscan_VER
-
-DTL-050:RFS-PAmp-110:PwrFwd-Wave-PM
-DTL-050:RFS-Kly-110:PwrFwd-Wave-PM
-DTL-050:RFS-Load-130:PwrFwd-Wave-PM
-DTL-050:RFS-Kly-110:PwrRfl-Wave-PM
-DTL-050:RFS-Cav-110:PwrFwd-Wave-PM
-DTL-050:RFS-Cav-120:PwrFwd-Wave-PM
-DTL-050:RFS-Load-120:PwrFwd-Wave-PM
-DTL-050:RFS-Cav-110:Fld-Wave-PM
-DTL-050:RFS-Cav-110:PwrRfl-Wave-PM
-DTL-050:RFS-Cav-120:PwrRfl-Wave-PM
-DTL-050:RFS-Mod-110:Vol-Wave-PM
-DTL-050:RFS-Mod-110:Cur-Wave-PM
-DTL-050:RFS-SolPS-110:Cur-Wave-PM
-DTL-050:RFS-SolPS-120:Cur-Wave-PM
-DTL-050:RFS-SolPS-130:Cur-Wave-PM
-DTL-050:RFS-SIM-110:HvEna-Wave-PM
-DTL-050:RFS-SIM-110:RfEna-Wave-PM
-DTL-050:RFS-Mod-110:PCcon-Wave-PM
-DTL-050:RFS-Mod-110:Ready-Wave-PM
-DTL-050:RFS-VacPS-110:I-SP-Wave-PM
-DTL-050:RFS-VacPS-120:I-SP-Wave-PM
-DTL-050:RFS-VacMon-110:Status-Wave-PM
-DTL-050:RFS-FIM-101:DI10-Wave-PM
-DTL-050:RFS-VacMon-130:Status-Wave-PM
-DTL-050:RFS-ADG-110:IlckStatus-Wave-PM
-DTL-050:RFS-ADG-110:PwrFail-Wave-PM
-DTL-050:RFS-LLRF-101:Status-Wave-PM
\ No newline at end of file
diff --git a/files/HBL-010RFC_SC-IOC-102.archive b/files/HBL-010RFC_SC-IOC-102.archive
index 1b809b4..17a006f 100644
--- a/files/HBL-010RFC_SC-IOC-102.archive
+++ b/files/HBL-010RFC_SC-IOC-102.archive
@@ -2,12 +2,10 @@ HBL-010RFC:RFS-ADG-110:IlckStatus-DIlckMode-RB
 HBL-010RFC:RFS-ADG-110:IlckStatus-Ilck-RB
 HBL-010RFC:RFS-ADG-110:IlckStatus-Input-RB
 HBL-010RFC:RFS-ADG-110:IlckStatus-isFirstIlck
-HBL-010RFC:RFS-ADG-110:IlckStatus-Wave-PM
 HBL-010RFC:RFS-ADG-110:PwrFail-DIlckMode-RB
 HBL-010RFC:RFS-ADG-110:PwrFail-Ilck-RB
 HBL-010RFC:RFS-ADG-110:PwrFail-Input-RB
 HBL-010RFC:RFS-ADG-110:PwrFail-isFirstIlck
-HBL-010RFC:RFS-ADG-110:PwrFail-Wave-PM
 HBL-010RFC:RFS-Cav-110:Fld-DevMonEval-RB
 HBL-010RFC:RFS-Cav-110:Fld-DevMonFact-RB
 HBL-010RFC:RFS-Cav-110:Fld-DevMonIlck-RB
@@ -46,7 +44,6 @@ HBL-010RFC:RFS-Cav-110:Fld-Wave-Avg
 HBL-010RFC:RFS-Cav-110:Fld-Wave-High
 HBL-010RFC:RFS-Cav-110:Fld-Wave-Low
 HBL-010RFC:RFS-Cav-110:Fld-Wave-Med
-HBL-010RFC:RFS-Cav-110:Fld-Wave-PM
 HBL-010RFC:RFS-Cav-110:PwrFwd-DevMonEval-RB
 HBL-010RFC:RFS-Cav-110:PwrFwd-DevMonFact-RB
 HBL-010RFC:RFS-Cav-110:PwrFwd-DevMonIlck-RB
@@ -85,7 +82,6 @@ HBL-010RFC:RFS-Cav-110:PwrFwd-Wave-Avg
 HBL-010RFC:RFS-Cav-110:PwrFwd-Wave-High
 HBL-010RFC:RFS-Cav-110:PwrFwd-Wave-Low
 HBL-010RFC:RFS-Cav-110:PwrFwd-Wave-Med
-HBL-010RFC:RFS-Cav-110:PwrFwd-Wave-PM
 HBL-010RFC:RFS-Cav-110:PwrRfl-DevMonEval-RB
 HBL-010RFC:RFS-Cav-110:PwrRfl-DevMonFact-RB
 HBL-010RFC:RFS-Cav-110:PwrRfl-DevMonIlck-RB
@@ -124,7 +120,6 @@ HBL-010RFC:RFS-Cav-110:PwrRfl-Wave-Avg
 HBL-010RFC:RFS-Cav-110:PwrRfl-Wave-High
 HBL-010RFC:RFS-Cav-110:PwrRfl-Wave-Low
 HBL-010RFC:RFS-Cav-110:PwrRfl-Wave-Med
-HBL-010RFC:RFS-Cav-110:PwrRfl-Wave-PM
 HBL-010RFC:RFS-EPR-110:Cur-DevMonEval-RB
 HBL-010RFC:RFS-EPR-110:Cur-DevMonFact-RB
 HBL-010RFC:RFS-EPR-110:Cur-DevMonIlck-RB
@@ -163,7 +158,6 @@ HBL-010RFC:RFS-EPR-110:Cur-Wave-Avg
 HBL-010RFC:RFS-EPR-110:Cur-Wave-High
 HBL-010RFC:RFS-EPR-110:Cur-Wave-Low
 HBL-010RFC:RFS-EPR-110:Cur-Wave-Med
-HBL-010RFC:RFS-EPR-110:Cur-Wave-PM
 HBL-010RFC:RFS-FIM-101:AI1-FastRst-IlckCnt
 HBL-010RFC:RFS-FIM-101:AI1-HVON-En-RB
 HBL-010RFC:RFS-FIM-101:AI1-HVON-Precond
@@ -214,7 +208,6 @@ HBL-010RFC:RFS-FIM-101:AI10-Wave-Avg
 HBL-010RFC:RFS-FIM-101:AI10-Wave-High
 HBL-010RFC:RFS-FIM-101:AI10-Wave-Low
 HBL-010RFC:RFS-FIM-101:AI10-Wave-Med
-HBL-010RFC:RFS-FIM-101:AI10-Wave-PM
 HBL-010RFC:RFS-FIM-101:AI2-FastRst-IlckCnt
 HBL-010RFC:RFS-FIM-101:AI2-HVON-En-RB
 HBL-010RFC:RFS-FIM-101:AI2-HVON-Precond
@@ -277,7 +270,6 @@ HBL-010RFC:RFS-FIM-101:AI5-Wave-Avg
 HBL-010RFC:RFS-FIM-101:AI5-Wave-High
 HBL-010RFC:RFS-FIM-101:AI5-Wave-Low
 HBL-010RFC:RFS-FIM-101:AI5-Wave-Med
-HBL-010RFC:RFS-FIM-101:AI5-Wave-PM
 HBL-010RFC:RFS-FIM-101:AI6-FastRst-IlckCnt
 HBL-010RFC:RFS-FIM-101:AI6-HVON-En-RB
 HBL-010RFC:RFS-FIM-101:AI6-HVON-Precond
@@ -328,7 +320,6 @@ HBL-010RFC:RFS-FIM-101:AI7-Wave-Avg
 HBL-010RFC:RFS-FIM-101:AI7-Wave-High
 HBL-010RFC:RFS-FIM-101:AI7-Wave-Low
 HBL-010RFC:RFS-FIM-101:AI7-Wave-Med
-HBL-010RFC:RFS-FIM-101:AI7-Wave-PM
 HBL-010RFC:RFS-FIM-101:AI8-DevMonEval-RB
 HBL-010RFC:RFS-FIM-101:AI8-DevMonFact-RB
 HBL-010RFC:RFS-FIM-101:AI8-DevMonIlck-RB
@@ -373,7 +364,6 @@ HBL-010RFC:RFS-FIM-101:AI8-Wave-Avg
 HBL-010RFC:RFS-FIM-101:AI8-Wave-High
 HBL-010RFC:RFS-FIM-101:AI8-Wave-Low
 HBL-010RFC:RFS-FIM-101:AI8-Wave-Med
-HBL-010RFC:RFS-FIM-101:AI8-Wave-PM
 HBL-010RFC:RFS-FIM-101:AI9-DevMonEval-RB
 HBL-010RFC:RFS-FIM-101:AI9-DevMonFact-RB
 HBL-010RFC:RFS-FIM-101:AI9-DevMonIlck-RB
@@ -418,7 +408,6 @@ HBL-010RFC:RFS-FIM-101:AI9-Wave-Avg
 HBL-010RFC:RFS-FIM-101:AI9-Wave-High
 HBL-010RFC:RFS-FIM-101:AI9-Wave-Low
 HBL-010RFC:RFS-FIM-101:AI9-Wave-Med
-HBL-010RFC:RFS-FIM-101:AI9-Wave-PM
 HBL-010RFC:RFS-FIM-101:CD1-DevFactor-RB
 HBL-010RFC:RFS-FIM-101:CD1-DevPeriod-RB
 HBL-010RFC:RFS-FIM-101:CD1-FastRst-IlckCnt
@@ -440,7 +429,6 @@ HBL-010RFC:RFS-FIM-101:CD1-RFON-En-RB
 HBL-010RFC:RFS-FIM-101:CD1-RFON-Precond
 HBL-010RFC:RFS-FIM-101:CD1-TrigSel-RB
 HBL-010RFC:RFS-FIM-101:CD1-TrigThre-RB
-HBL-010RFC:RFS-FIM-101:CD1-Wave-IlckPM
 HBL-010RFC:RFS-FIM-101:CD2-DevFactor-RB
 HBL-010RFC:RFS-FIM-101:CD2-DevPeriod-RB
 HBL-010RFC:RFS-FIM-101:CD2-FastRst-IlckCnt
@@ -462,7 +450,6 @@ HBL-010RFC:RFS-FIM-101:CD2-RFON-En-RB
 HBL-010RFC:RFS-FIM-101:CD2-RFON-Precond
 HBL-010RFC:RFS-FIM-101:CD2-TrigSel-RB
 HBL-010RFC:RFS-FIM-101:CD2-TrigThre-RB
-HBL-010RFC:RFS-FIM-101:CD2-Wave-IlckPM
 HBL-010RFC:RFS-FIM-101:DI1-DIlckLatch-RB
 HBL-010RFC:RFS-FIM-101:DI1-FastRst-IlckCnt
 HBL-010RFC:RFS-FIM-101:DI1-HVON-En-RB
@@ -481,7 +468,6 @@ HBL-010RFC:RFS-FIM-101:DI10-Input-RB
 HBL-010RFC:RFS-FIM-101:DI10-isFirstIlck
 HBL-010RFC:RFS-FIM-101:DI10-RFON-En-RB
 HBL-010RFC:RFS-FIM-101:DI10-RFON-Precond
-HBL-010RFC:RFS-FIM-101:DI10-Wave-PM
 HBL-010RFC:RFS-FIM-101:DI11-DIlckLatch-RB
 HBL-010RFC:RFS-FIM-101:DI11-FastRst-IlckCnt
 HBL-010RFC:RFS-FIM-101:DI11-HVON-En-RB
@@ -500,7 +486,6 @@ HBL-010RFC:RFS-FIM-101:DI12-Input-RB
 HBL-010RFC:RFS-FIM-101:DI12-isFirstIlck
 HBL-010RFC:RFS-FIM-101:DI12-RFON-En-RB
 HBL-010RFC:RFS-FIM-101:DI12-RFON-Precond
-HBL-010RFC:RFS-FIM-101:DI12-Wave-PM
 HBL-010RFC:RFS-FIM-101:DI13-DIlckLatch-RB
 HBL-010RFC:RFS-FIM-101:DI13-DIlckMode-RB
 HBL-010RFC:RFS-FIM-101:DI13-FastRst-IlckCnt
@@ -512,7 +497,6 @@ HBL-010RFC:RFS-FIM-101:DI13-Input-RB
 HBL-010RFC:RFS-FIM-101:DI13-isFirstIlck
 HBL-010RFC:RFS-FIM-101:DI13-RFON-En-RB
 HBL-010RFC:RFS-FIM-101:DI13-RFON-Precond
-HBL-010RFC:RFS-FIM-101:DI13-Wave-PM
 HBL-010RFC:RFS-FIM-101:DI14-DIlckLatch-RB
 HBL-010RFC:RFS-FIM-101:DI14-DIlckMode-RB
 HBL-010RFC:RFS-FIM-101:DI14-FastRst-IlckCnt
@@ -524,7 +508,6 @@ HBL-010RFC:RFS-FIM-101:DI14-Input-RB
 HBL-010RFC:RFS-FIM-101:DI14-isFirstIlck
 HBL-010RFC:RFS-FIM-101:DI14-RFON-En-RB
 HBL-010RFC:RFS-FIM-101:DI14-RFON-Precond
-HBL-010RFC:RFS-FIM-101:DI14-Wave-PM
 HBL-010RFC:RFS-FIM-101:DI15-DIlckLatch-RB
 HBL-010RFC:RFS-FIM-101:DI15-FastRst-IlckCnt
 HBL-010RFC:RFS-FIM-101:DI15-HVON-En-RB
@@ -550,7 +533,6 @@ HBL-010RFC:RFS-FIM-101:DI17-Input-RB
 HBL-010RFC:RFS-FIM-101:DI17-isFirstIlck
 HBL-010RFC:RFS-FIM-101:DI17-RFON-En-RB
 HBL-010RFC:RFS-FIM-101:DI17-RFON-Precond
-HBL-010RFC:RFS-FIM-101:DI17-Wave-PM
 HBL-010RFC:RFS-FIM-101:DI18-DIlckLatch-RB
 HBL-010RFC:RFS-FIM-101:DI18-DIlckMode-RB
 HBL-010RFC:RFS-FIM-101:DI18-FastRst-IlckCnt
@@ -562,7 +544,6 @@ HBL-010RFC:RFS-FIM-101:DI18-Input-RB
 HBL-010RFC:RFS-FIM-101:DI18-isFirstIlck
 HBL-010RFC:RFS-FIM-101:DI18-RFON-En-RB
 HBL-010RFC:RFS-FIM-101:DI18-RFON-Precond
-HBL-010RFC:RFS-FIM-101:DI18-Wave-PM
 HBL-010RFC:RFS-FIM-101:DI19-DIlckLatch-RB
 HBL-010RFC:RFS-FIM-101:DI19-DIlckMode-RB
 HBL-010RFC:RFS-FIM-101:DI19-FastRst-IlckCnt
@@ -574,7 +555,6 @@ HBL-010RFC:RFS-FIM-101:DI19-Input-RB
 HBL-010RFC:RFS-FIM-101:DI19-isFirstIlck
 HBL-010RFC:RFS-FIM-101:DI19-RFON-En-RB
 HBL-010RFC:RFS-FIM-101:DI19-RFON-Precond
-HBL-010RFC:RFS-FIM-101:DI19-Wave-PM
 HBL-010RFC:RFS-FIM-101:DI2-DIlckLatch-RB
 HBL-010RFC:RFS-FIM-101:DI2-FastRst-IlckCnt
 HBL-010RFC:RFS-FIM-101:DI2-HVON-En-RB
@@ -593,7 +573,6 @@ HBL-010RFC:RFS-FIM-101:DI20-Input-RB
 HBL-010RFC:RFS-FIM-101:DI20-isFirstIlck
 HBL-010RFC:RFS-FIM-101:DI20-RFON-En-RB
 HBL-010RFC:RFS-FIM-101:DI20-RFON-Precond
-HBL-010RFC:RFS-FIM-101:DI20-Wave-PM
 HBL-010RFC:RFS-FIM-101:DI21-DIlckLatch-RB
 HBL-010RFC:RFS-FIM-101:DI21-FastRst-IlckCnt
 HBL-010RFC:RFS-FIM-101:DI21-HVON-En-RB
@@ -640,7 +619,6 @@ HBL-010RFC:RFS-FIM-101:DI7-Input-RB
 HBL-010RFC:RFS-FIM-101:DI7-isFirstIlck
 HBL-010RFC:RFS-FIM-101:DI7-RFON-En-RB
 HBL-010RFC:RFS-FIM-101:DI7-RFON-Precond
-HBL-010RFC:RFS-FIM-101:DI7-Wave-PM
 HBL-010RFC:RFS-FIM-101:DI8-DIlckLatch-RB
 HBL-010RFC:RFS-FIM-101:DI8-DIlckMode-RB
 HBL-010RFC:RFS-FIM-101:DI8-FastRst-IlckCnt
@@ -652,7 +630,6 @@ HBL-010RFC:RFS-FIM-101:DI8-Input-RB
 HBL-010RFC:RFS-FIM-101:DI8-isFirstIlck
 HBL-010RFC:RFS-FIM-101:DI8-RFON-En-RB
 HBL-010RFC:RFS-FIM-101:DI8-RFON-Precond
-HBL-010RFC:RFS-FIM-101:DI8-Wave-PM
 HBL-010RFC:RFS-FIM-101:DI9-DIlckLatch-RB
 HBL-010RFC:RFS-FIM-101:DI9-FastRst-IlckCnt
 HBL-010RFC:RFS-FIM-101:DI9-HVON-En-RB
@@ -716,7 +693,6 @@ HBL-010RFC:RFS-FIM-101:RF10-Wave-Avg
 HBL-010RFC:RFS-FIM-101:RF10-Wave-High
 HBL-010RFC:RFS-FIM-101:RF10-Wave-Low
 HBL-010RFC:RFS-FIM-101:RF10-Wave-Med
-HBL-010RFC:RFS-FIM-101:RF10-Wave-PM
 HBL-010RFC:RFS-FIM-101:RF2-FastRst-IlckCnt
 HBL-010RFC:RFS-FIM-101:RF2-HVON-En-RB
 HBL-010RFC:RFS-FIM-101:RF2-HVON-Precond
@@ -803,7 +779,6 @@ HBL-010RFC:RFS-FIM-101:RF9-Wave-Avg
 HBL-010RFC:RFS-FIM-101:RF9-Wave-High
 HBL-010RFC:RFS-FIM-101:RF9-Wave-Low
 HBL-010RFC:RFS-FIM-101:RF9-Wave-Med
-HBL-010RFC:RFS-FIM-101:RF9-Wave-PM
 HBL-010RFC:RFS-FIM-101:RFON-Precond
 HBL-010RFC:RFS-FIM-101:RP1-FastRst-IlckCnt
 HBL-010RFC:RFS-FIM-101:RP1-HVON-En-RB
@@ -824,7 +799,6 @@ HBL-010RFC:RFS-FIM-101:RP1-RFON-En-RB
 HBL-010RFC:RFS-FIM-101:RP1-RFON-Precond
 HBL-010RFC:RFS-FIM-101:RP1-TrigSel-RB
 HBL-010RFC:RFS-FIM-101:RP1-TrigThre-RB
-HBL-010RFC:RFS-FIM-101:RP1-Wave-IlckPM
 HBL-010RFC:RFS-FIM-101:RP2-FastRst-IlckCnt
 HBL-010RFC:RFS-FIM-101:RP2-HVON-En-RB
 HBL-010RFC:RFS-FIM-101:RP2-HVON-Precond
@@ -844,7 +818,6 @@ HBL-010RFC:RFS-FIM-101:RP2-RFON-En-RB
 HBL-010RFC:RFS-FIM-101:RP2-RFON-Precond
 HBL-010RFC:RFS-FIM-101:RP2-TrigSel-RB
 HBL-010RFC:RFS-FIM-101:RP2-TrigThre-RB
-HBL-010RFC:RFS-FIM-101:RP2-Wave-IlckPM
 HBL-010RFC:RFS-FIM-101:TriggerLine-RB
 HBL-010RFC:RFS-Kly-110:PwrFwd-DevMonEval-RB
 HBL-010RFC:RFS-Kly-110:PwrFwd-DevMonFact-RB
@@ -884,7 +857,6 @@ HBL-010RFC:RFS-Kly-110:PwrFwd-Wave-Avg
 HBL-010RFC:RFS-Kly-110:PwrFwd-Wave-High
 HBL-010RFC:RFS-Kly-110:PwrFwd-Wave-Low
 HBL-010RFC:RFS-Kly-110:PwrFwd-Wave-Med
-HBL-010RFC:RFS-Kly-110:PwrFwd-Wave-PM
 HBL-010RFC:RFS-Kly-110:PwrRfl-DevMonEval-RB
 HBL-010RFC:RFS-Kly-110:PwrRfl-DevMonFact-RB
 HBL-010RFC:RFS-Kly-110:PwrRfl-DevMonIlck-RB
@@ -923,12 +895,10 @@ HBL-010RFC:RFS-Kly-110:PwrRfl-Wave-Avg
 HBL-010RFC:RFS-Kly-110:PwrRfl-Wave-High
 HBL-010RFC:RFS-Kly-110:PwrRfl-Wave-Low
 HBL-010RFC:RFS-Kly-110:PwrRfl-Wave-Med
-HBL-010RFC:RFS-Kly-110:PwrRfl-Wave-PM
 HBL-010RFC:RFS-LLRF-101:Status-DIlckMode-RB
 HBL-010RFC:RFS-LLRF-101:Status-Ilck-RB
 HBL-010RFC:RFS-LLRF-101:Status-Input-RB
 HBL-010RFC:RFS-LLRF-101:Status-isFirstIlck
-HBL-010RFC:RFS-LLRF-101:Status-Wave-PM
 HBL-010RFC:RFS-Load-120:PwrFwd-DevMonEval-RB
 HBL-010RFC:RFS-Load-120:PwrFwd-DevMonFact-RB
 HBL-010RFC:RFS-Load-120:PwrFwd-DevMonIlck-RB
@@ -967,7 +937,6 @@ HBL-010RFC:RFS-Load-120:PwrFwd-Wave-Avg
 HBL-010RFC:RFS-Load-120:PwrFwd-Wave-High
 HBL-010RFC:RFS-Load-120:PwrFwd-Wave-Low
 HBL-010RFC:RFS-Load-120:PwrFwd-Wave-Med
-HBL-010RFC:RFS-Load-120:PwrFwd-Wave-PM
 HBL-010RFC:RFS-Load-120:PwrRfl-DevMonEval-RB
 HBL-010RFC:RFS-Load-120:PwrRfl-DevMonFact-RB
 HBL-010RFC:RFS-Load-120:PwrRfl-DevMonIlck-RB
@@ -1006,7 +975,6 @@ HBL-010RFC:RFS-Load-120:PwrRfl-Wave-Avg
 HBL-010RFC:RFS-Load-120:PwrRfl-Wave-High
 HBL-010RFC:RFS-Load-120:PwrRfl-Wave-Low
 HBL-010RFC:RFS-Load-120:PwrRfl-Wave-Med
-HBL-010RFC:RFS-Load-120:PwrRfl-Wave-PM
 HBL-010RFC:RFS-Mod-110:Cur-DevMonEval-RB
 HBL-010RFC:RFS-Mod-110:Cur-DevMonFact-RB
 HBL-010RFC:RFS-Mod-110:Cur-DevMonIlck-RB
@@ -1045,17 +1013,14 @@ HBL-010RFC:RFS-Mod-110:Cur-Wave-Avg
 HBL-010RFC:RFS-Mod-110:Cur-Wave-High
 HBL-010RFC:RFS-Mod-110:Cur-Wave-Low
 HBL-010RFC:RFS-Mod-110:Cur-Wave-Med
-HBL-010RFC:RFS-Mod-110:Cur-Wave-PM
 HBL-010RFC:RFS-Mod-110:PCcon-DIlckMode-RB
 HBL-010RFC:RFS-Mod-110:PCcon-Ilck-RB
 HBL-010RFC:RFS-Mod-110:PCcon-Input-RB
 HBL-010RFC:RFS-Mod-110:PCcon-isFirstIlck
-HBL-010RFC:RFS-Mod-110:PCcon-Wave-PM
 HBL-010RFC:RFS-Mod-110:Ready-DIlckMode-RB
 HBL-010RFC:RFS-Mod-110:Ready-Ilck-RB
 HBL-010RFC:RFS-Mod-110:Ready-Input-RB
 HBL-010RFC:RFS-Mod-110:Ready-isFirstIlck
-HBL-010RFC:RFS-Mod-110:Ready-Wave-PM
 HBL-010RFC:RFS-Mod-110:Vol-DevMonEval-RB
 HBL-010RFC:RFS-Mod-110:Vol-DevMonFact-RB
 HBL-010RFC:RFS-Mod-110:Vol-DevMonIlck-RB
@@ -1094,7 +1059,6 @@ HBL-010RFC:RFS-Mod-110:Vol-Wave-Avg
 HBL-010RFC:RFS-Mod-110:Vol-Wave-High
 HBL-010RFC:RFS-Mod-110:Vol-Wave-Low
 HBL-010RFC:RFS-Mod-110:Vol-Wave-Med
-HBL-010RFC:RFS-Mod-110:Vol-Wave-PM
 HBL-010RFC:RFS-PAmp-110:PwrFwd-DevMonEval-RB
 HBL-010RFC:RFS-PAmp-110:PwrFwd-DevMonFact-RB
 HBL-010RFC:RFS-PAmp-110:PwrFwd-DevMonIlck-RB
@@ -1133,17 +1097,14 @@ HBL-010RFC:RFS-PAmp-110:PwrFwd-Wave-Avg
 HBL-010RFC:RFS-PAmp-110:PwrFwd-Wave-High
 HBL-010RFC:RFS-PAmp-110:PwrFwd-Wave-Low
 HBL-010RFC:RFS-PAmp-110:PwrFwd-Wave-Med
-HBL-010RFC:RFS-PAmp-110:PwrFwd-Wave-PM
 HBL-010RFC:RFS-SIM-110:HvEna-DIlckMode-RB
 HBL-010RFC:RFS-SIM-110:HvEna-Ilck-RB
 HBL-010RFC:RFS-SIM-110:HvEna-Input-RB
 HBL-010RFC:RFS-SIM-110:HvEna-isFirstIlck
-HBL-010RFC:RFS-SIM-110:HvEna-Wave-PM
 HBL-010RFC:RFS-SIM-110:RfEna-DIlckMode-RB
 HBL-010RFC:RFS-SIM-110:RfEna-Ilck-RB
 HBL-010RFC:RFS-SIM-110:RfEna-Input-RB
 HBL-010RFC:RFS-SIM-110:RfEna-isFirstIlck
-HBL-010RFC:RFS-SIM-110:RfEna-Wave-PM
 HBL-010RFC:RFS-SolPS-110:Cur-DevMonEval-RB
 HBL-010RFC:RFS-SolPS-110:Cur-DevMonFact-RB
 HBL-010RFC:RFS-SolPS-110:Cur-DevMonIlck-RB
@@ -1182,7 +1143,6 @@ HBL-010RFC:RFS-SolPS-110:Cur-Wave-Avg
 HBL-010RFC:RFS-SolPS-110:Cur-Wave-High
 HBL-010RFC:RFS-SolPS-110:Cur-Wave-Low
 HBL-010RFC:RFS-SolPS-110:Cur-Wave-Med
-HBL-010RFC:RFS-SolPS-110:Cur-Wave-PM
 HBL-010RFC:RFS-SolPS-120:Cur-DevMonEval-RB
 HBL-010RFC:RFS-SolPS-120:Cur-DevMonFact-RB
 HBL-010RFC:RFS-SolPS-120:Cur-DevMonIlck-RB
@@ -1221,24 +1181,19 @@ HBL-010RFC:RFS-SolPS-120:Cur-Wave-Avg
 HBL-010RFC:RFS-SolPS-120:Cur-Wave-High
 HBL-010RFC:RFS-SolPS-120:Cur-Wave-Low
 HBL-010RFC:RFS-SolPS-120:Cur-Wave-Med
-HBL-010RFC:RFS-SolPS-120:Cur-Wave-PM
 HBL-010RFC:RFS-VacBody-110:Status-DIlckMode-RB
 HBL-010RFC:RFS-VacBody-110:Status-Ilck-RB
 HBL-010RFC:RFS-VacBody-110:Status-Input-RB
 HBL-010RFC:RFS-VacBody-110:Status-isFirstIlck
-HBL-010RFC:RFS-VacBody-110:Status-Wave-PM
 HBL-010RFC:RFS-VacCav-110:Status-DIlckMode-RB
 HBL-010RFC:RFS-VacCav-110:Status-Ilck-RB
 HBL-010RFC:RFS-VacCav-110:Status-Input-RB
 HBL-010RFC:RFS-VacCav-110:Status-isFirstIlck
-HBL-010RFC:RFS-VacCav-110:Status-Wave-PM
 HBL-010RFC:RFS-VacPS-110:I-SP-DIlckMode-RB
 HBL-010RFC:RFS-VacPS-110:I-SP-Ilck-RB
 HBL-010RFC:RFS-VacPS-110:I-SP-Input-RB
 HBL-010RFC:RFS-VacPS-110:I-SP-isFirstIlck
-HBL-010RFC:RFS-VacPS-110:I-SP-Wave-PM
 HBL-010RFC:RFS-VacPS-120:I-SP-DIlckMode-RB
 HBL-010RFC:RFS-VacPS-120:I-SP-Ilck-RB
 HBL-010RFC:RFS-VacPS-120:I-SP-Input-RB
 HBL-010RFC:RFS-VacPS-120:I-SP-isFirstIlck
-HBL-010RFC:RFS-VacPS-120:I-SP-Wave-PM
\ No newline at end of file
diff --git a/files/HBL-010RFC_SC-IOC-202.archive b/files/HBL-010RFC_SC-IOC-202.archive
index 98bd2b7..d7c63ff 100644
--- a/files/HBL-010RFC_SC-IOC-202.archive
+++ b/files/HBL-010RFC_SC-IOC-202.archive
@@ -2,12 +2,10 @@ HBL-010RFC:RFS-ADG-210:IlckStatus-DIlckMode-RB
 HBL-010RFC:RFS-ADG-210:IlckStatus-Ilck-RB
 HBL-010RFC:RFS-ADG-210:IlckStatus-Input-RB
 HBL-010RFC:RFS-ADG-210:IlckStatus-isFirstIlck
-HBL-010RFC:RFS-ADG-210:IlckStatus-Wave-PM
 HBL-010RFC:RFS-ADG-210:PwrFail-DIlckMode-RB
 HBL-010RFC:RFS-ADG-210:PwrFail-Ilck-RB
 HBL-010RFC:RFS-ADG-210:PwrFail-Input-RB
 HBL-010RFC:RFS-ADG-210:PwrFail-isFirstIlck
-HBL-010RFC:RFS-ADG-210:PwrFail-Wave-PM
 HBL-010RFC:RFS-Cav-210:Fld-DevMonEval-RB
 HBL-010RFC:RFS-Cav-210:Fld-DevMonFact-RB
 HBL-010RFC:RFS-Cav-210:Fld-DevMonIlck-RB
@@ -46,7 +44,6 @@ HBL-010RFC:RFS-Cav-210:Fld-Wave-Avg
 HBL-010RFC:RFS-Cav-210:Fld-Wave-High
 HBL-010RFC:RFS-Cav-210:Fld-Wave-Low
 HBL-010RFC:RFS-Cav-210:Fld-Wave-Med
-HBL-010RFC:RFS-Cav-210:Fld-Wave-PM
 HBL-010RFC:RFS-Cav-210:PwrFwd-DevMonEval-RB
 HBL-010RFC:RFS-Cav-210:PwrFwd-DevMonFact-RB
 HBL-010RFC:RFS-Cav-210:PwrFwd-DevMonIlck-RB
@@ -85,7 +82,6 @@ HBL-010RFC:RFS-Cav-210:PwrFwd-Wave-Avg
 HBL-010RFC:RFS-Cav-210:PwrFwd-Wave-High
 HBL-010RFC:RFS-Cav-210:PwrFwd-Wave-Low
 HBL-010RFC:RFS-Cav-210:PwrFwd-Wave-Med
-HBL-010RFC:RFS-Cav-210:PwrFwd-Wave-PM
 HBL-010RFC:RFS-Cav-210:PwrRfl-DevMonEval-RB
 HBL-010RFC:RFS-Cav-210:PwrRfl-DevMonFact-RB
 HBL-010RFC:RFS-Cav-210:PwrRfl-DevMonIlck-RB
@@ -124,7 +120,6 @@ HBL-010RFC:RFS-Cav-210:PwrRfl-Wave-Avg
 HBL-010RFC:RFS-Cav-210:PwrRfl-Wave-High
 HBL-010RFC:RFS-Cav-210:PwrRfl-Wave-Low
 HBL-010RFC:RFS-Cav-210:PwrRfl-Wave-Med
-HBL-010RFC:RFS-Cav-210:PwrRfl-Wave-PM
 HBL-010RFC:RFS-EPR-210:Cur-DevMonEval-RB
 HBL-010RFC:RFS-EPR-210:Cur-DevMonFact-RB
 HBL-010RFC:RFS-EPR-210:Cur-DevMonIlck-RB
@@ -163,7 +158,6 @@ HBL-010RFC:RFS-EPR-210:Cur-Wave-Avg
 HBL-010RFC:RFS-EPR-210:Cur-Wave-High
 HBL-010RFC:RFS-EPR-210:Cur-Wave-Low
 HBL-010RFC:RFS-EPR-210:Cur-Wave-Med
-HBL-010RFC:RFS-EPR-210:Cur-Wave-PM
 HBL-010RFC:RFS-FIM-201:AI1-FastRst-IlckCnt
 HBL-010RFC:RFS-FIM-201:AI1-HVON-En-RB
 HBL-010RFC:RFS-FIM-201:AI1-HVON-Precond
@@ -214,7 +208,6 @@ HBL-010RFC:RFS-FIM-201:AI10-Wave-Avg
 HBL-010RFC:RFS-FIM-201:AI10-Wave-High
 HBL-010RFC:RFS-FIM-201:AI10-Wave-Low
 HBL-010RFC:RFS-FIM-201:AI10-Wave-Med
-HBL-010RFC:RFS-FIM-201:AI10-Wave-PM
 HBL-010RFC:RFS-FIM-201:AI2-FastRst-IlckCnt
 HBL-010RFC:RFS-FIM-201:AI2-HVON-En-RB
 HBL-010RFC:RFS-FIM-201:AI2-HVON-Precond
@@ -277,7 +270,6 @@ HBL-010RFC:RFS-FIM-201:AI5-Wave-Avg
 HBL-010RFC:RFS-FIM-201:AI5-Wave-High
 HBL-010RFC:RFS-FIM-201:AI5-Wave-Low
 HBL-010RFC:RFS-FIM-201:AI5-Wave-Med
-HBL-010RFC:RFS-FIM-201:AI5-Wave-PM
 HBL-010RFC:RFS-FIM-201:AI6-FastRst-IlckCnt
 HBL-010RFC:RFS-FIM-201:AI6-HVON-En-RB
 HBL-010RFC:RFS-FIM-201:AI6-HVON-Precond
@@ -328,7 +320,6 @@ HBL-010RFC:RFS-FIM-201:AI7-Wave-Avg
 HBL-010RFC:RFS-FIM-201:AI7-Wave-High
 HBL-010RFC:RFS-FIM-201:AI7-Wave-Low
 HBL-010RFC:RFS-FIM-201:AI7-Wave-Med
-HBL-010RFC:RFS-FIM-201:AI7-Wave-PM
 HBL-010RFC:RFS-FIM-201:AI8-DevMonEval-RB
 HBL-010RFC:RFS-FIM-201:AI8-DevMonFact-RB
 HBL-010RFC:RFS-FIM-201:AI8-DevMonIlck-RB
@@ -373,7 +364,6 @@ HBL-010RFC:RFS-FIM-201:AI8-Wave-Avg
 HBL-010RFC:RFS-FIM-201:AI8-Wave-High
 HBL-010RFC:RFS-FIM-201:AI8-Wave-Low
 HBL-010RFC:RFS-FIM-201:AI8-Wave-Med
-HBL-010RFC:RFS-FIM-201:AI8-Wave-PM
 HBL-010RFC:RFS-FIM-201:AI9-DevMonEval-RB
 HBL-010RFC:RFS-FIM-201:AI9-DevMonFact-RB
 HBL-010RFC:RFS-FIM-201:AI9-DevMonIlck-RB
@@ -418,7 +408,6 @@ HBL-010RFC:RFS-FIM-201:AI9-Wave-Avg
 HBL-010RFC:RFS-FIM-201:AI9-Wave-High
 HBL-010RFC:RFS-FIM-201:AI9-Wave-Low
 HBL-010RFC:RFS-FIM-201:AI9-Wave-Med
-HBL-010RFC:RFS-FIM-201:AI9-Wave-PM
 HBL-010RFC:RFS-FIM-201:CD1-DevFactor-RB
 HBL-010RFC:RFS-FIM-201:CD1-DevPeriod-RB
 HBL-010RFC:RFS-FIM-201:CD1-FastRst-IlckCnt
@@ -440,7 +429,6 @@ HBL-010RFC:RFS-FIM-201:CD1-RFON-En-RB
 HBL-010RFC:RFS-FIM-201:CD1-RFON-Precond
 HBL-010RFC:RFS-FIM-201:CD1-TrigSel-RB
 HBL-010RFC:RFS-FIM-201:CD1-TrigThre-RB
-HBL-010RFC:RFS-FIM-201:CD1-Wave-IlckPM
 HBL-010RFC:RFS-FIM-201:CD2-DevFactor-RB
 HBL-010RFC:RFS-FIM-201:CD2-DevPeriod-RB
 HBL-010RFC:RFS-FIM-201:CD2-FastRst-IlckCnt
@@ -462,7 +450,6 @@ HBL-010RFC:RFS-FIM-201:CD2-RFON-En-RB
 HBL-010RFC:RFS-FIM-201:CD2-RFON-Precond
 HBL-010RFC:RFS-FIM-201:CD2-TrigSel-RB
 HBL-010RFC:RFS-FIM-201:CD2-TrigThre-RB
-HBL-010RFC:RFS-FIM-201:CD2-Wave-IlckPM
 HBL-010RFC:RFS-FIM-201:DI1-DIlckLatch-RB
 HBL-010RFC:RFS-FIM-201:DI1-FastRst-IlckCnt
 HBL-010RFC:RFS-FIM-201:DI1-HVON-En-RB
@@ -481,7 +468,6 @@ HBL-010RFC:RFS-FIM-201:DI10-Input-RB
 HBL-010RFC:RFS-FIM-201:DI10-isFirstIlck
 HBL-010RFC:RFS-FIM-201:DI10-RFON-En-RB
 HBL-010RFC:RFS-FIM-201:DI10-RFON-Precond
-HBL-010RFC:RFS-FIM-201:DI10-Wave-PM
 HBL-010RFC:RFS-FIM-201:DI11-DIlckLatch-RB
 HBL-010RFC:RFS-FIM-201:DI11-FastRst-IlckCnt
 HBL-010RFC:RFS-FIM-201:DI11-HVON-En-RB
@@ -500,7 +486,6 @@ HBL-010RFC:RFS-FIM-201:DI12-Input-RB
 HBL-010RFC:RFS-FIM-201:DI12-isFirstIlck
 HBL-010RFC:RFS-FIM-201:DI12-RFON-En-RB
 HBL-010RFC:RFS-FIM-201:DI12-RFON-Precond
-HBL-010RFC:RFS-FIM-201:DI12-Wave-PM
 HBL-010RFC:RFS-FIM-201:DI13-DIlckLatch-RB
 HBL-010RFC:RFS-FIM-201:DI13-DIlckMode-RB
 HBL-010RFC:RFS-FIM-201:DI13-FastRst-IlckCnt
@@ -512,7 +497,6 @@ HBL-010RFC:RFS-FIM-201:DI13-Input-RB
 HBL-010RFC:RFS-FIM-201:DI13-isFirstIlck
 HBL-010RFC:RFS-FIM-201:DI13-RFON-En-RB
 HBL-010RFC:RFS-FIM-201:DI13-RFON-Precond
-HBL-010RFC:RFS-FIM-201:DI13-Wave-PM
 HBL-010RFC:RFS-FIM-201:DI14-DIlckLatch-RB
 HBL-010RFC:RFS-FIM-201:DI14-DIlckMode-RB
 HBL-010RFC:RFS-FIM-201:DI14-FastRst-IlckCnt
@@ -524,7 +508,6 @@ HBL-010RFC:RFS-FIM-201:DI14-Input-RB
 HBL-010RFC:RFS-FIM-201:DI14-isFirstIlck
 HBL-010RFC:RFS-FIM-201:DI14-RFON-En-RB
 HBL-010RFC:RFS-FIM-201:DI14-RFON-Precond
-HBL-010RFC:RFS-FIM-201:DI14-Wave-PM
 HBL-010RFC:RFS-FIM-201:DI15-DIlckLatch-RB
 HBL-010RFC:RFS-FIM-201:DI15-FastRst-IlckCnt
 HBL-010RFC:RFS-FIM-201:DI15-HVON-En-RB
@@ -550,7 +533,6 @@ HBL-010RFC:RFS-FIM-201:DI17-Input-RB
 HBL-010RFC:RFS-FIM-201:DI17-isFirstIlck
 HBL-010RFC:RFS-FIM-201:DI17-RFON-En-RB
 HBL-010RFC:RFS-FIM-201:DI17-RFON-Precond
-HBL-010RFC:RFS-FIM-201:DI17-Wave-PM
 HBL-010RFC:RFS-FIM-201:DI18-DIlckLatch-RB
 HBL-010RFC:RFS-FIM-201:DI18-DIlckMode-RB
 HBL-010RFC:RFS-FIM-201:DI18-FastRst-IlckCnt
@@ -562,7 +544,6 @@ HBL-010RFC:RFS-FIM-201:DI18-Input-RB
 HBL-010RFC:RFS-FIM-201:DI18-isFirstIlck
 HBL-010RFC:RFS-FIM-201:DI18-RFON-En-RB
 HBL-010RFC:RFS-FIM-201:DI18-RFON-Precond
-HBL-010RFC:RFS-FIM-201:DI18-Wave-PM
 HBL-010RFC:RFS-FIM-201:DI19-DIlckLatch-RB
 HBL-010RFC:RFS-FIM-201:DI19-DIlckMode-RB
 HBL-010RFC:RFS-FIM-201:DI19-FastRst-IlckCnt
@@ -574,7 +555,6 @@ HBL-010RFC:RFS-FIM-201:DI19-Input-RB
 HBL-010RFC:RFS-FIM-201:DI19-isFirstIlck
 HBL-010RFC:RFS-FIM-201:DI19-RFON-En-RB
 HBL-010RFC:RFS-FIM-201:DI19-RFON-Precond
-HBL-010RFC:RFS-FIM-201:DI19-Wave-PM
 HBL-010RFC:RFS-FIM-201:DI2-DIlckLatch-RB
 HBL-010RFC:RFS-FIM-201:DI2-FastRst-IlckCnt
 HBL-010RFC:RFS-FIM-201:DI2-HVON-En-RB
@@ -593,7 +573,6 @@ HBL-010RFC:RFS-FIM-201:DI20-Input-RB
 HBL-010RFC:RFS-FIM-201:DI20-isFirstIlck
 HBL-010RFC:RFS-FIM-201:DI20-RFON-En-RB
 HBL-010RFC:RFS-FIM-201:DI20-RFON-Precond
-HBL-010RFC:RFS-FIM-201:DI20-Wave-PM
 HBL-010RFC:RFS-FIM-201:DI21-DIlckLatch-RB
 HBL-010RFC:RFS-FIM-201:DI21-FastRst-IlckCnt
 HBL-010RFC:RFS-FIM-201:DI21-HVON-En-RB
@@ -640,7 +619,6 @@ HBL-010RFC:RFS-FIM-201:DI7-Input-RB
 HBL-010RFC:RFS-FIM-201:DI7-isFirstIlck
 HBL-010RFC:RFS-FIM-201:DI7-RFON-En-RB
 HBL-010RFC:RFS-FIM-201:DI7-RFON-Precond
-HBL-010RFC:RFS-FIM-201:DI7-Wave-PM
 HBL-010RFC:RFS-FIM-201:DI8-DIlckLatch-RB
 HBL-010RFC:RFS-FIM-201:DI8-DIlckMode-RB
 HBL-010RFC:RFS-FIM-201:DI8-FastRst-IlckCnt
@@ -652,7 +630,6 @@ HBL-010RFC:RFS-FIM-201:DI8-Input-RB
 HBL-010RFC:RFS-FIM-201:DI8-isFirstIlck
 HBL-010RFC:RFS-FIM-201:DI8-RFON-En-RB
 HBL-010RFC:RFS-FIM-201:DI8-RFON-Precond
-HBL-010RFC:RFS-FIM-201:DI8-Wave-PM
 HBL-010RFC:RFS-FIM-201:DI9-DIlckLatch-RB
 HBL-010RFC:RFS-FIM-201:DI9-FastRst-IlckCnt
 HBL-010RFC:RFS-FIM-201:DI9-HVON-En-RB
@@ -716,7 +693,6 @@ HBL-010RFC:RFS-FIM-201:RF10-Wave-Avg
 HBL-010RFC:RFS-FIM-201:RF10-Wave-High
 HBL-010RFC:RFS-FIM-201:RF10-Wave-Low
 HBL-010RFC:RFS-FIM-201:RF10-Wave-Med
-HBL-010RFC:RFS-FIM-201:RF10-Wave-PM
 HBL-010RFC:RFS-FIM-201:RF2-FastRst-IlckCnt
 HBL-010RFC:RFS-FIM-201:RF2-HVON-En-RB
 HBL-010RFC:RFS-FIM-201:RF2-HVON-Precond
@@ -803,7 +779,6 @@ HBL-010RFC:RFS-FIM-201:RF9-Wave-Avg
 HBL-010RFC:RFS-FIM-201:RF9-Wave-High
 HBL-010RFC:RFS-FIM-201:RF9-Wave-Low
 HBL-010RFC:RFS-FIM-201:RF9-Wave-Med
-HBL-010RFC:RFS-FIM-201:RF9-Wave-PM
 HBL-010RFC:RFS-FIM-201:RFON-Precond
 HBL-010RFC:RFS-FIM-201:RP1-FastRst-IlckCnt
 HBL-010RFC:RFS-FIM-201:RP1-HVON-En-RB
@@ -824,7 +799,6 @@ HBL-010RFC:RFS-FIM-201:RP1-RFON-En-RB
 HBL-010RFC:RFS-FIM-201:RP1-RFON-Precond
 HBL-010RFC:RFS-FIM-201:RP1-TrigSel-RB
 HBL-010RFC:RFS-FIM-201:RP1-TrigThre-RB
-HBL-010RFC:RFS-FIM-201:RP1-Wave-IlckPM
 HBL-010RFC:RFS-FIM-201:RP2-FastRst-IlckCnt
 HBL-010RFC:RFS-FIM-201:RP2-HVON-En-RB
 HBL-010RFC:RFS-FIM-201:RP2-HVON-Precond
@@ -844,7 +818,6 @@ HBL-010RFC:RFS-FIM-201:RP2-RFON-En-RB
 HBL-010RFC:RFS-FIM-201:RP2-RFON-Precond
 HBL-010RFC:RFS-FIM-201:RP2-TrigSel-RB
 HBL-010RFC:RFS-FIM-201:RP2-TrigThre-RB
-HBL-010RFC:RFS-FIM-201:RP2-Wave-IlckPM
 HBL-010RFC:RFS-FIM-201:TriggerLine-RB
 HBL-010RFC:RFS-Kly-210:PwrFwd-DevMonEval-RB
 HBL-010RFC:RFS-Kly-210:PwrFwd-DevMonFact-RB
@@ -884,7 +857,6 @@ HBL-010RFC:RFS-Kly-210:PwrFwd-Wave-Avg
 HBL-010RFC:RFS-Kly-210:PwrFwd-Wave-High
 HBL-010RFC:RFS-Kly-210:PwrFwd-Wave-Low
 HBL-010RFC:RFS-Kly-210:PwrFwd-Wave-Med
-HBL-010RFC:RFS-Kly-210:PwrFwd-Wave-PM
 HBL-010RFC:RFS-Kly-210:PwrRfl-DevMonEval-RB
 HBL-010RFC:RFS-Kly-210:PwrRfl-DevMonFact-RB
 HBL-010RFC:RFS-Kly-210:PwrRfl-DevMonIlck-RB
@@ -923,12 +895,10 @@ HBL-010RFC:RFS-Kly-210:PwrRfl-Wave-Avg
 HBL-010RFC:RFS-Kly-210:PwrRfl-Wave-High
 HBL-010RFC:RFS-Kly-210:PwrRfl-Wave-Low
 HBL-010RFC:RFS-Kly-210:PwrRfl-Wave-Med
-HBL-010RFC:RFS-Kly-210:PwrRfl-Wave-PM
 HBL-010RFC:RFS-LLRF-201:Status-DIlckMode-RB
 HBL-010RFC:RFS-LLRF-201:Status-Ilck-RB
 HBL-010RFC:RFS-LLRF-201:Status-Input-RB
 HBL-010RFC:RFS-LLRF-201:Status-isFirstIlck
-HBL-010RFC:RFS-LLRF-201:Status-Wave-PM
 HBL-010RFC:RFS-Load-220:PwrFwd-DevMonEval-RB
 HBL-010RFC:RFS-Load-220:PwrFwd-DevMonFact-RB
 HBL-010RFC:RFS-Load-220:PwrFwd-DevMonIlck-RB
@@ -967,7 +937,6 @@ HBL-010RFC:RFS-Load-220:PwrFwd-Wave-Avg
 HBL-010RFC:RFS-Load-220:PwrFwd-Wave-High
 HBL-010RFC:RFS-Load-220:PwrFwd-Wave-Low
 HBL-010RFC:RFS-Load-220:PwrFwd-Wave-Med
-HBL-010RFC:RFS-Load-220:PwrFwd-Wave-PM
 HBL-010RFC:RFS-Load-220:PwrRfl-DevMonEval-RB
 HBL-010RFC:RFS-Load-220:PwrRfl-DevMonFact-RB
 HBL-010RFC:RFS-Load-220:PwrRfl-DevMonIlck-RB
@@ -1006,7 +975,6 @@ HBL-010RFC:RFS-Load-220:PwrRfl-Wave-Avg
 HBL-010RFC:RFS-Load-220:PwrRfl-Wave-High
 HBL-010RFC:RFS-Load-220:PwrRfl-Wave-Low
 HBL-010RFC:RFS-Load-220:PwrRfl-Wave-Med
-HBL-010RFC:RFS-Load-220:PwrRfl-Wave-PM
 HBL-010RFC:RFS-Mod-210:Cur-DevMonEval-RB
 HBL-010RFC:RFS-Mod-210:Cur-DevMonFact-RB
 HBL-010RFC:RFS-Mod-210:Cur-DevMonIlck-RB
@@ -1045,17 +1013,14 @@ HBL-010RFC:RFS-Mod-210:Cur-Wave-Avg
 HBL-010RFC:RFS-Mod-210:Cur-Wave-High
 HBL-010RFC:RFS-Mod-210:Cur-Wave-Low
 HBL-010RFC:RFS-Mod-210:Cur-Wave-Med
-HBL-010RFC:RFS-Mod-210:Cur-Wave-PM
 HBL-010RFC:RFS-Mod-210:PCcon-DIlckMode-RB
 HBL-010RFC:RFS-Mod-210:PCcon-Ilck-RB
 HBL-010RFC:RFS-Mod-210:PCcon-Input-RB
 HBL-010RFC:RFS-Mod-210:PCcon-isFirstIlck
-HBL-010RFC:RFS-Mod-210:PCcon-Wave-PM
 HBL-010RFC:RFS-Mod-210:Ready-DIlckMode-RB
 HBL-010RFC:RFS-Mod-210:Ready-Ilck-RB
 HBL-010RFC:RFS-Mod-210:Ready-Input-RB
 HBL-010RFC:RFS-Mod-210:Ready-isFirstIlck
-HBL-010RFC:RFS-Mod-210:Ready-Wave-PM
 HBL-010RFC:RFS-Mod-210:Vol-DevMonEval-RB
 HBL-010RFC:RFS-Mod-210:Vol-DevMonFact-RB
 HBL-010RFC:RFS-Mod-210:Vol-DevMonIlck-RB
@@ -1094,7 +1059,6 @@ HBL-010RFC:RFS-Mod-210:Vol-Wave-Avg
 HBL-010RFC:RFS-Mod-210:Vol-Wave-High
 HBL-010RFC:RFS-Mod-210:Vol-Wave-Low
 HBL-010RFC:RFS-Mod-210:Vol-Wave-Med
-HBL-010RFC:RFS-Mod-210:Vol-Wave-PM
 HBL-010RFC:RFS-PAmp-210:PwrFwd-DevMonEval-RB
 HBL-010RFC:RFS-PAmp-210:PwrFwd-DevMonFact-RB
 HBL-010RFC:RFS-PAmp-210:PwrFwd-DevMonIlck-RB
@@ -1133,17 +1097,14 @@ HBL-010RFC:RFS-PAmp-210:PwrFwd-Wave-Avg
 HBL-010RFC:RFS-PAmp-210:PwrFwd-Wave-High
 HBL-010RFC:RFS-PAmp-210:PwrFwd-Wave-Low
 HBL-010RFC:RFS-PAmp-210:PwrFwd-Wave-Med
-HBL-010RFC:RFS-PAmp-210:PwrFwd-Wave-PM
 HBL-010RFC:RFS-SIM-210:HvEna-DIlckMode-RB
 HBL-010RFC:RFS-SIM-210:HvEna-Ilck-RB
 HBL-010RFC:RFS-SIM-210:HvEna-Input-RB
 HBL-010RFC:RFS-SIM-210:HvEna-isFirstIlck
-HBL-010RFC:RFS-SIM-210:HvEna-Wave-PM
 HBL-010RFC:RFS-SIM-210:RfEna-DIlckMode-RB
 HBL-010RFC:RFS-SIM-210:RfEna-Ilck-RB
 HBL-010RFC:RFS-SIM-210:RfEna-Input-RB
 HBL-010RFC:RFS-SIM-210:RfEna-isFirstIlck
-HBL-010RFC:RFS-SIM-210:RfEna-Wave-PM
 HBL-010RFC:RFS-SolPS-210:Cur-DevMonEval-RB
 HBL-010RFC:RFS-SolPS-210:Cur-DevMonFact-RB
 HBL-010RFC:RFS-SolPS-210:Cur-DevMonIlck-RB
@@ -1182,7 +1143,6 @@ HBL-010RFC:RFS-SolPS-210:Cur-Wave-Avg
 HBL-010RFC:RFS-SolPS-210:Cur-Wave-High
 HBL-010RFC:RFS-SolPS-210:Cur-Wave-Low
 HBL-010RFC:RFS-SolPS-210:Cur-Wave-Med
-HBL-010RFC:RFS-SolPS-210:Cur-Wave-PM
 HBL-010RFC:RFS-SolPS-220:Cur-DevMonEval-RB
 HBL-010RFC:RFS-SolPS-220:Cur-DevMonFact-RB
 HBL-010RFC:RFS-SolPS-220:Cur-DevMonIlck-RB
@@ -1221,24 +1181,19 @@ HBL-010RFC:RFS-SolPS-220:Cur-Wave-Avg
 HBL-010RFC:RFS-SolPS-220:Cur-Wave-High
 HBL-010RFC:RFS-SolPS-220:Cur-Wave-Low
 HBL-010RFC:RFS-SolPS-220:Cur-Wave-Med
-HBL-010RFC:RFS-SolPS-220:Cur-Wave-PM
 HBL-010RFC:RFS-VacBody-210:Status-DIlckMode-RB
 HBL-010RFC:RFS-VacBody-210:Status-Ilck-RB
 HBL-010RFC:RFS-VacBody-210:Status-Input-RB
 HBL-010RFC:RFS-VacBody-210:Status-isFirstIlck
-HBL-010RFC:RFS-VacBody-210:Status-Wave-PM
 HBL-010RFC:RFS-VacCav-210:Status-DIlckMode-RB
 HBL-010RFC:RFS-VacCav-210:Status-Ilck-RB
 HBL-010RFC:RFS-VacCav-210:Status-Input-RB
 HBL-010RFC:RFS-VacCav-210:Status-isFirstIlck
-HBL-010RFC:RFS-VacCav-210:Status-Wave-PM
 HBL-010RFC:RFS-VacPS-210:I-SP-DIlckMode-RB
 HBL-010RFC:RFS-VacPS-210:I-SP-Ilck-RB
 HBL-010RFC:RFS-VacPS-210:I-SP-Input-RB
 HBL-010RFC:RFS-VacPS-210:I-SP-isFirstIlck
-HBL-010RFC:RFS-VacPS-210:I-SP-Wave-PM
 HBL-010RFC:RFS-VacPS-220:I-SP-DIlckMode-RB
 HBL-010RFC:RFS-VacPS-220:I-SP-Ilck-RB
 HBL-010RFC:RFS-VacPS-220:I-SP-Input-RB
 HBL-010RFC:RFS-VacPS-220:I-SP-isFirstIlck
-HBL-010RFC:RFS-VacPS-220:I-SP-Wave-PM
\ No newline at end of file
diff --git a/files/HBL-010RFC_SC-IOC-302.archive b/files/HBL-010RFC_SC-IOC-302.archive
index 5b84a66..7227f4f 100644
--- a/files/HBL-010RFC_SC-IOC-302.archive
+++ b/files/HBL-010RFC_SC-IOC-302.archive
@@ -2,12 +2,10 @@ HBL-010RFC:RFS-ADG-310:IlckStatus-DIlckMode-RB
 HBL-010RFC:RFS-ADG-310:IlckStatus-Ilck-RB
 HBL-010RFC:RFS-ADG-310:IlckStatus-Input-RB
 HBL-010RFC:RFS-ADG-310:IlckStatus-isFirstIlck
-HBL-010RFC:RFS-ADG-310:IlckStatus-Wave-PM
 HBL-010RFC:RFS-ADG-310:PwrFail-DIlckMode-RB
 HBL-010RFC:RFS-ADG-310:PwrFail-Ilck-RB
 HBL-010RFC:RFS-ADG-310:PwrFail-Input-RB
 HBL-010RFC:RFS-ADG-310:PwrFail-isFirstIlck
-HBL-010RFC:RFS-ADG-310:PwrFail-Wave-PM
 HBL-010RFC:RFS-Cav-310:Fld-DevMonEval-RB
 HBL-010RFC:RFS-Cav-310:Fld-DevMonFact-RB
 HBL-010RFC:RFS-Cav-310:Fld-DevMonIlck-RB
@@ -46,7 +44,6 @@ HBL-010RFC:RFS-Cav-310:Fld-Wave-Avg
 HBL-010RFC:RFS-Cav-310:Fld-Wave-High
 HBL-010RFC:RFS-Cav-310:Fld-Wave-Low
 HBL-010RFC:RFS-Cav-310:Fld-Wave-Med
-HBL-010RFC:RFS-Cav-310:Fld-Wave-PM
 HBL-010RFC:RFS-Cav-310:PwrFwd-DevMonEval-RB
 HBL-010RFC:RFS-Cav-310:PwrFwd-DevMonFact-RB
 HBL-010RFC:RFS-Cav-310:PwrFwd-DevMonIlck-RB
@@ -85,7 +82,6 @@ HBL-010RFC:RFS-Cav-310:PwrFwd-Wave-Avg
 HBL-010RFC:RFS-Cav-310:PwrFwd-Wave-High
 HBL-010RFC:RFS-Cav-310:PwrFwd-Wave-Low
 HBL-010RFC:RFS-Cav-310:PwrFwd-Wave-Med
-HBL-010RFC:RFS-Cav-310:PwrFwd-Wave-PM
 HBL-010RFC:RFS-Cav-310:PwrRfl-DevMonEval-RB
 HBL-010RFC:RFS-Cav-310:PwrRfl-DevMonFact-RB
 HBL-010RFC:RFS-Cav-310:PwrRfl-DevMonIlck-RB
@@ -124,7 +120,6 @@ HBL-010RFC:RFS-Cav-310:PwrRfl-Wave-Avg
 HBL-010RFC:RFS-Cav-310:PwrRfl-Wave-High
 HBL-010RFC:RFS-Cav-310:PwrRfl-Wave-Low
 HBL-010RFC:RFS-Cav-310:PwrRfl-Wave-Med
-HBL-010RFC:RFS-Cav-310:PwrRfl-Wave-PM
 HBL-010RFC:RFS-EPR-310:Cur-DevMonEval-RB
 HBL-010RFC:RFS-EPR-310:Cur-DevMonFact-RB
 HBL-010RFC:RFS-EPR-310:Cur-DevMonIlck-RB
@@ -163,7 +158,6 @@ HBL-010RFC:RFS-EPR-310:Cur-Wave-Avg
 HBL-010RFC:RFS-EPR-310:Cur-Wave-High
 HBL-010RFC:RFS-EPR-310:Cur-Wave-Low
 HBL-010RFC:RFS-EPR-310:Cur-Wave-Med
-HBL-010RFC:RFS-EPR-310:Cur-Wave-PM
 HBL-010RFC:RFS-FIM-301:AI1-FastRst-IlckCnt
 HBL-010RFC:RFS-FIM-301:AI1-HVON-En-RB
 HBL-010RFC:RFS-FIM-301:AI1-HVON-Precond
@@ -214,7 +208,6 @@ HBL-010RFC:RFS-FIM-301:AI10-Wave-Avg
 HBL-010RFC:RFS-FIM-301:AI10-Wave-High
 HBL-010RFC:RFS-FIM-301:AI10-Wave-Low
 HBL-010RFC:RFS-FIM-301:AI10-Wave-Med
-HBL-010RFC:RFS-FIM-301:AI10-Wave-PM
 HBL-010RFC:RFS-FIM-301:AI2-FastRst-IlckCnt
 HBL-010RFC:RFS-FIM-301:AI2-HVON-En-RB
 HBL-010RFC:RFS-FIM-301:AI2-HVON-Precond
@@ -277,7 +270,6 @@ HBL-010RFC:RFS-FIM-301:AI5-Wave-Avg
 HBL-010RFC:RFS-FIM-301:AI5-Wave-High
 HBL-010RFC:RFS-FIM-301:AI5-Wave-Low
 HBL-010RFC:RFS-FIM-301:AI5-Wave-Med
-HBL-010RFC:RFS-FIM-301:AI5-Wave-PM
 HBL-010RFC:RFS-FIM-301:AI6-FastRst-IlckCnt
 HBL-010RFC:RFS-FIM-301:AI6-HVON-En-RB
 HBL-010RFC:RFS-FIM-301:AI6-HVON-Precond
@@ -328,7 +320,6 @@ HBL-010RFC:RFS-FIM-301:AI7-Wave-Avg
 HBL-010RFC:RFS-FIM-301:AI7-Wave-High
 HBL-010RFC:RFS-FIM-301:AI7-Wave-Low
 HBL-010RFC:RFS-FIM-301:AI7-Wave-Med
-HBL-010RFC:RFS-FIM-301:AI7-Wave-PM
 HBL-010RFC:RFS-FIM-301:AI8-DevMonEval-RB
 HBL-010RFC:RFS-FIM-301:AI8-DevMonFact-RB
 HBL-010RFC:RFS-FIM-301:AI8-DevMonIlck-RB
@@ -373,7 +364,6 @@ HBL-010RFC:RFS-FIM-301:AI8-Wave-Avg
 HBL-010RFC:RFS-FIM-301:AI8-Wave-High
 HBL-010RFC:RFS-FIM-301:AI8-Wave-Low
 HBL-010RFC:RFS-FIM-301:AI8-Wave-Med
-HBL-010RFC:RFS-FIM-301:AI8-Wave-PM
 HBL-010RFC:RFS-FIM-301:AI9-DevMonEval-RB
 HBL-010RFC:RFS-FIM-301:AI9-DevMonFact-RB
 HBL-010RFC:RFS-FIM-301:AI9-DevMonIlck-RB
@@ -418,7 +408,6 @@ HBL-010RFC:RFS-FIM-301:AI9-Wave-Avg
 HBL-010RFC:RFS-FIM-301:AI9-Wave-High
 HBL-010RFC:RFS-FIM-301:AI9-Wave-Low
 HBL-010RFC:RFS-FIM-301:AI9-Wave-Med
-HBL-010RFC:RFS-FIM-301:AI9-Wave-PM
 HBL-010RFC:RFS-FIM-301:CD1-DevFactor-RB
 HBL-010RFC:RFS-FIM-301:CD1-DevPeriod-RB
 HBL-010RFC:RFS-FIM-301:CD1-FastRst-IlckCnt
@@ -440,7 +429,6 @@ HBL-010RFC:RFS-FIM-301:CD1-RFON-En-RB
 HBL-010RFC:RFS-FIM-301:CD1-RFON-Precond
 HBL-010RFC:RFS-FIM-301:CD1-TrigSel-RB
 HBL-010RFC:RFS-FIM-301:CD1-TrigThre-RB
-HBL-010RFC:RFS-FIM-301:CD1-Wave-IlckPM
 HBL-010RFC:RFS-FIM-301:CD2-DevFactor-RB
 HBL-010RFC:RFS-FIM-301:CD2-DevPeriod-RB
 HBL-010RFC:RFS-FIM-301:CD2-FastRst-IlckCnt
@@ -462,7 +450,6 @@ HBL-010RFC:RFS-FIM-301:CD2-RFON-En-RB
 HBL-010RFC:RFS-FIM-301:CD2-RFON-Precond
 HBL-010RFC:RFS-FIM-301:CD2-TrigSel-RB
 HBL-010RFC:RFS-FIM-301:CD2-TrigThre-RB
-HBL-010RFC:RFS-FIM-301:CD2-Wave-IlckPM
 HBL-010RFC:RFS-FIM-301:DI1-DIlckLatch-RB
 HBL-010RFC:RFS-FIM-301:DI1-FastRst-IlckCnt
 HBL-010RFC:RFS-FIM-301:DI1-HVON-En-RB
@@ -481,7 +468,6 @@ HBL-010RFC:RFS-FIM-301:DI10-Input-RB
 HBL-010RFC:RFS-FIM-301:DI10-isFirstIlck
 HBL-010RFC:RFS-FIM-301:DI10-RFON-En-RB
 HBL-010RFC:RFS-FIM-301:DI10-RFON-Precond
-HBL-010RFC:RFS-FIM-301:DI10-Wave-PM
 HBL-010RFC:RFS-FIM-301:DI11-DIlckLatch-RB
 HBL-010RFC:RFS-FIM-301:DI11-FastRst-IlckCnt
 HBL-010RFC:RFS-FIM-301:DI11-HVON-En-RB
@@ -500,7 +486,6 @@ HBL-010RFC:RFS-FIM-301:DI12-Input-RB
 HBL-010RFC:RFS-FIM-301:DI12-isFirstIlck
 HBL-010RFC:RFS-FIM-301:DI12-RFON-En-RB
 HBL-010RFC:RFS-FIM-301:DI12-RFON-Precond
-HBL-010RFC:RFS-FIM-301:DI12-Wave-PM
 HBL-010RFC:RFS-FIM-301:DI13-DIlckLatch-RB
 HBL-010RFC:RFS-FIM-301:DI13-DIlckMode-RB
 HBL-010RFC:RFS-FIM-301:DI13-FastRst-IlckCnt
@@ -512,7 +497,6 @@ HBL-010RFC:RFS-FIM-301:DI13-Input-RB
 HBL-010RFC:RFS-FIM-301:DI13-isFirstIlck
 HBL-010RFC:RFS-FIM-301:DI13-RFON-En-RB
 HBL-010RFC:RFS-FIM-301:DI13-RFON-Precond
-HBL-010RFC:RFS-FIM-301:DI13-Wave-PM
 HBL-010RFC:RFS-FIM-301:DI14-DIlckLatch-RB
 HBL-010RFC:RFS-FIM-301:DI14-DIlckMode-RB
 HBL-010RFC:RFS-FIM-301:DI14-FastRst-IlckCnt
@@ -524,7 +508,6 @@ HBL-010RFC:RFS-FIM-301:DI14-Input-RB
 HBL-010RFC:RFS-FIM-301:DI14-isFirstIlck
 HBL-010RFC:RFS-FIM-301:DI14-RFON-En-RB
 HBL-010RFC:RFS-FIM-301:DI14-RFON-Precond
-HBL-010RFC:RFS-FIM-301:DI14-Wave-PM
 HBL-010RFC:RFS-FIM-301:DI15-DIlckLatch-RB
 HBL-010RFC:RFS-FIM-301:DI15-FastRst-IlckCnt
 HBL-010RFC:RFS-FIM-301:DI15-HVON-En-RB
@@ -550,7 +533,6 @@ HBL-010RFC:RFS-FIM-301:DI17-Input-RB
 HBL-010RFC:RFS-FIM-301:DI17-isFirstIlck
 HBL-010RFC:RFS-FIM-301:DI17-RFON-En-RB
 HBL-010RFC:RFS-FIM-301:DI17-RFON-Precond
-HBL-010RFC:RFS-FIM-301:DI17-Wave-PM
 HBL-010RFC:RFS-FIM-301:DI18-DIlckLatch-RB
 HBL-010RFC:RFS-FIM-301:DI18-DIlckMode-RB
 HBL-010RFC:RFS-FIM-301:DI18-FastRst-IlckCnt
@@ -562,7 +544,6 @@ HBL-010RFC:RFS-FIM-301:DI18-Input-RB
 HBL-010RFC:RFS-FIM-301:DI18-isFirstIlck
 HBL-010RFC:RFS-FIM-301:DI18-RFON-En-RB
 HBL-010RFC:RFS-FIM-301:DI18-RFON-Precond
-HBL-010RFC:RFS-FIM-301:DI18-Wave-PM
 HBL-010RFC:RFS-FIM-301:DI19-DIlckLatch-RB
 HBL-010RFC:RFS-FIM-301:DI19-DIlckMode-RB
 HBL-010RFC:RFS-FIM-301:DI19-FastRst-IlckCnt
@@ -574,7 +555,6 @@ HBL-010RFC:RFS-FIM-301:DI19-Input-RB
 HBL-010RFC:RFS-FIM-301:DI19-isFirstIlck
 HBL-010RFC:RFS-FIM-301:DI19-RFON-En-RB
 HBL-010RFC:RFS-FIM-301:DI19-RFON-Precond
-HBL-010RFC:RFS-FIM-301:DI19-Wave-PM
 HBL-010RFC:RFS-FIM-301:DI2-DIlckLatch-RB
 HBL-010RFC:RFS-FIM-301:DI2-FastRst-IlckCnt
 HBL-010RFC:RFS-FIM-301:DI2-HVON-En-RB
@@ -593,7 +573,6 @@ HBL-010RFC:RFS-FIM-301:DI20-Input-RB
 HBL-010RFC:RFS-FIM-301:DI20-isFirstIlck
 HBL-010RFC:RFS-FIM-301:DI20-RFON-En-RB
 HBL-010RFC:RFS-FIM-301:DI20-RFON-Precond
-HBL-010RFC:RFS-FIM-301:DI20-Wave-PM
 HBL-010RFC:RFS-FIM-301:DI21-DIlckLatch-RB
 HBL-010RFC:RFS-FIM-301:DI21-FastRst-IlckCnt
 HBL-010RFC:RFS-FIM-301:DI21-HVON-En-RB
@@ -640,7 +619,6 @@ HBL-010RFC:RFS-FIM-301:DI7-Input-RB
 HBL-010RFC:RFS-FIM-301:DI7-isFirstIlck
 HBL-010RFC:RFS-FIM-301:DI7-RFON-En-RB
 HBL-010RFC:RFS-FIM-301:DI7-RFON-Precond
-HBL-010RFC:RFS-FIM-301:DI7-Wave-PM
 HBL-010RFC:RFS-FIM-301:DI8-DIlckLatch-RB
 HBL-010RFC:RFS-FIM-301:DI8-DIlckMode-RB
 HBL-010RFC:RFS-FIM-301:DI8-FastRst-IlckCnt
@@ -652,7 +630,6 @@ HBL-010RFC:RFS-FIM-301:DI8-Input-RB
 HBL-010RFC:RFS-FIM-301:DI8-isFirstIlck
 HBL-010RFC:RFS-FIM-301:DI8-RFON-En-RB
 HBL-010RFC:RFS-FIM-301:DI8-RFON-Precond
-HBL-010RFC:RFS-FIM-301:DI8-Wave-PM
 HBL-010RFC:RFS-FIM-301:DI9-DIlckLatch-RB
 HBL-010RFC:RFS-FIM-301:DI9-FastRst-IlckCnt
 HBL-010RFC:RFS-FIM-301:DI9-HVON-En-RB
@@ -716,7 +693,6 @@ HBL-010RFC:RFS-FIM-301:RF10-Wave-Avg
 HBL-010RFC:RFS-FIM-301:RF10-Wave-High
 HBL-010RFC:RFS-FIM-301:RF10-Wave-Low
 HBL-010RFC:RFS-FIM-301:RF10-Wave-Med
-HBL-010RFC:RFS-FIM-301:RF10-Wave-PM
 HBL-010RFC:RFS-FIM-301:RF2-FastRst-IlckCnt
 HBL-010RFC:RFS-FIM-301:RF2-HVON-En-RB
 HBL-010RFC:RFS-FIM-301:RF2-HVON-Precond
@@ -803,7 +779,6 @@ HBL-010RFC:RFS-FIM-301:RF9-Wave-Avg
 HBL-010RFC:RFS-FIM-301:RF9-Wave-High
 HBL-010RFC:RFS-FIM-301:RF9-Wave-Low
 HBL-010RFC:RFS-FIM-301:RF9-Wave-Med
-HBL-010RFC:RFS-FIM-301:RF9-Wave-PM
 HBL-010RFC:RFS-FIM-301:RFON-Precond
 HBL-010RFC:RFS-FIM-301:RP1-FastRst-IlckCnt
 HBL-010RFC:RFS-FIM-301:RP1-HVON-En-RB
@@ -824,7 +799,6 @@ HBL-010RFC:RFS-FIM-301:RP1-RFON-En-RB
 HBL-010RFC:RFS-FIM-301:RP1-RFON-Precond
 HBL-010RFC:RFS-FIM-301:RP1-TrigSel-RB
 HBL-010RFC:RFS-FIM-301:RP1-TrigThre-RB
-HBL-010RFC:RFS-FIM-301:RP1-Wave-IlckPM
 HBL-010RFC:RFS-FIM-301:RP2-FastRst-IlckCnt
 HBL-010RFC:RFS-FIM-301:RP2-HVON-En-RB
 HBL-010RFC:RFS-FIM-301:RP2-HVON-Precond
@@ -844,7 +818,6 @@ HBL-010RFC:RFS-FIM-301:RP2-RFON-En-RB
 HBL-010RFC:RFS-FIM-301:RP2-RFON-Precond
 HBL-010RFC:RFS-FIM-301:RP2-TrigSel-RB
 HBL-010RFC:RFS-FIM-301:RP2-TrigThre-RB
-HBL-010RFC:RFS-FIM-301:RP2-Wave-IlckPM
 HBL-010RFC:RFS-FIM-301:TriggerLine-RB
 HBL-010RFC:RFS-Kly-310:PwrFwd-DevMonEval-RB
 HBL-010RFC:RFS-Kly-310:PwrFwd-DevMonFact-RB
@@ -884,7 +857,6 @@ HBL-010RFC:RFS-Kly-310:PwrFwd-Wave-Avg
 HBL-010RFC:RFS-Kly-310:PwrFwd-Wave-High
 HBL-010RFC:RFS-Kly-310:PwrFwd-Wave-Low
 HBL-010RFC:RFS-Kly-310:PwrFwd-Wave-Med
-HBL-010RFC:RFS-Kly-310:PwrFwd-Wave-PM
 HBL-010RFC:RFS-Kly-310:PwrRfl-DevMonEval-RB
 HBL-010RFC:RFS-Kly-310:PwrRfl-DevMonFact-RB
 HBL-010RFC:RFS-Kly-310:PwrRfl-DevMonIlck-RB
@@ -923,12 +895,10 @@ HBL-010RFC:RFS-Kly-310:PwrRfl-Wave-Avg
 HBL-010RFC:RFS-Kly-310:PwrRfl-Wave-High
 HBL-010RFC:RFS-Kly-310:PwrRfl-Wave-Low
 HBL-010RFC:RFS-Kly-310:PwrRfl-Wave-Med
-HBL-010RFC:RFS-Kly-310:PwrRfl-Wave-PM
 HBL-010RFC:RFS-LLRF-301:Status-DIlckMode-RB
 HBL-010RFC:RFS-LLRF-301:Status-Ilck-RB
 HBL-010RFC:RFS-LLRF-301:Status-Input-RB
 HBL-010RFC:RFS-LLRF-301:Status-isFirstIlck
-HBL-010RFC:RFS-LLRF-301:Status-Wave-PM
 HBL-010RFC:RFS-Load-320:PwrFwd-DevMonEval-RB
 HBL-010RFC:RFS-Load-320:PwrFwd-DevMonFact-RB
 HBL-010RFC:RFS-Load-320:PwrFwd-DevMonIlck-RB
@@ -967,7 +937,6 @@ HBL-010RFC:RFS-Load-320:PwrFwd-Wave-Avg
 HBL-010RFC:RFS-Load-320:PwrFwd-Wave-High
 HBL-010RFC:RFS-Load-320:PwrFwd-Wave-Low
 HBL-010RFC:RFS-Load-320:PwrFwd-Wave-Med
-HBL-010RFC:RFS-Load-320:PwrFwd-Wave-PM
 HBL-010RFC:RFS-Load-320:PwrRfl-DevMonEval-RB
 HBL-010RFC:RFS-Load-320:PwrRfl-DevMonFact-RB
 HBL-010RFC:RFS-Load-320:PwrRfl-DevMonIlck-RB
@@ -1006,7 +975,6 @@ HBL-010RFC:RFS-Load-320:PwrRfl-Wave-Avg
 HBL-010RFC:RFS-Load-320:PwrRfl-Wave-High
 HBL-010RFC:RFS-Load-320:PwrRfl-Wave-Low
 HBL-010RFC:RFS-Load-320:PwrRfl-Wave-Med
-HBL-010RFC:RFS-Load-320:PwrRfl-Wave-PM
 HBL-010RFC:RFS-Mod-310:Cur-DevMonEval-RB
 HBL-010RFC:RFS-Mod-310:Cur-DevMonFact-RB
 HBL-010RFC:RFS-Mod-310:Cur-DevMonIlck-RB
@@ -1045,17 +1013,14 @@ HBL-010RFC:RFS-Mod-310:Cur-Wave-Avg
 HBL-010RFC:RFS-Mod-310:Cur-Wave-High
 HBL-010RFC:RFS-Mod-310:Cur-Wave-Low
 HBL-010RFC:RFS-Mod-310:Cur-Wave-Med
-HBL-010RFC:RFS-Mod-310:Cur-Wave-PM
 HBL-010RFC:RFS-Mod-310:PCcon-DIlckMode-RB
 HBL-010RFC:RFS-Mod-310:PCcon-Ilck-RB
 HBL-010RFC:RFS-Mod-310:PCcon-Input-RB
 HBL-010RFC:RFS-Mod-310:PCcon-isFirstIlck
-HBL-010RFC:RFS-Mod-310:PCcon-Wave-PM
 HBL-010RFC:RFS-Mod-310:Ready-DIlckMode-RB
 HBL-010RFC:RFS-Mod-310:Ready-Ilck-RB
 HBL-010RFC:RFS-Mod-310:Ready-Input-RB
 HBL-010RFC:RFS-Mod-310:Ready-isFirstIlck
-HBL-010RFC:RFS-Mod-310:Ready-Wave-PM
 HBL-010RFC:RFS-Mod-310:Vol-DevMonEval-RB
 HBL-010RFC:RFS-Mod-310:Vol-DevMonFact-RB
 HBL-010RFC:RFS-Mod-310:Vol-DevMonIlck-RB
@@ -1094,7 +1059,6 @@ HBL-010RFC:RFS-Mod-310:Vol-Wave-Avg
 HBL-010RFC:RFS-Mod-310:Vol-Wave-High
 HBL-010RFC:RFS-Mod-310:Vol-Wave-Low
 HBL-010RFC:RFS-Mod-310:Vol-Wave-Med
-HBL-010RFC:RFS-Mod-310:Vol-Wave-PM
 HBL-010RFC:RFS-PAmp-310:PwrFwd-DevMonEval-RB
 HBL-010RFC:RFS-PAmp-310:PwrFwd-DevMonFact-RB
 HBL-010RFC:RFS-PAmp-310:PwrFwd-DevMonIlck-RB
@@ -1133,17 +1097,14 @@ HBL-010RFC:RFS-PAmp-310:PwrFwd-Wave-Avg
 HBL-010RFC:RFS-PAmp-310:PwrFwd-Wave-High
 HBL-010RFC:RFS-PAmp-310:PwrFwd-Wave-Low
 HBL-010RFC:RFS-PAmp-310:PwrFwd-Wave-Med
-HBL-010RFC:RFS-PAmp-310:PwrFwd-Wave-PM
 HBL-010RFC:RFS-SIM-310:HvEna-DIlckMode-RB
 HBL-010RFC:RFS-SIM-310:HvEna-Ilck-RB
 HBL-010RFC:RFS-SIM-310:HvEna-Input-RB
 HBL-010RFC:RFS-SIM-310:HvEna-isFirstIlck
-HBL-010RFC:RFS-SIM-310:HvEna-Wave-PM
 HBL-010RFC:RFS-SIM-310:RfEna-DIlckMode-RB
 HBL-010RFC:RFS-SIM-310:RfEna-Ilck-RB
 HBL-010RFC:RFS-SIM-310:RfEna-Input-RB
 HBL-010RFC:RFS-SIM-310:RfEna-isFirstIlck
-HBL-010RFC:RFS-SIM-310:RfEna-Wave-PM
 HBL-010RFC:RFS-SolPS-310:Cur-DevMonEval-RB
 HBL-010RFC:RFS-SolPS-310:Cur-DevMonFact-RB
 HBL-010RFC:RFS-SolPS-310:Cur-DevMonIlck-RB
@@ -1182,7 +1143,6 @@ HBL-010RFC:RFS-SolPS-310:Cur-Wave-Avg
 HBL-010RFC:RFS-SolPS-310:Cur-Wave-High
 HBL-010RFC:RFS-SolPS-310:Cur-Wave-Low
 HBL-010RFC:RFS-SolPS-310:Cur-Wave-Med
-HBL-010RFC:RFS-SolPS-310:Cur-Wave-PM
 HBL-010RFC:RFS-SolPS-320:Cur-DevMonEval-RB
 HBL-010RFC:RFS-SolPS-320:Cur-DevMonFact-RB
 HBL-010RFC:RFS-SolPS-320:Cur-DevMonIlck-RB
@@ -1221,24 +1181,19 @@ HBL-010RFC:RFS-SolPS-320:Cur-Wave-Avg
 HBL-010RFC:RFS-SolPS-320:Cur-Wave-High
 HBL-010RFC:RFS-SolPS-320:Cur-Wave-Low
 HBL-010RFC:RFS-SolPS-320:Cur-Wave-Med
-HBL-010RFC:RFS-SolPS-320:Cur-Wave-PM
 HBL-010RFC:RFS-VacBody-310:Status-DIlckMode-RB
 HBL-010RFC:RFS-VacBody-310:Status-Ilck-RB
 HBL-010RFC:RFS-VacBody-310:Status-Input-RB
 HBL-010RFC:RFS-VacBody-310:Status-isFirstIlck
-HBL-010RFC:RFS-VacBody-310:Status-Wave-PM
 HBL-010RFC:RFS-VacCav-310:Status-DIlckMode-RB
 HBL-010RFC:RFS-VacCav-310:Status-Ilck-RB
 HBL-010RFC:RFS-VacCav-310:Status-Input-RB
 HBL-010RFC:RFS-VacCav-310:Status-isFirstIlck
-HBL-010RFC:RFS-VacCav-310:Status-Wave-PM
 HBL-010RFC:RFS-VacPS-310:I-SP-DIlckMode-RB
 HBL-010RFC:RFS-VacPS-310:I-SP-Ilck-RB
 HBL-010RFC:RFS-VacPS-310:I-SP-Input-RB
 HBL-010RFC:RFS-VacPS-310:I-SP-isFirstIlck
-HBL-010RFC:RFS-VacPS-310:I-SP-Wave-PM
 HBL-010RFC:RFS-VacPS-320:I-SP-DIlckMode-RB
 HBL-010RFC:RFS-VacPS-320:I-SP-Ilck-RB
 HBL-010RFC:RFS-VacPS-320:I-SP-Input-RB
 HBL-010RFC:RFS-VacPS-320:I-SP-isFirstIlck
-HBL-010RFC:RFS-VacPS-320:I-SP-Wave-PM
\ No newline at end of file
diff --git a/files/HBL-010RFC_SC-IOC-306.archive b/files/HBL-010RFC_SC-IOC-306.archive
index 36b7809..d35025f 100644
--- a/files/HBL-010RFC_SC-IOC-306.archive
+++ b/files/HBL-010RFC_SC-IOC-306.archive
@@ -1,452 +1,317 @@
 HBL-010RFC:Cryo-PLC-310:ReadyCryo
 HBL-010RFC:Cryo-PLC-310:ReadyCryo-DIS
-HBL-010RFC:Cryo-PLC-310:ReadyCryo-DIS-INT
 HBL-010RFC:Cryo-PLC-310:ReadyCryo-DIS-RB
 HBL-010RFC:Cryo-PLC-310:ReadyCryo-DTYP-RB
 HBL-010RFC:Cryo-PLC-310:ReadyCryo-ERR-RB
 HBL-010RFC:Cryo-PLC-310:ReadyCryo-FRC
-HBL-010RFC:Cryo-PLC-310:ReadyCryo-FRC-INT
 HBL-010RFC:Cryo-PLC-310:ReadyCryo-FRC-RB
-HBL-010RFC:Cryo-PLC-310:ReadyCryo-FRC-SEQ
 HBL-010RFC:Cryo-PLC-310:ReadyCryo-INT-RB
 HBL-010RFC:Cryo-PLC-310:ReadyCryo-INVDO-RB
 HBL-010RFC:Cryo-PLC-310:ReadyCryo-ISFRST-RB
 HBL-010RFC:Cryo-PLC-310:ReadyCryo-NFRC-RB
 HBL-010RFC:Cryo-PLC-310:ReadyCryo-NLTCH-RB
 HBL-010RFC:Cryo-PLC-310:ReadyCryo-SVAL
-HBL-010RFC:Cryo-PLC-310:ReadyCryo-SVAL-INT
 HBL-010RFC:Cryo-PLC-310:ReadyCryo-SVAL-RB
-HBL-010RFC:Cryo-PLC-310:ReadyCryo-SVAL-SEQ
-HBL-010RFC:Cryo-PLC-310:ReadyCryo-TMSTMP
 HBL-010RFC:Cryo-PLC-310:ReadyCryo-VAL-RB
 HBL-010RFC:RFS-ADG-310:Ilck-ch1
 HBL-010RFC:RFS-ADG-310:Ilck-ch1-DIS
-HBL-010RFC:RFS-ADG-310:Ilck-ch1-DIS-INT
 HBL-010RFC:RFS-ADG-310:Ilck-ch1-DIS-RB
 HBL-010RFC:RFS-ADG-310:Ilck-ch1-DTYP-RB
 HBL-010RFC:RFS-ADG-310:Ilck-ch1-ERR-RB
 HBL-010RFC:RFS-ADG-310:Ilck-ch1-FRC
-HBL-010RFC:RFS-ADG-310:Ilck-ch1-FRC-INT
 HBL-010RFC:RFS-ADG-310:Ilck-ch1-FRC-RB
-HBL-010RFC:RFS-ADG-310:Ilck-ch1-FRC-SEQ
 HBL-010RFC:RFS-ADG-310:Ilck-ch1-INT-RB
 HBL-010RFC:RFS-ADG-310:Ilck-ch1-INVDO-RB
 HBL-010RFC:RFS-ADG-310:Ilck-ch1-ISFRST-RB
 HBL-010RFC:RFS-ADG-310:Ilck-ch1-NFRC-RB
 HBL-010RFC:RFS-ADG-310:Ilck-ch1-NLTCH-RB
 HBL-010RFC:RFS-ADG-310:Ilck-ch1-SVAL
-HBL-010RFC:RFS-ADG-310:Ilck-ch1-SVAL-INT
 HBL-010RFC:RFS-ADG-310:Ilck-ch1-SVAL-RB
-HBL-010RFC:RFS-ADG-310:Ilck-ch1-SVAL-SEQ
-HBL-010RFC:RFS-ADG-310:Ilck-ch1-TMSTMP
 HBL-010RFC:RFS-ADG-310:Ilck-ch1-VAL-RB
 HBL-010RFC:RFS-ADG-310:Ilck-ch2
 HBL-010RFC:RFS-ADG-310:Ilck-ch2-DIS
-HBL-010RFC:RFS-ADG-310:Ilck-ch2-DIS-INT
 HBL-010RFC:RFS-ADG-310:Ilck-ch2-DIS-RB
 HBL-010RFC:RFS-ADG-310:Ilck-ch2-DTYP-RB
 HBL-010RFC:RFS-ADG-310:Ilck-ch2-ERR-RB
 HBL-010RFC:RFS-ADG-310:Ilck-ch2-FRC
-HBL-010RFC:RFS-ADG-310:Ilck-ch2-FRC-INT
 HBL-010RFC:RFS-ADG-310:Ilck-ch2-FRC-RB
-HBL-010RFC:RFS-ADG-310:Ilck-ch2-FRC-SEQ
 HBL-010RFC:RFS-ADG-310:Ilck-ch2-INT-RB
 HBL-010RFC:RFS-ADG-310:Ilck-ch2-INVDO-RB
 HBL-010RFC:RFS-ADG-310:Ilck-ch2-ISFRST-RB
 HBL-010RFC:RFS-ADG-310:Ilck-ch2-NFRC-RB
 HBL-010RFC:RFS-ADG-310:Ilck-ch2-NLTCH-RB
 HBL-010RFC:RFS-ADG-310:Ilck-ch2-SVAL
-HBL-010RFC:RFS-ADG-310:Ilck-ch2-SVAL-INT
 HBL-010RFC:RFS-ADG-310:Ilck-ch2-SVAL-RB
-HBL-010RFC:RFS-ADG-310:Ilck-ch2-SVAL-SEQ
-HBL-010RFC:RFS-ADG-310:Ilck-ch2-TMSTMP
 HBL-010RFC:RFS-ADG-310:Ilck-ch2-VAL-RB
 HBL-010RFC:RFS-ADG-320:Ilck-ch1
 HBL-010RFC:RFS-ADG-320:Ilck-ch1-DIS
-HBL-010RFC:RFS-ADG-320:Ilck-ch1-DIS-INT
 HBL-010RFC:RFS-ADG-320:Ilck-ch1-DIS-RB
 HBL-010RFC:RFS-ADG-320:Ilck-ch1-DTYP-RB
 HBL-010RFC:RFS-ADG-320:Ilck-ch1-ERR-RB
 HBL-010RFC:RFS-ADG-320:Ilck-ch1-FRC
-HBL-010RFC:RFS-ADG-320:Ilck-ch1-FRC-INT
 HBL-010RFC:RFS-ADG-320:Ilck-ch1-FRC-RB
-HBL-010RFC:RFS-ADG-320:Ilck-ch1-FRC-SEQ
 HBL-010RFC:RFS-ADG-320:Ilck-ch1-INT-RB
 HBL-010RFC:RFS-ADG-320:Ilck-ch1-INVDO-RB
 HBL-010RFC:RFS-ADG-320:Ilck-ch1-ISFRST-RB
 HBL-010RFC:RFS-ADG-320:Ilck-ch1-NFRC-RB
 HBL-010RFC:RFS-ADG-320:Ilck-ch1-NLTCH-RB
 HBL-010RFC:RFS-ADG-320:Ilck-ch1-SVAL
-HBL-010RFC:RFS-ADG-320:Ilck-ch1-SVAL-INT
 HBL-010RFC:RFS-ADG-320:Ilck-ch1-SVAL-RB
-HBL-010RFC:RFS-ADG-320:Ilck-ch1-SVAL-SEQ
-HBL-010RFC:RFS-ADG-320:Ilck-ch1-TMSTMP
 HBL-010RFC:RFS-ADG-320:Ilck-ch1-VAL-RB
 HBL-010RFC:RFS-ADG-320:Ilck-ch2
 HBL-010RFC:RFS-ADG-320:Ilck-ch2-DIS
-HBL-010RFC:RFS-ADG-320:Ilck-ch2-DIS-INT
 HBL-010RFC:RFS-ADG-320:Ilck-ch2-DIS-RB
 HBL-010RFC:RFS-ADG-320:Ilck-ch2-DTYP-RB
 HBL-010RFC:RFS-ADG-320:Ilck-ch2-ERR-RB
 HBL-010RFC:RFS-ADG-320:Ilck-ch2-FRC
-HBL-010RFC:RFS-ADG-320:Ilck-ch2-FRC-INT
 HBL-010RFC:RFS-ADG-320:Ilck-ch2-FRC-RB
-HBL-010RFC:RFS-ADG-320:Ilck-ch2-FRC-SEQ
 HBL-010RFC:RFS-ADG-320:Ilck-ch2-INT-RB
 HBL-010RFC:RFS-ADG-320:Ilck-ch2-INVDO-RB
 HBL-010RFC:RFS-ADG-320:Ilck-ch2-ISFRST-RB
 HBL-010RFC:RFS-ADG-320:Ilck-ch2-NFRC-RB
 HBL-010RFC:RFS-ADG-320:Ilck-ch2-NLTCH-RB
 HBL-010RFC:RFS-ADG-320:Ilck-ch2-SVAL
-HBL-010RFC:RFS-ADG-320:Ilck-ch2-SVAL-INT
 HBL-010RFC:RFS-ADG-320:Ilck-ch2-SVAL-RB
-HBL-010RFC:RFS-ADG-320:Ilck-ch2-SVAL-SEQ
-HBL-010RFC:RFS-ADG-320:Ilck-ch2-TMSTMP
 HBL-010RFC:RFS-ADG-320:Ilck-ch2-VAL-RB
 HBL-010RFC:RFS-ADG-330:Ilck-ch1
 HBL-010RFC:RFS-ADG-330:Ilck-ch1-DIS
-HBL-010RFC:RFS-ADG-330:Ilck-ch1-DIS-INT
 HBL-010RFC:RFS-ADG-330:Ilck-ch1-DIS-RB
 HBL-010RFC:RFS-ADG-330:Ilck-ch1-DTYP-RB
 HBL-010RFC:RFS-ADG-330:Ilck-ch1-ERR-RB
 HBL-010RFC:RFS-ADG-330:Ilck-ch1-FRC
-HBL-010RFC:RFS-ADG-330:Ilck-ch1-FRC-INT
 HBL-010RFC:RFS-ADG-330:Ilck-ch1-FRC-RB
-HBL-010RFC:RFS-ADG-330:Ilck-ch1-FRC-SEQ
 HBL-010RFC:RFS-ADG-330:Ilck-ch1-INT-RB
 HBL-010RFC:RFS-ADG-330:Ilck-ch1-INVDO-RB
 HBL-010RFC:RFS-ADG-330:Ilck-ch1-ISFRST-RB
 HBL-010RFC:RFS-ADG-330:Ilck-ch1-NFRC-RB
 HBL-010RFC:RFS-ADG-330:Ilck-ch1-NLTCH-RB
 HBL-010RFC:RFS-ADG-330:Ilck-ch1-SVAL
-HBL-010RFC:RFS-ADG-330:Ilck-ch1-SVAL-INT
 HBL-010RFC:RFS-ADG-330:Ilck-ch1-SVAL-RB
-HBL-010RFC:RFS-ADG-330:Ilck-ch1-SVAL-SEQ
-HBL-010RFC:RFS-ADG-330:Ilck-ch1-TMSTMP
 HBL-010RFC:RFS-ADG-330:Ilck-ch1-VAL-RB
 HBL-010RFC:RFS-ADG-330:Ilck-ch2
 HBL-010RFC:RFS-ADG-330:Ilck-ch2-DIS
-HBL-010RFC:RFS-ADG-330:Ilck-ch2-DIS-INT
 HBL-010RFC:RFS-ADG-330:Ilck-ch2-DIS-RB
 HBL-010RFC:RFS-ADG-330:Ilck-ch2-DTYP-RB
 HBL-010RFC:RFS-ADG-330:Ilck-ch2-ERR-RB
 HBL-010RFC:RFS-ADG-330:Ilck-ch2-FRC
-HBL-010RFC:RFS-ADG-330:Ilck-ch2-FRC-INT
 HBL-010RFC:RFS-ADG-330:Ilck-ch2-FRC-RB
-HBL-010RFC:RFS-ADG-330:Ilck-ch2-FRC-SEQ
 HBL-010RFC:RFS-ADG-330:Ilck-ch2-INT-RB
 HBL-010RFC:RFS-ADG-330:Ilck-ch2-INVDO-RB
 HBL-010RFC:RFS-ADG-330:Ilck-ch2-ISFRST-RB
 HBL-010RFC:RFS-ADG-330:Ilck-ch2-NFRC-RB
 HBL-010RFC:RFS-ADG-330:Ilck-ch2-NLTCH-RB
 HBL-010RFC:RFS-ADG-330:Ilck-ch2-SVAL
-HBL-010RFC:RFS-ADG-330:Ilck-ch2-SVAL-INT
 HBL-010RFC:RFS-ADG-330:Ilck-ch2-SVAL-RB
-HBL-010RFC:RFS-ADG-330:Ilck-ch2-SVAL-SEQ
-HBL-010RFC:RFS-ADG-330:Ilck-ch2-TMSTMP
 HBL-010RFC:RFS-ADG-330:Ilck-ch2-VAL-RB
 HBL-010RFC:RFS-ADG-340:Ilck-ch1
 HBL-010RFC:RFS-ADG-340:Ilck-ch1-DIS
-HBL-010RFC:RFS-ADG-340:Ilck-ch1-DIS-INT
 HBL-010RFC:RFS-ADG-340:Ilck-ch1-DIS-RB
 HBL-010RFC:RFS-ADG-340:Ilck-ch1-DTYP-RB
 HBL-010RFC:RFS-ADG-340:Ilck-ch1-ERR-RB
 HBL-010RFC:RFS-ADG-340:Ilck-ch1-FRC
-HBL-010RFC:RFS-ADG-340:Ilck-ch1-FRC-INT
 HBL-010RFC:RFS-ADG-340:Ilck-ch1-FRC-RB
-HBL-010RFC:RFS-ADG-340:Ilck-ch1-FRC-SEQ
 HBL-010RFC:RFS-ADG-340:Ilck-ch1-INT-RB
 HBL-010RFC:RFS-ADG-340:Ilck-ch1-INVDO-RB
 HBL-010RFC:RFS-ADG-340:Ilck-ch1-ISFRST-RB
 HBL-010RFC:RFS-ADG-340:Ilck-ch1-NFRC-RB
 HBL-010RFC:RFS-ADG-340:Ilck-ch1-NLTCH-RB
 HBL-010RFC:RFS-ADG-340:Ilck-ch1-SVAL
-HBL-010RFC:RFS-ADG-340:Ilck-ch1-SVAL-INT
 HBL-010RFC:RFS-ADG-340:Ilck-ch1-SVAL-RB
-HBL-010RFC:RFS-ADG-340:Ilck-ch1-SVAL-SEQ
-HBL-010RFC:RFS-ADG-340:Ilck-ch1-TMSTMP
 HBL-010RFC:RFS-ADG-340:Ilck-ch1-VAL-RB
 HBL-010RFC:RFS-ADG-340:Ilck-ch2
 HBL-010RFC:RFS-ADG-340:Ilck-ch2-DIS
-HBL-010RFC:RFS-ADG-340:Ilck-ch2-DIS-INT
 HBL-010RFC:RFS-ADG-340:Ilck-ch2-DIS-RB
 HBL-010RFC:RFS-ADG-340:Ilck-ch2-DTYP-RB
 HBL-010RFC:RFS-ADG-340:Ilck-ch2-ERR-RB
 HBL-010RFC:RFS-ADG-340:Ilck-ch2-FRC
-HBL-010RFC:RFS-ADG-340:Ilck-ch2-FRC-INT
 HBL-010RFC:RFS-ADG-340:Ilck-ch2-FRC-RB
-HBL-010RFC:RFS-ADG-340:Ilck-ch2-FRC-SEQ
 HBL-010RFC:RFS-ADG-340:Ilck-ch2-INT-RB
 HBL-010RFC:RFS-ADG-340:Ilck-ch2-INVDO-RB
 HBL-010RFC:RFS-ADG-340:Ilck-ch2-ISFRST-RB
 HBL-010RFC:RFS-ADG-340:Ilck-ch2-NFRC-RB
 HBL-010RFC:RFS-ADG-340:Ilck-ch2-NLTCH-RB
 HBL-010RFC:RFS-ADG-340:Ilck-ch2-SVAL
-HBL-010RFC:RFS-ADG-340:Ilck-ch2-SVAL-INT
 HBL-010RFC:RFS-ADG-340:Ilck-ch2-SVAL-RB
-HBL-010RFC:RFS-ADG-340:Ilck-ch2-SVAL-SEQ
-HBL-010RFC:RFS-ADG-340:Ilck-ch2-TMSTMP
 HBL-010RFC:RFS-ADG-340:Ilck-ch2-VAL-RB
 HBL-010RFC:RFS-Circ-320:WtrC-Flw
 HBL-010RFC:RFS-Circ-320:WtrC-Flw-DIS
-HBL-010RFC:RFS-Circ-320:WtrC-Flw-DIS-INT
 HBL-010RFC:RFS-Circ-320:WtrC-Flw-DIS-RB
 HBL-010RFC:RFS-Circ-320:WtrC-Flw-DTYP-RB
 HBL-010RFC:RFS-Circ-320:WtrC-Flw-ERR-RB
 HBL-010RFC:RFS-Circ-320:WtrC-Flw-FRC
-HBL-010RFC:RFS-Circ-320:WtrC-Flw-FRC-INT
 HBL-010RFC:RFS-Circ-320:WtrC-Flw-FRC-RB
-HBL-010RFC:RFS-Circ-320:WtrC-Flw-FRC-SEQ
 HBL-010RFC:RFS-Circ-320:WtrC-Flw-INT-RB
 HBL-010RFC:RFS-Circ-320:WtrC-Flw-INVDO-RB
 HBL-010RFC:RFS-Circ-320:WtrC-Flw-ISFRST-RB
 HBL-010RFC:RFS-Circ-320:WtrC-Flw-NFRC-RB
 HBL-010RFC:RFS-Circ-320:WtrC-Flw-NLTCH-RB
 HBL-010RFC:RFS-Circ-320:WtrC-Flw-SVAL
-HBL-010RFC:RFS-Circ-320:WtrC-Flw-SVAL-INT
 HBL-010RFC:RFS-Circ-320:WtrC-Flw-SVAL-RB
-HBL-010RFC:RFS-Circ-320:WtrC-Flw-SVAL-SEQ
-HBL-010RFC:RFS-Circ-320:WtrC-Flw-TMSTMP
 HBL-010RFC:RFS-Circ-320:WtrC-Flw-VAL-RB
 HBL-010RFC:RFS-Circ-320:WtrC-Tmp
 HBL-010RFC:RFS-Circ-320:WtrC-Tmp-AOFF
-HBL-010RFC:RFS-Circ-320:WtrC-Tmp-AOFF-INT
 HBL-010RFC:RFS-Circ-320:WtrC-Tmp-AOFF-RB
 HBL-010RFC:RFS-Circ-320:WtrC-Tmp-DIS
-HBL-010RFC:RFS-Circ-320:WtrC-Tmp-DIS-INT
 HBL-010RFC:RFS-Circ-320:WtrC-Tmp-DIS-RB
 HBL-010RFC:RFS-Circ-320:WtrC-Tmp-DTYP-RB
 HBL-010RFC:RFS-Circ-320:WtrC-Tmp-ERR-RB
 HBL-010RFC:RFS-Circ-320:WtrC-Tmp-FRC
-HBL-010RFC:RFS-Circ-320:WtrC-Tmp-FRC-INT
 HBL-010RFC:RFS-Circ-320:WtrC-Tmp-FRC-RB
-HBL-010RFC:RFS-Circ-320:WtrC-Tmp-FRC-SEQ
 HBL-010RFC:RFS-Circ-320:WtrC-Tmp-HIALR-RB
 HBL-010RFC:RFS-Circ-320:WtrC-Tmp-HIGH
-HBL-010RFC:RFS-Circ-320:WtrC-Tmp-HIGH-INT
 HBL-010RFC:RFS-Circ-320:WtrC-Tmp-HIGH-RB
-HBL-010RFC:RFS-Circ-320:WtrC-Tmp-HIGH-SEQ
 HBL-010RFC:RFS-Circ-320:WtrC-Tmp-HIHI
-HBL-010RFC:RFS-Circ-320:WtrC-Tmp-HIHI-INT
 HBL-010RFC:RFS-Circ-320:WtrC-Tmp-HIHI-RB
-HBL-010RFC:RFS-Circ-320:WtrC-Tmp-HIHI-SEQ
 HBL-010RFC:RFS-Circ-320:WtrC-Tmp-ISFRST-RB
 HBL-010RFC:RFS-Circ-320:WtrC-Tmp-Ilck-RB
 HBL-010RFC:RFS-Circ-320:WtrC-Tmp-LOALR-RB
 HBL-010RFC:RFS-Circ-320:WtrC-Tmp-LOLO
-HBL-010RFC:RFS-Circ-320:WtrC-Tmp-LOLO-INT
 HBL-010RFC:RFS-Circ-320:WtrC-Tmp-LOLO-RB
-HBL-010RFC:RFS-Circ-320:WtrC-Tmp-LOLO-SEQ
 HBL-010RFC:RFS-Circ-320:WtrC-Tmp-LOW
-HBL-010RFC:RFS-Circ-320:WtrC-Tmp-LOW-INT
 HBL-010RFC:RFS-Circ-320:WtrC-Tmp-LOW-RB
-HBL-010RFC:RFS-Circ-320:WtrC-Tmp-LOW-SEQ
 HBL-010RFC:RFS-Circ-320:WtrC-Tmp-NFRC-RB
 HBL-010RFC:RFS-Circ-320:WtrC-Tmp-NLTCH-RB
 HBL-010RFC:RFS-Circ-320:WtrC-Tmp-SVAL
-HBL-010RFC:RFS-Circ-320:WtrC-Tmp-SVAL-INT
 HBL-010RFC:RFS-Circ-320:WtrC-Tmp-SVAL-RB
-HBL-010RFC:RFS-Circ-320:WtrC-Tmp-SVAL-SEQ
-HBL-010RFC:RFS-Circ-320:WtrC-Tmp-TMSTMP
 HBL-010RFC:RFS-Circ-320:WtrC-Tmp-VAL-RB
 HBL-010RFC:RFS-Circ-320:WtrC-Tmp-WRN-RB
 HBL-010RFC:RFS-Coll-310:SW-CALC
 HBL-010RFC:RFS-Coll-310:SW-CALC-AOFF
-HBL-010RFC:RFS-Coll-310:SW-CALC-AOFF-INT
 HBL-010RFC:RFS-Coll-310:SW-CALC-AOFF-RB
 HBL-010RFC:RFS-Coll-310:SW-CALC-DIS
-HBL-010RFC:RFS-Coll-310:SW-CALC-DIS-INT
 HBL-010RFC:RFS-Coll-310:SW-CALC-DIS-RB
 HBL-010RFC:RFS-Coll-310:SW-CALC-DTYP-RB
 HBL-010RFC:RFS-Coll-310:SW-CALC-ERR-RB
 HBL-010RFC:RFS-Coll-310:SW-CALC-FRC
-HBL-010RFC:RFS-Coll-310:SW-CALC-FRC-INT
 HBL-010RFC:RFS-Coll-310:SW-CALC-FRC-RB
-HBL-010RFC:RFS-Coll-310:SW-CALC-FRC-SEQ
 HBL-010RFC:RFS-Coll-310:SW-CALC-HIALR-RB
 HBL-010RFC:RFS-Coll-310:SW-CALC-HIGH
-HBL-010RFC:RFS-Coll-310:SW-CALC-HIGH-INT
 HBL-010RFC:RFS-Coll-310:SW-CALC-HIGH-RB
-HBL-010RFC:RFS-Coll-310:SW-CALC-HIGH-SEQ
 HBL-010RFC:RFS-Coll-310:SW-CALC-HIHI
-HBL-010RFC:RFS-Coll-310:SW-CALC-HIHI-INT
 HBL-010RFC:RFS-Coll-310:SW-CALC-HIHI-RB
-HBL-010RFC:RFS-Coll-310:SW-CALC-HIHI-SEQ
 HBL-010RFC:RFS-Coll-310:SW-CALC-ISFRST-RB
 HBL-010RFC:RFS-Coll-310:SW-CALC-Ilck-RB
 HBL-010RFC:RFS-Coll-310:SW-CALC-LOALR-RB
 HBL-010RFC:RFS-Coll-310:SW-CALC-LOLO
-HBL-010RFC:RFS-Coll-310:SW-CALC-LOLO-INT
 HBL-010RFC:RFS-Coll-310:SW-CALC-LOLO-RB
-HBL-010RFC:RFS-Coll-310:SW-CALC-LOLO-SEQ
 HBL-010RFC:RFS-Coll-310:SW-CALC-LOW
-HBL-010RFC:RFS-Coll-310:SW-CALC-LOW-INT
 HBL-010RFC:RFS-Coll-310:SW-CALC-LOW-RB
-HBL-010RFC:RFS-Coll-310:SW-CALC-LOW-SEQ
 HBL-010RFC:RFS-Coll-310:SW-CALC-NFRC-RB
 HBL-010RFC:RFS-Coll-310:SW-CALC-NLTCH-RB
 HBL-010RFC:RFS-Coll-310:SW-CALC-SVAL
-HBL-010RFC:RFS-Coll-310:SW-CALC-SVAL-INT
 HBL-010RFC:RFS-Coll-310:SW-CALC-SVAL-RB
-HBL-010RFC:RFS-Coll-310:SW-CALC-SVAL-SEQ
-HBL-010RFC:RFS-Coll-310:SW-CALC-TMSTMP
 HBL-010RFC:RFS-Coll-310:SW-CALC-VAL-RB
 HBL-010RFC:RFS-Coll-310:SW-CALC-WRN-RB
 HBL-010RFC:RFS-DA-310:Enable
 HBL-010RFC:RFS-DA-310:Enable-DIS
-HBL-010RFC:RFS-DA-310:Enable-DIS-INT
 HBL-010RFC:RFS-DA-310:Enable-DIS-RB
 HBL-010RFC:RFS-DA-310:Enable-DTYP-RB
 HBL-010RFC:RFS-DA-310:Enable-ERR-RB
 HBL-010RFC:RFS-DA-310:Enable-FRC
-HBL-010RFC:RFS-DA-310:Enable-FRC-INT
 HBL-010RFC:RFS-DA-310:Enable-FRC-RB
-HBL-010RFC:RFS-DA-310:Enable-FRC-SEQ
 HBL-010RFC:RFS-DA-310:Enable-INT-RB
 HBL-010RFC:RFS-DA-310:Enable-INVDO-RB
 HBL-010RFC:RFS-DA-310:Enable-ISFRST-RB
 HBL-010RFC:RFS-DA-310:Enable-NFRC-RB
 HBL-010RFC:RFS-DA-310:Enable-NLTCH-RB
 HBL-010RFC:RFS-DA-310:Enable-SVAL
-HBL-010RFC:RFS-DA-310:Enable-SVAL-INT
 HBL-010RFC:RFS-DA-310:Enable-SVAL-RB
-HBL-010RFC:RFS-DA-310:Enable-SVAL-SEQ
-HBL-010RFC:RFS-DA-310:Enable-TMSTMP
 HBL-010RFC:RFS-DA-310:Enable-VAL-RB
 HBL-010RFC:RFS-DA-310:Ready
 HBL-010RFC:RFS-DA-310:Ready-DIS
-HBL-010RFC:RFS-DA-310:Ready-DIS-INT
 HBL-010RFC:RFS-DA-310:Ready-DIS-RB
 HBL-010RFC:RFS-DA-310:Ready-DTYP-RB
 HBL-010RFC:RFS-DA-310:Ready-ERR-RB
 HBL-010RFC:RFS-DA-310:Ready-FRC
-HBL-010RFC:RFS-DA-310:Ready-FRC-INT
 HBL-010RFC:RFS-DA-310:Ready-FRC-RB
-HBL-010RFC:RFS-DA-310:Ready-FRC-SEQ
 HBL-010RFC:RFS-DA-310:Ready-INT-RB
 HBL-010RFC:RFS-DA-310:Ready-INVDO-RB
 HBL-010RFC:RFS-DA-310:Ready-ISFRST-RB
 HBL-010RFC:RFS-DA-310:Ready-NFRC-RB
 HBL-010RFC:RFS-DA-310:Ready-NLTCH-RB
 HBL-010RFC:RFS-DA-310:Ready-SVAL
-HBL-010RFC:RFS-DA-310:Ready-SVAL-INT
 HBL-010RFC:RFS-DA-310:Ready-SVAL-RB
-HBL-010RFC:RFS-DA-310:Ready-SVAL-SEQ
-HBL-010RFC:RFS-DA-310:Ready-TMSTMP
 HBL-010RFC:RFS-DA-310:Ready-VAL-RB
 HBL-010RFC:RFS-DA-310:Reset
 HBL-010RFC:RFS-DA-310:Reset-DIS
-HBL-010RFC:RFS-DA-310:Reset-DIS-INT
 HBL-010RFC:RFS-DA-310:Reset-DIS-RB
 HBL-010RFC:RFS-DA-310:Reset-DTYP-RB
 HBL-010RFC:RFS-DA-310:Reset-ERR-RB
 HBL-010RFC:RFS-DA-310:Reset-FRC
-HBL-010RFC:RFS-DA-310:Reset-FRC-INT
 HBL-010RFC:RFS-DA-310:Reset-FRC-RB
-HBL-010RFC:RFS-DA-310:Reset-FRC-SEQ
 HBL-010RFC:RFS-DA-310:Reset-INT-RB
 HBL-010RFC:RFS-DA-310:Reset-INVDO-RB
 HBL-010RFC:RFS-DA-310:Reset-ISFRST-RB
 HBL-010RFC:RFS-DA-310:Reset-NFRC-RB
 HBL-010RFC:RFS-DA-310:Reset-NLTCH-RB
 HBL-010RFC:RFS-DA-310:Reset-SVAL
-HBL-010RFC:RFS-DA-310:Reset-SVAL-INT
 HBL-010RFC:RFS-DA-310:Reset-SVAL-RB
-HBL-010RFC:RFS-DA-310:Reset-SVAL-SEQ
-HBL-010RFC:RFS-DA-310:Reset-TMSTMP
 HBL-010RFC:RFS-DA-310:Reset-VAL-RB
 HBL-010RFC:RFS-FIM-310:HvEna
 HBL-010RFC:RFS-FIM-310:HvEna-DIS
-HBL-010RFC:RFS-FIM-310:HvEna-DIS-INT
 HBL-010RFC:RFS-FIM-310:HvEna-DIS-RB
 HBL-010RFC:RFS-FIM-310:HvEna-DTYP-RB
 HBL-010RFC:RFS-FIM-310:HvEna-ERR-RB
 HBL-010RFC:RFS-FIM-310:HvEna-FRC
-HBL-010RFC:RFS-FIM-310:HvEna-FRC-INT
 HBL-010RFC:RFS-FIM-310:HvEna-FRC-RB
-HBL-010RFC:RFS-FIM-310:HvEna-FRC-SEQ
 HBL-010RFC:RFS-FIM-310:HvEna-INT-RB
 HBL-010RFC:RFS-FIM-310:HvEna-INVDO-RB
 HBL-010RFC:RFS-FIM-310:HvEna-ISFRST-RB
 HBL-010RFC:RFS-FIM-310:HvEna-NFRC-RB
 HBL-010RFC:RFS-FIM-310:HvEna-NLTCH-RB
 HBL-010RFC:RFS-FIM-310:HvEna-SVAL
-HBL-010RFC:RFS-FIM-310:HvEna-SVAL-INT
 HBL-010RFC:RFS-FIM-310:HvEna-SVAL-RB
-HBL-010RFC:RFS-FIM-310:HvEna-SVAL-SEQ
-HBL-010RFC:RFS-FIM-310:HvEna-TMSTMP
 HBL-010RFC:RFS-FIM-310:HvEna-VAL-RB
 HBL-010RFC:RFS-FIM-310:HvEnaCmd
 HBL-010RFC:RFS-FIM-310:HvEnaCmd-DIS
-HBL-010RFC:RFS-FIM-310:HvEnaCmd-DIS-INT
 HBL-010RFC:RFS-FIM-310:HvEnaCmd-DIS-RB
 HBL-010RFC:RFS-FIM-310:HvEnaCmd-DTYP-RB
 HBL-010RFC:RFS-FIM-310:HvEnaCmd-ERR-RB
 HBL-010RFC:RFS-FIM-310:HvEnaCmd-FRC
-HBL-010RFC:RFS-FIM-310:HvEnaCmd-FRC-INT
 HBL-010RFC:RFS-FIM-310:HvEnaCmd-FRC-RB
-HBL-010RFC:RFS-FIM-310:HvEnaCmd-FRC-SEQ
 HBL-010RFC:RFS-FIM-310:HvEnaCmd-INT-RB
 HBL-010RFC:RFS-FIM-310:HvEnaCmd-INVDO-RB
 HBL-010RFC:RFS-FIM-310:HvEnaCmd-ISFRST-RB
 HBL-010RFC:RFS-FIM-310:HvEnaCmd-NFRC-RB
 HBL-010RFC:RFS-FIM-310:HvEnaCmd-NLTCH-RB
 HBL-010RFC:RFS-FIM-310:HvEnaCmd-SVAL
-HBL-010RFC:RFS-FIM-310:HvEnaCmd-SVAL-INT
 HBL-010RFC:RFS-FIM-310:HvEnaCmd-SVAL-RB
-HBL-010RFC:RFS-FIM-310:HvEnaCmd-SVAL-SEQ
-HBL-010RFC:RFS-FIM-310:HvEnaCmd-TMSTMP
 HBL-010RFC:RFS-FIM-310:HvEnaCmd-VAL-RB
 HBL-010RFC:RFS-FIM-310:RfEna
 HBL-010RFC:RFS-FIM-310:RfEna-DIS
-HBL-010RFC:RFS-FIM-310:RfEna-DIS-INT
 HBL-010RFC:RFS-FIM-310:RfEna-DIS-RB
 HBL-010RFC:RFS-FIM-310:RfEna-DTYP-RB
 HBL-010RFC:RFS-FIM-310:RfEna-ERR-RB
 HBL-010RFC:RFS-FIM-310:RfEna-FRC
-HBL-010RFC:RFS-FIM-310:RfEna-FRC-INT
 HBL-010RFC:RFS-FIM-310:RfEna-FRC-RB
-HBL-010RFC:RFS-FIM-310:RfEna-FRC-SEQ
 HBL-010RFC:RFS-FIM-310:RfEna-INT-RB
 HBL-010RFC:RFS-FIM-310:RfEna-INVDO-RB
 HBL-010RFC:RFS-FIM-310:RfEna-ISFRST-RB
 HBL-010RFC:RFS-FIM-310:RfEna-NFRC-RB
 HBL-010RFC:RFS-FIM-310:RfEna-NLTCH-RB
 HBL-010RFC:RFS-FIM-310:RfEna-SVAL
-HBL-010RFC:RFS-FIM-310:RfEna-SVAL-INT
 HBL-010RFC:RFS-FIM-310:RfEna-SVAL-RB
-HBL-010RFC:RFS-FIM-310:RfEna-SVAL-SEQ
-HBL-010RFC:RFS-FIM-310:RfEna-TMSTMP
 HBL-010RFC:RFS-FIM-310:RfEna-VAL-RB
 HBL-010RFC:RFS-FIM-310:RfEnaCmd
 HBL-010RFC:RFS-FIM-310:RfEnaCmd-DIS
-HBL-010RFC:RFS-FIM-310:RfEnaCmd-DIS-INT
 HBL-010RFC:RFS-FIM-310:RfEnaCmd-DIS-RB
 HBL-010RFC:RFS-FIM-310:RfEnaCmd-DTYP-RB
 HBL-010RFC:RFS-FIM-310:RfEnaCmd-ERR-RB
 HBL-010RFC:RFS-FIM-310:RfEnaCmd-FRC
-HBL-010RFC:RFS-FIM-310:RfEnaCmd-FRC-INT
 HBL-010RFC:RFS-FIM-310:RfEnaCmd-FRC-RB
-HBL-010RFC:RFS-FIM-310:RfEnaCmd-FRC-SEQ
 HBL-010RFC:RFS-FIM-310:RfEnaCmd-INT-RB
 HBL-010RFC:RFS-FIM-310:RfEnaCmd-INVDO-RB
 HBL-010RFC:RFS-FIM-310:RfEnaCmd-ISFRST-RB
 HBL-010RFC:RFS-FIM-310:RfEnaCmd-NFRC-RB
 HBL-010RFC:RFS-FIM-310:RfEnaCmd-NLTCH-RB
 HBL-010RFC:RFS-FIM-310:RfEnaCmd-SVAL
-HBL-010RFC:RFS-FIM-310:RfEnaCmd-SVAL-INT
 HBL-010RFC:RFS-FIM-310:RfEnaCmd-SVAL-RB
-HBL-010RFC:RFS-FIM-310:RfEnaCmd-SVAL-SEQ
-HBL-010RFC:RFS-FIM-310:RfEnaCmd-TMSTMP
 HBL-010RFC:RFS-FIM-310:RfEnaCmd-VAL-RB
 HBL-010RFC:RFS-FilPS-310:BlackHeat-Cmd
-HBL-010RFC:RFS-FilPS-310:BlackHeat-Cmd-INT
 HBL-010RFC:RFS-FilPS-310:BlackHeat-Cmd-RB
 HBL-010RFC:RFS-FilPS-310:BlackHeat-I
-HBL-010RFC:RFS-FilPS-310:BlackHeat-I-INT
 HBL-010RFC:RFS-FilPS-310:BlackHeat-I-RB
 HBL-010RFC:RFS-FilPS-310:Calib-ON
-HBL-010RFC:RFS-FilPS-310:Calib-ON-INT
 HBL-010RFC:RFS-FilPS-310:Calib-ON-RB
 HBL-010RFC:RFS-FilPS-310:CurrentState-RB
 HBL-010RFC:RFS-FilPS-310:ErrDisturbanceTol-RB
@@ -468,1111 +333,742 @@ HBL-010RFC:RFS-FilPS-310:ErrWMonitorScale-RB
 HBL-010RFC:RFS-FilPS-310:Error-RB
 HBL-010RFC:RFS-FilPS-310:FaultStatus-RB
 HBL-010RFC:RFS-FilPS-310:FilUpTime-Baseline
-HBL-010RFC:RFS-FilPS-310:FilUpTime-Baseline-INT
 HBL-010RFC:RFS-FilPS-310:FilUpTime-Baseline-RB
 HBL-010RFC:RFS-FilPS-310:FilUpTime-RB
 HBL-010RFC:RFS-FilPS-310:Force
-HBL-010RFC:RFS-FilPS-310:Force-INT
 HBL-010RFC:RFS-FilPS-310:Force-RB
 HBL-010RFC:RFS-FilPS-310:HeatingTime
-HBL-010RFC:RFS-FilPS-310:HeatingTime-INT
 HBL-010RFC:RFS-FilPS-310:HeatingTime-RB
 HBL-010RFC:RFS-FilPS-310:I-SP
-HBL-010RFC:RFS-FilPS-310:I-SP-INT
 HBL-010RFC:RFS-FilPS-310:I-SP-RB
 HBL-010RFC:RFS-FilPS-310:I-SPHIHI-RB
 HBL-010RFC:RFS-FilPS-310:IHIGH
-HBL-010RFC:RFS-FilPS-310:IHIGH-INT
 HBL-010RFC:RFS-FilPS-310:IHIGH-RB
 HBL-010RFC:RFS-FilPS-310:IHIHI
-HBL-010RFC:RFS-FilPS-310:IHIHI-INT
 HBL-010RFC:RFS-FilPS-310:IHIHI-RB
 HBL-010RFC:RFS-FilPS-310:ILOLO
-HBL-010RFC:RFS-FilPS-310:ILOLO-INT
 HBL-010RFC:RFS-FilPS-310:ILOLO-RB
 HBL-010RFC:RFS-FilPS-310:ILOW
-HBL-010RFC:RFS-FilPS-310:ILOW-INT
 HBL-010RFC:RFS-FilPS-310:ILOW-RB
 HBL-010RFC:RFS-FilPS-310:IMax-RB
 HBL-010RFC:RFS-FilPS-310:IMon-RB
 HBL-010RFC:RFS-FilPS-310:IPGM-SP-RB
 HBL-010RFC:RFS-FilPS-310:IREG-RB
 HBL-010RFC:RFS-FilPS-310:IRampON
-HBL-010RFC:RFS-FilPS-310:IRampON-INT
 HBL-010RFC:RFS-FilPS-310:IRampON-RB
-HBL-010RFC:RFS-FilPS-310:ISVAL-INT
 HBL-010RFC:RFS-FilPS-310:Ilck-RB
 HBL-010RFC:RFS-FilPS-310:KLY-Serial
-HBL-010RFC:RFS-FilPS-310:KLY-Serial-INT
 HBL-010RFC:RFS-FilPS-310:KLY-Serial-RB
 HBL-010RFC:RFS-FilPS-310:LocalRemote-RB
 HBL-010RFC:RFS-FilPS-310:NotForced-RB
 HBL-010RFC:RFS-FilPS-310:NotLatch-RB
 HBL-010RFC:RFS-FilPS-310:OpMode
-HBL-010RFC:RFS-FilPS-310:OpMode-INT
 HBL-010RFC:RFS-FilPS-310:OpMode-RB
 HBL-010RFC:RFS-FilPS-310:PsuON-RB
 HBL-010RFC:RFS-FilPS-310:RampTime
-HBL-010RFC:RFS-FilPS-310:RampTime-INT
 HBL-010RFC:RFS-FilPS-310:RampTime-RB
 HBL-010RFC:RFS-FilPS-310:SetPointReached-RB
 HBL-010RFC:RFS-FilPS-310:Timestamp
 HBL-010RFC:RFS-FilPS-310:Timestamp-Conv
 HBL-010RFC:RFS-FilPS-310:Timestamp-RB
 HBL-010RFC:RFS-FilPS-310:TolInWarmUp
-HBL-010RFC:RFS-FilPS-310:TolInWarmUp-INT
 HBL-010RFC:RFS-FilPS-310:TolInWarmUp-RB
 HBL-010RFC:RFS-FilPS-310:TotalTime-RB
 HBL-010RFC:RFS-FilPS-310:VMon-RB
 HBL-010RFC:RFS-FilPS-310:VRampON
-HBL-010RFC:RFS-FilPS-310:VRampON-INT
 HBL-010RFC:RFS-FilPS-310:VRampON-RB
-HBL-010RFC:RFS-FilPS-310:VSVAL-INT
 HBL-010RFC:RFS-FilPS-310:WHIGH
-HBL-010RFC:RFS-FilPS-310:WHIGH-INT
 HBL-010RFC:RFS-FilPS-310:WHIGH-RB
 HBL-010RFC:RFS-FilPS-310:WHIHI
-HBL-010RFC:RFS-FilPS-310:WHIHI-INT
 HBL-010RFC:RFS-FilPS-310:WHIHI-RB
 HBL-010RFC:RFS-FilPS-310:WLOLO
-HBL-010RFC:RFS-FilPS-310:WLOLO-INT
 HBL-010RFC:RFS-FilPS-310:WLOLO-RB
 HBL-010RFC:RFS-FilPS-310:WLOW
-HBL-010RFC:RFS-FilPS-310:WLOW-INT
 HBL-010RFC:RFS-FilPS-310:WLOW-RB
 HBL-010RFC:RFS-FilPS-310:WMax-RB
 HBL-010RFC:RFS-FilPS-310:WMon-RB
-HBL-010RFC:RFS-FilPS-310:WSVAL-INT
 HBL-010RFC:RFS-FilPS-310:WarmTimeLeft-RB
 HBL-010RFC:RFS-FilPS-310:Warn-RB
 HBL-010RFC:RFS-Fuse-310:Alarm
 HBL-010RFC:RFS-Fuse-310:Alarm-DIS
-HBL-010RFC:RFS-Fuse-310:Alarm-DIS-INT
 HBL-010RFC:RFS-Fuse-310:Alarm-DIS-RB
 HBL-010RFC:RFS-Fuse-310:Alarm-DTYP-RB
 HBL-010RFC:RFS-Fuse-310:Alarm-ERR-RB
 HBL-010RFC:RFS-Fuse-310:Alarm-FRC
-HBL-010RFC:RFS-Fuse-310:Alarm-FRC-INT
 HBL-010RFC:RFS-Fuse-310:Alarm-FRC-RB
-HBL-010RFC:RFS-Fuse-310:Alarm-FRC-SEQ
 HBL-010RFC:RFS-Fuse-310:Alarm-INT-RB
 HBL-010RFC:RFS-Fuse-310:Alarm-INVDO-RB
 HBL-010RFC:RFS-Fuse-310:Alarm-ISFRST-RB
 HBL-010RFC:RFS-Fuse-310:Alarm-NFRC-RB
 HBL-010RFC:RFS-Fuse-310:Alarm-NLTCH-RB
 HBL-010RFC:RFS-Fuse-310:Alarm-SVAL
-HBL-010RFC:RFS-Fuse-310:Alarm-SVAL-INT
 HBL-010RFC:RFS-Fuse-310:Alarm-SVAL-RB
-HBL-010RFC:RFS-Fuse-310:Alarm-SVAL-SEQ
-HBL-010RFC:RFS-Fuse-310:Alarm-TMSTMP
 HBL-010RFC:RFS-Fuse-310:Alarm-VAL-RB
 HBL-010RFC:RFS-Fuse-310:I-Wrn
 HBL-010RFC:RFS-Fuse-310:I-Wrn-DIS
-HBL-010RFC:RFS-Fuse-310:I-Wrn-DIS-INT
 HBL-010RFC:RFS-Fuse-310:I-Wrn-DIS-RB
 HBL-010RFC:RFS-Fuse-310:I-Wrn-DTYP-RB
 HBL-010RFC:RFS-Fuse-310:I-Wrn-ERR-RB
 HBL-010RFC:RFS-Fuse-310:I-Wrn-FRC
-HBL-010RFC:RFS-Fuse-310:I-Wrn-FRC-INT
 HBL-010RFC:RFS-Fuse-310:I-Wrn-FRC-RB
-HBL-010RFC:RFS-Fuse-310:I-Wrn-FRC-SEQ
 HBL-010RFC:RFS-Fuse-310:I-Wrn-INT-RB
 HBL-010RFC:RFS-Fuse-310:I-Wrn-INVDO-RB
 HBL-010RFC:RFS-Fuse-310:I-Wrn-ISFRST-RB
 HBL-010RFC:RFS-Fuse-310:I-Wrn-NFRC-RB
 HBL-010RFC:RFS-Fuse-310:I-Wrn-NLTCH-RB
 HBL-010RFC:RFS-Fuse-310:I-Wrn-SVAL
-HBL-010RFC:RFS-Fuse-310:I-Wrn-SVAL-INT
 HBL-010RFC:RFS-Fuse-310:I-Wrn-SVAL-RB
-HBL-010RFC:RFS-Fuse-310:I-Wrn-SVAL-SEQ
-HBL-010RFC:RFS-Fuse-310:I-Wrn-TMSTMP
 HBL-010RFC:RFS-Fuse-310:I-Wrn-VAL-RB
 HBL-010RFC:RFS-Kly-310:Body-Tmp
 HBL-010RFC:RFS-Kly-310:Body-Tmp-AOFF
-HBL-010RFC:RFS-Kly-310:Body-Tmp-AOFF-INT
 HBL-010RFC:RFS-Kly-310:Body-Tmp-AOFF-RB
 HBL-010RFC:RFS-Kly-310:Body-Tmp-DIS
-HBL-010RFC:RFS-Kly-310:Body-Tmp-DIS-INT
 HBL-010RFC:RFS-Kly-310:Body-Tmp-DIS-RB
 HBL-010RFC:RFS-Kly-310:Body-Tmp-DTYP-RB
 HBL-010RFC:RFS-Kly-310:Body-Tmp-ERR-RB
 HBL-010RFC:RFS-Kly-310:Body-Tmp-FRC
-HBL-010RFC:RFS-Kly-310:Body-Tmp-FRC-INT
 HBL-010RFC:RFS-Kly-310:Body-Tmp-FRC-RB
-HBL-010RFC:RFS-Kly-310:Body-Tmp-FRC-SEQ
 HBL-010RFC:RFS-Kly-310:Body-Tmp-HIALR-RB
 HBL-010RFC:RFS-Kly-310:Body-Tmp-HIGH
-HBL-010RFC:RFS-Kly-310:Body-Tmp-HIGH-INT
 HBL-010RFC:RFS-Kly-310:Body-Tmp-HIGH-RB
-HBL-010RFC:RFS-Kly-310:Body-Tmp-HIGH-SEQ
 HBL-010RFC:RFS-Kly-310:Body-Tmp-HIHI
-HBL-010RFC:RFS-Kly-310:Body-Tmp-HIHI-INT
 HBL-010RFC:RFS-Kly-310:Body-Tmp-HIHI-RB
-HBL-010RFC:RFS-Kly-310:Body-Tmp-HIHI-SEQ
 HBL-010RFC:RFS-Kly-310:Body-Tmp-ISFRST-RB
 HBL-010RFC:RFS-Kly-310:Body-Tmp-Ilck-RB
 HBL-010RFC:RFS-Kly-310:Body-Tmp-LOALR-RB
 HBL-010RFC:RFS-Kly-310:Body-Tmp-LOLO
-HBL-010RFC:RFS-Kly-310:Body-Tmp-LOLO-INT
 HBL-010RFC:RFS-Kly-310:Body-Tmp-LOLO-RB
-HBL-010RFC:RFS-Kly-310:Body-Tmp-LOLO-SEQ
 HBL-010RFC:RFS-Kly-310:Body-Tmp-LOW
-HBL-010RFC:RFS-Kly-310:Body-Tmp-LOW-INT
 HBL-010RFC:RFS-Kly-310:Body-Tmp-LOW-RB
-HBL-010RFC:RFS-Kly-310:Body-Tmp-LOW-SEQ
 HBL-010RFC:RFS-Kly-310:Body-Tmp-NFRC-RB
 HBL-010RFC:RFS-Kly-310:Body-Tmp-NLTCH-RB
 HBL-010RFC:RFS-Kly-310:Body-Tmp-SVAL
-HBL-010RFC:RFS-Kly-310:Body-Tmp-SVAL-INT
 HBL-010RFC:RFS-Kly-310:Body-Tmp-SVAL-RB
-HBL-010RFC:RFS-Kly-310:Body-Tmp-SVAL-SEQ
-HBL-010RFC:RFS-Kly-310:Body-Tmp-TMSTMP
 HBL-010RFC:RFS-Kly-310:Body-Tmp-VAL-RB
 HBL-010RFC:RFS-Kly-310:Body-Tmp-WRN-RB
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Flw
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Flw-DIS
-HBL-010RFC:RFS-Kly-310:Body-WtrC-Flw-DIS-INT
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Flw-DIS-RB
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Flw-DTYP-RB
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Flw-ERR-RB
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Flw-FRC
-HBL-010RFC:RFS-Kly-310:Body-WtrC-Flw-FRC-INT
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Flw-FRC-RB
-HBL-010RFC:RFS-Kly-310:Body-WtrC-Flw-FRC-SEQ
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Flw-INT-RB
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Flw-INVDO-RB
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Flw-ISFRST-RB
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Flw-NFRC-RB
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Flw-NLTCH-RB
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Flw-SVAL
-HBL-010RFC:RFS-Kly-310:Body-WtrC-Flw-SVAL-INT
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Flw-SVAL-RB
-HBL-010RFC:RFS-Kly-310:Body-WtrC-Flw-SVAL-SEQ
-HBL-010RFC:RFS-Kly-310:Body-WtrC-Flw-TMSTMP
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Flw-VAL-RB
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-AOFF
-HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-AOFF-INT
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-AOFF-RB
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-DIS
-HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-DIS-INT
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-DIS-RB
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-DTYP-RB
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-ERR-RB
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-FRC
-HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-FRC-INT
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-FRC-RB
-HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-FRC-SEQ
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-HIALR-RB
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-HIGH
-HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-HIGH-INT
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-HIGH-RB
-HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-HIGH-SEQ
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-HIHI
-HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-HIHI-INT
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-HIHI-RB
-HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-HIHI-SEQ
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-ISFRST-RB
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-Ilck-RB
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-LOALR-RB
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-LOLO
-HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-LOLO-INT
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-LOLO-RB
-HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-LOLO-SEQ
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-LOW
-HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-LOW-INT
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-LOW-RB
-HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-LOW-SEQ
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-NFRC-RB
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-NLTCH-RB
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-SVAL
-HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-SVAL-INT
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-SVAL-RB
-HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-SVAL-SEQ
-HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-TMSTMP
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-VAL-RB
 HBL-010RFC:RFS-Kly-310:Body-WtrC-Tmp-WRN-RB
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-AOFF
-HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-AOFF-INT
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-AOFF-RB
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-DIS
-HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-DIS-INT
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-DIS-RB
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-DTYP-RB
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-ERR-RB
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-FRC
-HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-FRC-INT
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-FRC-RB
-HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-FRC-SEQ
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-HIALR-RB
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-HIGH
-HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-HIGH-INT
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-HIGH-RB
-HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-HIGH-SEQ
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-HIHI
-HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-HIHI-INT
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-HIHI-RB
-HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-HIHI-SEQ
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-ISFRST-RB
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-Ilck-RB
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-LOALR-RB
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-LOLO
-HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-LOLO-INT
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-LOLO-RB
-HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-LOLO-SEQ
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-LOW
-HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-LOW-INT
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-LOW-RB
-HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-LOW-SEQ
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-NFRC-RB
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-NLTCH-RB
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-SVAL
-HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-SVAL-INT
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-SVAL-RB
-HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-SVAL-SEQ
-HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-TMSTMP
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-VAL-RB
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Prs-WRN-RB
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-AOFF
-HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-AOFF-INT
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-AOFF-RB
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-DIS
-HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-DIS-INT
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-DIS-RB
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-DTYP-RB
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-ERR-RB
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-FRC
-HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-FRC-INT
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-FRC-RB
-HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-FRC-SEQ
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-HIALR-RB
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-HIGH
-HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-HIGH-INT
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-HIGH-RB
-HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-HIGH-SEQ
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-HIHI
-HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-HIHI-INT
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-HIHI-RB
-HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-HIHI-SEQ
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-ISFRST-RB
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-Ilck-RB
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-LOALR-RB
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-LOLO
-HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-LOLO-INT
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-LOLO-RB
-HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-LOLO-SEQ
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-LOW
-HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-LOW-INT
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-LOW-RB
-HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-LOW-SEQ
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-NFRC-RB
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-NLTCH-RB
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-SVAL
-HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-SVAL-INT
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-SVAL-RB
-HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-SVAL-SEQ
-HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-TMSTMP
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-VAL-RB
 HBL-010RFC:RFS-Kly-310:CWH-WtrC-Tmp-WRN-RB
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-AOFF
-HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-AOFF-INT
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-AOFF-RB
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-DIS
-HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-DIS-INT
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-DIS-RB
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-DTYP-RB
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-ERR-RB
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-FRC
-HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-FRC-INT
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-FRC-RB
-HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-FRC-SEQ
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-HIALR-RB
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-HIGH
-HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-HIGH-INT
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-HIGH-RB
-HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-HIGH-SEQ
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-HIHI
-HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-HIHI-INT
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-HIHI-RB
-HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-HIHI-SEQ
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-ISFRST-RB
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-Ilck-RB
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-LOALR-RB
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-LOLO
-HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-LOLO-INT
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-LOLO-RB
-HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-LOLO-SEQ
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-LOW
-HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-LOW-INT
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-LOW-RB
-HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-LOW-SEQ
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-NFRC-RB
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-NLTCH-RB
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-SVAL
-HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-SVAL-INT
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-SVAL-RB
-HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-SVAL-SEQ
-HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-TMSTMP
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-VAL-RB
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Prs-WRN-RB
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-AOFF
-HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-AOFF-INT
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-AOFF-RB
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-DIS
-HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-DIS-INT
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-DIS-RB
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-DTYP-RB
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-ERR-RB
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-FRC
-HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-FRC-INT
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-FRC-RB
-HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-FRC-SEQ
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-HIALR-RB
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-HIGH
-HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-HIGH-INT
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-HIGH-RB
-HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-HIGH-SEQ
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-HIHI
-HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-HIHI-INT
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-HIHI-RB
-HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-HIHI-SEQ
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-ISFRST-RB
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-Ilck-RB
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-LOALR-RB
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-LOLO
-HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-LOLO-INT
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-LOLO-RB
-HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-LOLO-SEQ
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-LOW
-HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-LOW-INT
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-LOW-RB
-HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-LOW-SEQ
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-NFRC-RB
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-NLTCH-RB
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-SVAL
-HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-SVAL-INT
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-SVAL-RB
-HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-SVAL-SEQ
-HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-TMSTMP
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-VAL-RB
 HBL-010RFC:RFS-Kly-310:CWM-WtrC-Tmp-WRN-RB
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-AOFF
-HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-AOFF-INT
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-AOFF-RB
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-DIS
-HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-DIS-INT
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-DIS-RB
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-DTYP-RB
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-ERR-RB
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-FRC
-HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-FRC-INT
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-FRC-RB
-HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-FRC-SEQ
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-HIALR-RB
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-HIGH
-HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-HIGH-INT
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-HIGH-RB
-HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-HIGH-SEQ
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-HIHI
-HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-HIHI-INT
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-HIHI-RB
-HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-HIHI-SEQ
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-ISFRST-RB
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-Ilck-RB
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-LOALR-RB
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-LOLO
-HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-LOLO-INT
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-LOLO-RB
-HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-LOLO-SEQ
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-LOW
-HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-LOW-INT
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-LOW-RB
-HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-LOW-SEQ
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-NFRC-RB
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-NLTCH-RB
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-SVAL
-HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-SVAL-INT
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-SVAL-RB
-HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-SVAL-SEQ
-HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-TMSTMP
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-VAL-RB
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Flw-WRN-RB
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-AOFF
-HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-AOFF-INT
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-AOFF-RB
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-DIS
-HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-DIS-INT
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-DIS-RB
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-DTYP-RB
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-ERR-RB
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-FRC
-HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-FRC-INT
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-FRC-RB
-HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-FRC-SEQ
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-HIALR-RB
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-HIGH
-HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-HIGH-INT
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-HIGH-RB
-HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-HIGH-SEQ
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-HIHI
-HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-HIHI-INT
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-HIHI-RB
-HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-HIHI-SEQ
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-ISFRST-RB
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-Ilck-RB
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-LOALR-RB
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-LOLO
-HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-LOLO-INT
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-LOLO-RB
-HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-LOLO-SEQ
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-LOW
-HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-LOW-INT
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-LOW-RB
-HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-LOW-SEQ
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-NFRC-RB
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-NLTCH-RB
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-SVAL
-HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-SVAL-INT
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-SVAL-RB
-HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-SVAL-SEQ
-HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-TMSTMP
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-VAL-RB
 HBL-010RFC:RFS-Kly-310:Coll-WtrC-Tmp-WRN-RB
 HBL-010RFC:RFS-Kly-310:ConILck
 HBL-010RFC:RFS-Kly-310:ConILck-DIS
-HBL-010RFC:RFS-Kly-310:ConILck-DIS-INT
 HBL-010RFC:RFS-Kly-310:ConILck-DIS-RB
 HBL-010RFC:RFS-Kly-310:ConILck-DTYP-RB
 HBL-010RFC:RFS-Kly-310:ConILck-ERR-RB
 HBL-010RFC:RFS-Kly-310:ConILck-FRC
-HBL-010RFC:RFS-Kly-310:ConILck-FRC-INT
 HBL-010RFC:RFS-Kly-310:ConILck-FRC-RB
-HBL-010RFC:RFS-Kly-310:ConILck-FRC-SEQ
 HBL-010RFC:RFS-Kly-310:ConILck-INT-RB
 HBL-010RFC:RFS-Kly-310:ConILck-INVDO-RB
 HBL-010RFC:RFS-Kly-310:ConILck-ISFRST-RB
 HBL-010RFC:RFS-Kly-310:ConILck-NFRC-RB
 HBL-010RFC:RFS-Kly-310:ConILck-NLTCH-RB
 HBL-010RFC:RFS-Kly-310:ConILck-SVAL
-HBL-010RFC:RFS-Kly-310:ConILck-SVAL-INT
 HBL-010RFC:RFS-Kly-310:ConILck-SVAL-RB
-HBL-010RFC:RFS-Kly-310:ConILck-SVAL-SEQ
-HBL-010RFC:RFS-Kly-310:ConILck-TMSTMP
 HBL-010RFC:RFS-Kly-310:ConILck-VAL-RB
 HBL-010RFC:RFS-Kly-310:Oil-Tmp
 HBL-010RFC:RFS-Kly-310:Oil-Tmp-AOFF
-HBL-010RFC:RFS-Kly-310:Oil-Tmp-AOFF-INT
 HBL-010RFC:RFS-Kly-310:Oil-Tmp-AOFF-RB
 HBL-010RFC:RFS-Kly-310:Oil-Tmp-DIS
-HBL-010RFC:RFS-Kly-310:Oil-Tmp-DIS-INT
 HBL-010RFC:RFS-Kly-310:Oil-Tmp-DIS-RB
 HBL-010RFC:RFS-Kly-310:Oil-Tmp-DTYP-RB
 HBL-010RFC:RFS-Kly-310:Oil-Tmp-ERR-RB
 HBL-010RFC:RFS-Kly-310:Oil-Tmp-FRC
-HBL-010RFC:RFS-Kly-310:Oil-Tmp-FRC-INT
 HBL-010RFC:RFS-Kly-310:Oil-Tmp-FRC-RB
-HBL-010RFC:RFS-Kly-310:Oil-Tmp-FRC-SEQ
 HBL-010RFC:RFS-Kly-310:Oil-Tmp-HIALR-RB
 HBL-010RFC:RFS-Kly-310:Oil-Tmp-HIGH
-HBL-010RFC:RFS-Kly-310:Oil-Tmp-HIGH-INT
 HBL-010RFC:RFS-Kly-310:Oil-Tmp-HIGH-RB
-HBL-010RFC:RFS-Kly-310:Oil-Tmp-HIGH-SEQ
 HBL-010RFC:RFS-Kly-310:Oil-Tmp-HIHI
-HBL-010RFC:RFS-Kly-310:Oil-Tmp-HIHI-INT
 HBL-010RFC:RFS-Kly-310:Oil-Tmp-HIHI-RB
-HBL-010RFC:RFS-Kly-310:Oil-Tmp-HIHI-SEQ
 HBL-010RFC:RFS-Kly-310:Oil-Tmp-ISFRST-RB
 HBL-010RFC:RFS-Kly-310:Oil-Tmp-Ilck-RB
 HBL-010RFC:RFS-Kly-310:Oil-Tmp-LOALR-RB
 HBL-010RFC:RFS-Kly-310:Oil-Tmp-LOLO
-HBL-010RFC:RFS-Kly-310:Oil-Tmp-LOLO-INT
 HBL-010RFC:RFS-Kly-310:Oil-Tmp-LOLO-RB
-HBL-010RFC:RFS-Kly-310:Oil-Tmp-LOLO-SEQ
 HBL-010RFC:RFS-Kly-310:Oil-Tmp-LOW
-HBL-010RFC:RFS-Kly-310:Oil-Tmp-LOW-INT
 HBL-010RFC:RFS-Kly-310:Oil-Tmp-LOW-RB
-HBL-010RFC:RFS-Kly-310:Oil-Tmp-LOW-SEQ
 HBL-010RFC:RFS-Kly-310:Oil-Tmp-NFRC-RB
 HBL-010RFC:RFS-Kly-310:Oil-Tmp-NLTCH-RB
 HBL-010RFC:RFS-Kly-310:Oil-Tmp-SVAL
-HBL-010RFC:RFS-Kly-310:Oil-Tmp-SVAL-INT
 HBL-010RFC:RFS-Kly-310:Oil-Tmp-SVAL-RB
-HBL-010RFC:RFS-Kly-310:Oil-Tmp-SVAL-SEQ
-HBL-010RFC:RFS-Kly-310:Oil-Tmp-TMSTMP
 HBL-010RFC:RFS-Kly-310:Oil-Tmp-VAL-RB
 HBL-010RFC:RFS-Kly-310:Oil-Tmp-WRN-RB
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Flw
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Flw-DIS
-HBL-010RFC:RFS-Kly-310:Oil-WtrC-Flw-DIS-INT
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Flw-DIS-RB
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Flw-DTYP-RB
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Flw-ERR-RB
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Flw-FRC
-HBL-010RFC:RFS-Kly-310:Oil-WtrC-Flw-FRC-INT
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Flw-FRC-RB
-HBL-010RFC:RFS-Kly-310:Oil-WtrC-Flw-FRC-SEQ
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Flw-INT-RB
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Flw-INVDO-RB
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Flw-ISFRST-RB
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Flw-NFRC-RB
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Flw-NLTCH-RB
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Flw-SVAL
-HBL-010RFC:RFS-Kly-310:Oil-WtrC-Flw-SVAL-INT
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Flw-SVAL-RB
-HBL-010RFC:RFS-Kly-310:Oil-WtrC-Flw-SVAL-SEQ
-HBL-010RFC:RFS-Kly-310:Oil-WtrC-Flw-TMSTMP
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Flw-VAL-RB
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-AOFF
-HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-AOFF-INT
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-AOFF-RB
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-DIS
-HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-DIS-INT
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-DIS-RB
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-DTYP-RB
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-ERR-RB
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-FRC
-HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-FRC-INT
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-FRC-RB
-HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-FRC-SEQ
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-HIALR-RB
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-HIGH
-HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-HIGH-INT
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-HIGH-RB
-HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-HIGH-SEQ
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-HIHI
-HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-HIHI-INT
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-HIHI-RB
-HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-HIHI-SEQ
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-ISFRST-RB
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-Ilck-RB
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-LOALR-RB
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-LOLO
-HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-LOLO-INT
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-LOLO-RB
-HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-LOLO-SEQ
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-LOW
-HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-LOW-INT
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-LOW-RB
-HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-LOW-SEQ
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-NFRC-RB
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-NLTCH-RB
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-SVAL
-HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-SVAL-INT
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-SVAL-RB
-HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-SVAL-SEQ
-HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-TMSTMP
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-VAL-RB
 HBL-010RFC:RFS-Kly-310:Oil-WtrC-Tmp-WRN-RB
 HBL-010RFC:RFS-Kly-310:Sol-Tmp
 HBL-010RFC:RFS-Kly-310:Sol-Tmp-AOFF
-HBL-010RFC:RFS-Kly-310:Sol-Tmp-AOFF-INT
 HBL-010RFC:RFS-Kly-310:Sol-Tmp-AOFF-RB
 HBL-010RFC:RFS-Kly-310:Sol-Tmp-DIS
-HBL-010RFC:RFS-Kly-310:Sol-Tmp-DIS-INT
 HBL-010RFC:RFS-Kly-310:Sol-Tmp-DIS-RB
 HBL-010RFC:RFS-Kly-310:Sol-Tmp-DTYP-RB
 HBL-010RFC:RFS-Kly-310:Sol-Tmp-ERR-RB
 HBL-010RFC:RFS-Kly-310:Sol-Tmp-FRC
-HBL-010RFC:RFS-Kly-310:Sol-Tmp-FRC-INT
 HBL-010RFC:RFS-Kly-310:Sol-Tmp-FRC-RB
-HBL-010RFC:RFS-Kly-310:Sol-Tmp-FRC-SEQ
 HBL-010RFC:RFS-Kly-310:Sol-Tmp-HIALR-RB
 HBL-010RFC:RFS-Kly-310:Sol-Tmp-HIGH
-HBL-010RFC:RFS-Kly-310:Sol-Tmp-HIGH-INT
 HBL-010RFC:RFS-Kly-310:Sol-Tmp-HIGH-RB
-HBL-010RFC:RFS-Kly-310:Sol-Tmp-HIGH-SEQ
 HBL-010RFC:RFS-Kly-310:Sol-Tmp-HIHI
-HBL-010RFC:RFS-Kly-310:Sol-Tmp-HIHI-INT
 HBL-010RFC:RFS-Kly-310:Sol-Tmp-HIHI-RB
-HBL-010RFC:RFS-Kly-310:Sol-Tmp-HIHI-SEQ
 HBL-010RFC:RFS-Kly-310:Sol-Tmp-ISFRST-RB
 HBL-010RFC:RFS-Kly-310:Sol-Tmp-Ilck-RB
 HBL-010RFC:RFS-Kly-310:Sol-Tmp-LOALR-RB
 HBL-010RFC:RFS-Kly-310:Sol-Tmp-LOLO
-HBL-010RFC:RFS-Kly-310:Sol-Tmp-LOLO-INT
 HBL-010RFC:RFS-Kly-310:Sol-Tmp-LOLO-RB
-HBL-010RFC:RFS-Kly-310:Sol-Tmp-LOLO-SEQ
 HBL-010RFC:RFS-Kly-310:Sol-Tmp-LOW
-HBL-010RFC:RFS-Kly-310:Sol-Tmp-LOW-INT
 HBL-010RFC:RFS-Kly-310:Sol-Tmp-LOW-RB
-HBL-010RFC:RFS-Kly-310:Sol-Tmp-LOW-SEQ
 HBL-010RFC:RFS-Kly-310:Sol-Tmp-NFRC-RB
 HBL-010RFC:RFS-Kly-310:Sol-Tmp-NLTCH-RB
 HBL-010RFC:RFS-Kly-310:Sol-Tmp-SVAL
-HBL-010RFC:RFS-Kly-310:Sol-Tmp-SVAL-INT
 HBL-010RFC:RFS-Kly-310:Sol-Tmp-SVAL-RB
-HBL-010RFC:RFS-Kly-310:Sol-Tmp-SVAL-SEQ
-HBL-010RFC:RFS-Kly-310:Sol-Tmp-TMSTMP
 HBL-010RFC:RFS-Kly-310:Sol-Tmp-VAL-RB
 HBL-010RFC:RFS-Kly-310:Sol-Tmp-WRN-RB
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Flw
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Flw-DIS
-HBL-010RFC:RFS-Kly-310:Sol-WtrC-Flw-DIS-INT
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Flw-DIS-RB
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Flw-DTYP-RB
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Flw-ERR-RB
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Flw-FRC
-HBL-010RFC:RFS-Kly-310:Sol-WtrC-Flw-FRC-INT
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Flw-FRC-RB
-HBL-010RFC:RFS-Kly-310:Sol-WtrC-Flw-FRC-SEQ
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Flw-INT-RB
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Flw-INVDO-RB
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Flw-ISFRST-RB
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Flw-NFRC-RB
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Flw-NLTCH-RB
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Flw-SVAL
-HBL-010RFC:RFS-Kly-310:Sol-WtrC-Flw-SVAL-INT
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Flw-SVAL-RB
-HBL-010RFC:RFS-Kly-310:Sol-WtrC-Flw-SVAL-SEQ
-HBL-010RFC:RFS-Kly-310:Sol-WtrC-Flw-TMSTMP
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Flw-VAL-RB
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-AOFF
-HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-AOFF-INT
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-AOFF-RB
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-DIS
-HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-DIS-INT
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-DIS-RB
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-DTYP-RB
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-ERR-RB
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-FRC
-HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-FRC-INT
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-FRC-RB
-HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-FRC-SEQ
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-HIALR-RB
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-HIGH
-HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-HIGH-INT
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-HIGH-RB
-HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-HIGH-SEQ
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-HIHI
-HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-HIHI-INT
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-HIHI-RB
-HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-HIHI-SEQ
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-ISFRST-RB
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-Ilck-RB
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-LOALR-RB
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-LOLO
-HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-LOLO-INT
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-LOLO-RB
-HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-LOLO-SEQ
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-LOW
-HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-LOW-INT
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-LOW-RB
-HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-LOW-SEQ
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-NFRC-RB
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-NLTCH-RB
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-SVAL
-HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-SVAL-INT
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-SVAL-RB
-HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-SVAL-SEQ
-HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-TMSTMP
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-VAL-RB
 HBL-010RFC:RFS-Kly-310:Sol-WtrC-Tmp-WRN-RB
 HBL-010RFC:RFS-Kly-310:TS
 HBL-010RFC:RFS-Kly-310:TS-DIS
-HBL-010RFC:RFS-Kly-310:TS-DIS-INT
 HBL-010RFC:RFS-Kly-310:TS-DIS-RB
 HBL-010RFC:RFS-Kly-310:TS-DTYP-RB
 HBL-010RFC:RFS-Kly-310:TS-ERR-RB
 HBL-010RFC:RFS-Kly-310:TS-FRC
-HBL-010RFC:RFS-Kly-310:TS-FRC-INT
 HBL-010RFC:RFS-Kly-310:TS-FRC-RB
-HBL-010RFC:RFS-Kly-310:TS-FRC-SEQ
 HBL-010RFC:RFS-Kly-310:TS-INT-RB
 HBL-010RFC:RFS-Kly-310:TS-INVDO-RB
 HBL-010RFC:RFS-Kly-310:TS-ISFRST-RB
 HBL-010RFC:RFS-Kly-310:TS-NFRC-RB
 HBL-010RFC:RFS-Kly-310:TS-NLTCH-RB
 HBL-010RFC:RFS-Kly-310:TS-SVAL
-HBL-010RFC:RFS-Kly-310:TS-SVAL-INT
 HBL-010RFC:RFS-Kly-310:TS-SVAL-RB
-HBL-010RFC:RFS-Kly-310:TS-SVAL-SEQ
-HBL-010RFC:RFS-Kly-310:TS-TMSTMP
 HBL-010RFC:RFS-Kly-310:TS-VAL-RB
 HBL-010RFC:RFS-Kly-320:Body-Tmp
 HBL-010RFC:RFS-Kly-320:Body-Tmp-AOFF
-HBL-010RFC:RFS-Kly-320:Body-Tmp-AOFF-INT
 HBL-010RFC:RFS-Kly-320:Body-Tmp-AOFF-RB
 HBL-010RFC:RFS-Kly-320:Body-Tmp-DIS
-HBL-010RFC:RFS-Kly-320:Body-Tmp-DIS-INT
 HBL-010RFC:RFS-Kly-320:Body-Tmp-DIS-RB
 HBL-010RFC:RFS-Kly-320:Body-Tmp-DTYP-RB
 HBL-010RFC:RFS-Kly-320:Body-Tmp-ERR-RB
 HBL-010RFC:RFS-Kly-320:Body-Tmp-FRC
-HBL-010RFC:RFS-Kly-320:Body-Tmp-FRC-INT
 HBL-010RFC:RFS-Kly-320:Body-Tmp-FRC-RB
-HBL-010RFC:RFS-Kly-320:Body-Tmp-FRC-SEQ
 HBL-010RFC:RFS-Kly-320:Body-Tmp-HIALR-RB
 HBL-010RFC:RFS-Kly-320:Body-Tmp-HIGH
-HBL-010RFC:RFS-Kly-320:Body-Tmp-HIGH-INT
 HBL-010RFC:RFS-Kly-320:Body-Tmp-HIGH-RB
-HBL-010RFC:RFS-Kly-320:Body-Tmp-HIGH-SEQ
 HBL-010RFC:RFS-Kly-320:Body-Tmp-HIHI
-HBL-010RFC:RFS-Kly-320:Body-Tmp-HIHI-INT
 HBL-010RFC:RFS-Kly-320:Body-Tmp-HIHI-RB
-HBL-010RFC:RFS-Kly-320:Body-Tmp-HIHI-SEQ
 HBL-010RFC:RFS-Kly-320:Body-Tmp-ISFRST-RB
 HBL-010RFC:RFS-Kly-320:Body-Tmp-Ilck-RB
 HBL-010RFC:RFS-Kly-320:Body-Tmp-LOALR-RB
 HBL-010RFC:RFS-Kly-320:Body-Tmp-LOLO
-HBL-010RFC:RFS-Kly-320:Body-Tmp-LOLO-INT
 HBL-010RFC:RFS-Kly-320:Body-Tmp-LOLO-RB
-HBL-010RFC:RFS-Kly-320:Body-Tmp-LOLO-SEQ
 HBL-010RFC:RFS-Kly-320:Body-Tmp-LOW
-HBL-010RFC:RFS-Kly-320:Body-Tmp-LOW-INT
 HBL-010RFC:RFS-Kly-320:Body-Tmp-LOW-RB
-HBL-010RFC:RFS-Kly-320:Body-Tmp-LOW-SEQ
 HBL-010RFC:RFS-Kly-320:Body-Tmp-NFRC-RB
 HBL-010RFC:RFS-Kly-320:Body-Tmp-NLTCH-RB
 HBL-010RFC:RFS-Kly-320:Body-Tmp-SVAL
-HBL-010RFC:RFS-Kly-320:Body-Tmp-SVAL-INT
 HBL-010RFC:RFS-Kly-320:Body-Tmp-SVAL-RB
-HBL-010RFC:RFS-Kly-320:Body-Tmp-SVAL-SEQ
-HBL-010RFC:RFS-Kly-320:Body-Tmp-TMSTMP
 HBL-010RFC:RFS-Kly-320:Body-Tmp-VAL-RB
 HBL-010RFC:RFS-Kly-320:Body-Tmp-WRN-RB
 HBL-010RFC:RFS-Kly-320:Sol-Tmp
 HBL-010RFC:RFS-Kly-320:Sol-Tmp-AOFF
-HBL-010RFC:RFS-Kly-320:Sol-Tmp-AOFF-INT
 HBL-010RFC:RFS-Kly-320:Sol-Tmp-AOFF-RB
 HBL-010RFC:RFS-Kly-320:Sol-Tmp-DIS
-HBL-010RFC:RFS-Kly-320:Sol-Tmp-DIS-INT
 HBL-010RFC:RFS-Kly-320:Sol-Tmp-DIS-RB
 HBL-010RFC:RFS-Kly-320:Sol-Tmp-DTYP-RB
 HBL-010RFC:RFS-Kly-320:Sol-Tmp-ERR-RB
 HBL-010RFC:RFS-Kly-320:Sol-Tmp-FRC
-HBL-010RFC:RFS-Kly-320:Sol-Tmp-FRC-INT
 HBL-010RFC:RFS-Kly-320:Sol-Tmp-FRC-RB
-HBL-010RFC:RFS-Kly-320:Sol-Tmp-FRC-SEQ
 HBL-010RFC:RFS-Kly-320:Sol-Tmp-HIALR-RB
 HBL-010RFC:RFS-Kly-320:Sol-Tmp-HIGH
-HBL-010RFC:RFS-Kly-320:Sol-Tmp-HIGH-INT
 HBL-010RFC:RFS-Kly-320:Sol-Tmp-HIGH-RB
-HBL-010RFC:RFS-Kly-320:Sol-Tmp-HIGH-SEQ
 HBL-010RFC:RFS-Kly-320:Sol-Tmp-HIHI
-HBL-010RFC:RFS-Kly-320:Sol-Tmp-HIHI-INT
 HBL-010RFC:RFS-Kly-320:Sol-Tmp-HIHI-RB
-HBL-010RFC:RFS-Kly-320:Sol-Tmp-HIHI-SEQ
 HBL-010RFC:RFS-Kly-320:Sol-Tmp-ISFRST-RB
 HBL-010RFC:RFS-Kly-320:Sol-Tmp-Ilck-RB
 HBL-010RFC:RFS-Kly-320:Sol-Tmp-LOALR-RB
 HBL-010RFC:RFS-Kly-320:Sol-Tmp-LOLO
-HBL-010RFC:RFS-Kly-320:Sol-Tmp-LOLO-INT
 HBL-010RFC:RFS-Kly-320:Sol-Tmp-LOLO-RB
-HBL-010RFC:RFS-Kly-320:Sol-Tmp-LOLO-SEQ
 HBL-010RFC:RFS-Kly-320:Sol-Tmp-LOW
-HBL-010RFC:RFS-Kly-320:Sol-Tmp-LOW-INT
 HBL-010RFC:RFS-Kly-320:Sol-Tmp-LOW-RB
-HBL-010RFC:RFS-Kly-320:Sol-Tmp-LOW-SEQ
 HBL-010RFC:RFS-Kly-320:Sol-Tmp-NFRC-RB
 HBL-010RFC:RFS-Kly-320:Sol-Tmp-NLTCH-RB
 HBL-010RFC:RFS-Kly-320:Sol-Tmp-SVAL
-HBL-010RFC:RFS-Kly-320:Sol-Tmp-SVAL-INT
 HBL-010RFC:RFS-Kly-320:Sol-Tmp-SVAL-RB
-HBL-010RFC:RFS-Kly-320:Sol-Tmp-SVAL-SEQ
-HBL-010RFC:RFS-Kly-320:Sol-Tmp-TMSTMP
 HBL-010RFC:RFS-Kly-320:Sol-Tmp-VAL-RB
 HBL-010RFC:RFS-Kly-320:Sol-Tmp-WRN-RB
 HBL-010RFC:RFS-Kly-330:Sol-Tmp
 HBL-010RFC:RFS-Kly-330:Sol-Tmp-AOFF
-HBL-010RFC:RFS-Kly-330:Sol-Tmp-AOFF-INT
 HBL-010RFC:RFS-Kly-330:Sol-Tmp-AOFF-RB
 HBL-010RFC:RFS-Kly-330:Sol-Tmp-DIS
-HBL-010RFC:RFS-Kly-330:Sol-Tmp-DIS-INT
 HBL-010RFC:RFS-Kly-330:Sol-Tmp-DIS-RB
 HBL-010RFC:RFS-Kly-330:Sol-Tmp-DTYP-RB
 HBL-010RFC:RFS-Kly-330:Sol-Tmp-ERR-RB
 HBL-010RFC:RFS-Kly-330:Sol-Tmp-FRC
-HBL-010RFC:RFS-Kly-330:Sol-Tmp-FRC-INT
 HBL-010RFC:RFS-Kly-330:Sol-Tmp-FRC-RB
-HBL-010RFC:RFS-Kly-330:Sol-Tmp-FRC-SEQ
 HBL-010RFC:RFS-Kly-330:Sol-Tmp-HIALR-RB
 HBL-010RFC:RFS-Kly-330:Sol-Tmp-HIGH
-HBL-010RFC:RFS-Kly-330:Sol-Tmp-HIGH-INT
 HBL-010RFC:RFS-Kly-330:Sol-Tmp-HIGH-RB
-HBL-010RFC:RFS-Kly-330:Sol-Tmp-HIGH-SEQ
 HBL-010RFC:RFS-Kly-330:Sol-Tmp-HIHI
-HBL-010RFC:RFS-Kly-330:Sol-Tmp-HIHI-INT
 HBL-010RFC:RFS-Kly-330:Sol-Tmp-HIHI-RB
-HBL-010RFC:RFS-Kly-330:Sol-Tmp-HIHI-SEQ
 HBL-010RFC:RFS-Kly-330:Sol-Tmp-ISFRST-RB
 HBL-010RFC:RFS-Kly-330:Sol-Tmp-Ilck-RB
 HBL-010RFC:RFS-Kly-330:Sol-Tmp-LOALR-RB
 HBL-010RFC:RFS-Kly-330:Sol-Tmp-LOLO
-HBL-010RFC:RFS-Kly-330:Sol-Tmp-LOLO-INT
 HBL-010RFC:RFS-Kly-330:Sol-Tmp-LOLO-RB
-HBL-010RFC:RFS-Kly-330:Sol-Tmp-LOLO-SEQ
 HBL-010RFC:RFS-Kly-330:Sol-Tmp-LOW
-HBL-010RFC:RFS-Kly-330:Sol-Tmp-LOW-INT
 HBL-010RFC:RFS-Kly-330:Sol-Tmp-LOW-RB
-HBL-010RFC:RFS-Kly-330:Sol-Tmp-LOW-SEQ
 HBL-010RFC:RFS-Kly-330:Sol-Tmp-NFRC-RB
 HBL-010RFC:RFS-Kly-330:Sol-Tmp-NLTCH-RB
 HBL-010RFC:RFS-Kly-330:Sol-Tmp-SVAL
-HBL-010RFC:RFS-Kly-330:Sol-Tmp-SVAL-INT
 HBL-010RFC:RFS-Kly-330:Sol-Tmp-SVAL-RB
-HBL-010RFC:RFS-Kly-330:Sol-Tmp-SVAL-SEQ
-HBL-010RFC:RFS-Kly-330:Sol-Tmp-TMSTMP
-HBL-010RFC:RFS-Kly-330:Sol-Tmp-VAL-RB
-HBL-010RFC:RFS-Kly-330:Sol-Tmp-WRN-RB
-HBL-010RFC:RFS-Load-320:WtrC-Flw
 HBL-010RFC:RFS-Load-320:WtrC-Flw-AOFF
-HBL-010RFC:RFS-Load-320:WtrC-Flw-AOFF-INT
 HBL-010RFC:RFS-Load-320:WtrC-Flw-AOFF-RB
 HBL-010RFC:RFS-Load-320:WtrC-Flw-DIS
-HBL-010RFC:RFS-Load-320:WtrC-Flw-DIS-INT
 HBL-010RFC:RFS-Load-320:WtrC-Flw-DIS-RB
 HBL-010RFC:RFS-Load-320:WtrC-Flw-DTYP-RB
 HBL-010RFC:RFS-Load-320:WtrC-Flw-ERR-RB
 HBL-010RFC:RFS-Load-320:WtrC-Flw-FRC
-HBL-010RFC:RFS-Load-320:WtrC-Flw-FRC-INT
 HBL-010RFC:RFS-Load-320:WtrC-Flw-FRC-RB
-HBL-010RFC:RFS-Load-320:WtrC-Flw-FRC-SEQ
 HBL-010RFC:RFS-Load-320:WtrC-Flw-HIALR-RB
 HBL-010RFC:RFS-Load-320:WtrC-Flw-HIGH
-HBL-010RFC:RFS-Load-320:WtrC-Flw-HIGH-INT
 HBL-010RFC:RFS-Load-320:WtrC-Flw-HIGH-RB
-HBL-010RFC:RFS-Load-320:WtrC-Flw-HIGH-SEQ
 HBL-010RFC:RFS-Load-320:WtrC-Flw-HIHI
-HBL-010RFC:RFS-Load-320:WtrC-Flw-HIHI-INT
 HBL-010RFC:RFS-Load-320:WtrC-Flw-HIHI-RB
-HBL-010RFC:RFS-Load-320:WtrC-Flw-HIHI-SEQ
 HBL-010RFC:RFS-Load-320:WtrC-Flw-ISFRST-RB
 HBL-010RFC:RFS-Load-320:WtrC-Flw-Ilck-RB
 HBL-010RFC:RFS-Load-320:WtrC-Flw-LOALR-RB
 HBL-010RFC:RFS-Load-320:WtrC-Flw-LOLO
-HBL-010RFC:RFS-Load-320:WtrC-Flw-LOLO-INT
 HBL-010RFC:RFS-Load-320:WtrC-Flw-LOLO-RB
-HBL-010RFC:RFS-Load-320:WtrC-Flw-LOLO-SEQ
 HBL-010RFC:RFS-Load-320:WtrC-Flw-LOW
-HBL-010RFC:RFS-Load-320:WtrC-Flw-LOW-INT
 HBL-010RFC:RFS-Load-320:WtrC-Flw-LOW-RB
-HBL-010RFC:RFS-Load-320:WtrC-Flw-LOW-SEQ
 HBL-010RFC:RFS-Load-320:WtrC-Flw-NFRC-RB
 HBL-010RFC:RFS-Load-320:WtrC-Flw-NLTCH-RB
 HBL-010RFC:RFS-Load-320:WtrC-Flw-SVAL
-HBL-010RFC:RFS-Load-320:WtrC-Flw-SVAL-INT
 HBL-010RFC:RFS-Load-320:WtrC-Flw-SVAL-RB
-HBL-010RFC:RFS-Load-320:WtrC-Flw-SVAL-SEQ
-HBL-010RFC:RFS-Load-320:WtrC-Flw-TMSTMP
 HBL-010RFC:RFS-Load-320:WtrC-Flw-VAL-RB
 HBL-010RFC:RFS-Load-320:WtrC-Flw-WRN-RB
 HBL-010RFC:RFS-Load-320:WtrC-Tmp
 HBL-010RFC:RFS-Load-320:WtrC-Tmp-AOFF
-HBL-010RFC:RFS-Load-320:WtrC-Tmp-AOFF-INT
 HBL-010RFC:RFS-Load-320:WtrC-Tmp-AOFF-RB
 HBL-010RFC:RFS-Load-320:WtrC-Tmp-DIS
-HBL-010RFC:RFS-Load-320:WtrC-Tmp-DIS-INT
 HBL-010RFC:RFS-Load-320:WtrC-Tmp-DIS-RB
 HBL-010RFC:RFS-Load-320:WtrC-Tmp-DTYP-RB
 HBL-010RFC:RFS-Load-320:WtrC-Tmp-ERR-RB
 HBL-010RFC:RFS-Load-320:WtrC-Tmp-FRC
-HBL-010RFC:RFS-Load-320:WtrC-Tmp-FRC-INT
 HBL-010RFC:RFS-Load-320:WtrC-Tmp-FRC-RB
-HBL-010RFC:RFS-Load-320:WtrC-Tmp-FRC-SEQ
 HBL-010RFC:RFS-Load-320:WtrC-Tmp-HIALR-RB
 HBL-010RFC:RFS-Load-320:WtrC-Tmp-HIGH
-HBL-010RFC:RFS-Load-320:WtrC-Tmp-HIGH-INT
 HBL-010RFC:RFS-Load-320:WtrC-Tmp-HIGH-RB
-HBL-010RFC:RFS-Load-320:WtrC-Tmp-HIGH-SEQ
 HBL-010RFC:RFS-Load-320:WtrC-Tmp-HIHI
-HBL-010RFC:RFS-Load-320:WtrC-Tmp-HIHI-INT
 HBL-010RFC:RFS-Load-320:WtrC-Tmp-HIHI-RB
-HBL-010RFC:RFS-Load-320:WtrC-Tmp-HIHI-SEQ
 HBL-010RFC:RFS-Load-320:WtrC-Tmp-ISFRST-RB
 HBL-010RFC:RFS-Load-320:WtrC-Tmp-Ilck-RB
 HBL-010RFC:RFS-Load-320:WtrC-Tmp-LOALR-RB
 HBL-010RFC:RFS-Load-320:WtrC-Tmp-LOLO
-HBL-010RFC:RFS-Load-320:WtrC-Tmp-LOLO-INT
 HBL-010RFC:RFS-Load-320:WtrC-Tmp-LOLO-RB
-HBL-010RFC:RFS-Load-320:WtrC-Tmp-LOLO-SEQ
 HBL-010RFC:RFS-Load-320:WtrC-Tmp-LOW
-HBL-010RFC:RFS-Load-320:WtrC-Tmp-LOW-INT
 HBL-010RFC:RFS-Load-320:WtrC-Tmp-LOW-RB
-HBL-010RFC:RFS-Load-320:WtrC-Tmp-LOW-SEQ
 HBL-010RFC:RFS-Load-320:WtrC-Tmp-NFRC-RB
 HBL-010RFC:RFS-Load-320:WtrC-Tmp-NLTCH-RB
 HBL-010RFC:RFS-Load-320:WtrC-Tmp-SVAL
-HBL-010RFC:RFS-Load-320:WtrC-Tmp-SVAL-INT
 HBL-010RFC:RFS-Load-320:WtrC-Tmp-SVAL-RB
-HBL-010RFC:RFS-Load-320:WtrC-Tmp-SVAL-SEQ
-HBL-010RFC:RFS-Load-320:WtrC-Tmp-TMSTMP
 HBL-010RFC:RFS-Load-320:WtrC-Tmp-VAL-RB
 HBL-010RFC:RFS-Load-320:WtrC-Tmp-WRN-RB
 HBL-010RFC:RFS-Main-310:EmSw
 HBL-010RFC:RFS-Main-310:EmSw-DIS
-HBL-010RFC:RFS-Main-310:EmSw-DIS-INT
 HBL-010RFC:RFS-Main-310:EmSw-DIS-RB
 HBL-010RFC:RFS-Main-310:EmSw-DTYP-RB
 HBL-010RFC:RFS-Main-310:EmSw-ERR-RB
 HBL-010RFC:RFS-Main-310:EmSw-FRC
-HBL-010RFC:RFS-Main-310:EmSw-FRC-INT
 HBL-010RFC:RFS-Main-310:EmSw-FRC-RB
-HBL-010RFC:RFS-Main-310:EmSw-FRC-SEQ
 HBL-010RFC:RFS-Main-310:EmSw-INT-RB
 HBL-010RFC:RFS-Main-310:EmSw-INVDO-RB
 HBL-010RFC:RFS-Main-310:EmSw-ISFRST-RB
 HBL-010RFC:RFS-Main-310:EmSw-NFRC-RB
 HBL-010RFC:RFS-Main-310:EmSw-NLTCH-RB
 HBL-010RFC:RFS-Main-310:EmSw-SVAL
-HBL-010RFC:RFS-Main-310:EmSw-SVAL-INT
 HBL-010RFC:RFS-Main-310:EmSw-SVAL-RB
-HBL-010RFC:RFS-Main-310:EmSw-SVAL-SEQ
-HBL-010RFC:RFS-Main-310:EmSw-TMSTMP
 HBL-010RFC:RFS-Main-310:EmSw-VAL-RB
 HBL-010RFC:RFS-Oil-310:LO
 HBL-010RFC:RFS-Oil-310:LO-DIS
-HBL-010RFC:RFS-Oil-310:LO-DIS-INT
 HBL-010RFC:RFS-Oil-310:LO-DIS-RB
 HBL-010RFC:RFS-Oil-310:LO-DTYP-RB
 HBL-010RFC:RFS-Oil-310:LO-ERR-RB
 HBL-010RFC:RFS-Oil-310:LO-FRC
-HBL-010RFC:RFS-Oil-310:LO-FRC-INT
 HBL-010RFC:RFS-Oil-310:LO-FRC-RB
-HBL-010RFC:RFS-Oil-310:LO-FRC-SEQ
 HBL-010RFC:RFS-Oil-310:LO-INT-RB
 HBL-010RFC:RFS-Oil-310:LO-INVDO-RB
 HBL-010RFC:RFS-Oil-310:LO-ISFRST-RB
 HBL-010RFC:RFS-Oil-310:LO-NFRC-RB
 HBL-010RFC:RFS-Oil-310:LO-NLTCH-RB
 HBL-010RFC:RFS-Oil-310:LO-SVAL
-HBL-010RFC:RFS-Oil-310:LO-SVAL-INT
 HBL-010RFC:RFS-Oil-310:LO-SVAL-RB
-HBL-010RFC:RFS-Oil-310:LO-SVAL-SEQ
-HBL-010RFC:RFS-Oil-310:LO-TMSTMP
 HBL-010RFC:RFS-Oil-310:LO-VAL-RB
 HBL-010RFC:RFS-Oil-310:LS
 HBL-010RFC:RFS-Oil-310:LS-DIS
-HBL-010RFC:RFS-Oil-310:LS-DIS-INT
 HBL-010RFC:RFS-Oil-310:LS-DIS-RB
 HBL-010RFC:RFS-Oil-310:LS-DTYP-RB
 HBL-010RFC:RFS-Oil-310:LS-ERR-RB
 HBL-010RFC:RFS-Oil-310:LS-FRC
-HBL-010RFC:RFS-Oil-310:LS-FRC-INT
 HBL-010RFC:RFS-Oil-310:LS-FRC-RB
-HBL-010RFC:RFS-Oil-310:LS-FRC-SEQ
 HBL-010RFC:RFS-Oil-310:LS-INT-RB
 HBL-010RFC:RFS-Oil-310:LS-INVDO-RB
 HBL-010RFC:RFS-Oil-310:LS-ISFRST-RB
 HBL-010RFC:RFS-Oil-310:LS-NFRC-RB
 HBL-010RFC:RFS-Oil-310:LS-NLTCH-RB
 HBL-010RFC:RFS-Oil-310:LS-SVAL
-HBL-010RFC:RFS-Oil-310:LS-SVAL-INT
 HBL-010RFC:RFS-Oil-310:LS-SVAL-RB
-HBL-010RFC:RFS-Oil-310:LS-SVAL-SEQ
-HBL-010RFC:RFS-Oil-310:LS-TMSTMP
 HBL-010RFC:RFS-Oil-310:LS-VAL-RB
 HBL-010RFC:RFS-Oil-310:Leak
 HBL-010RFC:RFS-Oil-310:Leak-DIS
-HBL-010RFC:RFS-Oil-310:Leak-DIS-INT
 HBL-010RFC:RFS-Oil-310:Leak-DIS-RB
 HBL-010RFC:RFS-Oil-310:Leak-DTYP-RB
 HBL-010RFC:RFS-Oil-310:Leak-ERR-RB
 HBL-010RFC:RFS-Oil-310:Leak-FRC
-HBL-010RFC:RFS-Oil-310:Leak-FRC-INT
 HBL-010RFC:RFS-Oil-310:Leak-FRC-RB
-HBL-010RFC:RFS-Oil-310:Leak-FRC-SEQ
 HBL-010RFC:RFS-Oil-310:Leak-INT-RB
 HBL-010RFC:RFS-Oil-310:Leak-INVDO-RB
 HBL-010RFC:RFS-Oil-310:Leak-ISFRST-RB
 HBL-010RFC:RFS-Oil-310:Leak-NFRC-RB
 HBL-010RFC:RFS-Oil-310:Leak-NLTCH-RB
 HBL-010RFC:RFS-Oil-310:Leak-SVAL
-HBL-010RFC:RFS-Oil-310:Leak-SVAL-INT
 HBL-010RFC:RFS-Oil-310:Leak-SVAL-RB
-HBL-010RFC:RFS-Oil-310:Leak-SVAL-SEQ
-HBL-010RFC:RFS-Oil-310:Leak-TMSTMP
 HBL-010RFC:RFS-Oil-310:Leak-VAL-RB
 HBL-010RFC:RFS-Oil-310:TS
 HBL-010RFC:RFS-Oil-310:TS-DIS
-HBL-010RFC:RFS-Oil-310:TS-DIS-INT
 HBL-010RFC:RFS-Oil-310:TS-DIS-RB
 HBL-010RFC:RFS-Oil-310:TS-DTYP-RB
 HBL-010RFC:RFS-Oil-310:TS-ERR-RB
 HBL-010RFC:RFS-Oil-310:TS-FRC
-HBL-010RFC:RFS-Oil-310:TS-FRC-INT
 HBL-010RFC:RFS-Oil-310:TS-FRC-RB
-HBL-010RFC:RFS-Oil-310:TS-FRC-SEQ
 HBL-010RFC:RFS-Oil-310:TS-INT-RB
 HBL-010RFC:RFS-Oil-310:TS-INVDO-RB
 HBL-010RFC:RFS-Oil-310:TS-ISFRST-RB
 HBL-010RFC:RFS-Oil-310:TS-NFRC-RB
 HBL-010RFC:RFS-Oil-310:TS-NLTCH-RB
 HBL-010RFC:RFS-Oil-310:TS-SVAL
-HBL-010RFC:RFS-Oil-310:TS-SVAL-INT
 HBL-010RFC:RFS-Oil-310:TS-SVAL-RB
-HBL-010RFC:RFS-Oil-310:TS-SVAL-SEQ
-HBL-010RFC:RFS-Oil-310:TS-TMSTMP
 HBL-010RFC:RFS-Oil-310:TS-VAL-RB
 HBL-010RFC:RFS-PSS-310:Shutter
 HBL-010RFC:RFS-PSS-310:Shutter-DIS
-HBL-010RFC:RFS-PSS-310:Shutter-DIS-INT
 HBL-010RFC:RFS-PSS-310:Shutter-DIS-RB
 HBL-010RFC:RFS-PSS-310:Shutter-DTYP-RB
 HBL-010RFC:RFS-PSS-310:Shutter-ERR-RB
 HBL-010RFC:RFS-PSS-310:Shutter-FRC
-HBL-010RFC:RFS-PSS-310:Shutter-FRC-INT
 HBL-010RFC:RFS-PSS-310:Shutter-FRC-RB
-HBL-010RFC:RFS-PSS-310:Shutter-FRC-SEQ
 HBL-010RFC:RFS-PSS-310:Shutter-INT-RB
 HBL-010RFC:RFS-PSS-310:Shutter-INVDO-RB
 HBL-010RFC:RFS-PSS-310:Shutter-ISFRST-RB
 HBL-010RFC:RFS-PSS-310:Shutter-NFRC-RB
 HBL-010RFC:RFS-PSS-310:Shutter-NLTCH-RB
 HBL-010RFC:RFS-PSS-310:Shutter-SVAL
-HBL-010RFC:RFS-PSS-310:Shutter-SVAL-INT
 HBL-010RFC:RFS-PSS-310:Shutter-SVAL-RB
-HBL-010RFC:RFS-PSS-310:Shutter-SVAL-SEQ
-HBL-010RFC:RFS-PSS-310:Shutter-TMSTMP
 HBL-010RFC:RFS-PSS-310:Shutter-VAL-RB
 HBL-010RFC:RFS-RIO-310:Greenlight
 HBL-010RFC:RFS-RIO-310:Greenlight-DIS
-HBL-010RFC:RFS-RIO-310:Greenlight-DIS-INT
 HBL-010RFC:RFS-RIO-310:Greenlight-DIS-RB
 HBL-010RFC:RFS-RIO-310:Greenlight-DTYP-RB
 HBL-010RFC:RFS-RIO-310:Greenlight-ERR-RB
 HBL-010RFC:RFS-RIO-310:Greenlight-FRC
-HBL-010RFC:RFS-RIO-310:Greenlight-FRC-INT
 HBL-010RFC:RFS-RIO-310:Greenlight-FRC-RB
-HBL-010RFC:RFS-RIO-310:Greenlight-FRC-SEQ
 HBL-010RFC:RFS-RIO-310:Greenlight-INT-RB
 HBL-010RFC:RFS-RIO-310:Greenlight-INVDO-RB
 HBL-010RFC:RFS-RIO-310:Greenlight-ISFRST-RB
 HBL-010RFC:RFS-RIO-310:Greenlight-NFRC-RB
 HBL-010RFC:RFS-RIO-310:Greenlight-NLTCH-RB
 HBL-010RFC:RFS-RIO-310:Greenlight-SVAL
-HBL-010RFC:RFS-RIO-310:Greenlight-SVAL-INT
 HBL-010RFC:RFS-RIO-310:Greenlight-SVAL-RB
-HBL-010RFC:RFS-RIO-310:Greenlight-SVAL-SEQ
-HBL-010RFC:RFS-RIO-310:Greenlight-TMSTMP
 HBL-010RFC:RFS-RIO-310:Greenlight-VAL-RB
 HBL-010RFC:RFS-RIO-310:Redlight
 HBL-010RFC:RFS-RIO-310:Redlight-DIS
-HBL-010RFC:RFS-RIO-310:Redlight-DIS-INT
 HBL-010RFC:RFS-RIO-310:Redlight-DIS-RB
 HBL-010RFC:RFS-RIO-310:Redlight-DTYP-RB
 HBL-010RFC:RFS-RIO-310:Redlight-ERR-RB
 HBL-010RFC:RFS-RIO-310:Redlight-FRC
-HBL-010RFC:RFS-RIO-310:Redlight-FRC-INT
 HBL-010RFC:RFS-RIO-310:Redlight-FRC-RB
-HBL-010RFC:RFS-RIO-310:Redlight-FRC-SEQ
 HBL-010RFC:RFS-RIO-310:Redlight-INT-RB
 HBL-010RFC:RFS-RIO-310:Redlight-INVDO-RB
 HBL-010RFC:RFS-RIO-310:Redlight-ISFRST-RB
 HBL-010RFC:RFS-RIO-310:Redlight-NFRC-RB
 HBL-010RFC:RFS-RIO-310:Redlight-NLTCH-RB
 HBL-010RFC:RFS-RIO-310:Redlight-SVAL
-HBL-010RFC:RFS-RIO-310:Redlight-SVAL-INT
 HBL-010RFC:RFS-RIO-310:Redlight-SVAL-RB
-HBL-010RFC:RFS-RIO-310:Redlight-SVAL-SEQ
-HBL-010RFC:RFS-RIO-310:Redlight-TMSTMP
 HBL-010RFC:RFS-RIO-310:Redlight-VAL-RB
 HBL-010RFC:RFS-SIM-310:AFComm
 HBL-010RFC:RFS-SIM-310:AUX
@@ -1592,28 +1088,21 @@ HBL-010RFC:RFS-SIM-310:Ilck-RB
 HBL-010RFC:RFS-SIM-310:LatchCmd-RB
 HBL-010RFC:RFS-SIM-310:OFF
 HBL-010RFC:RFS-SIM-310:OPMode
-HBL-010RFC:RFS-SIM-310:OPMode-INT
 HBL-010RFC:RFS-SIM-310:OPMode-RB
 HBL-010RFC:RFS-SIM-310:PSS-Ready
 HBL-010RFC:RFS-SIM-310:PSS-Ready-DIS
-HBL-010RFC:RFS-SIM-310:PSS-Ready-DIS-INT
 HBL-010RFC:RFS-SIM-310:PSS-Ready-DIS-RB
 HBL-010RFC:RFS-SIM-310:PSS-Ready-DTYP-RB
 HBL-010RFC:RFS-SIM-310:PSS-Ready-ERR-RB
 HBL-010RFC:RFS-SIM-310:PSS-Ready-FRC
-HBL-010RFC:RFS-SIM-310:PSS-Ready-FRC-INT
 HBL-010RFC:RFS-SIM-310:PSS-Ready-FRC-RB
-HBL-010RFC:RFS-SIM-310:PSS-Ready-FRC-SEQ
 HBL-010RFC:RFS-SIM-310:PSS-Ready-INT-RB
 HBL-010RFC:RFS-SIM-310:PSS-Ready-INVDO-RB
 HBL-010RFC:RFS-SIM-310:PSS-Ready-ISFRST-RB
 HBL-010RFC:RFS-SIM-310:PSS-Ready-NFRC-RB
 HBL-010RFC:RFS-SIM-310:PSS-Ready-NLTCH-RB
 HBL-010RFC:RFS-SIM-310:PSS-Ready-SVAL
-HBL-010RFC:RFS-SIM-310:PSS-Ready-SVAL-INT
 HBL-010RFC:RFS-SIM-310:PSS-Ready-SVAL-RB
-HBL-010RFC:RFS-SIM-310:PSS-Ready-SVAL-SEQ
-HBL-010RFC:RFS-SIM-310:PSS-Ready-TMSTMP
 HBL-010RFC:RFS-SIM-310:PSS-Ready-VAL-RB
 HBL-010RFC:RFS-SIM-310:PSUComm
 HBL-010RFC:RFS-SIM-310:RFON
@@ -1628,105 +1117,77 @@ HBL-010RFC:RFS-SIM-310:State-RB
 HBL-010RFC:RFS-SIM-310:Test-All-ADS
 HBL-010RFC:RFS-SIM-310:WarnAckReq-RB
 HBL-010RFC:RFS-SS-310:RF-Switch-FRC
-HBL-010RFC:RFS-SS-310:RF-Switch-FRC-INT
 HBL-010RFC:RFS-SS-310:RF-Switch-PIN1-RB
 HBL-010RFC:RFS-SS-310:RF-Switch-PIN3-RB
 HBL-010RFC:RFS-SS-310:RF-Switch-PIN7-RB
 HBL-010RFC:RFS-SS-310:RF-Switch-PIN9-RB
 HBL-010RFC:RFS-SS-310:RF-Switch-STAT-RB
 HBL-010RFC:RFS-SS-310:RF-Switch-SVAL
-HBL-010RFC:RFS-SS-310:RF-Switch-SVAL-INT
 HBL-010RFC:RFS-SS-310:RF-Switch-SVAL-RB
 HBL-010RFC:RFS-SS-320:RF-Switch-FRC
-HBL-010RFC:RFS-SS-320:RF-Switch-FRC-INT
 HBL-010RFC:RFS-SS-320:RF-Switch-PIN1-RB
 HBL-010RFC:RFS-SS-320:RF-Switch-PIN3-RB
 HBL-010RFC:RFS-SS-320:RF-Switch-PIN7-RB
 HBL-010RFC:RFS-SS-320:RF-Switch-PIN9-RB
 HBL-010RFC:RFS-SS-320:RF-Switch-STAT-RB
 HBL-010RFC:RFS-SS-320:RF-Switch-SVAL
-HBL-010RFC:RFS-SS-320:RF-Switch-SVAL-INT
 HBL-010RFC:RFS-SS-320:RF-Switch-SVAL-RB
 HBL-010RFC:RFS-SiC-310:GreenLight
 HBL-010RFC:RFS-SiC-310:GreenLight-DIS
-HBL-010RFC:RFS-SiC-310:GreenLight-DIS-INT
 HBL-010RFC:RFS-SiC-310:GreenLight-DIS-RB
 HBL-010RFC:RFS-SiC-310:GreenLight-DTYP-RB
 HBL-010RFC:RFS-SiC-310:GreenLight-ERR-RB
 HBL-010RFC:RFS-SiC-310:GreenLight-FRC
-HBL-010RFC:RFS-SiC-310:GreenLight-FRC-INT
 HBL-010RFC:RFS-SiC-310:GreenLight-FRC-RB
-HBL-010RFC:RFS-SiC-310:GreenLight-FRC-SEQ
 HBL-010RFC:RFS-SiC-310:GreenLight-INT-RB
 HBL-010RFC:RFS-SiC-310:GreenLight-INVDO-RB
 HBL-010RFC:RFS-SiC-310:GreenLight-ISFRST-RB
 HBL-010RFC:RFS-SiC-310:GreenLight-NFRC-RB
 HBL-010RFC:RFS-SiC-310:GreenLight-NLTCH-RB
 HBL-010RFC:RFS-SiC-310:GreenLight-SVAL
-HBL-010RFC:RFS-SiC-310:GreenLight-SVAL-INT
 HBL-010RFC:RFS-SiC-310:GreenLight-SVAL-RB
-HBL-010RFC:RFS-SiC-310:GreenLight-SVAL-SEQ
-HBL-010RFC:RFS-SiC-310:GreenLight-TMSTMP
 HBL-010RFC:RFS-SiC-310:GreenLight-VAL-RB
 HBL-010RFC:RFS-SiC-310:RedLight
 HBL-010RFC:RFS-SiC-310:RedLight-DIS
-HBL-010RFC:RFS-SiC-310:RedLight-DIS-INT
 HBL-010RFC:RFS-SiC-310:RedLight-DIS-RB
 HBL-010RFC:RFS-SiC-310:RedLight-DTYP-RB
 HBL-010RFC:RFS-SiC-310:RedLight-ERR-RB
 HBL-010RFC:RFS-SiC-310:RedLight-FRC
-HBL-010RFC:RFS-SiC-310:RedLight-FRC-INT
 HBL-010RFC:RFS-SiC-310:RedLight-FRC-RB
-HBL-010RFC:RFS-SiC-310:RedLight-FRC-SEQ
 HBL-010RFC:RFS-SiC-310:RedLight-INT-RB
 HBL-010RFC:RFS-SiC-310:RedLight-INVDO-RB
 HBL-010RFC:RFS-SiC-310:RedLight-ISFRST-RB
 HBL-010RFC:RFS-SiC-310:RedLight-NFRC-RB
 HBL-010RFC:RFS-SiC-310:RedLight-NLTCH-RB
 HBL-010RFC:RFS-SiC-310:RedLight-SVAL
-HBL-010RFC:RFS-SiC-310:RedLight-SVAL-INT
 HBL-010RFC:RFS-SiC-310:RedLight-SVAL-RB
-HBL-010RFC:RFS-SiC-310:RedLight-SVAL-SEQ
-HBL-010RFC:RFS-SiC-310:RedLight-TMSTMP
 HBL-010RFC:RFS-SiC-310:RedLight-VAL-RB
 HBL-010RFC:RFS-SiC-310:RedYellow
 HBL-010RFC:RFS-SiC-310:RedYellow-DIS
-HBL-010RFC:RFS-SiC-310:RedYellow-DIS-INT
 HBL-010RFC:RFS-SiC-310:RedYellow-DIS-RB
 HBL-010RFC:RFS-SiC-310:RedYellow-DTYP-RB
 HBL-010RFC:RFS-SiC-310:RedYellow-ERR-RB
 HBL-010RFC:RFS-SiC-310:RedYellow-FRC
-HBL-010RFC:RFS-SiC-310:RedYellow-FRC-INT
 HBL-010RFC:RFS-SiC-310:RedYellow-FRC-RB
-HBL-010RFC:RFS-SiC-310:RedYellow-FRC-SEQ
 HBL-010RFC:RFS-SiC-310:RedYellow-INT-RB
 HBL-010RFC:RFS-SiC-310:RedYellow-INVDO-RB
 HBL-010RFC:RFS-SiC-310:RedYellow-ISFRST-RB
 HBL-010RFC:RFS-SiC-310:RedYellow-NFRC-RB
 HBL-010RFC:RFS-SiC-310:RedYellow-NLTCH-RB
 HBL-010RFC:RFS-SiC-310:RedYellow-SVAL
-HBL-010RFC:RFS-SiC-310:RedYellow-SVAL-INT
 HBL-010RFC:RFS-SiC-310:RedYellow-SVAL-RB
-HBL-010RFC:RFS-SiC-310:RedYellow-SVAL-SEQ
-HBL-010RFC:RFS-SiC-310:RedYellow-TMSTMP
 HBL-010RFC:RFS-SiC-310:RedYellow-VAL-RB
-HBL-010RFC:RFS-SolPS-310-TMSTMP
 HBL-010RFC:RFS-SolPS-310:DTYP-RB
 HBL-010RFC:RFS-SolPS-310:ERR-RB
 HBL-010RFC:RFS-SolPS-310:FRC
-HBL-010RFC:RFS-SolPS-310:FRC-INT
 HBL-010RFC:RFS-SolPS-310:FRC-RB
 HBL-010RFC:RFS-SolPS-310:IHIGH
-HBL-010RFC:RFS-SolPS-310:IHIGH-INT
 HBL-010RFC:RFS-SolPS-310:IHIGH-RB
 HBL-010RFC:RFS-SolPS-310:IHIHI
-HBL-010RFC:RFS-SolPS-310:IHIHI-INT
 HBL-010RFC:RFS-SolPS-310:IHIHI-RB
 HBL-010RFC:RFS-SolPS-310:ILOLO
-HBL-010RFC:RFS-SolPS-310:ILOLO-INT
 HBL-010RFC:RFS-SolPS-310:ILOLO-RB
 HBL-010RFC:RFS-SolPS-310:ILOW
-HBL-010RFC:RFS-SolPS-310:ILOW-INT
 HBL-010RFC:RFS-SolPS-310:ILOW-RB
 HBL-010RFC:RFS-SolPS-310:IMAXSOL-RB
 HBL-010RFC:RFS-SolPS-310:IMON-RB
@@ -1734,68 +1195,46 @@ HBL-010RFC:RFS-SolPS-310:INT-RB
 HBL-010RFC:RFS-SolPS-310:IREG-RB
 HBL-010RFC:RFS-SolPS-310:ISFRST-RB
 HBL-010RFC:RFS-SolPS-310:ISP1
-HBL-010RFC:RFS-SolPS-310:ISP1-INT
 HBL-010RFC:RFS-SolPS-310:ISP1-RB
 HBL-010RFC:RFS-SolPS-310:ISVAL
-HBL-010RFC:RFS-SolPS-310:ISVAL-INT
 HBL-010RFC:RFS-SolPS-310:ISVAL-RB
 HBL-010RFC:RFS-SolPS-310:LOCREM-RB
 HBL-010RFC:RFS-SolPS-310:NFRC-RB
 HBL-010RFC:RFS-SolPS-310:NLTCH-RB
 HBL-010RFC:RFS-SolPS-310:ON-RB
 HBL-010RFC:RFS-SolPS-310:SFAULT
-HBL-010RFC:RFS-SolPS-310:SFAULT-INT
 HBL-010RFC:RFS-SolPS-310:SFAULT-RB
 HBL-010RFC:RFS-SolPS-310:SIREG
-HBL-010RFC:RFS-SolPS-310:SIREG-INT
-HBL-010RFC:RFS-SolPS-310:SIREG-RB
-HBL-010RFC:RFS-SolPS-310:SLOCREM
-HBL-010RFC:RFS-SolPS-310:SLOCREM-INT
-HBL-010RFC:RFS-SolPS-310:SLOCREM-RB
-HBL-010RFC:RFS-SolPS-310:SONST
-HBL-010RFC:RFS-SolPS-310:SONST-INT
 HBL-010RFC:RFS-SolPS-310:SONST-RB
 HBL-010RFC:RFS-SolPS-310:STARTED-RB
 HBL-010RFC:RFS-SolPS-310:STOPPED-RB
 HBL-010RFC:RFS-SolPS-310:UPTIMENOHV-RB
 HBL-010RFC:RFS-SolPS-310:VHIGH
-HBL-010RFC:RFS-SolPS-310:VHIGH-INT
 HBL-010RFC:RFS-SolPS-310:VHIGH-RB
 HBL-010RFC:RFS-SolPS-310:VHIHI
-HBL-010RFC:RFS-SolPS-310:VHIHI-INT
 HBL-010RFC:RFS-SolPS-310:VHIHI-RB
 HBL-010RFC:RFS-SolPS-310:VLOLO
-HBL-010RFC:RFS-SolPS-310:VLOLO-INT
 HBL-010RFC:RFS-SolPS-310:VLOLO-RB
 HBL-010RFC:RFS-SolPS-310:VLOW
-HBL-010RFC:RFS-SolPS-310:VLOW-INT
 HBL-010RFC:RFS-SolPS-310:VLOW-RB
 HBL-010RFC:RFS-SolPS-310:VMAXSOL-RB
 HBL-010RFC:RFS-SolPS-310:VMON-RB
 HBL-010RFC:RFS-SolPS-310:VSP1
-HBL-010RFC:RFS-SolPS-310:VSP1-INT
 HBL-010RFC:RFS-SolPS-310:VSP1-RB
 HBL-010RFC:RFS-SolPS-310:VSVAL
-HBL-010RFC:RFS-SolPS-310:VSVAL-INT
 HBL-010RFC:RFS-SolPS-310:VSVAL-RB
 HBL-010RFC:RFS-SolPS-310:WRN-RB
-HBL-010RFC:RFS-SolPS-320-TMSTMP
 HBL-010RFC:RFS-SolPS-320:DTYP-RB
 HBL-010RFC:RFS-SolPS-320:ERR-RB
 HBL-010RFC:RFS-SolPS-320:FRC
-HBL-010RFC:RFS-SolPS-320:FRC-INT
 HBL-010RFC:RFS-SolPS-320:FRC-RB
 HBL-010RFC:RFS-SolPS-320:IHIGH
-HBL-010RFC:RFS-SolPS-320:IHIGH-INT
 HBL-010RFC:RFS-SolPS-320:IHIGH-RB
 HBL-010RFC:RFS-SolPS-320:IHIHI
-HBL-010RFC:RFS-SolPS-320:IHIHI-INT
 HBL-010RFC:RFS-SolPS-320:IHIHI-RB
 HBL-010RFC:RFS-SolPS-320:ILOLO
-HBL-010RFC:RFS-SolPS-320:ILOLO-INT
 HBL-010RFC:RFS-SolPS-320:ILOLO-RB
 HBL-010RFC:RFS-SolPS-320:ILOW
-HBL-010RFC:RFS-SolPS-320:ILOW-INT
 HBL-010RFC:RFS-SolPS-320:ILOW-RB
 HBL-010RFC:RFS-SolPS-320:IMAXSOL-RB
 HBL-010RFC:RFS-SolPS-320:IMON-RB
@@ -1803,68 +1242,50 @@ HBL-010RFC:RFS-SolPS-320:INT-RB
 HBL-010RFC:RFS-SolPS-320:IREG-RB
 HBL-010RFC:RFS-SolPS-320:ISFRST-RB
 HBL-010RFC:RFS-SolPS-320:ISP1
-HBL-010RFC:RFS-SolPS-320:ISP1-INT
 HBL-010RFC:RFS-SolPS-320:ISP1-RB
 HBL-010RFC:RFS-SolPS-320:ISVAL
-HBL-010RFC:RFS-SolPS-320:ISVAL-INT
 HBL-010RFC:RFS-SolPS-320:ISVAL-RB
 HBL-010RFC:RFS-SolPS-320:LOCREM-RB
 HBL-010RFC:RFS-SolPS-320:NFRC-RB
 HBL-010RFC:RFS-SolPS-320:NLTCH-RB
 HBL-010RFC:RFS-SolPS-320:ON-RB
 HBL-010RFC:RFS-SolPS-320:SFAULT
-HBL-010RFC:RFS-SolPS-320:SFAULT-INT
 HBL-010RFC:RFS-SolPS-320:SFAULT-RB
 HBL-010RFC:RFS-SolPS-320:SIREG
-HBL-010RFC:RFS-SolPS-320:SIREG-INT
 HBL-010RFC:RFS-SolPS-320:SIREG-RB
 HBL-010RFC:RFS-SolPS-320:SLOCREM
-HBL-010RFC:RFS-SolPS-320:SLOCREM-INT
 HBL-010RFC:RFS-SolPS-320:SLOCREM-RB
 HBL-010RFC:RFS-SolPS-320:SONST
-HBL-010RFC:RFS-SolPS-320:SONST-INT
 HBL-010RFC:RFS-SolPS-320:SONST-RB
 HBL-010RFC:RFS-SolPS-320:STARTED-RB
 HBL-010RFC:RFS-SolPS-320:STOPPED-RB
 HBL-010RFC:RFS-SolPS-320:UPTIMENOHV-RB
 HBL-010RFC:RFS-SolPS-320:VHIGH
-HBL-010RFC:RFS-SolPS-320:VHIGH-INT
 HBL-010RFC:RFS-SolPS-320:VHIGH-RB
 HBL-010RFC:RFS-SolPS-320:VHIHI
-HBL-010RFC:RFS-SolPS-320:VHIHI-INT
 HBL-010RFC:RFS-SolPS-320:VHIHI-RB
 HBL-010RFC:RFS-SolPS-320:VLOLO
-HBL-010RFC:RFS-SolPS-320:VLOLO-INT
 HBL-010RFC:RFS-SolPS-320:VLOLO-RB
 HBL-010RFC:RFS-SolPS-320:VLOW
-HBL-010RFC:RFS-SolPS-320:VLOW-INT
 HBL-010RFC:RFS-SolPS-320:VLOW-RB
 HBL-010RFC:RFS-SolPS-320:VMAXSOL-RB
 HBL-010RFC:RFS-SolPS-320:VMON-RB
 HBL-010RFC:RFS-SolPS-320:VSP1
-HBL-010RFC:RFS-SolPS-320:VSP1-INT
 HBL-010RFC:RFS-SolPS-320:VSP1-RB
 HBL-010RFC:RFS-SolPS-320:VSVAL
-HBL-010RFC:RFS-SolPS-320:VSVAL-INT
 HBL-010RFC:RFS-SolPS-320:VSVAL-RB
 HBL-010RFC:RFS-SolPS-320:WRN-RB
-HBL-010RFC:RFS-SolPS-330-TMSTMP
 HBL-010RFC:RFS-SolPS-330:DTYP-RB
 HBL-010RFC:RFS-SolPS-330:ERR-RB
 HBL-010RFC:RFS-SolPS-330:FRC
-HBL-010RFC:RFS-SolPS-330:FRC-INT
 HBL-010RFC:RFS-SolPS-330:FRC-RB
 HBL-010RFC:RFS-SolPS-330:IHIGH
-HBL-010RFC:RFS-SolPS-330:IHIGH-INT
 HBL-010RFC:RFS-SolPS-330:IHIGH-RB
 HBL-010RFC:RFS-SolPS-330:IHIHI
-HBL-010RFC:RFS-SolPS-330:IHIHI-INT
 HBL-010RFC:RFS-SolPS-330:IHIHI-RB
 HBL-010RFC:RFS-SolPS-330:ILOLO
-HBL-010RFC:RFS-SolPS-330:ILOLO-INT
 HBL-010RFC:RFS-SolPS-330:ILOLO-RB
 HBL-010RFC:RFS-SolPS-330:ILOW
-HBL-010RFC:RFS-SolPS-330:ILOW-INT
 HBL-010RFC:RFS-SolPS-330:ILOW-RB
 HBL-010RFC:RFS-SolPS-330:IMAXSOL-RB
 HBL-010RFC:RFS-SolPS-330:IMON-RB
@@ -1872,195 +1293,129 @@ HBL-010RFC:RFS-SolPS-330:INT-RB
 HBL-010RFC:RFS-SolPS-330:IREG-RB
 HBL-010RFC:RFS-SolPS-330:ISFRST-RB
 HBL-010RFC:RFS-SolPS-330:ISP1
-HBL-010RFC:RFS-SolPS-330:ISP1-INT
 HBL-010RFC:RFS-SolPS-330:ISP1-RB
 HBL-010RFC:RFS-SolPS-330:ISVAL
-HBL-010RFC:RFS-SolPS-330:ISVAL-INT
 HBL-010RFC:RFS-SolPS-330:ISVAL-RB
 HBL-010RFC:RFS-SolPS-330:LOCREM-RB
 HBL-010RFC:RFS-SolPS-330:NFRC-RB
 HBL-010RFC:RFS-SolPS-330:NLTCH-RB
 HBL-010RFC:RFS-SolPS-330:ON-RB
 HBL-010RFC:RFS-SolPS-330:SFAULT
-HBL-010RFC:RFS-SolPS-330:SFAULT-INT
 HBL-010RFC:RFS-SolPS-330:SFAULT-RB
 HBL-010RFC:RFS-SolPS-330:SIREG
-HBL-010RFC:RFS-SolPS-330:SIREG-INT
 HBL-010RFC:RFS-SolPS-330:SIREG-RB
 HBL-010RFC:RFS-SolPS-330:SLOCREM
-HBL-010RFC:RFS-SolPS-330:SLOCREM-INT
 HBL-010RFC:RFS-SolPS-330:SLOCREM-RB
 HBL-010RFC:RFS-SolPS-330:SONST
-HBL-010RFC:RFS-SolPS-330:SONST-INT
 HBL-010RFC:RFS-SolPS-330:SONST-RB
 HBL-010RFC:RFS-SolPS-330:STARTED-RB
 HBL-010RFC:RFS-SolPS-330:STOPPED-RB
 HBL-010RFC:RFS-SolPS-330:UPTIMENOHV-RB
 HBL-010RFC:RFS-SolPS-330:VHIGH
-HBL-010RFC:RFS-SolPS-330:VHIGH-INT
 HBL-010RFC:RFS-SolPS-330:VHIGH-RB
 HBL-010RFC:RFS-SolPS-330:VHIHI
-HBL-010RFC:RFS-SolPS-330:VHIHI-INT
 HBL-010RFC:RFS-SolPS-330:VHIHI-RB
 HBL-010RFC:RFS-SolPS-330:VLOLO
-HBL-010RFC:RFS-SolPS-330:VLOLO-INT
 HBL-010RFC:RFS-SolPS-330:VLOLO-RB
 HBL-010RFC:RFS-SolPS-330:VLOW
-HBL-010RFC:RFS-SolPS-330:VLOW-INT
 HBL-010RFC:RFS-SolPS-330:VLOW-RB
 HBL-010RFC:RFS-SolPS-330:VMAXSOL-RB
 HBL-010RFC:RFS-SolPS-330:VMON-RB
 HBL-010RFC:RFS-SolPS-330:VSP1
-HBL-010RFC:RFS-SolPS-330:VSP1-INT
 HBL-010RFC:RFS-SolPS-330:VSP1-RB
 HBL-010RFC:RFS-SolPS-330:VSVAL
-HBL-010RFC:RFS-SolPS-330:VSVAL-INT
 HBL-010RFC:RFS-SolPS-330:VSVAL-RB
 HBL-010RFC:RFS-SolPS-330:WRN-RB
 HBL-010RFC:RFS-TCU-310:ES
 HBL-010RFC:RFS-TCU-310:ES-DIS
-HBL-010RFC:RFS-TCU-310:ES-DIS-INT
 HBL-010RFC:RFS-TCU-310:ES-DIS-RB
 HBL-010RFC:RFS-TCU-310:ES-DTYP-RB
 HBL-010RFC:RFS-TCU-310:ES-ERR-RB
 HBL-010RFC:RFS-TCU-310:ES-FRC
-HBL-010RFC:RFS-TCU-310:ES-FRC-INT
 HBL-010RFC:RFS-TCU-310:ES-FRC-RB
-HBL-010RFC:RFS-TCU-310:ES-FRC-SEQ
 HBL-010RFC:RFS-TCU-310:ES-INT-RB
 HBL-010RFC:RFS-TCU-310:ES-INVDO-RB
 HBL-010RFC:RFS-TCU-310:ES-ISFRST-RB
 HBL-010RFC:RFS-TCU-310:ES-NFRC-RB
 HBL-010RFC:RFS-TCU-310:ES-NLTCH-RB
 HBL-010RFC:RFS-TCU-310:ES-SVAL
-HBL-010RFC:RFS-TCU-310:ES-SVAL-INT
 HBL-010RFC:RFS-TCU-310:ES-SVAL-RB
-HBL-010RFC:RFS-TCU-310:ES-SVAL-SEQ
-HBL-010RFC:RFS-TCU-310:ES-TMSTMP
 HBL-010RFC:RFS-TCU-310:ES-VAL-RB
 HBL-010RFC:RFS-VacPS-310:HVON
 HBL-010RFC:RFS-VacPS-310:HVON-DIS
-HBL-010RFC:RFS-VacPS-310:HVON-DIS-INT
 HBL-010RFC:RFS-VacPS-310:HVON-DIS-RB
 HBL-010RFC:RFS-VacPS-310:HVON-DTYP-RB
 HBL-010RFC:RFS-VacPS-310:HVON-ERR-RB
 HBL-010RFC:RFS-VacPS-310:HVON-FRC
-HBL-010RFC:RFS-VacPS-310:HVON-FRC-INT
 HBL-010RFC:RFS-VacPS-310:HVON-FRC-RB
-HBL-010RFC:RFS-VacPS-310:HVON-FRC-SEQ
 HBL-010RFC:RFS-VacPS-310:HVON-INT-RB
 HBL-010RFC:RFS-VacPS-310:HVON-INVDO-RB
 HBL-010RFC:RFS-VacPS-310:HVON-ISFRST-RB
 HBL-010RFC:RFS-VacPS-310:HVON-NFRC-RB
 HBL-010RFC:RFS-VacPS-310:HVON-NLTCH-RB
 HBL-010RFC:RFS-VacPS-310:HVON-SVAL
-HBL-010RFC:RFS-VacPS-310:HVON-SVAL-INT
 HBL-010RFC:RFS-VacPS-310:HVON-SVAL-RB
-HBL-010RFC:RFS-VacPS-310:HVON-SVAL-SEQ
-HBL-010RFC:RFS-VacPS-310:HVON-TMSTMP
 HBL-010RFC:RFS-VacPS-310:HVON-VAL-RB
 HBL-010RFC:RFS-VacPS-310:I
 HBL-010RFC:RFS-VacPS-310:I-AOFF
-HBL-010RFC:RFS-VacPS-310:I-AOFF-INT
 HBL-010RFC:RFS-VacPS-310:I-AOFF-RB
 HBL-010RFC:RFS-VacPS-310:I-DIS
-HBL-010RFC:RFS-VacPS-310:I-DIS-INT
 HBL-010RFC:RFS-VacPS-310:I-DIS-RB
 HBL-010RFC:RFS-VacPS-310:I-DTYP-RB
 HBL-010RFC:RFS-VacPS-310:I-ERR-RB
 HBL-010RFC:RFS-VacPS-310:I-FRC
-HBL-010RFC:RFS-VacPS-310:I-FRC-INT
 HBL-010RFC:RFS-VacPS-310:I-FRC-RB
-HBL-010RFC:RFS-VacPS-310:I-FRC-SEQ
 HBL-010RFC:RFS-VacPS-310:I-HIALR-RB
 HBL-010RFC:RFS-VacPS-310:I-HIGH
-HBL-010RFC:RFS-VacPS-310:I-HIGH-INT
 HBL-010RFC:RFS-VacPS-310:I-HIGH-RB
-HBL-010RFC:RFS-VacPS-310:I-HIGH-SEQ
 HBL-010RFC:RFS-VacPS-310:I-HIHI
-HBL-010RFC:RFS-VacPS-310:I-HIHI-INT
 HBL-010RFC:RFS-VacPS-310:I-HIHI-RB
-HBL-010RFC:RFS-VacPS-310:I-HIHI-SEQ
 HBL-010RFC:RFS-VacPS-310:I-ISFRST-RB
 HBL-010RFC:RFS-VacPS-310:I-Ilck-RB
 HBL-010RFC:RFS-VacPS-310:I-LOALR-RB
 HBL-010RFC:RFS-VacPS-310:I-LOLO
-HBL-010RFC:RFS-VacPS-310:I-LOLO-INT
 HBL-010RFC:RFS-VacPS-310:I-LOLO-RB
-HBL-010RFC:RFS-VacPS-310:I-LOLO-SEQ
 HBL-010RFC:RFS-VacPS-310:I-LOW
-HBL-010RFC:RFS-VacPS-310:I-LOW-INT
 HBL-010RFC:RFS-VacPS-310:I-LOW-RB
-HBL-010RFC:RFS-VacPS-310:I-LOW-SEQ
 HBL-010RFC:RFS-VacPS-310:I-NFRC-RB
 HBL-010RFC:RFS-VacPS-310:I-NLTCH-RB
 HBL-010RFC:RFS-VacPS-310:I-SVAL
-HBL-010RFC:RFS-VacPS-310:I-SVAL-INT
 HBL-010RFC:RFS-VacPS-310:I-SVAL-RB
-HBL-010RFC:RFS-VacPS-310:I-SVAL-SEQ
-HBL-010RFC:RFS-VacPS-310:I-TMSTMP
 HBL-010RFC:RFS-VacPS-310:I-VAL-RB
 HBL-010RFC:RFS-VacPS-310:I-WRN-RB
 HBL-010RFC:RFS-VacPS-320:HVON
 HBL-010RFC:RFS-VacPS-320:HVON-DIS
-HBL-010RFC:RFS-VacPS-320:HVON-DIS-INT
 HBL-010RFC:RFS-VacPS-320:HVON-DIS-RB
 HBL-010RFC:RFS-VacPS-320:HVON-DTYP-RB
 HBL-010RFC:RFS-VacPS-320:HVON-ERR-RB
 HBL-010RFC:RFS-VacPS-320:HVON-FRC
-HBL-010RFC:RFS-VacPS-320:HVON-FRC-INT
 HBL-010RFC:RFS-VacPS-320:HVON-FRC-RB
-HBL-010RFC:RFS-VacPS-320:HVON-FRC-SEQ
 HBL-010RFC:RFS-VacPS-320:HVON-INT-RB
 HBL-010RFC:RFS-VacPS-320:HVON-INVDO-RB
 HBL-010RFC:RFS-VacPS-320:HVON-ISFRST-RB
 HBL-010RFC:RFS-VacPS-320:HVON-NFRC-RB
 HBL-010RFC:RFS-VacPS-320:HVON-NLTCH-RB
 HBL-010RFC:RFS-VacPS-320:HVON-SVAL
-HBL-010RFC:RFS-VacPS-320:HVON-SVAL-INT
 HBL-010RFC:RFS-VacPS-320:HVON-SVAL-RB
-HBL-010RFC:RFS-VacPS-320:HVON-SVAL-SEQ
-HBL-010RFC:RFS-VacPS-320:HVON-TMSTMP
 HBL-010RFC:RFS-VacPS-320:HVON-VAL-RB
-HBL-010RFC:RFS-VacPS-320:I
-HBL-010RFC:RFS-VacPS-320:I-AOFF
-HBL-010RFC:RFS-VacPS-320:I-AOFF-INT
-HBL-010RFC:RFS-VacPS-320:I-AOFF-RB
-HBL-010RFC:RFS-VacPS-320:I-DIS
-HBL-010RFC:RFS-VacPS-320:I-DIS-INT
-HBL-010RFC:RFS-VacPS-320:I-DIS-RB
-HBL-010RFC:RFS-VacPS-320:I-DTYP-RB
 HBL-010RFC:RFS-VacPS-320:I-ERR-RB
 HBL-010RFC:RFS-VacPS-320:I-FRC
-HBL-010RFC:RFS-VacPS-320:I-FRC-INT
 HBL-010RFC:RFS-VacPS-320:I-FRC-RB
-HBL-010RFC:RFS-VacPS-320:I-FRC-SEQ
 HBL-010RFC:RFS-VacPS-320:I-HIALR-RB
 HBL-010RFC:RFS-VacPS-320:I-HIGH
-HBL-010RFC:RFS-VacPS-320:I-HIGH-INT
 HBL-010RFC:RFS-VacPS-320:I-HIGH-RB
-HBL-010RFC:RFS-VacPS-320:I-HIGH-SEQ
 HBL-010RFC:RFS-VacPS-320:I-HIHI
-HBL-010RFC:RFS-VacPS-320:I-HIHI-INT
 HBL-010RFC:RFS-VacPS-320:I-HIHI-RB
-HBL-010RFC:RFS-VacPS-320:I-HIHI-SEQ
 HBL-010RFC:RFS-VacPS-320:I-ISFRST-RB
 HBL-010RFC:RFS-VacPS-320:I-Ilck-RB
 HBL-010RFC:RFS-VacPS-320:I-LOALR-RB
 HBL-010RFC:RFS-VacPS-320:I-LOLO
-HBL-010RFC:RFS-VacPS-320:I-LOLO-INT
 HBL-010RFC:RFS-VacPS-320:I-LOLO-RB
-HBL-010RFC:RFS-VacPS-320:I-LOLO-SEQ
 HBL-010RFC:RFS-VacPS-320:I-LOW
-HBL-010RFC:RFS-VacPS-320:I-LOW-INT
 HBL-010RFC:RFS-VacPS-320:I-LOW-RB
-HBL-010RFC:RFS-VacPS-320:I-LOW-SEQ
 HBL-010RFC:RFS-VacPS-320:I-NFRC-RB
 HBL-010RFC:RFS-VacPS-320:I-NLTCH-RB
 HBL-010RFC:RFS-VacPS-320:I-SVAL
-HBL-010RFC:RFS-VacPS-320:I-SVAL-INT
 HBL-010RFC:RFS-VacPS-320:I-SVAL-RB
-HBL-010RFC:RFS-VacPS-320:I-SVAL-SEQ
-HBL-010RFC:RFS-VacPS-320:I-TMSTMP
 HBL-010RFC:RFS-VacPS-320:I-VAL-RB
 HBL-010RFC:RFS-VacPS-320:I-WRN-RB
diff --git a/files/HBL-010RFC_SC-IOC-402.archive b/files/HBL-010RFC_SC-IOC-402.archive
index 5a68d76..33c97e5 100644
--- a/files/HBL-010RFC_SC-IOC-402.archive
+++ b/files/HBL-010RFC_SC-IOC-402.archive
@@ -260,51 +260,6 @@ HBL-010RFC:RFS-FIM-401:RF10-Wave-Avg
 HBL-010RFC:RFS-FIM-401:RF10-Wave-Low
 HBL-010RFC:RFS-FIM-401:RF10-Wave-High
 HBL-010RFC:RFS-FIM-401:RF10-Wave-Med
-HBL-010RFC:RFS-Mod-410:Vol-Wave-PM
-HBL-010RFC:RFS-Mod-410:Cur-Wave-PM
-HBL-010RFC:RFS-SolPS-410:Cur-Wave-PM
-HBL-010RFC:RFS-SolPS-420:Cur-Wave-PM
-HBL-010RFC:RFS-FIM-401:AI5-Wave-PM
-HBL-010RFC:RFS-EPR-410:Cur-Wave-PM
-HBL-010RFC:RFS-FIM-401:AI7-Wave-PM
-HBL-010RFC:RFS-FIM-401:AI8-Wave-PM
-HBL-010RFC:RFS-FIM-401:AI9-Wave-PM
-HBL-010RFC:RFS-FIM-401:AI10-Wave-PM
-HBL-010RFC:RFS-PAmp-410:PwrFwd-Wave-PM
-HBL-010RFC:RFS-Kly-410:PwrFwd-Wave-PM
-HBL-010RFC:RFS-Load-420:PwrFwd-Wave-PM
-HBL-010RFC:RFS-Kly-410:PwrRfl-Wave-PM
-HBL-010RFC:RFS-Cav-410:PwrFwd-Wave-PM
-HBL-010RFC:RFS-Cav-410:PwrRfl-Wave-PM
-HBL-010RFC:RFS-Load-420:PwrRfl-Wave-PM
-HBL-010RFC:RFS-Cav-410:Fld-Wave-PM
-HBL-010RFC:RFS-FIM-401:RF9-Wave-PM
-HBL-010RFC:RFS-FIM-401:RF10-Wave-PM
-HBL-010RFC:RFS-SIM-410:HvEna-Wave-PM
-HBL-010RFC:RFS-SIM-410:RfEna-Wave-PM
-HBL-010RFC:RFS-Mod-410:PCcon-Wave-PM
-HBL-010RFC:RFS-Mod-410:Ready-Wave-PM
-HBL-010RFC:RFS-VacPS-410:I-SP-Wave-PM
-HBL-010RFC:RFS-VacPS-420:I-SP-Wave-PM
-HBL-010RFC:RFS-FIM-401:DI7-Wave-PM
-HBL-010RFC:RFS-FIM-401:DI8-Wave-PM
-HBL-010RFC:RFS-VacCav-410:Status-Wave-PM
-HBL-010RFC:RFS-FIM-401:DI10-Wave-PM
-HBL-010RFC:RFS-VacBody-410:Status-Wave-PM
-HBL-010RFC:RFS-FIM-401:DI12-Wave-PM
-HBL-010RFC:RFS-FIM-401:DI13-Wave-PM
-HBL-010RFC:RFS-FIM-401:DI14-Wave-PM
-HBL-010RFC:RFS-ADG-410:IlckStatus-Wave-PM
-HBL-010RFC:RFS-ADG-410:PwrFail-Wave-PM
-HBL-010RFC:RFS-FIM-401:DI17-Wave-PM
-HBL-010RFC:RFS-FIM-401:DI18-Wave-PM
-HBL-010RFC:RFS-FIM-401:DI19-Wave-PM
-HBL-010RFC:RFS-FIM-401:DI20-Wave-PM
-HBL-010RFC:RFS-LLRF-401:Status-Wave-PM
-HBL-010RFC:RFS-FIM-401:RP1-Wave-IlckPM
-HBL-010RFC:RFS-FIM-401:RP2-Wave-IlckPM
-HBL-010RFC:RFS-FIM-401:CD1-Wave-IlckPM
-HBL-010RFC:RFS-FIM-401:CD2-Wave-IlckPM
 HBL-010RFC:RFS-FIM-401:FastReset-IlckCnt
 HBL-010RFC:RFS-FIM-401:RF1-FastRst-IlckCnt
 HBL-010RFC:RFS-FIM-401:RF2-FastRst-IlckCnt
diff --git a/files/HBL-020RFC_SC-IOC-102.archive b/files/HBL-020RFC_SC-IOC-102.archive
index 6b6255e..2b9a39a 100644
--- a/files/HBL-020RFC_SC-IOC-102.archive
+++ b/files/HBL-020RFC_SC-IOC-102.archive
@@ -2,12 +2,10 @@ HBL-020RFC:RFS-ADG-110:IlckStatus-DIlckMode-RB
 HBL-020RFC:RFS-ADG-110:IlckStatus-Ilck-RB
 HBL-020RFC:RFS-ADG-110:IlckStatus-Input-RB
 HBL-020RFC:RFS-ADG-110:IlckStatus-isFirstIlck
-HBL-020RFC:RFS-ADG-110:IlckStatus-Wave-PM
 HBL-020RFC:RFS-ADG-110:PwrFail-DIlckMode-RB
 HBL-020RFC:RFS-ADG-110:PwrFail-Ilck-RB
 HBL-020RFC:RFS-ADG-110:PwrFail-Input-RB
 HBL-020RFC:RFS-ADG-110:PwrFail-isFirstIlck
-HBL-020RFC:RFS-ADG-110:PwrFail-Wave-PM
 HBL-020RFC:RFS-Cav-110:Fld-DevMonEval-RB
 HBL-020RFC:RFS-Cav-110:Fld-DevMonFact-RB
 HBL-020RFC:RFS-Cav-110:Fld-DevMonIlck-RB
@@ -46,7 +44,6 @@ HBL-020RFC:RFS-Cav-110:Fld-Wave-Avg
 HBL-020RFC:RFS-Cav-110:Fld-Wave-High
 HBL-020RFC:RFS-Cav-110:Fld-Wave-Low
 HBL-020RFC:RFS-Cav-110:Fld-Wave-Med
-HBL-020RFC:RFS-Cav-110:Fld-Wave-PM
 HBL-020RFC:RFS-Cav-110:PwrFwd-DevMonEval-RB
 HBL-020RFC:RFS-Cav-110:PwrFwd-DevMonFact-RB
 HBL-020RFC:RFS-Cav-110:PwrFwd-DevMonIlck-RB
@@ -85,7 +82,6 @@ HBL-020RFC:RFS-Cav-110:PwrFwd-Wave-Avg
 HBL-020RFC:RFS-Cav-110:PwrFwd-Wave-High
 HBL-020RFC:RFS-Cav-110:PwrFwd-Wave-Low
 HBL-020RFC:RFS-Cav-110:PwrFwd-Wave-Med
-HBL-020RFC:RFS-Cav-110:PwrFwd-Wave-PM
 HBL-020RFC:RFS-Cav-110:PwrRfl-DevMonEval-RB
 HBL-020RFC:RFS-Cav-110:PwrRfl-DevMonFact-RB
 HBL-020RFC:RFS-Cav-110:PwrRfl-DevMonIlck-RB
@@ -124,7 +120,6 @@ HBL-020RFC:RFS-Cav-110:PwrRfl-Wave-Avg
 HBL-020RFC:RFS-Cav-110:PwrRfl-Wave-High
 HBL-020RFC:RFS-Cav-110:PwrRfl-Wave-Low
 HBL-020RFC:RFS-Cav-110:PwrRfl-Wave-Med
-HBL-020RFC:RFS-Cav-110:PwrRfl-Wave-PM
 HBL-020RFC:RFS-EPR-110:Cur-DevMonEval-RB
 HBL-020RFC:RFS-EPR-110:Cur-DevMonFact-RB
 HBL-020RFC:RFS-EPR-110:Cur-DevMonIlck-RB
@@ -163,7 +158,6 @@ HBL-020RFC:RFS-EPR-110:Cur-Wave-Avg
 HBL-020RFC:RFS-EPR-110:Cur-Wave-High
 HBL-020RFC:RFS-EPR-110:Cur-Wave-Low
 HBL-020RFC:RFS-EPR-110:Cur-Wave-Med
-HBL-020RFC:RFS-EPR-110:Cur-Wave-PM
 HBL-020RFC:RFS-FIM-101:AI1-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-101:AI1-HVON-En-RB
 HBL-020RFC:RFS-FIM-101:AI1-HVON-Precond
@@ -214,7 +208,6 @@ HBL-020RFC:RFS-FIM-101:AI10-Wave-Avg
 HBL-020RFC:RFS-FIM-101:AI10-Wave-High
 HBL-020RFC:RFS-FIM-101:AI10-Wave-Low
 HBL-020RFC:RFS-FIM-101:AI10-Wave-Med
-HBL-020RFC:RFS-FIM-101:AI10-Wave-PM
 HBL-020RFC:RFS-FIM-101:AI2-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-101:AI2-HVON-En-RB
 HBL-020RFC:RFS-FIM-101:AI2-HVON-Precond
@@ -277,7 +270,6 @@ HBL-020RFC:RFS-FIM-101:AI5-Wave-Avg
 HBL-020RFC:RFS-FIM-101:AI5-Wave-High
 HBL-020RFC:RFS-FIM-101:AI5-Wave-Low
 HBL-020RFC:RFS-FIM-101:AI5-Wave-Med
-HBL-020RFC:RFS-FIM-101:AI5-Wave-PM
 HBL-020RFC:RFS-FIM-101:AI6-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-101:AI6-HVON-En-RB
 HBL-020RFC:RFS-FIM-101:AI6-HVON-Precond
@@ -328,7 +320,6 @@ HBL-020RFC:RFS-FIM-101:AI7-Wave-Avg
 HBL-020RFC:RFS-FIM-101:AI7-Wave-High
 HBL-020RFC:RFS-FIM-101:AI7-Wave-Low
 HBL-020RFC:RFS-FIM-101:AI7-Wave-Med
-HBL-020RFC:RFS-FIM-101:AI7-Wave-PM
 HBL-020RFC:RFS-FIM-101:AI8-DevMonEval-RB
 HBL-020RFC:RFS-FIM-101:AI8-DevMonFact-RB
 HBL-020RFC:RFS-FIM-101:AI8-DevMonIlck-RB
@@ -373,7 +364,6 @@ HBL-020RFC:RFS-FIM-101:AI8-Wave-Avg
 HBL-020RFC:RFS-FIM-101:AI8-Wave-High
 HBL-020RFC:RFS-FIM-101:AI8-Wave-Low
 HBL-020RFC:RFS-FIM-101:AI8-Wave-Med
-HBL-020RFC:RFS-FIM-101:AI8-Wave-PM
 HBL-020RFC:RFS-FIM-101:AI9-DevMonEval-RB
 HBL-020RFC:RFS-FIM-101:AI9-DevMonFact-RB
 HBL-020RFC:RFS-FIM-101:AI9-DevMonIlck-RB
@@ -418,7 +408,6 @@ HBL-020RFC:RFS-FIM-101:AI9-Wave-Avg
 HBL-020RFC:RFS-FIM-101:AI9-Wave-High
 HBL-020RFC:RFS-FIM-101:AI9-Wave-Low
 HBL-020RFC:RFS-FIM-101:AI9-Wave-Med
-HBL-020RFC:RFS-FIM-101:AI9-Wave-PM
 HBL-020RFC:RFS-FIM-101:CD1-DevFactor-RB
 HBL-020RFC:RFS-FIM-101:CD1-DevPeriod-RB
 HBL-020RFC:RFS-FIM-101:CD1-FastRst-IlckCnt
@@ -440,7 +429,6 @@ HBL-020RFC:RFS-FIM-101:CD1-RFON-En-RB
 HBL-020RFC:RFS-FIM-101:CD1-RFON-Precond
 HBL-020RFC:RFS-FIM-101:CD1-TrigSel-RB
 HBL-020RFC:RFS-FIM-101:CD1-TrigThre-RB
-HBL-020RFC:RFS-FIM-101:CD1-Wave-IlckPM
 HBL-020RFC:RFS-FIM-101:CD2-DevFactor-RB
 HBL-020RFC:RFS-FIM-101:CD2-DevPeriod-RB
 HBL-020RFC:RFS-FIM-101:CD2-FastRst-IlckCnt
@@ -462,7 +450,6 @@ HBL-020RFC:RFS-FIM-101:CD2-RFON-En-RB
 HBL-020RFC:RFS-FIM-101:CD2-RFON-Precond
 HBL-020RFC:RFS-FIM-101:CD2-TrigSel-RB
 HBL-020RFC:RFS-FIM-101:CD2-TrigThre-RB
-HBL-020RFC:RFS-FIM-101:CD2-Wave-IlckPM
 HBL-020RFC:RFS-FIM-101:DI1-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-101:DI1-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-101:DI1-HVON-En-RB
@@ -481,7 +468,6 @@ HBL-020RFC:RFS-FIM-101:DI10-Input-RB
 HBL-020RFC:RFS-FIM-101:DI10-isFirstIlck
 HBL-020RFC:RFS-FIM-101:DI10-RFON-En-RB
 HBL-020RFC:RFS-FIM-101:DI10-RFON-Precond
-HBL-020RFC:RFS-FIM-101:DI10-Wave-PM
 HBL-020RFC:RFS-FIM-101:DI11-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-101:DI11-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-101:DI11-HVON-En-RB
@@ -500,7 +486,6 @@ HBL-020RFC:RFS-FIM-101:DI12-Input-RB
 HBL-020RFC:RFS-FIM-101:DI12-isFirstIlck
 HBL-020RFC:RFS-FIM-101:DI12-RFON-En-RB
 HBL-020RFC:RFS-FIM-101:DI12-RFON-Precond
-HBL-020RFC:RFS-FIM-101:DI12-Wave-PM
 HBL-020RFC:RFS-FIM-101:DI13-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-101:DI13-DIlckMode-RB
 HBL-020RFC:RFS-FIM-101:DI13-FastRst-IlckCnt
@@ -512,7 +497,6 @@ HBL-020RFC:RFS-FIM-101:DI13-Input-RB
 HBL-020RFC:RFS-FIM-101:DI13-isFirstIlck
 HBL-020RFC:RFS-FIM-101:DI13-RFON-En-RB
 HBL-020RFC:RFS-FIM-101:DI13-RFON-Precond
-HBL-020RFC:RFS-FIM-101:DI13-Wave-PM
 HBL-020RFC:RFS-FIM-101:DI14-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-101:DI14-DIlckMode-RB
 HBL-020RFC:RFS-FIM-101:DI14-FastRst-IlckCnt
@@ -524,7 +508,6 @@ HBL-020RFC:RFS-FIM-101:DI14-Input-RB
 HBL-020RFC:RFS-FIM-101:DI14-isFirstIlck
 HBL-020RFC:RFS-FIM-101:DI14-RFON-En-RB
 HBL-020RFC:RFS-FIM-101:DI14-RFON-Precond
-HBL-020RFC:RFS-FIM-101:DI14-Wave-PM
 HBL-020RFC:RFS-FIM-101:DI15-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-101:DI15-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-101:DI15-HVON-En-RB
@@ -550,7 +533,6 @@ HBL-020RFC:RFS-FIM-101:DI17-Input-RB
 HBL-020RFC:RFS-FIM-101:DI17-isFirstIlck
 HBL-020RFC:RFS-FIM-101:DI17-RFON-En-RB
 HBL-020RFC:RFS-FIM-101:DI17-RFON-Precond
-HBL-020RFC:RFS-FIM-101:DI17-Wave-PM
 HBL-020RFC:RFS-FIM-101:DI18-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-101:DI18-DIlckMode-RB
 HBL-020RFC:RFS-FIM-101:DI18-FastRst-IlckCnt
@@ -562,7 +544,6 @@ HBL-020RFC:RFS-FIM-101:DI18-Input-RB
 HBL-020RFC:RFS-FIM-101:DI18-isFirstIlck
 HBL-020RFC:RFS-FIM-101:DI18-RFON-En-RB
 HBL-020RFC:RFS-FIM-101:DI18-RFON-Precond
-HBL-020RFC:RFS-FIM-101:DI18-Wave-PM
 HBL-020RFC:RFS-FIM-101:DI19-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-101:DI19-DIlckMode-RB
 HBL-020RFC:RFS-FIM-101:DI19-FastRst-IlckCnt
@@ -574,7 +555,6 @@ HBL-020RFC:RFS-FIM-101:DI19-Input-RB
 HBL-020RFC:RFS-FIM-101:DI19-isFirstIlck
 HBL-020RFC:RFS-FIM-101:DI19-RFON-En-RB
 HBL-020RFC:RFS-FIM-101:DI19-RFON-Precond
-HBL-020RFC:RFS-FIM-101:DI19-Wave-PM
 HBL-020RFC:RFS-FIM-101:DI2-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-101:DI2-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-101:DI2-HVON-En-RB
@@ -593,7 +573,6 @@ HBL-020RFC:RFS-FIM-101:DI20-Input-RB
 HBL-020RFC:RFS-FIM-101:DI20-isFirstIlck
 HBL-020RFC:RFS-FIM-101:DI20-RFON-En-RB
 HBL-020RFC:RFS-FIM-101:DI20-RFON-Precond
-HBL-020RFC:RFS-FIM-101:DI20-Wave-PM
 HBL-020RFC:RFS-FIM-101:DI21-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-101:DI21-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-101:DI21-HVON-En-RB
@@ -640,7 +619,6 @@ HBL-020RFC:RFS-FIM-101:DI7-Input-RB
 HBL-020RFC:RFS-FIM-101:DI7-isFirstIlck
 HBL-020RFC:RFS-FIM-101:DI7-RFON-En-RB
 HBL-020RFC:RFS-FIM-101:DI7-RFON-Precond
-HBL-020RFC:RFS-FIM-101:DI7-Wave-PM
 HBL-020RFC:RFS-FIM-101:DI8-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-101:DI8-DIlckMode-RB
 HBL-020RFC:RFS-FIM-101:DI8-FastRst-IlckCnt
@@ -652,7 +630,6 @@ HBL-020RFC:RFS-FIM-101:DI8-Input-RB
 HBL-020RFC:RFS-FIM-101:DI8-isFirstIlck
 HBL-020RFC:RFS-FIM-101:DI8-RFON-En-RB
 HBL-020RFC:RFS-FIM-101:DI8-RFON-Precond
-HBL-020RFC:RFS-FIM-101:DI8-Wave-PM
 HBL-020RFC:RFS-FIM-101:DI9-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-101:DI9-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-101:DI9-HVON-En-RB
@@ -716,7 +693,6 @@ HBL-020RFC:RFS-FIM-101:RF10-Wave-Avg
 HBL-020RFC:RFS-FIM-101:RF10-Wave-High
 HBL-020RFC:RFS-FIM-101:RF10-Wave-Low
 HBL-020RFC:RFS-FIM-101:RF10-Wave-Med
-HBL-020RFC:RFS-FIM-101:RF10-Wave-PM
 HBL-020RFC:RFS-FIM-101:RF2-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-101:RF2-HVON-En-RB
 HBL-020RFC:RFS-FIM-101:RF2-HVON-Precond
@@ -803,7 +779,6 @@ HBL-020RFC:RFS-FIM-101:RF9-Wave-Avg
 HBL-020RFC:RFS-FIM-101:RF9-Wave-High
 HBL-020RFC:RFS-FIM-101:RF9-Wave-Low
 HBL-020RFC:RFS-FIM-101:RF9-Wave-Med
-HBL-020RFC:RFS-FIM-101:RF9-Wave-PM
 HBL-020RFC:RFS-FIM-101:RFON-Precond
 HBL-020RFC:RFS-FIM-101:RP1-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-101:RP1-HVON-En-RB
@@ -824,7 +799,6 @@ HBL-020RFC:RFS-FIM-101:RP1-RFON-En-RB
 HBL-020RFC:RFS-FIM-101:RP1-RFON-Precond
 HBL-020RFC:RFS-FIM-101:RP1-TrigSel-RB
 HBL-020RFC:RFS-FIM-101:RP1-TrigThre-RB
-HBL-020RFC:RFS-FIM-101:RP1-Wave-IlckPM
 HBL-020RFC:RFS-FIM-101:RP2-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-101:RP2-HVON-En-RB
 HBL-020RFC:RFS-FIM-101:RP2-HVON-Precond
@@ -844,7 +818,6 @@ HBL-020RFC:RFS-FIM-101:RP2-RFON-En-RB
 HBL-020RFC:RFS-FIM-101:RP2-RFON-Precond
 HBL-020RFC:RFS-FIM-101:RP2-TrigSel-RB
 HBL-020RFC:RFS-FIM-101:RP2-TrigThre-RB
-HBL-020RFC:RFS-FIM-101:RP2-Wave-IlckPM
 HBL-020RFC:RFS-FIM-101:TriggerLine-RB
 HBL-020RFC:RFS-Kly-110:PwrFwd-DevMonEval-RB
 HBL-020RFC:RFS-Kly-110:PwrFwd-DevMonFact-RB
@@ -884,7 +857,6 @@ HBL-020RFC:RFS-Kly-110:PwrFwd-Wave-Avg
 HBL-020RFC:RFS-Kly-110:PwrFwd-Wave-High
 HBL-020RFC:RFS-Kly-110:PwrFwd-Wave-Low
 HBL-020RFC:RFS-Kly-110:PwrFwd-Wave-Med
-HBL-020RFC:RFS-Kly-110:PwrFwd-Wave-PM
 HBL-020RFC:RFS-Kly-110:PwrRfl-DevMonEval-RB
 HBL-020RFC:RFS-Kly-110:PwrRfl-DevMonFact-RB
 HBL-020RFC:RFS-Kly-110:PwrRfl-DevMonIlck-RB
@@ -923,12 +895,10 @@ HBL-020RFC:RFS-Kly-110:PwrRfl-Wave-Avg
 HBL-020RFC:RFS-Kly-110:PwrRfl-Wave-High
 HBL-020RFC:RFS-Kly-110:PwrRfl-Wave-Low
 HBL-020RFC:RFS-Kly-110:PwrRfl-Wave-Med
-HBL-020RFC:RFS-Kly-110:PwrRfl-Wave-PM
 HBL-020RFC:RFS-LLRF-101:Status-DIlckMode-RB
 HBL-020RFC:RFS-LLRF-101:Status-Ilck-RB
 HBL-020RFC:RFS-LLRF-101:Status-Input-RB
 HBL-020RFC:RFS-LLRF-101:Status-isFirstIlck
-HBL-020RFC:RFS-LLRF-101:Status-Wave-PM
 HBL-020RFC:RFS-Load-120:PwrFwd-DevMonEval-RB
 HBL-020RFC:RFS-Load-120:PwrFwd-DevMonFact-RB
 HBL-020RFC:RFS-Load-120:PwrFwd-DevMonIlck-RB
@@ -967,7 +937,6 @@ HBL-020RFC:RFS-Load-120:PwrFwd-Wave-Avg
 HBL-020RFC:RFS-Load-120:PwrFwd-Wave-High
 HBL-020RFC:RFS-Load-120:PwrFwd-Wave-Low
 HBL-020RFC:RFS-Load-120:PwrFwd-Wave-Med
-HBL-020RFC:RFS-Load-120:PwrFwd-Wave-PM
 HBL-020RFC:RFS-Load-120:PwrRfl-DevMonEval-RB
 HBL-020RFC:RFS-Load-120:PwrRfl-DevMonFact-RB
 HBL-020RFC:RFS-Load-120:PwrRfl-DevMonIlck-RB
@@ -1006,7 +975,6 @@ HBL-020RFC:RFS-Load-120:PwrRfl-Wave-Avg
 HBL-020RFC:RFS-Load-120:PwrRfl-Wave-High
 HBL-020RFC:RFS-Load-120:PwrRfl-Wave-Low
 HBL-020RFC:RFS-Load-120:PwrRfl-Wave-Med
-HBL-020RFC:RFS-Load-120:PwrRfl-Wave-PM
 HBL-020RFC:RFS-Mod-110:Cur-DevMonEval-RB
 HBL-020RFC:RFS-Mod-110:Cur-DevMonFact-RB
 HBL-020RFC:RFS-Mod-110:Cur-DevMonIlck-RB
@@ -1045,17 +1013,14 @@ HBL-020RFC:RFS-Mod-110:Cur-Wave-Avg
 HBL-020RFC:RFS-Mod-110:Cur-Wave-High
 HBL-020RFC:RFS-Mod-110:Cur-Wave-Low
 HBL-020RFC:RFS-Mod-110:Cur-Wave-Med
-HBL-020RFC:RFS-Mod-110:Cur-Wave-PM
 HBL-020RFC:RFS-Mod-110:PCcon-DIlckMode-RB
 HBL-020RFC:RFS-Mod-110:PCcon-Ilck-RB
 HBL-020RFC:RFS-Mod-110:PCcon-Input-RB
 HBL-020RFC:RFS-Mod-110:PCcon-isFirstIlck
-HBL-020RFC:RFS-Mod-110:PCcon-Wave-PM
 HBL-020RFC:RFS-Mod-110:Ready-DIlckMode-RB
 HBL-020RFC:RFS-Mod-110:Ready-Ilck-RB
 HBL-020RFC:RFS-Mod-110:Ready-Input-RB
 HBL-020RFC:RFS-Mod-110:Ready-isFirstIlck
-HBL-020RFC:RFS-Mod-110:Ready-Wave-PM
 HBL-020RFC:RFS-Mod-110:Vol-DevMonEval-RB
 HBL-020RFC:RFS-Mod-110:Vol-DevMonFact-RB
 HBL-020RFC:RFS-Mod-110:Vol-DevMonIlck-RB
@@ -1094,7 +1059,6 @@ HBL-020RFC:RFS-Mod-110:Vol-Wave-Avg
 HBL-020RFC:RFS-Mod-110:Vol-Wave-High
 HBL-020RFC:RFS-Mod-110:Vol-Wave-Low
 HBL-020RFC:RFS-Mod-110:Vol-Wave-Med
-HBL-020RFC:RFS-Mod-110:Vol-Wave-PM
 HBL-020RFC:RFS-PAmp-110:PwrFwd-DevMonEval-RB
 HBL-020RFC:RFS-PAmp-110:PwrFwd-DevMonFact-RB
 HBL-020RFC:RFS-PAmp-110:PwrFwd-DevMonIlck-RB
@@ -1133,17 +1097,14 @@ HBL-020RFC:RFS-PAmp-110:PwrFwd-Wave-Avg
 HBL-020RFC:RFS-PAmp-110:PwrFwd-Wave-High
 HBL-020RFC:RFS-PAmp-110:PwrFwd-Wave-Low
 HBL-020RFC:RFS-PAmp-110:PwrFwd-Wave-Med
-HBL-020RFC:RFS-PAmp-110:PwrFwd-Wave-PM
 HBL-020RFC:RFS-SIM-110:HvEna-DIlckMode-RB
 HBL-020RFC:RFS-SIM-110:HvEna-Ilck-RB
 HBL-020RFC:RFS-SIM-110:HvEna-Input-RB
 HBL-020RFC:RFS-SIM-110:HvEna-isFirstIlck
-HBL-020RFC:RFS-SIM-110:HvEna-Wave-PM
 HBL-020RFC:RFS-SIM-110:RfEna-DIlckMode-RB
 HBL-020RFC:RFS-SIM-110:RfEna-Ilck-RB
 HBL-020RFC:RFS-SIM-110:RfEna-Input-RB
 HBL-020RFC:RFS-SIM-110:RfEna-isFirstIlck
-HBL-020RFC:RFS-SIM-110:RfEna-Wave-PM
 HBL-020RFC:RFS-SolPS-110:Cur-DevMonEval-RB
 HBL-020RFC:RFS-SolPS-110:Cur-DevMonFact-RB
 HBL-020RFC:RFS-SolPS-110:Cur-DevMonIlck-RB
@@ -1182,7 +1143,6 @@ HBL-020RFC:RFS-SolPS-110:Cur-Wave-Avg
 HBL-020RFC:RFS-SolPS-110:Cur-Wave-High
 HBL-020RFC:RFS-SolPS-110:Cur-Wave-Low
 HBL-020RFC:RFS-SolPS-110:Cur-Wave-Med
-HBL-020RFC:RFS-SolPS-110:Cur-Wave-PM
 HBL-020RFC:RFS-SolPS-120:Cur-DevMonEval-RB
 HBL-020RFC:RFS-SolPS-120:Cur-DevMonFact-RB
 HBL-020RFC:RFS-SolPS-120:Cur-DevMonIlck-RB
@@ -1221,24 +1181,19 @@ HBL-020RFC:RFS-SolPS-120:Cur-Wave-Avg
 HBL-020RFC:RFS-SolPS-120:Cur-Wave-High
 HBL-020RFC:RFS-SolPS-120:Cur-Wave-Low
 HBL-020RFC:RFS-SolPS-120:Cur-Wave-Med
-HBL-020RFC:RFS-SolPS-120:Cur-Wave-PM
 HBL-020RFC:RFS-VacBody-110:Status-DIlckMode-RB
 HBL-020RFC:RFS-VacBody-110:Status-Ilck-RB
 HBL-020RFC:RFS-VacBody-110:Status-Input-RB
 HBL-020RFC:RFS-VacBody-110:Status-isFirstIlck
-HBL-020RFC:RFS-VacBody-110:Status-Wave-PM
 HBL-020RFC:RFS-VacCav-110:Status-DIlckMode-RB
 HBL-020RFC:RFS-VacCav-110:Status-Ilck-RB
 HBL-020RFC:RFS-VacCav-110:Status-Input-RB
 HBL-020RFC:RFS-VacCav-110:Status-isFirstIlck
-HBL-020RFC:RFS-VacCav-110:Status-Wave-PM
 HBL-020RFC:RFS-VacPS-110:I-SP-DIlckMode-RB
 HBL-020RFC:RFS-VacPS-110:I-SP-Ilck-RB
 HBL-020RFC:RFS-VacPS-110:I-SP-Input-RB
 HBL-020RFC:RFS-VacPS-110:I-SP-isFirstIlck
-HBL-020RFC:RFS-VacPS-110:I-SP-Wave-PM
 HBL-020RFC:RFS-VacPS-120:I-SP-DIlckMode-RB
 HBL-020RFC:RFS-VacPS-120:I-SP-Ilck-RB
 HBL-020RFC:RFS-VacPS-120:I-SP-Input-RB
 HBL-020RFC:RFS-VacPS-120:I-SP-isFirstIlck
-HBL-020RFC:RFS-VacPS-120:I-SP-Wave-PM
\ No newline at end of file
diff --git a/files/HBL-020RFC_SC-IOC-202.archive b/files/HBL-020RFC_SC-IOC-202.archive
index 7126efe..eb52efe 100644
--- a/files/HBL-020RFC_SC-IOC-202.archive
+++ b/files/HBL-020RFC_SC-IOC-202.archive
@@ -2,12 +2,10 @@ HBL-020RFC:RFS-ADG-210:IlckStatus-DIlckMode-RB
 HBL-020RFC:RFS-ADG-210:IlckStatus-Ilck-RB
 HBL-020RFC:RFS-ADG-210:IlckStatus-Input-RB
 HBL-020RFC:RFS-ADG-210:IlckStatus-isFirstIlck
-HBL-020RFC:RFS-ADG-210:IlckStatus-Wave-PM
 HBL-020RFC:RFS-ADG-210:PwrFail-DIlckMode-RB
 HBL-020RFC:RFS-ADG-210:PwrFail-Ilck-RB
 HBL-020RFC:RFS-ADG-210:PwrFail-Input-RB
 HBL-020RFC:RFS-ADG-210:PwrFail-isFirstIlck
-HBL-020RFC:RFS-ADG-210:PwrFail-Wave-PM
 HBL-020RFC:RFS-Cav-210:Fld-DevMonEval-RB
 HBL-020RFC:RFS-Cav-210:Fld-DevMonFact-RB
 HBL-020RFC:RFS-Cav-210:Fld-DevMonIlck-RB
@@ -46,7 +44,6 @@ HBL-020RFC:RFS-Cav-210:Fld-Wave-Avg
 HBL-020RFC:RFS-Cav-210:Fld-Wave-High
 HBL-020RFC:RFS-Cav-210:Fld-Wave-Low
 HBL-020RFC:RFS-Cav-210:Fld-Wave-Med
-HBL-020RFC:RFS-Cav-210:Fld-Wave-PM
 HBL-020RFC:RFS-Cav-210:PwrFwd-DevMonEval-RB
 HBL-020RFC:RFS-Cav-210:PwrFwd-DevMonFact-RB
 HBL-020RFC:RFS-Cav-210:PwrFwd-DevMonIlck-RB
@@ -85,7 +82,6 @@ HBL-020RFC:RFS-Cav-210:PwrFwd-Wave-Avg
 HBL-020RFC:RFS-Cav-210:PwrFwd-Wave-High
 HBL-020RFC:RFS-Cav-210:PwrFwd-Wave-Low
 HBL-020RFC:RFS-Cav-210:PwrFwd-Wave-Med
-HBL-020RFC:RFS-Cav-210:PwrFwd-Wave-PM
 HBL-020RFC:RFS-Cav-210:PwrRfl-DevMonEval-RB
 HBL-020RFC:RFS-Cav-210:PwrRfl-DevMonFact-RB
 HBL-020RFC:RFS-Cav-210:PwrRfl-DevMonIlck-RB
@@ -124,7 +120,6 @@ HBL-020RFC:RFS-Cav-210:PwrRfl-Wave-Avg
 HBL-020RFC:RFS-Cav-210:PwrRfl-Wave-High
 HBL-020RFC:RFS-Cav-210:PwrRfl-Wave-Low
 HBL-020RFC:RFS-Cav-210:PwrRfl-Wave-Med
-HBL-020RFC:RFS-Cav-210:PwrRfl-Wave-PM
 HBL-020RFC:RFS-EPR-210:Cur-DevMonEval-RB
 HBL-020RFC:RFS-EPR-210:Cur-DevMonFact-RB
 HBL-020RFC:RFS-EPR-210:Cur-DevMonIlck-RB
@@ -163,7 +158,6 @@ HBL-020RFC:RFS-EPR-210:Cur-Wave-Avg
 HBL-020RFC:RFS-EPR-210:Cur-Wave-High
 HBL-020RFC:RFS-EPR-210:Cur-Wave-Low
 HBL-020RFC:RFS-EPR-210:Cur-Wave-Med
-HBL-020RFC:RFS-EPR-210:Cur-Wave-PM
 HBL-020RFC:RFS-FIM-201:AI1-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-201:AI1-HVON-En-RB
 HBL-020RFC:RFS-FIM-201:AI1-HVON-Precond
@@ -214,7 +208,6 @@ HBL-020RFC:RFS-FIM-201:AI10-Wave-Avg
 HBL-020RFC:RFS-FIM-201:AI10-Wave-High
 HBL-020RFC:RFS-FIM-201:AI10-Wave-Low
 HBL-020RFC:RFS-FIM-201:AI10-Wave-Med
-HBL-020RFC:RFS-FIM-201:AI10-Wave-PM
 HBL-020RFC:RFS-FIM-201:AI2-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-201:AI2-HVON-En-RB
 HBL-020RFC:RFS-FIM-201:AI2-HVON-Precond
@@ -277,7 +270,6 @@ HBL-020RFC:RFS-FIM-201:AI5-Wave-Avg
 HBL-020RFC:RFS-FIM-201:AI5-Wave-High
 HBL-020RFC:RFS-FIM-201:AI5-Wave-Low
 HBL-020RFC:RFS-FIM-201:AI5-Wave-Med
-HBL-020RFC:RFS-FIM-201:AI5-Wave-PM
 HBL-020RFC:RFS-FIM-201:AI6-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-201:AI6-HVON-En-RB
 HBL-020RFC:RFS-FIM-201:AI6-HVON-Precond
@@ -328,7 +320,6 @@ HBL-020RFC:RFS-FIM-201:AI7-Wave-Avg
 HBL-020RFC:RFS-FIM-201:AI7-Wave-High
 HBL-020RFC:RFS-FIM-201:AI7-Wave-Low
 HBL-020RFC:RFS-FIM-201:AI7-Wave-Med
-HBL-020RFC:RFS-FIM-201:AI7-Wave-PM
 HBL-020RFC:RFS-FIM-201:AI8-DevMonEval-RB
 HBL-020RFC:RFS-FIM-201:AI8-DevMonFact-RB
 HBL-020RFC:RFS-FIM-201:AI8-DevMonIlck-RB
@@ -373,7 +364,6 @@ HBL-020RFC:RFS-FIM-201:AI8-Wave-Avg
 HBL-020RFC:RFS-FIM-201:AI8-Wave-High
 HBL-020RFC:RFS-FIM-201:AI8-Wave-Low
 HBL-020RFC:RFS-FIM-201:AI8-Wave-Med
-HBL-020RFC:RFS-FIM-201:AI8-Wave-PM
 HBL-020RFC:RFS-FIM-201:AI9-DevMonEval-RB
 HBL-020RFC:RFS-FIM-201:AI9-DevMonFact-RB
 HBL-020RFC:RFS-FIM-201:AI9-DevMonIlck-RB
@@ -418,7 +408,6 @@ HBL-020RFC:RFS-FIM-201:AI9-Wave-Avg
 HBL-020RFC:RFS-FIM-201:AI9-Wave-High
 HBL-020RFC:RFS-FIM-201:AI9-Wave-Low
 HBL-020RFC:RFS-FIM-201:AI9-Wave-Med
-HBL-020RFC:RFS-FIM-201:AI9-Wave-PM
 HBL-020RFC:RFS-FIM-201:CD1-DevFactor-RB
 HBL-020RFC:RFS-FIM-201:CD1-DevPeriod-RB
 HBL-020RFC:RFS-FIM-201:CD1-FastRst-IlckCnt
@@ -440,7 +429,6 @@ HBL-020RFC:RFS-FIM-201:CD1-RFON-En-RB
 HBL-020RFC:RFS-FIM-201:CD1-RFON-Precond
 HBL-020RFC:RFS-FIM-201:CD1-TrigSel-RB
 HBL-020RFC:RFS-FIM-201:CD1-TrigThre-RB
-HBL-020RFC:RFS-FIM-201:CD1-Wave-IlckPM
 HBL-020RFC:RFS-FIM-201:CD2-DevFactor-RB
 HBL-020RFC:RFS-FIM-201:CD2-DevPeriod-RB
 HBL-020RFC:RFS-FIM-201:CD2-FastRst-IlckCnt
@@ -462,7 +450,6 @@ HBL-020RFC:RFS-FIM-201:CD2-RFON-En-RB
 HBL-020RFC:RFS-FIM-201:CD2-RFON-Precond
 HBL-020RFC:RFS-FIM-201:CD2-TrigSel-RB
 HBL-020RFC:RFS-FIM-201:CD2-TrigThre-RB
-HBL-020RFC:RFS-FIM-201:CD2-Wave-IlckPM
 HBL-020RFC:RFS-FIM-201:DI1-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-201:DI1-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-201:DI1-HVON-En-RB
@@ -481,7 +468,6 @@ HBL-020RFC:RFS-FIM-201:DI10-Input-RB
 HBL-020RFC:RFS-FIM-201:DI10-isFirstIlck
 HBL-020RFC:RFS-FIM-201:DI10-RFON-En-RB
 HBL-020RFC:RFS-FIM-201:DI10-RFON-Precond
-HBL-020RFC:RFS-FIM-201:DI10-Wave-PM
 HBL-020RFC:RFS-FIM-201:DI11-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-201:DI11-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-201:DI11-HVON-En-RB
@@ -500,7 +486,6 @@ HBL-020RFC:RFS-FIM-201:DI12-Input-RB
 HBL-020RFC:RFS-FIM-201:DI12-isFirstIlck
 HBL-020RFC:RFS-FIM-201:DI12-RFON-En-RB
 HBL-020RFC:RFS-FIM-201:DI12-RFON-Precond
-HBL-020RFC:RFS-FIM-201:DI12-Wave-PM
 HBL-020RFC:RFS-FIM-201:DI13-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-201:DI13-DIlckMode-RB
 HBL-020RFC:RFS-FIM-201:DI13-FastRst-IlckCnt
@@ -512,7 +497,6 @@ HBL-020RFC:RFS-FIM-201:DI13-Input-RB
 HBL-020RFC:RFS-FIM-201:DI13-isFirstIlck
 HBL-020RFC:RFS-FIM-201:DI13-RFON-En-RB
 HBL-020RFC:RFS-FIM-201:DI13-RFON-Precond
-HBL-020RFC:RFS-FIM-201:DI13-Wave-PM
 HBL-020RFC:RFS-FIM-201:DI14-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-201:DI14-DIlckMode-RB
 HBL-020RFC:RFS-FIM-201:DI14-FastRst-IlckCnt
@@ -524,7 +508,6 @@ HBL-020RFC:RFS-FIM-201:DI14-Input-RB
 HBL-020RFC:RFS-FIM-201:DI14-isFirstIlck
 HBL-020RFC:RFS-FIM-201:DI14-RFON-En-RB
 HBL-020RFC:RFS-FIM-201:DI14-RFON-Precond
-HBL-020RFC:RFS-FIM-201:DI14-Wave-PM
 HBL-020RFC:RFS-FIM-201:DI15-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-201:DI15-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-201:DI15-HVON-En-RB
@@ -550,7 +533,6 @@ HBL-020RFC:RFS-FIM-201:DI17-Input-RB
 HBL-020RFC:RFS-FIM-201:DI17-isFirstIlck
 HBL-020RFC:RFS-FIM-201:DI17-RFON-En-RB
 HBL-020RFC:RFS-FIM-201:DI17-RFON-Precond
-HBL-020RFC:RFS-FIM-201:DI17-Wave-PM
 HBL-020RFC:RFS-FIM-201:DI18-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-201:DI18-DIlckMode-RB
 HBL-020RFC:RFS-FIM-201:DI18-FastRst-IlckCnt
@@ -562,7 +544,6 @@ HBL-020RFC:RFS-FIM-201:DI18-Input-RB
 HBL-020RFC:RFS-FIM-201:DI18-isFirstIlck
 HBL-020RFC:RFS-FIM-201:DI18-RFON-En-RB
 HBL-020RFC:RFS-FIM-201:DI18-RFON-Precond
-HBL-020RFC:RFS-FIM-201:DI18-Wave-PM
 HBL-020RFC:RFS-FIM-201:DI19-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-201:DI19-DIlckMode-RB
 HBL-020RFC:RFS-FIM-201:DI19-FastRst-IlckCnt
@@ -574,7 +555,6 @@ HBL-020RFC:RFS-FIM-201:DI19-Input-RB
 HBL-020RFC:RFS-FIM-201:DI19-isFirstIlck
 HBL-020RFC:RFS-FIM-201:DI19-RFON-En-RB
 HBL-020RFC:RFS-FIM-201:DI19-RFON-Precond
-HBL-020RFC:RFS-FIM-201:DI19-Wave-PM
 HBL-020RFC:RFS-FIM-201:DI2-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-201:DI2-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-201:DI2-HVON-En-RB
@@ -593,7 +573,6 @@ HBL-020RFC:RFS-FIM-201:DI20-Input-RB
 HBL-020RFC:RFS-FIM-201:DI20-isFirstIlck
 HBL-020RFC:RFS-FIM-201:DI20-RFON-En-RB
 HBL-020RFC:RFS-FIM-201:DI20-RFON-Precond
-HBL-020RFC:RFS-FIM-201:DI20-Wave-PM
 HBL-020RFC:RFS-FIM-201:DI21-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-201:DI21-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-201:DI21-HVON-En-RB
@@ -640,7 +619,6 @@ HBL-020RFC:RFS-FIM-201:DI7-Input-RB
 HBL-020RFC:RFS-FIM-201:DI7-isFirstIlck
 HBL-020RFC:RFS-FIM-201:DI7-RFON-En-RB
 HBL-020RFC:RFS-FIM-201:DI7-RFON-Precond
-HBL-020RFC:RFS-FIM-201:DI7-Wave-PM
 HBL-020RFC:RFS-FIM-201:DI8-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-201:DI8-DIlckMode-RB
 HBL-020RFC:RFS-FIM-201:DI8-FastRst-IlckCnt
@@ -652,7 +630,6 @@ HBL-020RFC:RFS-FIM-201:DI8-Input-RB
 HBL-020RFC:RFS-FIM-201:DI8-isFirstIlck
 HBL-020RFC:RFS-FIM-201:DI8-RFON-En-RB
 HBL-020RFC:RFS-FIM-201:DI8-RFON-Precond
-HBL-020RFC:RFS-FIM-201:DI8-Wave-PM
 HBL-020RFC:RFS-FIM-201:DI9-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-201:DI9-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-201:DI9-HVON-En-RB
@@ -716,7 +693,6 @@ HBL-020RFC:RFS-FIM-201:RF10-Wave-Avg
 HBL-020RFC:RFS-FIM-201:RF10-Wave-High
 HBL-020RFC:RFS-FIM-201:RF10-Wave-Low
 HBL-020RFC:RFS-FIM-201:RF10-Wave-Med
-HBL-020RFC:RFS-FIM-201:RF10-Wave-PM
 HBL-020RFC:RFS-FIM-201:RF2-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-201:RF2-HVON-En-RB
 HBL-020RFC:RFS-FIM-201:RF2-HVON-Precond
@@ -803,7 +779,6 @@ HBL-020RFC:RFS-FIM-201:RF9-Wave-Avg
 HBL-020RFC:RFS-FIM-201:RF9-Wave-High
 HBL-020RFC:RFS-FIM-201:RF9-Wave-Low
 HBL-020RFC:RFS-FIM-201:RF9-Wave-Med
-HBL-020RFC:RFS-FIM-201:RF9-Wave-PM
 HBL-020RFC:RFS-FIM-201:RFON-Precond
 HBL-020RFC:RFS-FIM-201:RP1-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-201:RP1-HVON-En-RB
@@ -824,7 +799,6 @@ HBL-020RFC:RFS-FIM-201:RP1-RFON-En-RB
 HBL-020RFC:RFS-FIM-201:RP1-RFON-Precond
 HBL-020RFC:RFS-FIM-201:RP1-TrigSel-RB
 HBL-020RFC:RFS-FIM-201:RP1-TrigThre-RB
-HBL-020RFC:RFS-FIM-201:RP1-Wave-IlckPM
 HBL-020RFC:RFS-FIM-201:RP2-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-201:RP2-HVON-En-RB
 HBL-020RFC:RFS-FIM-201:RP2-HVON-Precond
@@ -844,7 +818,6 @@ HBL-020RFC:RFS-FIM-201:RP2-RFON-En-RB
 HBL-020RFC:RFS-FIM-201:RP2-RFON-Precond
 HBL-020RFC:RFS-FIM-201:RP2-TrigSel-RB
 HBL-020RFC:RFS-FIM-201:RP2-TrigThre-RB
-HBL-020RFC:RFS-FIM-201:RP2-Wave-IlckPM
 HBL-020RFC:RFS-FIM-201:TriggerLine-RB
 HBL-020RFC:RFS-Kly-210:PwrFwd-DevMonEval-RB
 HBL-020RFC:RFS-Kly-210:PwrFwd-DevMonFact-RB
@@ -884,7 +857,6 @@ HBL-020RFC:RFS-Kly-210:PwrFwd-Wave-Avg
 HBL-020RFC:RFS-Kly-210:PwrFwd-Wave-High
 HBL-020RFC:RFS-Kly-210:PwrFwd-Wave-Low
 HBL-020RFC:RFS-Kly-210:PwrFwd-Wave-Med
-HBL-020RFC:RFS-Kly-210:PwrFwd-Wave-PM
 HBL-020RFC:RFS-Kly-210:PwrRfl-DevMonEval-RB
 HBL-020RFC:RFS-Kly-210:PwrRfl-DevMonFact-RB
 HBL-020RFC:RFS-Kly-210:PwrRfl-DevMonIlck-RB
@@ -923,12 +895,10 @@ HBL-020RFC:RFS-Kly-210:PwrRfl-Wave-Avg
 HBL-020RFC:RFS-Kly-210:PwrRfl-Wave-High
 HBL-020RFC:RFS-Kly-210:PwrRfl-Wave-Low
 HBL-020RFC:RFS-Kly-210:PwrRfl-Wave-Med
-HBL-020RFC:RFS-Kly-210:PwrRfl-Wave-PM
 HBL-020RFC:RFS-LLRF-201:Status-DIlckMode-RB
 HBL-020RFC:RFS-LLRF-201:Status-Ilck-RB
 HBL-020RFC:RFS-LLRF-201:Status-Input-RB
 HBL-020RFC:RFS-LLRF-201:Status-isFirstIlck
-HBL-020RFC:RFS-LLRF-201:Status-Wave-PM
 HBL-020RFC:RFS-Load-220:PwrFwd-DevMonEval-RB
 HBL-020RFC:RFS-Load-220:PwrFwd-DevMonFact-RB
 HBL-020RFC:RFS-Load-220:PwrFwd-DevMonIlck-RB
@@ -967,7 +937,6 @@ HBL-020RFC:RFS-Load-220:PwrFwd-Wave-Avg
 HBL-020RFC:RFS-Load-220:PwrFwd-Wave-High
 HBL-020RFC:RFS-Load-220:PwrFwd-Wave-Low
 HBL-020RFC:RFS-Load-220:PwrFwd-Wave-Med
-HBL-020RFC:RFS-Load-220:PwrFwd-Wave-PM
 HBL-020RFC:RFS-Load-220:PwrRfl-DevMonEval-RB
 HBL-020RFC:RFS-Load-220:PwrRfl-DevMonFact-RB
 HBL-020RFC:RFS-Load-220:PwrRfl-DevMonIlck-RB
@@ -1006,7 +975,6 @@ HBL-020RFC:RFS-Load-220:PwrRfl-Wave-Avg
 HBL-020RFC:RFS-Load-220:PwrRfl-Wave-High
 HBL-020RFC:RFS-Load-220:PwrRfl-Wave-Low
 HBL-020RFC:RFS-Load-220:PwrRfl-Wave-Med
-HBL-020RFC:RFS-Load-220:PwrRfl-Wave-PM
 HBL-020RFC:RFS-Mod-210:Cur-DevMonEval-RB
 HBL-020RFC:RFS-Mod-210:Cur-DevMonFact-RB
 HBL-020RFC:RFS-Mod-210:Cur-DevMonIlck-RB
@@ -1045,17 +1013,14 @@ HBL-020RFC:RFS-Mod-210:Cur-Wave-Avg
 HBL-020RFC:RFS-Mod-210:Cur-Wave-High
 HBL-020RFC:RFS-Mod-210:Cur-Wave-Low
 HBL-020RFC:RFS-Mod-210:Cur-Wave-Med
-HBL-020RFC:RFS-Mod-210:Cur-Wave-PM
 HBL-020RFC:RFS-Mod-210:PCcon-DIlckMode-RB
 HBL-020RFC:RFS-Mod-210:PCcon-Ilck-RB
 HBL-020RFC:RFS-Mod-210:PCcon-Input-RB
 HBL-020RFC:RFS-Mod-210:PCcon-isFirstIlck
-HBL-020RFC:RFS-Mod-210:PCcon-Wave-PM
 HBL-020RFC:RFS-Mod-210:Ready-DIlckMode-RB
 HBL-020RFC:RFS-Mod-210:Ready-Ilck-RB
 HBL-020RFC:RFS-Mod-210:Ready-Input-RB
 HBL-020RFC:RFS-Mod-210:Ready-isFirstIlck
-HBL-020RFC:RFS-Mod-210:Ready-Wave-PM
 HBL-020RFC:RFS-Mod-210:Vol-DevMonEval-RB
 HBL-020RFC:RFS-Mod-210:Vol-DevMonFact-RB
 HBL-020RFC:RFS-Mod-210:Vol-DevMonIlck-RB
@@ -1094,7 +1059,6 @@ HBL-020RFC:RFS-Mod-210:Vol-Wave-Avg
 HBL-020RFC:RFS-Mod-210:Vol-Wave-High
 HBL-020RFC:RFS-Mod-210:Vol-Wave-Low
 HBL-020RFC:RFS-Mod-210:Vol-Wave-Med
-HBL-020RFC:RFS-Mod-210:Vol-Wave-PM
 HBL-020RFC:RFS-PAmp-210:PwrFwd-DevMonEval-RB
 HBL-020RFC:RFS-PAmp-210:PwrFwd-DevMonFact-RB
 HBL-020RFC:RFS-PAmp-210:PwrFwd-DevMonIlck-RB
@@ -1133,17 +1097,14 @@ HBL-020RFC:RFS-PAmp-210:PwrFwd-Wave-Avg
 HBL-020RFC:RFS-PAmp-210:PwrFwd-Wave-High
 HBL-020RFC:RFS-PAmp-210:PwrFwd-Wave-Low
 HBL-020RFC:RFS-PAmp-210:PwrFwd-Wave-Med
-HBL-020RFC:RFS-PAmp-210:PwrFwd-Wave-PM
 HBL-020RFC:RFS-SIM-210:HvEna-DIlckMode-RB
 HBL-020RFC:RFS-SIM-210:HvEna-Ilck-RB
 HBL-020RFC:RFS-SIM-210:HvEna-Input-RB
 HBL-020RFC:RFS-SIM-210:HvEna-isFirstIlck
-HBL-020RFC:RFS-SIM-210:HvEna-Wave-PM
 HBL-020RFC:RFS-SIM-210:RfEna-DIlckMode-RB
 HBL-020RFC:RFS-SIM-210:RfEna-Ilck-RB
 HBL-020RFC:RFS-SIM-210:RfEna-Input-RB
 HBL-020RFC:RFS-SIM-210:RfEna-isFirstIlck
-HBL-020RFC:RFS-SIM-210:RfEna-Wave-PM
 HBL-020RFC:RFS-SolPS-210:Cur-DevMonEval-RB
 HBL-020RFC:RFS-SolPS-210:Cur-DevMonFact-RB
 HBL-020RFC:RFS-SolPS-210:Cur-DevMonIlck-RB
@@ -1182,7 +1143,6 @@ HBL-020RFC:RFS-SolPS-210:Cur-Wave-Avg
 HBL-020RFC:RFS-SolPS-210:Cur-Wave-High
 HBL-020RFC:RFS-SolPS-210:Cur-Wave-Low
 HBL-020RFC:RFS-SolPS-210:Cur-Wave-Med
-HBL-020RFC:RFS-SolPS-210:Cur-Wave-PM
 HBL-020RFC:RFS-SolPS-220:Cur-DevMonEval-RB
 HBL-020RFC:RFS-SolPS-220:Cur-DevMonFact-RB
 HBL-020RFC:RFS-SolPS-220:Cur-DevMonIlck-RB
@@ -1221,24 +1181,19 @@ HBL-020RFC:RFS-SolPS-220:Cur-Wave-Avg
 HBL-020RFC:RFS-SolPS-220:Cur-Wave-High
 HBL-020RFC:RFS-SolPS-220:Cur-Wave-Low
 HBL-020RFC:RFS-SolPS-220:Cur-Wave-Med
-HBL-020RFC:RFS-SolPS-220:Cur-Wave-PM
 HBL-020RFC:RFS-VacBody-210:Status-DIlckMode-RB
 HBL-020RFC:RFS-VacBody-210:Status-Ilck-RB
 HBL-020RFC:RFS-VacBody-210:Status-Input-RB
 HBL-020RFC:RFS-VacBody-210:Status-isFirstIlck
-HBL-020RFC:RFS-VacBody-210:Status-Wave-PM
 HBL-020RFC:RFS-VacCav-210:Status-DIlckMode-RB
 HBL-020RFC:RFS-VacCav-210:Status-Ilck-RB
 HBL-020RFC:RFS-VacCav-210:Status-Input-RB
 HBL-020RFC:RFS-VacCav-210:Status-isFirstIlck
-HBL-020RFC:RFS-VacCav-210:Status-Wave-PM
 HBL-020RFC:RFS-VacPS-210:I-SP-DIlckMode-RB
 HBL-020RFC:RFS-VacPS-210:I-SP-Ilck-RB
 HBL-020RFC:RFS-VacPS-210:I-SP-Input-RB
 HBL-020RFC:RFS-VacPS-210:I-SP-isFirstIlck
-HBL-020RFC:RFS-VacPS-210:I-SP-Wave-PM
 HBL-020RFC:RFS-VacPS-220:I-SP-DIlckMode-RB
 HBL-020RFC:RFS-VacPS-220:I-SP-Ilck-RB
 HBL-020RFC:RFS-VacPS-220:I-SP-Input-RB
 HBL-020RFC:RFS-VacPS-220:I-SP-isFirstIlck
-HBL-020RFC:RFS-VacPS-220:I-SP-Wave-PM
\ No newline at end of file
diff --git a/files/HBL-020RFC_SC-IOC-302.archive b/files/HBL-020RFC_SC-IOC-302.archive
index 716aa14..7ae99d0 100644
--- a/files/HBL-020RFC_SC-IOC-302.archive
+++ b/files/HBL-020RFC_SC-IOC-302.archive
@@ -2,12 +2,10 @@ HBL-020RFC:RFS-ADG-310:IlckStatus-DIlckMode-RB
 HBL-020RFC:RFS-ADG-310:IlckStatus-Ilck-RB
 HBL-020RFC:RFS-ADG-310:IlckStatus-Input-RB
 HBL-020RFC:RFS-ADG-310:IlckStatus-isFirstIlck
-HBL-020RFC:RFS-ADG-310:IlckStatus-Wave-PM
 HBL-020RFC:RFS-ADG-310:PwrFail-DIlckMode-RB
 HBL-020RFC:RFS-ADG-310:PwrFail-Ilck-RB
 HBL-020RFC:RFS-ADG-310:PwrFail-Input-RB
 HBL-020RFC:RFS-ADG-310:PwrFail-isFirstIlck
-HBL-020RFC:RFS-ADG-310:PwrFail-Wave-PM
 HBL-020RFC:RFS-Cav-310:Fld-DevMonEval-RB
 HBL-020RFC:RFS-Cav-310:Fld-DevMonFact-RB
 HBL-020RFC:RFS-Cav-310:Fld-DevMonIlck-RB
@@ -46,7 +44,6 @@ HBL-020RFC:RFS-Cav-310:Fld-Wave-Avg
 HBL-020RFC:RFS-Cav-310:Fld-Wave-High
 HBL-020RFC:RFS-Cav-310:Fld-Wave-Low
 HBL-020RFC:RFS-Cav-310:Fld-Wave-Med
-HBL-020RFC:RFS-Cav-310:Fld-Wave-PM
 HBL-020RFC:RFS-Cav-310:PwrFwd-DevMonEval-RB
 HBL-020RFC:RFS-Cav-310:PwrFwd-DevMonFact-RB
 HBL-020RFC:RFS-Cav-310:PwrFwd-DevMonIlck-RB
@@ -85,7 +82,6 @@ HBL-020RFC:RFS-Cav-310:PwrFwd-Wave-Avg
 HBL-020RFC:RFS-Cav-310:PwrFwd-Wave-High
 HBL-020RFC:RFS-Cav-310:PwrFwd-Wave-Low
 HBL-020RFC:RFS-Cav-310:PwrFwd-Wave-Med
-HBL-020RFC:RFS-Cav-310:PwrFwd-Wave-PM
 HBL-020RFC:RFS-Cav-310:PwrRfl-DevMonEval-RB
 HBL-020RFC:RFS-Cav-310:PwrRfl-DevMonFact-RB
 HBL-020RFC:RFS-Cav-310:PwrRfl-DevMonIlck-RB
@@ -124,7 +120,6 @@ HBL-020RFC:RFS-Cav-310:PwrRfl-Wave-Avg
 HBL-020RFC:RFS-Cav-310:PwrRfl-Wave-High
 HBL-020RFC:RFS-Cav-310:PwrRfl-Wave-Low
 HBL-020RFC:RFS-Cav-310:PwrRfl-Wave-Med
-HBL-020RFC:RFS-Cav-310:PwrRfl-Wave-PM
 HBL-020RFC:RFS-EPR-310:Cur-DevMonEval-RB
 HBL-020RFC:RFS-EPR-310:Cur-DevMonFact-RB
 HBL-020RFC:RFS-EPR-310:Cur-DevMonIlck-RB
@@ -163,7 +158,6 @@ HBL-020RFC:RFS-EPR-310:Cur-Wave-Avg
 HBL-020RFC:RFS-EPR-310:Cur-Wave-High
 HBL-020RFC:RFS-EPR-310:Cur-Wave-Low
 HBL-020RFC:RFS-EPR-310:Cur-Wave-Med
-HBL-020RFC:RFS-EPR-310:Cur-Wave-PM
 HBL-020RFC:RFS-FIM-301:AI1-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-301:AI1-HVON-En-RB
 HBL-020RFC:RFS-FIM-301:AI1-HVON-Precond
@@ -214,7 +208,6 @@ HBL-020RFC:RFS-FIM-301:AI10-Wave-Avg
 HBL-020RFC:RFS-FIM-301:AI10-Wave-High
 HBL-020RFC:RFS-FIM-301:AI10-Wave-Low
 HBL-020RFC:RFS-FIM-301:AI10-Wave-Med
-HBL-020RFC:RFS-FIM-301:AI10-Wave-PM
 HBL-020RFC:RFS-FIM-301:AI2-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-301:AI2-HVON-En-RB
 HBL-020RFC:RFS-FIM-301:AI2-HVON-Precond
@@ -277,7 +270,6 @@ HBL-020RFC:RFS-FIM-301:AI5-Wave-Avg
 HBL-020RFC:RFS-FIM-301:AI5-Wave-High
 HBL-020RFC:RFS-FIM-301:AI5-Wave-Low
 HBL-020RFC:RFS-FIM-301:AI5-Wave-Med
-HBL-020RFC:RFS-FIM-301:AI5-Wave-PM
 HBL-020RFC:RFS-FIM-301:AI6-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-301:AI6-HVON-En-RB
 HBL-020RFC:RFS-FIM-301:AI6-HVON-Precond
@@ -328,7 +320,6 @@ HBL-020RFC:RFS-FIM-301:AI7-Wave-Avg
 HBL-020RFC:RFS-FIM-301:AI7-Wave-High
 HBL-020RFC:RFS-FIM-301:AI7-Wave-Low
 HBL-020RFC:RFS-FIM-301:AI7-Wave-Med
-HBL-020RFC:RFS-FIM-301:AI7-Wave-PM
 HBL-020RFC:RFS-FIM-301:AI8-DevMonEval-RB
 HBL-020RFC:RFS-FIM-301:AI8-DevMonFact-RB
 HBL-020RFC:RFS-FIM-301:AI8-DevMonIlck-RB
@@ -373,7 +364,6 @@ HBL-020RFC:RFS-FIM-301:AI8-Wave-Avg
 HBL-020RFC:RFS-FIM-301:AI8-Wave-High
 HBL-020RFC:RFS-FIM-301:AI8-Wave-Low
 HBL-020RFC:RFS-FIM-301:AI8-Wave-Med
-HBL-020RFC:RFS-FIM-301:AI8-Wave-PM
 HBL-020RFC:RFS-FIM-301:AI9-DevMonEval-RB
 HBL-020RFC:RFS-FIM-301:AI9-DevMonFact-RB
 HBL-020RFC:RFS-FIM-301:AI9-DevMonIlck-RB
@@ -418,7 +408,6 @@ HBL-020RFC:RFS-FIM-301:AI9-Wave-Avg
 HBL-020RFC:RFS-FIM-301:AI9-Wave-High
 HBL-020RFC:RFS-FIM-301:AI9-Wave-Low
 HBL-020RFC:RFS-FIM-301:AI9-Wave-Med
-HBL-020RFC:RFS-FIM-301:AI9-Wave-PM
 HBL-020RFC:RFS-FIM-301:CD1-DevFactor-RB
 HBL-020RFC:RFS-FIM-301:CD1-DevPeriod-RB
 HBL-020RFC:RFS-FIM-301:CD1-FastRst-IlckCnt
@@ -440,7 +429,6 @@ HBL-020RFC:RFS-FIM-301:CD1-RFON-En-RB
 HBL-020RFC:RFS-FIM-301:CD1-RFON-Precond
 HBL-020RFC:RFS-FIM-301:CD1-TrigSel-RB
 HBL-020RFC:RFS-FIM-301:CD1-TrigThre-RB
-HBL-020RFC:RFS-FIM-301:CD1-Wave-IlckPM
 HBL-020RFC:RFS-FIM-301:CD2-DevFactor-RB
 HBL-020RFC:RFS-FIM-301:CD2-DevPeriod-RB
 HBL-020RFC:RFS-FIM-301:CD2-FastRst-IlckCnt
@@ -462,7 +450,6 @@ HBL-020RFC:RFS-FIM-301:CD2-RFON-En-RB
 HBL-020RFC:RFS-FIM-301:CD2-RFON-Precond
 HBL-020RFC:RFS-FIM-301:CD2-TrigSel-RB
 HBL-020RFC:RFS-FIM-301:CD2-TrigThre-RB
-HBL-020RFC:RFS-FIM-301:CD2-Wave-IlckPM
 HBL-020RFC:RFS-FIM-301:DI1-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-301:DI1-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-301:DI1-HVON-En-RB
@@ -481,7 +468,6 @@ HBL-020RFC:RFS-FIM-301:DI10-Input-RB
 HBL-020RFC:RFS-FIM-301:DI10-isFirstIlck
 HBL-020RFC:RFS-FIM-301:DI10-RFON-En-RB
 HBL-020RFC:RFS-FIM-301:DI10-RFON-Precond
-HBL-020RFC:RFS-FIM-301:DI10-Wave-PM
 HBL-020RFC:RFS-FIM-301:DI11-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-301:DI11-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-301:DI11-HVON-En-RB
@@ -500,7 +486,6 @@ HBL-020RFC:RFS-FIM-301:DI12-Input-RB
 HBL-020RFC:RFS-FIM-301:DI12-isFirstIlck
 HBL-020RFC:RFS-FIM-301:DI12-RFON-En-RB
 HBL-020RFC:RFS-FIM-301:DI12-RFON-Precond
-HBL-020RFC:RFS-FIM-301:DI12-Wave-PM
 HBL-020RFC:RFS-FIM-301:DI13-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-301:DI13-DIlckMode-RB
 HBL-020RFC:RFS-FIM-301:DI13-FastRst-IlckCnt
@@ -512,7 +497,6 @@ HBL-020RFC:RFS-FIM-301:DI13-Input-RB
 HBL-020RFC:RFS-FIM-301:DI13-isFirstIlck
 HBL-020RFC:RFS-FIM-301:DI13-RFON-En-RB
 HBL-020RFC:RFS-FIM-301:DI13-RFON-Precond
-HBL-020RFC:RFS-FIM-301:DI13-Wave-PM
 HBL-020RFC:RFS-FIM-301:DI14-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-301:DI14-DIlckMode-RB
 HBL-020RFC:RFS-FIM-301:DI14-FastRst-IlckCnt
@@ -524,7 +508,6 @@ HBL-020RFC:RFS-FIM-301:DI14-Input-RB
 HBL-020RFC:RFS-FIM-301:DI14-isFirstIlck
 HBL-020RFC:RFS-FIM-301:DI14-RFON-En-RB
 HBL-020RFC:RFS-FIM-301:DI14-RFON-Precond
-HBL-020RFC:RFS-FIM-301:DI14-Wave-PM
 HBL-020RFC:RFS-FIM-301:DI15-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-301:DI15-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-301:DI15-HVON-En-RB
@@ -550,7 +533,6 @@ HBL-020RFC:RFS-FIM-301:DI17-Input-RB
 HBL-020RFC:RFS-FIM-301:DI17-isFirstIlck
 HBL-020RFC:RFS-FIM-301:DI17-RFON-En-RB
 HBL-020RFC:RFS-FIM-301:DI17-RFON-Precond
-HBL-020RFC:RFS-FIM-301:DI17-Wave-PM
 HBL-020RFC:RFS-FIM-301:DI18-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-301:DI18-DIlckMode-RB
 HBL-020RFC:RFS-FIM-301:DI18-FastRst-IlckCnt
@@ -562,7 +544,6 @@ HBL-020RFC:RFS-FIM-301:DI18-Input-RB
 HBL-020RFC:RFS-FIM-301:DI18-isFirstIlck
 HBL-020RFC:RFS-FIM-301:DI18-RFON-En-RB
 HBL-020RFC:RFS-FIM-301:DI18-RFON-Precond
-HBL-020RFC:RFS-FIM-301:DI18-Wave-PM
 HBL-020RFC:RFS-FIM-301:DI19-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-301:DI19-DIlckMode-RB
 HBL-020RFC:RFS-FIM-301:DI19-FastRst-IlckCnt
@@ -574,7 +555,6 @@ HBL-020RFC:RFS-FIM-301:DI19-Input-RB
 HBL-020RFC:RFS-FIM-301:DI19-isFirstIlck
 HBL-020RFC:RFS-FIM-301:DI19-RFON-En-RB
 HBL-020RFC:RFS-FIM-301:DI19-RFON-Precond
-HBL-020RFC:RFS-FIM-301:DI19-Wave-PM
 HBL-020RFC:RFS-FIM-301:DI2-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-301:DI2-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-301:DI2-HVON-En-RB
@@ -593,7 +573,6 @@ HBL-020RFC:RFS-FIM-301:DI20-Input-RB
 HBL-020RFC:RFS-FIM-301:DI20-isFirstIlck
 HBL-020RFC:RFS-FIM-301:DI20-RFON-En-RB
 HBL-020RFC:RFS-FIM-301:DI20-RFON-Precond
-HBL-020RFC:RFS-FIM-301:DI20-Wave-PM
 HBL-020RFC:RFS-FIM-301:DI21-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-301:DI21-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-301:DI21-HVON-En-RB
@@ -640,7 +619,6 @@ HBL-020RFC:RFS-FIM-301:DI7-Input-RB
 HBL-020RFC:RFS-FIM-301:DI7-isFirstIlck
 HBL-020RFC:RFS-FIM-301:DI7-RFON-En-RB
 HBL-020RFC:RFS-FIM-301:DI7-RFON-Precond
-HBL-020RFC:RFS-FIM-301:DI7-Wave-PM
 HBL-020RFC:RFS-FIM-301:DI8-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-301:DI8-DIlckMode-RB
 HBL-020RFC:RFS-FIM-301:DI8-FastRst-IlckCnt
@@ -652,7 +630,6 @@ HBL-020RFC:RFS-FIM-301:DI8-Input-RB
 HBL-020RFC:RFS-FIM-301:DI8-isFirstIlck
 HBL-020RFC:RFS-FIM-301:DI8-RFON-En-RB
 HBL-020RFC:RFS-FIM-301:DI8-RFON-Precond
-HBL-020RFC:RFS-FIM-301:DI8-Wave-PM
 HBL-020RFC:RFS-FIM-301:DI9-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-301:DI9-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-301:DI9-HVON-En-RB
@@ -716,7 +693,6 @@ HBL-020RFC:RFS-FIM-301:RF10-Wave-Avg
 HBL-020RFC:RFS-FIM-301:RF10-Wave-High
 HBL-020RFC:RFS-FIM-301:RF10-Wave-Low
 HBL-020RFC:RFS-FIM-301:RF10-Wave-Med
-HBL-020RFC:RFS-FIM-301:RF10-Wave-PM
 HBL-020RFC:RFS-FIM-301:RF2-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-301:RF2-HVON-En-RB
 HBL-020RFC:RFS-FIM-301:RF2-HVON-Precond
@@ -803,7 +779,6 @@ HBL-020RFC:RFS-FIM-301:RF9-Wave-Avg
 HBL-020RFC:RFS-FIM-301:RF9-Wave-High
 HBL-020RFC:RFS-FIM-301:RF9-Wave-Low
 HBL-020RFC:RFS-FIM-301:RF9-Wave-Med
-HBL-020RFC:RFS-FIM-301:RF9-Wave-PM
 HBL-020RFC:RFS-FIM-301:RFON-Precond
 HBL-020RFC:RFS-FIM-301:RP1-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-301:RP1-HVON-En-RB
@@ -824,7 +799,6 @@ HBL-020RFC:RFS-FIM-301:RP1-RFON-En-RB
 HBL-020RFC:RFS-FIM-301:RP1-RFON-Precond
 HBL-020RFC:RFS-FIM-301:RP1-TrigSel-RB
 HBL-020RFC:RFS-FIM-301:RP1-TrigThre-RB
-HBL-020RFC:RFS-FIM-301:RP1-Wave-IlckPM
 HBL-020RFC:RFS-FIM-301:RP2-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-301:RP2-HVON-En-RB
 HBL-020RFC:RFS-FIM-301:RP2-HVON-Precond
@@ -844,7 +818,6 @@ HBL-020RFC:RFS-FIM-301:RP2-RFON-En-RB
 HBL-020RFC:RFS-FIM-301:RP2-RFON-Precond
 HBL-020RFC:RFS-FIM-301:RP2-TrigSel-RB
 HBL-020RFC:RFS-FIM-301:RP2-TrigThre-RB
-HBL-020RFC:RFS-FIM-301:RP2-Wave-IlckPM
 HBL-020RFC:RFS-FIM-301:TriggerLine-RB
 HBL-020RFC:RFS-Kly-310:PwrFwd-DevMonEval-RB
 HBL-020RFC:RFS-Kly-310:PwrFwd-DevMonFact-RB
@@ -884,7 +857,6 @@ HBL-020RFC:RFS-Kly-310:PwrFwd-Wave-Avg
 HBL-020RFC:RFS-Kly-310:PwrFwd-Wave-High
 HBL-020RFC:RFS-Kly-310:PwrFwd-Wave-Low
 HBL-020RFC:RFS-Kly-310:PwrFwd-Wave-Med
-HBL-020RFC:RFS-Kly-310:PwrFwd-Wave-PM
 HBL-020RFC:RFS-Kly-310:PwrRfl-DevMonEval-RB
 HBL-020RFC:RFS-Kly-310:PwrRfl-DevMonFact-RB
 HBL-020RFC:RFS-Kly-310:PwrRfl-DevMonIlck-RB
@@ -923,12 +895,10 @@ HBL-020RFC:RFS-Kly-310:PwrRfl-Wave-Avg
 HBL-020RFC:RFS-Kly-310:PwrRfl-Wave-High
 HBL-020RFC:RFS-Kly-310:PwrRfl-Wave-Low
 HBL-020RFC:RFS-Kly-310:PwrRfl-Wave-Med
-HBL-020RFC:RFS-Kly-310:PwrRfl-Wave-PM
 HBL-020RFC:RFS-LLRF-301:Status-DIlckMode-RB
 HBL-020RFC:RFS-LLRF-301:Status-Ilck-RB
 HBL-020RFC:RFS-LLRF-301:Status-Input-RB
 HBL-020RFC:RFS-LLRF-301:Status-isFirstIlck
-HBL-020RFC:RFS-LLRF-301:Status-Wave-PM
 HBL-020RFC:RFS-Load-320:PwrFwd-DevMonEval-RB
 HBL-020RFC:RFS-Load-320:PwrFwd-DevMonFact-RB
 HBL-020RFC:RFS-Load-320:PwrFwd-DevMonIlck-RB
@@ -967,7 +937,6 @@ HBL-020RFC:RFS-Load-320:PwrFwd-Wave-Avg
 HBL-020RFC:RFS-Load-320:PwrFwd-Wave-High
 HBL-020RFC:RFS-Load-320:PwrFwd-Wave-Low
 HBL-020RFC:RFS-Load-320:PwrFwd-Wave-Med
-HBL-020RFC:RFS-Load-320:PwrFwd-Wave-PM
 HBL-020RFC:RFS-Load-320:PwrRfl-DevMonEval-RB
 HBL-020RFC:RFS-Load-320:PwrRfl-DevMonFact-RB
 HBL-020RFC:RFS-Load-320:PwrRfl-DevMonIlck-RB
@@ -1006,7 +975,6 @@ HBL-020RFC:RFS-Load-320:PwrRfl-Wave-Avg
 HBL-020RFC:RFS-Load-320:PwrRfl-Wave-High
 HBL-020RFC:RFS-Load-320:PwrRfl-Wave-Low
 HBL-020RFC:RFS-Load-320:PwrRfl-Wave-Med
-HBL-020RFC:RFS-Load-320:PwrRfl-Wave-PM
 HBL-020RFC:RFS-Mod-310:Cur-DevMonEval-RB
 HBL-020RFC:RFS-Mod-310:Cur-DevMonFact-RB
 HBL-020RFC:RFS-Mod-310:Cur-DevMonIlck-RB
@@ -1045,17 +1013,14 @@ HBL-020RFC:RFS-Mod-310:Cur-Wave-Avg
 HBL-020RFC:RFS-Mod-310:Cur-Wave-High
 HBL-020RFC:RFS-Mod-310:Cur-Wave-Low
 HBL-020RFC:RFS-Mod-310:Cur-Wave-Med
-HBL-020RFC:RFS-Mod-310:Cur-Wave-PM
 HBL-020RFC:RFS-Mod-310:PCcon-DIlckMode-RB
 HBL-020RFC:RFS-Mod-310:PCcon-Ilck-RB
 HBL-020RFC:RFS-Mod-310:PCcon-Input-RB
 HBL-020RFC:RFS-Mod-310:PCcon-isFirstIlck
-HBL-020RFC:RFS-Mod-310:PCcon-Wave-PM
 HBL-020RFC:RFS-Mod-310:Ready-DIlckMode-RB
 HBL-020RFC:RFS-Mod-310:Ready-Ilck-RB
 HBL-020RFC:RFS-Mod-310:Ready-Input-RB
 HBL-020RFC:RFS-Mod-310:Ready-isFirstIlck
-HBL-020RFC:RFS-Mod-310:Ready-Wave-PM
 HBL-020RFC:RFS-Mod-310:Vol-DevMonEval-RB
 HBL-020RFC:RFS-Mod-310:Vol-DevMonFact-RB
 HBL-020RFC:RFS-Mod-310:Vol-DevMonIlck-RB
@@ -1094,7 +1059,6 @@ HBL-020RFC:RFS-Mod-310:Vol-Wave-Avg
 HBL-020RFC:RFS-Mod-310:Vol-Wave-High
 HBL-020RFC:RFS-Mod-310:Vol-Wave-Low
 HBL-020RFC:RFS-Mod-310:Vol-Wave-Med
-HBL-020RFC:RFS-Mod-310:Vol-Wave-PM
 HBL-020RFC:RFS-PAmp-310:PwrFwd-DevMonEval-RB
 HBL-020RFC:RFS-PAmp-310:PwrFwd-DevMonFact-RB
 HBL-020RFC:RFS-PAmp-310:PwrFwd-DevMonIlck-RB
@@ -1133,17 +1097,14 @@ HBL-020RFC:RFS-PAmp-310:PwrFwd-Wave-Avg
 HBL-020RFC:RFS-PAmp-310:PwrFwd-Wave-High
 HBL-020RFC:RFS-PAmp-310:PwrFwd-Wave-Low
 HBL-020RFC:RFS-PAmp-310:PwrFwd-Wave-Med
-HBL-020RFC:RFS-PAmp-310:PwrFwd-Wave-PM
 HBL-020RFC:RFS-SIM-310:HvEna-DIlckMode-RB
 HBL-020RFC:RFS-SIM-310:HvEna-Ilck-RB
 HBL-020RFC:RFS-SIM-310:HvEna-Input-RB
 HBL-020RFC:RFS-SIM-310:HvEna-isFirstIlck
-HBL-020RFC:RFS-SIM-310:HvEna-Wave-PM
 HBL-020RFC:RFS-SIM-310:RfEna-DIlckMode-RB
 HBL-020RFC:RFS-SIM-310:RfEna-Ilck-RB
 HBL-020RFC:RFS-SIM-310:RfEna-Input-RB
 HBL-020RFC:RFS-SIM-310:RfEna-isFirstIlck
-HBL-020RFC:RFS-SIM-310:RfEna-Wave-PM
 HBL-020RFC:RFS-SolPS-310:Cur-DevMonEval-RB
 HBL-020RFC:RFS-SolPS-310:Cur-DevMonFact-RB
 HBL-020RFC:RFS-SolPS-310:Cur-DevMonIlck-RB
@@ -1182,7 +1143,6 @@ HBL-020RFC:RFS-SolPS-310:Cur-Wave-Avg
 HBL-020RFC:RFS-SolPS-310:Cur-Wave-High
 HBL-020RFC:RFS-SolPS-310:Cur-Wave-Low
 HBL-020RFC:RFS-SolPS-310:Cur-Wave-Med
-HBL-020RFC:RFS-SolPS-310:Cur-Wave-PM
 HBL-020RFC:RFS-SolPS-320:Cur-DevMonEval-RB
 HBL-020RFC:RFS-SolPS-320:Cur-DevMonFact-RB
 HBL-020RFC:RFS-SolPS-320:Cur-DevMonIlck-RB
@@ -1221,24 +1181,19 @@ HBL-020RFC:RFS-SolPS-320:Cur-Wave-Avg
 HBL-020RFC:RFS-SolPS-320:Cur-Wave-High
 HBL-020RFC:RFS-SolPS-320:Cur-Wave-Low
 HBL-020RFC:RFS-SolPS-320:Cur-Wave-Med
-HBL-020RFC:RFS-SolPS-320:Cur-Wave-PM
 HBL-020RFC:RFS-VacBody-310:Status-DIlckMode-RB
 HBL-020RFC:RFS-VacBody-310:Status-Ilck-RB
 HBL-020RFC:RFS-VacBody-310:Status-Input-RB
 HBL-020RFC:RFS-VacBody-310:Status-isFirstIlck
-HBL-020RFC:RFS-VacBody-310:Status-Wave-PM
 HBL-020RFC:RFS-VacCav-310:Status-DIlckMode-RB
 HBL-020RFC:RFS-VacCav-310:Status-Ilck-RB
 HBL-020RFC:RFS-VacCav-310:Status-Input-RB
 HBL-020RFC:RFS-VacCav-310:Status-isFirstIlck
-HBL-020RFC:RFS-VacCav-310:Status-Wave-PM
 HBL-020RFC:RFS-VacPS-310:I-SP-DIlckMode-RB
 HBL-020RFC:RFS-VacPS-310:I-SP-Ilck-RB
 HBL-020RFC:RFS-VacPS-310:I-SP-Input-RB
 HBL-020RFC:RFS-VacPS-310:I-SP-isFirstIlck
-HBL-020RFC:RFS-VacPS-310:I-SP-Wave-PM
 HBL-020RFC:RFS-VacPS-320:I-SP-DIlckMode-RB
 HBL-020RFC:RFS-VacPS-320:I-SP-Ilck-RB
 HBL-020RFC:RFS-VacPS-320:I-SP-Input-RB
 HBL-020RFC:RFS-VacPS-320:I-SP-isFirstIlck
-HBL-020RFC:RFS-VacPS-320:I-SP-Wave-PM
\ No newline at end of file
diff --git a/files/HBL-020RFC_SC-IOC-402.archive b/files/HBL-020RFC_SC-IOC-402.archive
index 593106f..f385877 100644
--- a/files/HBL-020RFC_SC-IOC-402.archive
+++ b/files/HBL-020RFC_SC-IOC-402.archive
@@ -2,12 +2,10 @@ HBL-020RFC:RFS-ADG-410:IlckStatus-DIlckMode-RB
 HBL-020RFC:RFS-ADG-410:IlckStatus-Ilck-RB
 HBL-020RFC:RFS-ADG-410:IlckStatus-Input-RB
 HBL-020RFC:RFS-ADG-410:IlckStatus-isFirstIlck
-HBL-020RFC:RFS-ADG-410:IlckStatus-Wave-PM
 HBL-020RFC:RFS-ADG-410:PwrFail-DIlckMode-RB
 HBL-020RFC:RFS-ADG-410:PwrFail-Ilck-RB
 HBL-020RFC:RFS-ADG-410:PwrFail-Input-RB
 HBL-020RFC:RFS-ADG-410:PwrFail-isFirstIlck
-HBL-020RFC:RFS-ADG-410:PwrFail-Wave-PM
 HBL-020RFC:RFS-Cav-410:Fld-DevMonEval-RB
 HBL-020RFC:RFS-Cav-410:Fld-DevMonFact-RB
 HBL-020RFC:RFS-Cav-410:Fld-DevMonIlck-RB
@@ -46,7 +44,6 @@ HBL-020RFC:RFS-Cav-410:Fld-Wave-Avg
 HBL-020RFC:RFS-Cav-410:Fld-Wave-High
 HBL-020RFC:RFS-Cav-410:Fld-Wave-Low
 HBL-020RFC:RFS-Cav-410:Fld-Wave-Med
-HBL-020RFC:RFS-Cav-410:Fld-Wave-PM
 HBL-020RFC:RFS-Cav-410:PwrFwd-DevMonEval-RB
 HBL-020RFC:RFS-Cav-410:PwrFwd-DevMonFact-RB
 HBL-020RFC:RFS-Cav-410:PwrFwd-DevMonIlck-RB
@@ -85,7 +82,6 @@ HBL-020RFC:RFS-Cav-410:PwrFwd-Wave-Avg
 HBL-020RFC:RFS-Cav-410:PwrFwd-Wave-High
 HBL-020RFC:RFS-Cav-410:PwrFwd-Wave-Low
 HBL-020RFC:RFS-Cav-410:PwrFwd-Wave-Med
-HBL-020RFC:RFS-Cav-410:PwrFwd-Wave-PM
 HBL-020RFC:RFS-Cav-410:PwrRfl-DevMonEval-RB
 HBL-020RFC:RFS-Cav-410:PwrRfl-DevMonFact-RB
 HBL-020RFC:RFS-Cav-410:PwrRfl-DevMonIlck-RB
@@ -124,7 +120,6 @@ HBL-020RFC:RFS-Cav-410:PwrRfl-Wave-Avg
 HBL-020RFC:RFS-Cav-410:PwrRfl-Wave-High
 HBL-020RFC:RFS-Cav-410:PwrRfl-Wave-Low
 HBL-020RFC:RFS-Cav-410:PwrRfl-Wave-Med
-HBL-020RFC:RFS-Cav-410:PwrRfl-Wave-PM
 HBL-020RFC:RFS-EPR-410:Cur-DevMonEval-RB
 HBL-020RFC:RFS-EPR-410:Cur-DevMonFact-RB
 HBL-020RFC:RFS-EPR-410:Cur-DevMonIlck-RB
@@ -163,7 +158,6 @@ HBL-020RFC:RFS-EPR-410:Cur-Wave-Avg
 HBL-020RFC:RFS-EPR-410:Cur-Wave-High
 HBL-020RFC:RFS-EPR-410:Cur-Wave-Low
 HBL-020RFC:RFS-EPR-410:Cur-Wave-Med
-HBL-020RFC:RFS-EPR-410:Cur-Wave-PM
 HBL-020RFC:RFS-FIM-401:AI1-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-401:AI1-HVON-En-RB
 HBL-020RFC:RFS-FIM-401:AI1-HVON-Precond
@@ -214,7 +208,6 @@ HBL-020RFC:RFS-FIM-401:AI10-Wave-Avg
 HBL-020RFC:RFS-FIM-401:AI10-Wave-High
 HBL-020RFC:RFS-FIM-401:AI10-Wave-Low
 HBL-020RFC:RFS-FIM-401:AI10-Wave-Med
-HBL-020RFC:RFS-FIM-401:AI10-Wave-PM
 HBL-020RFC:RFS-FIM-401:AI2-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-401:AI2-HVON-En-RB
 HBL-020RFC:RFS-FIM-401:AI2-HVON-Precond
@@ -277,7 +270,6 @@ HBL-020RFC:RFS-FIM-401:AI5-Wave-Avg
 HBL-020RFC:RFS-FIM-401:AI5-Wave-High
 HBL-020RFC:RFS-FIM-401:AI5-Wave-Low
 HBL-020RFC:RFS-FIM-401:AI5-Wave-Med
-HBL-020RFC:RFS-FIM-401:AI5-Wave-PM
 HBL-020RFC:RFS-FIM-401:AI6-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-401:AI6-HVON-En-RB
 HBL-020RFC:RFS-FIM-401:AI6-HVON-Precond
@@ -328,7 +320,6 @@ HBL-020RFC:RFS-FIM-401:AI7-Wave-Avg
 HBL-020RFC:RFS-FIM-401:AI7-Wave-High
 HBL-020RFC:RFS-FIM-401:AI7-Wave-Low
 HBL-020RFC:RFS-FIM-401:AI7-Wave-Med
-HBL-020RFC:RFS-FIM-401:AI7-Wave-PM
 HBL-020RFC:RFS-FIM-401:AI8-DevMonEval-RB
 HBL-020RFC:RFS-FIM-401:AI8-DevMonFact-RB
 HBL-020RFC:RFS-FIM-401:AI8-DevMonIlck-RB
@@ -373,7 +364,6 @@ HBL-020RFC:RFS-FIM-401:AI8-Wave-Avg
 HBL-020RFC:RFS-FIM-401:AI8-Wave-High
 HBL-020RFC:RFS-FIM-401:AI8-Wave-Low
 HBL-020RFC:RFS-FIM-401:AI8-Wave-Med
-HBL-020RFC:RFS-FIM-401:AI8-Wave-PM
 HBL-020RFC:RFS-FIM-401:AI9-DevMonEval-RB
 HBL-020RFC:RFS-FIM-401:AI9-DevMonFact-RB
 HBL-020RFC:RFS-FIM-401:AI9-DevMonIlck-RB
@@ -418,7 +408,6 @@ HBL-020RFC:RFS-FIM-401:AI9-Wave-Avg
 HBL-020RFC:RFS-FIM-401:AI9-Wave-High
 HBL-020RFC:RFS-FIM-401:AI9-Wave-Low
 HBL-020RFC:RFS-FIM-401:AI9-Wave-Med
-HBL-020RFC:RFS-FIM-401:AI9-Wave-PM
 HBL-020RFC:RFS-FIM-401:CD1-DevFactor-RB
 HBL-020RFC:RFS-FIM-401:CD1-DevPeriod-RB
 HBL-020RFC:RFS-FIM-401:CD1-FastRst-IlckCnt
@@ -440,7 +429,6 @@ HBL-020RFC:RFS-FIM-401:CD1-RFON-En-RB
 HBL-020RFC:RFS-FIM-401:CD1-RFON-Precond
 HBL-020RFC:RFS-FIM-401:CD1-TrigSel-RB
 HBL-020RFC:RFS-FIM-401:CD1-TrigThre-RB
-HBL-020RFC:RFS-FIM-401:CD1-Wave-IlckPM
 HBL-020RFC:RFS-FIM-401:CD2-DevFactor-RB
 HBL-020RFC:RFS-FIM-401:CD2-DevPeriod-RB
 HBL-020RFC:RFS-FIM-401:CD2-FastRst-IlckCnt
@@ -462,7 +450,6 @@ HBL-020RFC:RFS-FIM-401:CD2-RFON-En-RB
 HBL-020RFC:RFS-FIM-401:CD2-RFON-Precond
 HBL-020RFC:RFS-FIM-401:CD2-TrigSel-RB
 HBL-020RFC:RFS-FIM-401:CD2-TrigThre-RB
-HBL-020RFC:RFS-FIM-401:CD2-Wave-IlckPM
 HBL-020RFC:RFS-FIM-401:DI1-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-401:DI1-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-401:DI1-HVON-En-RB
@@ -481,7 +468,6 @@ HBL-020RFC:RFS-FIM-401:DI10-Input-RB
 HBL-020RFC:RFS-FIM-401:DI10-isFirstIlck
 HBL-020RFC:RFS-FIM-401:DI10-RFON-En-RB
 HBL-020RFC:RFS-FIM-401:DI10-RFON-Precond
-HBL-020RFC:RFS-FIM-401:DI10-Wave-PM
 HBL-020RFC:RFS-FIM-401:DI11-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-401:DI11-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-401:DI11-HVON-En-RB
@@ -500,7 +486,6 @@ HBL-020RFC:RFS-FIM-401:DI12-Input-RB
 HBL-020RFC:RFS-FIM-401:DI12-isFirstIlck
 HBL-020RFC:RFS-FIM-401:DI12-RFON-En-RB
 HBL-020RFC:RFS-FIM-401:DI12-RFON-Precond
-HBL-020RFC:RFS-FIM-401:DI12-Wave-PM
 HBL-020RFC:RFS-FIM-401:DI13-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-401:DI13-DIlckMode-RB
 HBL-020RFC:RFS-FIM-401:DI13-FastRst-IlckCnt
@@ -512,7 +497,6 @@ HBL-020RFC:RFS-FIM-401:DI13-Input-RB
 HBL-020RFC:RFS-FIM-401:DI13-isFirstIlck
 HBL-020RFC:RFS-FIM-401:DI13-RFON-En-RB
 HBL-020RFC:RFS-FIM-401:DI13-RFON-Precond
-HBL-020RFC:RFS-FIM-401:DI13-Wave-PM
 HBL-020RFC:RFS-FIM-401:DI14-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-401:DI14-DIlckMode-RB
 HBL-020RFC:RFS-FIM-401:DI14-FastRst-IlckCnt
@@ -524,7 +508,6 @@ HBL-020RFC:RFS-FIM-401:DI14-Input-RB
 HBL-020RFC:RFS-FIM-401:DI14-isFirstIlck
 HBL-020RFC:RFS-FIM-401:DI14-RFON-En-RB
 HBL-020RFC:RFS-FIM-401:DI14-RFON-Precond
-HBL-020RFC:RFS-FIM-401:DI14-Wave-PM
 HBL-020RFC:RFS-FIM-401:DI15-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-401:DI15-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-401:DI15-HVON-En-RB
@@ -550,7 +533,6 @@ HBL-020RFC:RFS-FIM-401:DI17-Input-RB
 HBL-020RFC:RFS-FIM-401:DI17-isFirstIlck
 HBL-020RFC:RFS-FIM-401:DI17-RFON-En-RB
 HBL-020RFC:RFS-FIM-401:DI17-RFON-Precond
-HBL-020RFC:RFS-FIM-401:DI17-Wave-PM
 HBL-020RFC:RFS-FIM-401:DI18-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-401:DI18-DIlckMode-RB
 HBL-020RFC:RFS-FIM-401:DI18-FastRst-IlckCnt
@@ -562,7 +544,6 @@ HBL-020RFC:RFS-FIM-401:DI18-Input-RB
 HBL-020RFC:RFS-FIM-401:DI18-isFirstIlck
 HBL-020RFC:RFS-FIM-401:DI18-RFON-En-RB
 HBL-020RFC:RFS-FIM-401:DI18-RFON-Precond
-HBL-020RFC:RFS-FIM-401:DI18-Wave-PM
 HBL-020RFC:RFS-FIM-401:DI19-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-401:DI19-DIlckMode-RB
 HBL-020RFC:RFS-FIM-401:DI19-FastRst-IlckCnt
@@ -574,7 +555,6 @@ HBL-020RFC:RFS-FIM-401:DI19-Input-RB
 HBL-020RFC:RFS-FIM-401:DI19-isFirstIlck
 HBL-020RFC:RFS-FIM-401:DI19-RFON-En-RB
 HBL-020RFC:RFS-FIM-401:DI19-RFON-Precond
-HBL-020RFC:RFS-FIM-401:DI19-Wave-PM
 HBL-020RFC:RFS-FIM-401:DI2-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-401:DI2-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-401:DI2-HVON-En-RB
@@ -593,7 +573,6 @@ HBL-020RFC:RFS-FIM-401:DI20-Input-RB
 HBL-020RFC:RFS-FIM-401:DI20-isFirstIlck
 HBL-020RFC:RFS-FIM-401:DI20-RFON-En-RB
 HBL-020RFC:RFS-FIM-401:DI20-RFON-Precond
-HBL-020RFC:RFS-FIM-401:DI20-Wave-PM
 HBL-020RFC:RFS-FIM-401:DI21-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-401:DI21-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-401:DI21-HVON-En-RB
@@ -640,7 +619,6 @@ HBL-020RFC:RFS-FIM-401:DI7-Input-RB
 HBL-020RFC:RFS-FIM-401:DI7-isFirstIlck
 HBL-020RFC:RFS-FIM-401:DI7-RFON-En-RB
 HBL-020RFC:RFS-FIM-401:DI7-RFON-Precond
-HBL-020RFC:RFS-FIM-401:DI7-Wave-PM
 HBL-020RFC:RFS-FIM-401:DI8-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-401:DI8-DIlckMode-RB
 HBL-020RFC:RFS-FIM-401:DI8-FastRst-IlckCnt
@@ -652,7 +630,6 @@ HBL-020RFC:RFS-FIM-401:DI8-Input-RB
 HBL-020RFC:RFS-FIM-401:DI8-isFirstIlck
 HBL-020RFC:RFS-FIM-401:DI8-RFON-En-RB
 HBL-020RFC:RFS-FIM-401:DI8-RFON-Precond
-HBL-020RFC:RFS-FIM-401:DI8-Wave-PM
 HBL-020RFC:RFS-FIM-401:DI9-DIlckLatch-RB
 HBL-020RFC:RFS-FIM-401:DI9-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-401:DI9-HVON-En-RB
@@ -716,7 +693,6 @@ HBL-020RFC:RFS-FIM-401:RF10-Wave-Avg
 HBL-020RFC:RFS-FIM-401:RF10-Wave-High
 HBL-020RFC:RFS-FIM-401:RF10-Wave-Low
 HBL-020RFC:RFS-FIM-401:RF10-Wave-Med
-HBL-020RFC:RFS-FIM-401:RF10-Wave-PM
 HBL-020RFC:RFS-FIM-401:RF2-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-401:RF2-HVON-En-RB
 HBL-020RFC:RFS-FIM-401:RF2-HVON-Precond
@@ -803,7 +779,6 @@ HBL-020RFC:RFS-FIM-401:RF9-Wave-Avg
 HBL-020RFC:RFS-FIM-401:RF9-Wave-High
 HBL-020RFC:RFS-FIM-401:RF9-Wave-Low
 HBL-020RFC:RFS-FIM-401:RF9-Wave-Med
-HBL-020RFC:RFS-FIM-401:RF9-Wave-PM
 HBL-020RFC:RFS-FIM-401:RFON-Precond
 HBL-020RFC:RFS-FIM-401:RP1-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-401:RP1-HVON-En-RB
@@ -824,7 +799,6 @@ HBL-020RFC:RFS-FIM-401:RP1-RFON-En-RB
 HBL-020RFC:RFS-FIM-401:RP1-RFON-Precond
 HBL-020RFC:RFS-FIM-401:RP1-TrigSel-RB
 HBL-020RFC:RFS-FIM-401:RP1-TrigThre-RB
-HBL-020RFC:RFS-FIM-401:RP1-Wave-IlckPM
 HBL-020RFC:RFS-FIM-401:RP2-FastRst-IlckCnt
 HBL-020RFC:RFS-FIM-401:RP2-HVON-En-RB
 HBL-020RFC:RFS-FIM-401:RP2-HVON-Precond
@@ -844,7 +818,6 @@ HBL-020RFC:RFS-FIM-401:RP2-RFON-En-RB
 HBL-020RFC:RFS-FIM-401:RP2-RFON-Precond
 HBL-020RFC:RFS-FIM-401:RP2-TrigSel-RB
 HBL-020RFC:RFS-FIM-401:RP2-TrigThre-RB
-HBL-020RFC:RFS-FIM-401:RP2-Wave-IlckPM
 HBL-020RFC:RFS-FIM-401:TriggerLine-RB
 HBL-020RFC:RFS-Kly-410:PwrFwd-DevMonEval-RB
 HBL-020RFC:RFS-Kly-410:PwrFwd-DevMonFact-RB
@@ -884,7 +857,6 @@ HBL-020RFC:RFS-Kly-410:PwrFwd-Wave-Avg
 HBL-020RFC:RFS-Kly-410:PwrFwd-Wave-High
 HBL-020RFC:RFS-Kly-410:PwrFwd-Wave-Low
 HBL-020RFC:RFS-Kly-410:PwrFwd-Wave-Med
-HBL-020RFC:RFS-Kly-410:PwrFwd-Wave-PM
 HBL-020RFC:RFS-Kly-410:PwrRfl-DevMonEval-RB
 HBL-020RFC:RFS-Kly-410:PwrRfl-DevMonFact-RB
 HBL-020RFC:RFS-Kly-410:PwrRfl-DevMonIlck-RB
@@ -923,12 +895,10 @@ HBL-020RFC:RFS-Kly-410:PwrRfl-Wave-Avg
 HBL-020RFC:RFS-Kly-410:PwrRfl-Wave-High
 HBL-020RFC:RFS-Kly-410:PwrRfl-Wave-Low
 HBL-020RFC:RFS-Kly-410:PwrRfl-Wave-Med
-HBL-020RFC:RFS-Kly-410:PwrRfl-Wave-PM
 HBL-020RFC:RFS-LLRF-401:Status-DIlckMode-RB
 HBL-020RFC:RFS-LLRF-401:Status-Ilck-RB
 HBL-020RFC:RFS-LLRF-401:Status-Input-RB
 HBL-020RFC:RFS-LLRF-401:Status-isFirstIlck
-HBL-020RFC:RFS-LLRF-401:Status-Wave-PM
 HBL-020RFC:RFS-Load-420:PwrFwd-DevMonEval-RB
 HBL-020RFC:RFS-Load-420:PwrFwd-DevMonFact-RB
 HBL-020RFC:RFS-Load-420:PwrFwd-DevMonIlck-RB
@@ -967,7 +937,6 @@ HBL-020RFC:RFS-Load-420:PwrFwd-Wave-Avg
 HBL-020RFC:RFS-Load-420:PwrFwd-Wave-High
 HBL-020RFC:RFS-Load-420:PwrFwd-Wave-Low
 HBL-020RFC:RFS-Load-420:PwrFwd-Wave-Med
-HBL-020RFC:RFS-Load-420:PwrFwd-Wave-PM
 HBL-020RFC:RFS-Load-420:PwrRfl-DevMonEval-RB
 HBL-020RFC:RFS-Load-420:PwrRfl-DevMonFact-RB
 HBL-020RFC:RFS-Load-420:PwrRfl-DevMonIlck-RB
@@ -1006,7 +975,6 @@ HBL-020RFC:RFS-Load-420:PwrRfl-Wave-Avg
 HBL-020RFC:RFS-Load-420:PwrRfl-Wave-High
 HBL-020RFC:RFS-Load-420:PwrRfl-Wave-Low
 HBL-020RFC:RFS-Load-420:PwrRfl-Wave-Med
-HBL-020RFC:RFS-Load-420:PwrRfl-Wave-PM
 HBL-020RFC:RFS-Mod-410:Cur-DevMonEval-RB
 HBL-020RFC:RFS-Mod-410:Cur-DevMonFact-RB
 HBL-020RFC:RFS-Mod-410:Cur-DevMonIlck-RB
@@ -1045,17 +1013,14 @@ HBL-020RFC:RFS-Mod-410:Cur-Wave-Avg
 HBL-020RFC:RFS-Mod-410:Cur-Wave-High
 HBL-020RFC:RFS-Mod-410:Cur-Wave-Low
 HBL-020RFC:RFS-Mod-410:Cur-Wave-Med
-HBL-020RFC:RFS-Mod-410:Cur-Wave-PM
 HBL-020RFC:RFS-Mod-410:PCcon-DIlckMode-RB
 HBL-020RFC:RFS-Mod-410:PCcon-Ilck-RB
 HBL-020RFC:RFS-Mod-410:PCcon-Input-RB
 HBL-020RFC:RFS-Mod-410:PCcon-isFirstIlck
-HBL-020RFC:RFS-Mod-410:PCcon-Wave-PM
 HBL-020RFC:RFS-Mod-410:Ready-DIlckMode-RB
 HBL-020RFC:RFS-Mod-410:Ready-Ilck-RB
 HBL-020RFC:RFS-Mod-410:Ready-Input-RB
 HBL-020RFC:RFS-Mod-410:Ready-isFirstIlck
-HBL-020RFC:RFS-Mod-410:Ready-Wave-PM
 HBL-020RFC:RFS-Mod-410:Vol-DevMonEval-RB
 HBL-020RFC:RFS-Mod-410:Vol-DevMonFact-RB
 HBL-020RFC:RFS-Mod-410:Vol-DevMonIlck-RB
@@ -1094,7 +1059,6 @@ HBL-020RFC:RFS-Mod-410:Vol-Wave-Avg
 HBL-020RFC:RFS-Mod-410:Vol-Wave-High
 HBL-020RFC:RFS-Mod-410:Vol-Wave-Low
 HBL-020RFC:RFS-Mod-410:Vol-Wave-Med
-HBL-020RFC:RFS-Mod-410:Vol-Wave-PM
 HBL-020RFC:RFS-PAmp-410:PwrFwd-DevMonEval-RB
 HBL-020RFC:RFS-PAmp-410:PwrFwd-DevMonFact-RB
 HBL-020RFC:RFS-PAmp-410:PwrFwd-DevMonIlck-RB
@@ -1133,17 +1097,14 @@ HBL-020RFC:RFS-PAmp-410:PwrFwd-Wave-Avg
 HBL-020RFC:RFS-PAmp-410:PwrFwd-Wave-High
 HBL-020RFC:RFS-PAmp-410:PwrFwd-Wave-Low
 HBL-020RFC:RFS-PAmp-410:PwrFwd-Wave-Med
-HBL-020RFC:RFS-PAmp-410:PwrFwd-Wave-PM
 HBL-020RFC:RFS-SIM-410:HvEna-DIlckMode-RB
 HBL-020RFC:RFS-SIM-410:HvEna-Ilck-RB
 HBL-020RFC:RFS-SIM-410:HvEna-Input-RB
 HBL-020RFC:RFS-SIM-410:HvEna-isFirstIlck
-HBL-020RFC:RFS-SIM-410:HvEna-Wave-PM
 HBL-020RFC:RFS-SIM-410:RfEna-DIlckMode-RB
 HBL-020RFC:RFS-SIM-410:RfEna-Ilck-RB
 HBL-020RFC:RFS-SIM-410:RfEna-Input-RB
 HBL-020RFC:RFS-SIM-410:RfEna-isFirstIlck
-HBL-020RFC:RFS-SIM-410:RfEna-Wave-PM
 HBL-020RFC:RFS-SolPS-410:Cur-DevMonEval-RB
 HBL-020RFC:RFS-SolPS-410:Cur-DevMonFact-RB
 HBL-020RFC:RFS-SolPS-410:Cur-DevMonIlck-RB
@@ -1182,7 +1143,6 @@ HBL-020RFC:RFS-SolPS-410:Cur-Wave-Avg
 HBL-020RFC:RFS-SolPS-410:Cur-Wave-High
 HBL-020RFC:RFS-SolPS-410:Cur-Wave-Low
 HBL-020RFC:RFS-SolPS-410:Cur-Wave-Med
-HBL-020RFC:RFS-SolPS-410:Cur-Wave-PM
 HBL-020RFC:RFS-SolPS-420:Cur-DevMonEval-RB
 HBL-020RFC:RFS-SolPS-420:Cur-DevMonFact-RB
 HBL-020RFC:RFS-SolPS-420:Cur-DevMonIlck-RB
@@ -1221,24 +1181,19 @@ HBL-020RFC:RFS-SolPS-420:Cur-Wave-Avg
 HBL-020RFC:RFS-SolPS-420:Cur-Wave-High
 HBL-020RFC:RFS-SolPS-420:Cur-Wave-Low
 HBL-020RFC:RFS-SolPS-420:Cur-Wave-Med
-HBL-020RFC:RFS-SolPS-420:Cur-Wave-PM
 HBL-020RFC:RFS-VacBody-410:Status-DIlckMode-RB
 HBL-020RFC:RFS-VacBody-410:Status-Ilck-RB
 HBL-020RFC:RFS-VacBody-410:Status-Input-RB
 HBL-020RFC:RFS-VacBody-410:Status-isFirstIlck
-HBL-020RFC:RFS-VacBody-410:Status-Wave-PM
 HBL-020RFC:RFS-VacCav-410:Status-DIlckMode-RB
 HBL-020RFC:RFS-VacCav-410:Status-Ilck-RB
 HBL-020RFC:RFS-VacCav-410:Status-Input-RB
 HBL-020RFC:RFS-VacCav-410:Status-isFirstIlck
-HBL-020RFC:RFS-VacCav-410:Status-Wave-PM
 HBL-020RFC:RFS-VacPS-410:I-SP-DIlckMode-RB
 HBL-020RFC:RFS-VacPS-410:I-SP-Ilck-RB
 HBL-020RFC:RFS-VacPS-410:I-SP-Input-RB
 HBL-020RFC:RFS-VacPS-410:I-SP-isFirstIlck
-HBL-020RFC:RFS-VacPS-410:I-SP-Wave-PM
 HBL-020RFC:RFS-VacPS-420:I-SP-DIlckMode-RB
 HBL-020RFC:RFS-VacPS-420:I-SP-Ilck-RB
 HBL-020RFC:RFS-VacPS-420:I-SP-Input-RB
 HBL-020RFC:RFS-VacPS-420:I-SP-isFirstIlck
-HBL-020RFC:RFS-VacPS-420:I-SP-Wave-PM
\ No newline at end of file
diff --git a/files/MBL-010RFC_RFS-RFLPS-101.archive b/files/MBL-010RFC_RFS-RFLPS-101.archive
index 01ee199..b25fe43 100644
--- a/files/MBL-010RFC_RFS-RFLPS-101.archive
+++ b/files/MBL-010RFC_RFS-RFLPS-101.archive
@@ -2,12 +2,10 @@ MBL-010RFC:RFS-ADG-110:IlckStatus-DIlckMode-RB
 MBL-010RFC:RFS-ADG-110:IlckStatus-Ilck-RB
 MBL-010RFC:RFS-ADG-110:IlckStatus-Input-RB
 MBL-010RFC:RFS-ADG-110:IlckStatus-isFirstIlck
-MBL-010RFC:RFS-ADG-110:IlckStatus-Wave-PM
 MBL-010RFC:RFS-ADG-110:PwrFail-DIlckMode-RB
 MBL-010RFC:RFS-ADG-110:PwrFail-Ilck-RB
 MBL-010RFC:RFS-ADG-110:PwrFail-Input-RB
 MBL-010RFC:RFS-ADG-110:PwrFail-isFirstIlck
-MBL-010RFC:RFS-ADG-110:PwrFail-Wave-PM
 MBL-010RFC:RFS-Cav-110:Fld-DevMonEval-RB
 MBL-010RFC:RFS-Cav-110:Fld-DevMonFact-RB
 MBL-010RFC:RFS-Cav-110:Fld-DevMonIlck-RB
@@ -46,7 +44,6 @@ MBL-010RFC:RFS-Cav-110:Fld-Wave-Avg
 MBL-010RFC:RFS-Cav-110:Fld-Wave-High
 MBL-010RFC:RFS-Cav-110:Fld-Wave-Low
 MBL-010RFC:RFS-Cav-110:Fld-Wave-Med
-MBL-010RFC:RFS-Cav-110:Fld-Wave-PM
 MBL-010RFC:RFS-Cav-110:PwrFwd-DevMonEval-RB
 MBL-010RFC:RFS-Cav-110:PwrFwd-DevMonFact-RB
 MBL-010RFC:RFS-Cav-110:PwrFwd-DevMonIlck-RB
@@ -85,7 +82,6 @@ MBL-010RFC:RFS-Cav-110:PwrFwd-Wave-Avg
 MBL-010RFC:RFS-Cav-110:PwrFwd-Wave-High
 MBL-010RFC:RFS-Cav-110:PwrFwd-Wave-Low
 MBL-010RFC:RFS-Cav-110:PwrFwd-Wave-Med
-MBL-010RFC:RFS-Cav-110:PwrFwd-Wave-PM
 MBL-010RFC:RFS-Cav-110:PwrRfl-DevMonEval-RB
 MBL-010RFC:RFS-Cav-110:PwrRfl-DevMonFact-RB
 MBL-010RFC:RFS-Cav-110:PwrRfl-DevMonIlck-RB
@@ -124,7 +120,6 @@ MBL-010RFC:RFS-Cav-110:PwrRfl-Wave-Avg
 MBL-010RFC:RFS-Cav-110:PwrRfl-Wave-High
 MBL-010RFC:RFS-Cav-110:PwrRfl-Wave-Low
 MBL-010RFC:RFS-Cav-110:PwrRfl-Wave-Med
-MBL-010RFC:RFS-Cav-110:PwrRfl-Wave-PM
 MBL-010RFC:RFS-EPR-110:Cur-DevMonEval-RB
 MBL-010RFC:RFS-EPR-110:Cur-DevMonFact-RB
 MBL-010RFC:RFS-EPR-110:Cur-DevMonIlck-RB
@@ -163,7 +158,6 @@ MBL-010RFC:RFS-EPR-110:Cur-Wave-Avg
 MBL-010RFC:RFS-EPR-110:Cur-Wave-High
 MBL-010RFC:RFS-EPR-110:Cur-Wave-Low
 MBL-010RFC:RFS-EPR-110:Cur-Wave-Med
-MBL-010RFC:RFS-EPR-110:Cur-Wave-PM
 MBL-010RFC:RFS-FIM-101:AI1-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-101:AI1-HVON-En-RB
 MBL-010RFC:RFS-FIM-101:AI1-HVON-Precond
@@ -214,7 +208,6 @@ MBL-010RFC:RFS-FIM-101:AI10-Wave-Avg
 MBL-010RFC:RFS-FIM-101:AI10-Wave-High
 MBL-010RFC:RFS-FIM-101:AI10-Wave-Low
 MBL-010RFC:RFS-FIM-101:AI10-Wave-Med
-MBL-010RFC:RFS-FIM-101:AI10-Wave-PM
 MBL-010RFC:RFS-FIM-101:AI2-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-101:AI2-HVON-En-RB
 MBL-010RFC:RFS-FIM-101:AI2-HVON-Precond
@@ -277,7 +270,6 @@ MBL-010RFC:RFS-FIM-101:AI5-Wave-Avg
 MBL-010RFC:RFS-FIM-101:AI5-Wave-High
 MBL-010RFC:RFS-FIM-101:AI5-Wave-Low
 MBL-010RFC:RFS-FIM-101:AI5-Wave-Med
-MBL-010RFC:RFS-FIM-101:AI5-Wave-PM
 MBL-010RFC:RFS-FIM-101:AI6-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-101:AI6-HVON-En-RB
 MBL-010RFC:RFS-FIM-101:AI6-HVON-Precond
@@ -328,7 +320,6 @@ MBL-010RFC:RFS-FIM-101:AI7-Wave-Avg
 MBL-010RFC:RFS-FIM-101:AI7-Wave-High
 MBL-010RFC:RFS-FIM-101:AI7-Wave-Low
 MBL-010RFC:RFS-FIM-101:AI7-Wave-Med
-MBL-010RFC:RFS-FIM-101:AI7-Wave-PM
 MBL-010RFC:RFS-FIM-101:AI8-DevMonEval-RB
 MBL-010RFC:RFS-FIM-101:AI8-DevMonFact-RB
 MBL-010RFC:RFS-FIM-101:AI8-DevMonIlck-RB
@@ -373,7 +364,6 @@ MBL-010RFC:RFS-FIM-101:AI8-Wave-Avg
 MBL-010RFC:RFS-FIM-101:AI8-Wave-High
 MBL-010RFC:RFS-FIM-101:AI8-Wave-Low
 MBL-010RFC:RFS-FIM-101:AI8-Wave-Med
-MBL-010RFC:RFS-FIM-101:AI8-Wave-PM
 MBL-010RFC:RFS-FIM-101:AI9-DevMonEval-RB
 MBL-010RFC:RFS-FIM-101:AI9-DevMonFact-RB
 MBL-010RFC:RFS-FIM-101:AI9-DevMonIlck-RB
@@ -418,7 +408,6 @@ MBL-010RFC:RFS-FIM-101:AI9-Wave-Avg
 MBL-010RFC:RFS-FIM-101:AI9-Wave-High
 MBL-010RFC:RFS-FIM-101:AI9-Wave-Low
 MBL-010RFC:RFS-FIM-101:AI9-Wave-Med
-MBL-010RFC:RFS-FIM-101:AI9-Wave-PM
 MBL-010RFC:RFS-FIM-101:CD1-DevFactor-RB
 MBL-010RFC:RFS-FIM-101:CD1-DevPeriod-RB
 MBL-010RFC:RFS-FIM-101:CD1-FastRst-IlckCnt
@@ -440,7 +429,6 @@ MBL-010RFC:RFS-FIM-101:CD1-RFON-En-RB
 MBL-010RFC:RFS-FIM-101:CD1-RFON-Precond
 MBL-010RFC:RFS-FIM-101:CD1-TrigSel-RB
 MBL-010RFC:RFS-FIM-101:CD1-TrigThre-RB
-MBL-010RFC:RFS-FIM-101:CD1-Wave-IlckPM
 MBL-010RFC:RFS-FIM-101:CD2-DevFactor-RB
 MBL-010RFC:RFS-FIM-101:CD2-DevPeriod-RB
 MBL-010RFC:RFS-FIM-101:CD2-FastRst-IlckCnt
@@ -462,7 +450,6 @@ MBL-010RFC:RFS-FIM-101:CD2-RFON-En-RB
 MBL-010RFC:RFS-FIM-101:CD2-RFON-Precond
 MBL-010RFC:RFS-FIM-101:CD2-TrigSel-RB
 MBL-010RFC:RFS-FIM-101:CD2-TrigThre-RB
-MBL-010RFC:RFS-FIM-101:CD2-Wave-IlckPM
 MBL-010RFC:RFS-FIM-101:DI1-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-101:DI1-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-101:DI1-HVON-En-RB
@@ -481,7 +468,6 @@ MBL-010RFC:RFS-FIM-101:DI10-Input-RB
 MBL-010RFC:RFS-FIM-101:DI10-isFirstIlck
 MBL-010RFC:RFS-FIM-101:DI10-RFON-En-RB
 MBL-010RFC:RFS-FIM-101:DI10-RFON-Precond
-MBL-010RFC:RFS-FIM-101:DI10-Wave-PM
 MBL-010RFC:RFS-FIM-101:DI11-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-101:DI11-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-101:DI11-HVON-En-RB
@@ -500,7 +486,6 @@ MBL-010RFC:RFS-FIM-101:DI12-Input-RB
 MBL-010RFC:RFS-FIM-101:DI12-isFirstIlck
 MBL-010RFC:RFS-FIM-101:DI12-RFON-En-RB
 MBL-010RFC:RFS-FIM-101:DI12-RFON-Precond
-MBL-010RFC:RFS-FIM-101:DI12-Wave-PM
 MBL-010RFC:RFS-FIM-101:DI13-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-101:DI13-DIlckMode-RB
 MBL-010RFC:RFS-FIM-101:DI13-FastRst-IlckCnt
@@ -512,7 +497,6 @@ MBL-010RFC:RFS-FIM-101:DI13-Input-RB
 MBL-010RFC:RFS-FIM-101:DI13-isFirstIlck
 MBL-010RFC:RFS-FIM-101:DI13-RFON-En-RB
 MBL-010RFC:RFS-FIM-101:DI13-RFON-Precond
-MBL-010RFC:RFS-FIM-101:DI13-Wave-PM
 MBL-010RFC:RFS-FIM-101:DI14-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-101:DI14-DIlckMode-RB
 MBL-010RFC:RFS-FIM-101:DI14-FastRst-IlckCnt
@@ -524,7 +508,6 @@ MBL-010RFC:RFS-FIM-101:DI14-Input-RB
 MBL-010RFC:RFS-FIM-101:DI14-isFirstIlck
 MBL-010RFC:RFS-FIM-101:DI14-RFON-En-RB
 MBL-010RFC:RFS-FIM-101:DI14-RFON-Precond
-MBL-010RFC:RFS-FIM-101:DI14-Wave-PM
 MBL-010RFC:RFS-FIM-101:DI15-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-101:DI15-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-101:DI15-HVON-En-RB
@@ -550,7 +533,6 @@ MBL-010RFC:RFS-FIM-101:DI17-Input-RB
 MBL-010RFC:RFS-FIM-101:DI17-isFirstIlck
 MBL-010RFC:RFS-FIM-101:DI17-RFON-En-RB
 MBL-010RFC:RFS-FIM-101:DI17-RFON-Precond
-MBL-010RFC:RFS-FIM-101:DI17-Wave-PM
 MBL-010RFC:RFS-FIM-101:DI18-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-101:DI18-DIlckMode-RB
 MBL-010RFC:RFS-FIM-101:DI18-FastRst-IlckCnt
@@ -562,7 +544,6 @@ MBL-010RFC:RFS-FIM-101:DI18-Input-RB
 MBL-010RFC:RFS-FIM-101:DI18-isFirstIlck
 MBL-010RFC:RFS-FIM-101:DI18-RFON-En-RB
 MBL-010RFC:RFS-FIM-101:DI18-RFON-Precond
-MBL-010RFC:RFS-FIM-101:DI18-Wave-PM
 MBL-010RFC:RFS-FIM-101:DI19-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-101:DI19-DIlckMode-RB
 MBL-010RFC:RFS-FIM-101:DI19-FastRst-IlckCnt
@@ -574,7 +555,6 @@ MBL-010RFC:RFS-FIM-101:DI19-Input-RB
 MBL-010RFC:RFS-FIM-101:DI19-isFirstIlck
 MBL-010RFC:RFS-FIM-101:DI19-RFON-En-RB
 MBL-010RFC:RFS-FIM-101:DI19-RFON-Precond
-MBL-010RFC:RFS-FIM-101:DI19-Wave-PM
 MBL-010RFC:RFS-FIM-101:DI2-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-101:DI2-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-101:DI2-HVON-En-RB
@@ -593,7 +573,6 @@ MBL-010RFC:RFS-FIM-101:DI20-Input-RB
 MBL-010RFC:RFS-FIM-101:DI20-isFirstIlck
 MBL-010RFC:RFS-FIM-101:DI20-RFON-En-RB
 MBL-010RFC:RFS-FIM-101:DI20-RFON-Precond
-MBL-010RFC:RFS-FIM-101:DI20-Wave-PM
 MBL-010RFC:RFS-FIM-101:DI21-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-101:DI21-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-101:DI21-HVON-En-RB
@@ -640,7 +619,6 @@ MBL-010RFC:RFS-FIM-101:DI7-Input-RB
 MBL-010RFC:RFS-FIM-101:DI7-isFirstIlck
 MBL-010RFC:RFS-FIM-101:DI7-RFON-En-RB
 MBL-010RFC:RFS-FIM-101:DI7-RFON-Precond
-MBL-010RFC:RFS-FIM-101:DI7-Wave-PM
 MBL-010RFC:RFS-FIM-101:DI8-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-101:DI8-DIlckMode-RB
 MBL-010RFC:RFS-FIM-101:DI8-FastRst-IlckCnt
@@ -652,7 +630,6 @@ MBL-010RFC:RFS-FIM-101:DI8-Input-RB
 MBL-010RFC:RFS-FIM-101:DI8-isFirstIlck
 MBL-010RFC:RFS-FIM-101:DI8-RFON-En-RB
 MBL-010RFC:RFS-FIM-101:DI8-RFON-Precond
-MBL-010RFC:RFS-FIM-101:DI8-Wave-PM
 MBL-010RFC:RFS-FIM-101:DI9-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-101:DI9-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-101:DI9-HVON-En-RB
@@ -716,7 +693,6 @@ MBL-010RFC:RFS-FIM-101:RF10-Wave-Avg
 MBL-010RFC:RFS-FIM-101:RF10-Wave-High
 MBL-010RFC:RFS-FIM-101:RF10-Wave-Low
 MBL-010RFC:RFS-FIM-101:RF10-Wave-Med
-MBL-010RFC:RFS-FIM-101:RF10-Wave-PM
 MBL-010RFC:RFS-FIM-101:RF2-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-101:RF2-HVON-En-RB
 MBL-010RFC:RFS-FIM-101:RF2-HVON-Precond
@@ -803,7 +779,6 @@ MBL-010RFC:RFS-FIM-101:RF9-Wave-Avg
 MBL-010RFC:RFS-FIM-101:RF9-Wave-High
 MBL-010RFC:RFS-FIM-101:RF9-Wave-Low
 MBL-010RFC:RFS-FIM-101:RF9-Wave-Med
-MBL-010RFC:RFS-FIM-101:RF9-Wave-PM
 MBL-010RFC:RFS-FIM-101:RFON-Precond
 MBL-010RFC:RFS-FIM-101:RP1-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-101:RP1-HVON-En-RB
@@ -824,7 +799,6 @@ MBL-010RFC:RFS-FIM-101:RP1-RFON-En-RB
 MBL-010RFC:RFS-FIM-101:RP1-RFON-Precond
 MBL-010RFC:RFS-FIM-101:RP1-TrigSel-RB
 MBL-010RFC:RFS-FIM-101:RP1-TrigThre-RB
-MBL-010RFC:RFS-FIM-101:RP1-Wave-IlckPM
 MBL-010RFC:RFS-FIM-101:RP2-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-101:RP2-HVON-En-RB
 MBL-010RFC:RFS-FIM-101:RP2-HVON-Precond
@@ -844,7 +818,6 @@ MBL-010RFC:RFS-FIM-101:RP2-RFON-En-RB
 MBL-010RFC:RFS-FIM-101:RP2-RFON-Precond
 MBL-010RFC:RFS-FIM-101:RP2-TrigSel-RB
 MBL-010RFC:RFS-FIM-101:RP2-TrigThre-RB
-MBL-010RFC:RFS-FIM-101:RP2-Wave-IlckPM
 MBL-010RFC:RFS-FIM-101:TriggerLine-RB
 MBL-010RFC:RFS-Kly-110:PwrFwd-DevMonEval-RB
 MBL-010RFC:RFS-Kly-110:PwrFwd-DevMonFact-RB
@@ -884,7 +857,6 @@ MBL-010RFC:RFS-Kly-110:PwrFwd-Wave-Avg
 MBL-010RFC:RFS-Kly-110:PwrFwd-Wave-High
 MBL-010RFC:RFS-Kly-110:PwrFwd-Wave-Low
 MBL-010RFC:RFS-Kly-110:PwrFwd-Wave-Med
-MBL-010RFC:RFS-Kly-110:PwrFwd-Wave-PM
 MBL-010RFC:RFS-Kly-110:PwrRfl-DevMonEval-RB
 MBL-010RFC:RFS-Kly-110:PwrRfl-DevMonFact-RB
 MBL-010RFC:RFS-Kly-110:PwrRfl-DevMonIlck-RB
@@ -923,12 +895,10 @@ MBL-010RFC:RFS-Kly-110:PwrRfl-Wave-Avg
 MBL-010RFC:RFS-Kly-110:PwrRfl-Wave-High
 MBL-010RFC:RFS-Kly-110:PwrRfl-Wave-Low
 MBL-010RFC:RFS-Kly-110:PwrRfl-Wave-Med
-MBL-010RFC:RFS-Kly-110:PwrRfl-Wave-PM
 MBL-010RFC:RFS-LLRF-101:Status-DIlckMode-RB
 MBL-010RFC:RFS-LLRF-101:Status-Ilck-RB
 MBL-010RFC:RFS-LLRF-101:Status-Input-RB
 MBL-010RFC:RFS-LLRF-101:Status-isFirstIlck
-MBL-010RFC:RFS-LLRF-101:Status-Wave-PM
 MBL-010RFC:RFS-Load-120:PwrFwd-DevMonEval-RB
 MBL-010RFC:RFS-Load-120:PwrFwd-DevMonFact-RB
 MBL-010RFC:RFS-Load-120:PwrFwd-DevMonIlck-RB
@@ -967,7 +937,6 @@ MBL-010RFC:RFS-Load-120:PwrFwd-Wave-Avg
 MBL-010RFC:RFS-Load-120:PwrFwd-Wave-High
 MBL-010RFC:RFS-Load-120:PwrFwd-Wave-Low
 MBL-010RFC:RFS-Load-120:PwrFwd-Wave-Med
-MBL-010RFC:RFS-Load-120:PwrFwd-Wave-PM
 MBL-010RFC:RFS-Load-120:PwrRfl-DevMonEval-RB
 MBL-010RFC:RFS-Load-120:PwrRfl-DevMonFact-RB
 MBL-010RFC:RFS-Load-120:PwrRfl-DevMonIlck-RB
@@ -1006,7 +975,6 @@ MBL-010RFC:RFS-Load-120:PwrRfl-Wave-Avg
 MBL-010RFC:RFS-Load-120:PwrRfl-Wave-High
 MBL-010RFC:RFS-Load-120:PwrRfl-Wave-Low
 MBL-010RFC:RFS-Load-120:PwrRfl-Wave-Med
-MBL-010RFC:RFS-Load-120:PwrRfl-Wave-PM
 MBL-010RFC:RFS-Mod-110:Cur-DevMonEval-RB
 MBL-010RFC:RFS-Mod-110:Cur-DevMonFact-RB
 MBL-010RFC:RFS-Mod-110:Cur-DevMonIlck-RB
@@ -1045,17 +1013,14 @@ MBL-010RFC:RFS-Mod-110:Cur-Wave-Avg
 MBL-010RFC:RFS-Mod-110:Cur-Wave-High
 MBL-010RFC:RFS-Mod-110:Cur-Wave-Low
 MBL-010RFC:RFS-Mod-110:Cur-Wave-Med
-MBL-010RFC:RFS-Mod-110:Cur-Wave-PM
 MBL-010RFC:RFS-Mod-110:PCcon-DIlckMode-RB
 MBL-010RFC:RFS-Mod-110:PCcon-Ilck-RB
 MBL-010RFC:RFS-Mod-110:PCcon-Input-RB
 MBL-010RFC:RFS-Mod-110:PCcon-isFirstIlck
-MBL-010RFC:RFS-Mod-110:PCcon-Wave-PM
 MBL-010RFC:RFS-Mod-110:Ready-DIlckMode-RB
 MBL-010RFC:RFS-Mod-110:Ready-Ilck-RB
 MBL-010RFC:RFS-Mod-110:Ready-Input-RB
 MBL-010RFC:RFS-Mod-110:Ready-isFirstIlck
-MBL-010RFC:RFS-Mod-110:Ready-Wave-PM
 MBL-010RFC:RFS-Mod-110:Vol-DevMonEval-RB
 MBL-010RFC:RFS-Mod-110:Vol-DevMonFact-RB
 MBL-010RFC:RFS-Mod-110:Vol-DevMonIlck-RB
@@ -1094,7 +1059,6 @@ MBL-010RFC:RFS-Mod-110:Vol-Wave-Avg
 MBL-010RFC:RFS-Mod-110:Vol-Wave-High
 MBL-010RFC:RFS-Mod-110:Vol-Wave-Low
 MBL-010RFC:RFS-Mod-110:Vol-Wave-Med
-MBL-010RFC:RFS-Mod-110:Vol-Wave-PM
 MBL-010RFC:RFS-PAmp-110:PwrFwd-DevMonEval-RB
 MBL-010RFC:RFS-PAmp-110:PwrFwd-DevMonFact-RB
 MBL-010RFC:RFS-PAmp-110:PwrFwd-DevMonIlck-RB
@@ -1133,17 +1097,14 @@ MBL-010RFC:RFS-PAmp-110:PwrFwd-Wave-Avg
 MBL-010RFC:RFS-PAmp-110:PwrFwd-Wave-High
 MBL-010RFC:RFS-PAmp-110:PwrFwd-Wave-Low
 MBL-010RFC:RFS-PAmp-110:PwrFwd-Wave-Med
-MBL-010RFC:RFS-PAmp-110:PwrFwd-Wave-PM
 MBL-010RFC:RFS-SIM-110:HvEna-DIlckMode-RB
 MBL-010RFC:RFS-SIM-110:HvEna-Ilck-RB
 MBL-010RFC:RFS-SIM-110:HvEna-Input-RB
 MBL-010RFC:RFS-SIM-110:HvEna-isFirstIlck
-MBL-010RFC:RFS-SIM-110:HvEna-Wave-PM
 MBL-010RFC:RFS-SIM-110:RfEna-DIlckMode-RB
 MBL-010RFC:RFS-SIM-110:RfEna-Ilck-RB
 MBL-010RFC:RFS-SIM-110:RfEna-Input-RB
 MBL-010RFC:RFS-SIM-110:RfEna-isFirstIlck
-MBL-010RFC:RFS-SIM-110:RfEna-Wave-PM
 MBL-010RFC:RFS-SolPS-110:Cur-DevMonEval-RB
 MBL-010RFC:RFS-SolPS-110:Cur-DevMonFact-RB
 MBL-010RFC:RFS-SolPS-110:Cur-DevMonIlck-RB
@@ -1182,7 +1143,6 @@ MBL-010RFC:RFS-SolPS-110:Cur-Wave-Avg
 MBL-010RFC:RFS-SolPS-110:Cur-Wave-High
 MBL-010RFC:RFS-SolPS-110:Cur-Wave-Low
 MBL-010RFC:RFS-SolPS-110:Cur-Wave-Med
-MBL-010RFC:RFS-SolPS-110:Cur-Wave-PM
 MBL-010RFC:RFS-SolPS-120:Cur-DevMonEval-RB
 MBL-010RFC:RFS-SolPS-120:Cur-DevMonFact-RB
 MBL-010RFC:RFS-SolPS-120:Cur-DevMonIlck-RB
@@ -1221,24 +1181,19 @@ MBL-010RFC:RFS-SolPS-120:Cur-Wave-Avg
 MBL-010RFC:RFS-SolPS-120:Cur-Wave-High
 MBL-010RFC:RFS-SolPS-120:Cur-Wave-Low
 MBL-010RFC:RFS-SolPS-120:Cur-Wave-Med
-MBL-010RFC:RFS-SolPS-120:Cur-Wave-PM
 MBL-010RFC:RFS-VacBody-110:Status-DIlckMode-RB
 MBL-010RFC:RFS-VacBody-110:Status-Ilck-RB
 MBL-010RFC:RFS-VacBody-110:Status-Input-RB
 MBL-010RFC:RFS-VacBody-110:Status-isFirstIlck
-MBL-010RFC:RFS-VacBody-110:Status-Wave-PM
 MBL-010RFC:RFS-VacCav-110:Status-DIlckMode-RB
 MBL-010RFC:RFS-VacCav-110:Status-Ilck-RB
 MBL-010RFC:RFS-VacCav-110:Status-Input-RB
 MBL-010RFC:RFS-VacCav-110:Status-isFirstIlck
-MBL-010RFC:RFS-VacCav-110:Status-Wave-PM
 MBL-010RFC:RFS-VacPS-110:I-SP-DIlckMode-RB
 MBL-010RFC:RFS-VacPS-110:I-SP-Ilck-RB
 MBL-010RFC:RFS-VacPS-110:I-SP-Input-RB
 MBL-010RFC:RFS-VacPS-110:I-SP-isFirstIlck
-MBL-010RFC:RFS-VacPS-110:I-SP-Wave-PM
 MBL-010RFC:RFS-VacPS-120:I-SP-DIlckMode-RB
 MBL-010RFC:RFS-VacPS-120:I-SP-Ilck-RB
 MBL-010RFC:RFS-VacPS-120:I-SP-Input-RB
 MBL-010RFC:RFS-VacPS-120:I-SP-isFirstIlck
-MBL-010RFC:RFS-VacPS-120:I-SP-Wave-PM
diff --git a/files/MBL-010RFC_RFS-RFLPS-201.archive b/files/MBL-010RFC_RFS-RFLPS-201.archive
index a09c18b..d0b9dad 100644
--- a/files/MBL-010RFC_RFS-RFLPS-201.archive
+++ b/files/MBL-010RFC_RFS-RFLPS-201.archive
@@ -2,12 +2,10 @@ MBL-010RFC:RFS-ADG-210:IlckStatus-DIlckMode-RB
 MBL-010RFC:RFS-ADG-210:IlckStatus-Ilck-RB
 MBL-010RFC:RFS-ADG-210:IlckStatus-Input-RB
 MBL-010RFC:RFS-ADG-210:IlckStatus-isFirstIlck
-MBL-010RFC:RFS-ADG-210:IlckStatus-Wave-PM
 MBL-010RFC:RFS-ADG-210:PwrFail-DIlckMode-RB
 MBL-010RFC:RFS-ADG-210:PwrFail-Ilck-RB
 MBL-010RFC:RFS-ADG-210:PwrFail-Input-RB
 MBL-010RFC:RFS-ADG-210:PwrFail-isFirstIlck
-MBL-010RFC:RFS-ADG-210:PwrFail-Wave-PM
 MBL-010RFC:RFS-Cav-210:Fld-DevMonEval-RB
 MBL-010RFC:RFS-Cav-210:Fld-DevMonFact-RB
 MBL-010RFC:RFS-Cav-210:Fld-DevMonIlck-RB
@@ -46,7 +44,6 @@ MBL-010RFC:RFS-Cav-210:Fld-Wave-Avg
 MBL-010RFC:RFS-Cav-210:Fld-Wave-High
 MBL-010RFC:RFS-Cav-210:Fld-Wave-Low
 MBL-010RFC:RFS-Cav-210:Fld-Wave-Med
-MBL-010RFC:RFS-Cav-210:Fld-Wave-PM
 MBL-010RFC:RFS-Cav-210:PwrFwd-DevMonEval-RB
 MBL-010RFC:RFS-Cav-210:PwrFwd-DevMonFact-RB
 MBL-010RFC:RFS-Cav-210:PwrFwd-DevMonIlck-RB
@@ -85,7 +82,6 @@ MBL-010RFC:RFS-Cav-210:PwrFwd-Wave-Avg
 MBL-010RFC:RFS-Cav-210:PwrFwd-Wave-High
 MBL-010RFC:RFS-Cav-210:PwrFwd-Wave-Low
 MBL-010RFC:RFS-Cav-210:PwrFwd-Wave-Med
-MBL-010RFC:RFS-Cav-210:PwrFwd-Wave-PM
 MBL-010RFC:RFS-Cav-210:PwrRfl-DevMonEval-RB
 MBL-010RFC:RFS-Cav-210:PwrRfl-DevMonFact-RB
 MBL-010RFC:RFS-Cav-210:PwrRfl-DevMonIlck-RB
@@ -124,7 +120,6 @@ MBL-010RFC:RFS-Cav-210:PwrRfl-Wave-Avg
 MBL-010RFC:RFS-Cav-210:PwrRfl-Wave-High
 MBL-010RFC:RFS-Cav-210:PwrRfl-Wave-Low
 MBL-010RFC:RFS-Cav-210:PwrRfl-Wave-Med
-MBL-010RFC:RFS-Cav-210:PwrRfl-Wave-PM
 MBL-010RFC:RFS-EPR-210:Cur-DevMonEval-RB
 MBL-010RFC:RFS-EPR-210:Cur-DevMonFact-RB
 MBL-010RFC:RFS-EPR-210:Cur-DevMonIlck-RB
@@ -163,7 +158,6 @@ MBL-010RFC:RFS-EPR-210:Cur-Wave-Avg
 MBL-010RFC:RFS-EPR-210:Cur-Wave-High
 MBL-010RFC:RFS-EPR-210:Cur-Wave-Low
 MBL-010RFC:RFS-EPR-210:Cur-Wave-Med
-MBL-010RFC:RFS-EPR-210:Cur-Wave-PM
 MBL-010RFC:RFS-FIM-201:AI1-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-201:AI1-HVON-En-RB
 MBL-010RFC:RFS-FIM-201:AI1-HVON-Precond
@@ -214,7 +208,6 @@ MBL-010RFC:RFS-FIM-201:AI10-Wave-Avg
 MBL-010RFC:RFS-FIM-201:AI10-Wave-High
 MBL-010RFC:RFS-FIM-201:AI10-Wave-Low
 MBL-010RFC:RFS-FIM-201:AI10-Wave-Med
-MBL-010RFC:RFS-FIM-201:AI10-Wave-PM
 MBL-010RFC:RFS-FIM-201:AI2-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-201:AI2-HVON-En-RB
 MBL-010RFC:RFS-FIM-201:AI2-HVON-Precond
@@ -277,7 +270,6 @@ MBL-010RFC:RFS-FIM-201:AI5-Wave-Avg
 MBL-010RFC:RFS-FIM-201:AI5-Wave-High
 MBL-010RFC:RFS-FIM-201:AI5-Wave-Low
 MBL-010RFC:RFS-FIM-201:AI5-Wave-Med
-MBL-010RFC:RFS-FIM-201:AI5-Wave-PM
 MBL-010RFC:RFS-FIM-201:AI6-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-201:AI6-HVON-En-RB
 MBL-010RFC:RFS-FIM-201:AI6-HVON-Precond
@@ -328,7 +320,6 @@ MBL-010RFC:RFS-FIM-201:AI7-Wave-Avg
 MBL-010RFC:RFS-FIM-201:AI7-Wave-High
 MBL-010RFC:RFS-FIM-201:AI7-Wave-Low
 MBL-010RFC:RFS-FIM-201:AI7-Wave-Med
-MBL-010RFC:RFS-FIM-201:AI7-Wave-PM
 MBL-010RFC:RFS-FIM-201:AI8-DevMonEval-RB
 MBL-010RFC:RFS-FIM-201:AI8-DevMonFact-RB
 MBL-010RFC:RFS-FIM-201:AI8-DevMonIlck-RB
@@ -373,7 +364,6 @@ MBL-010RFC:RFS-FIM-201:AI8-Wave-Avg
 MBL-010RFC:RFS-FIM-201:AI8-Wave-High
 MBL-010RFC:RFS-FIM-201:AI8-Wave-Low
 MBL-010RFC:RFS-FIM-201:AI8-Wave-Med
-MBL-010RFC:RFS-FIM-201:AI8-Wave-PM
 MBL-010RFC:RFS-FIM-201:AI9-DevMonEval-RB
 MBL-010RFC:RFS-FIM-201:AI9-DevMonFact-RB
 MBL-010RFC:RFS-FIM-201:AI9-DevMonIlck-RB
@@ -418,7 +408,6 @@ MBL-010RFC:RFS-FIM-201:AI9-Wave-Avg
 MBL-010RFC:RFS-FIM-201:AI9-Wave-High
 MBL-010RFC:RFS-FIM-201:AI9-Wave-Low
 MBL-010RFC:RFS-FIM-201:AI9-Wave-Med
-MBL-010RFC:RFS-FIM-201:AI9-Wave-PM
 MBL-010RFC:RFS-FIM-201:CD1-DevFactor-RB
 MBL-010RFC:RFS-FIM-201:CD1-DevPeriod-RB
 MBL-010RFC:RFS-FIM-201:CD1-FastRst-IlckCnt
@@ -440,7 +429,6 @@ MBL-010RFC:RFS-FIM-201:CD1-RFON-En-RB
 MBL-010RFC:RFS-FIM-201:CD1-RFON-Precond
 MBL-010RFC:RFS-FIM-201:CD1-TrigSel-RB
 MBL-010RFC:RFS-FIM-201:CD1-TrigThre-RB
-MBL-010RFC:RFS-FIM-201:CD1-Wave-IlckPM
 MBL-010RFC:RFS-FIM-201:CD2-DevFactor-RB
 MBL-010RFC:RFS-FIM-201:CD2-DevPeriod-RB
 MBL-010RFC:RFS-FIM-201:CD2-FastRst-IlckCnt
@@ -462,7 +450,6 @@ MBL-010RFC:RFS-FIM-201:CD2-RFON-En-RB
 MBL-010RFC:RFS-FIM-201:CD2-RFON-Precond
 MBL-010RFC:RFS-FIM-201:CD2-TrigSel-RB
 MBL-010RFC:RFS-FIM-201:CD2-TrigThre-RB
-MBL-010RFC:RFS-FIM-201:CD2-Wave-IlckPM
 MBL-010RFC:RFS-FIM-201:DI1-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-201:DI1-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-201:DI1-HVON-En-RB
@@ -481,7 +468,6 @@ MBL-010RFC:RFS-FIM-201:DI10-Input-RB
 MBL-010RFC:RFS-FIM-201:DI10-isFirstIlck
 MBL-010RFC:RFS-FIM-201:DI10-RFON-En-RB
 MBL-010RFC:RFS-FIM-201:DI10-RFON-Precond
-MBL-010RFC:RFS-FIM-201:DI10-Wave-PM
 MBL-010RFC:RFS-FIM-201:DI11-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-201:DI11-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-201:DI11-HVON-En-RB
@@ -500,7 +486,6 @@ MBL-010RFC:RFS-FIM-201:DI12-Input-RB
 MBL-010RFC:RFS-FIM-201:DI12-isFirstIlck
 MBL-010RFC:RFS-FIM-201:DI12-RFON-En-RB
 MBL-010RFC:RFS-FIM-201:DI12-RFON-Precond
-MBL-010RFC:RFS-FIM-201:DI12-Wave-PM
 MBL-010RFC:RFS-FIM-201:DI13-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-201:DI13-DIlckMode-RB
 MBL-010RFC:RFS-FIM-201:DI13-FastRst-IlckCnt
@@ -512,7 +497,6 @@ MBL-010RFC:RFS-FIM-201:DI13-Input-RB
 MBL-010RFC:RFS-FIM-201:DI13-isFirstIlck
 MBL-010RFC:RFS-FIM-201:DI13-RFON-En-RB
 MBL-010RFC:RFS-FIM-201:DI13-RFON-Precond
-MBL-010RFC:RFS-FIM-201:DI13-Wave-PM
 MBL-010RFC:RFS-FIM-201:DI14-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-201:DI14-DIlckMode-RB
 MBL-010RFC:RFS-FIM-201:DI14-FastRst-IlckCnt
@@ -524,7 +508,6 @@ MBL-010RFC:RFS-FIM-201:DI14-Input-RB
 MBL-010RFC:RFS-FIM-201:DI14-isFirstIlck
 MBL-010RFC:RFS-FIM-201:DI14-RFON-En-RB
 MBL-010RFC:RFS-FIM-201:DI14-RFON-Precond
-MBL-010RFC:RFS-FIM-201:DI14-Wave-PM
 MBL-010RFC:RFS-FIM-201:DI15-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-201:DI15-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-201:DI15-HVON-En-RB
@@ -550,7 +533,6 @@ MBL-010RFC:RFS-FIM-201:DI17-Input-RB
 MBL-010RFC:RFS-FIM-201:DI17-isFirstIlck
 MBL-010RFC:RFS-FIM-201:DI17-RFON-En-RB
 MBL-010RFC:RFS-FIM-201:DI17-RFON-Precond
-MBL-010RFC:RFS-FIM-201:DI17-Wave-PM
 MBL-010RFC:RFS-FIM-201:DI18-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-201:DI18-DIlckMode-RB
 MBL-010RFC:RFS-FIM-201:DI18-FastRst-IlckCnt
@@ -562,7 +544,6 @@ MBL-010RFC:RFS-FIM-201:DI18-Input-RB
 MBL-010RFC:RFS-FIM-201:DI18-isFirstIlck
 MBL-010RFC:RFS-FIM-201:DI18-RFON-En-RB
 MBL-010RFC:RFS-FIM-201:DI18-RFON-Precond
-MBL-010RFC:RFS-FIM-201:DI18-Wave-PM
 MBL-010RFC:RFS-FIM-201:DI19-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-201:DI19-DIlckMode-RB
 MBL-010RFC:RFS-FIM-201:DI19-FastRst-IlckCnt
@@ -574,7 +555,6 @@ MBL-010RFC:RFS-FIM-201:DI19-Input-RB
 MBL-010RFC:RFS-FIM-201:DI19-isFirstIlck
 MBL-010RFC:RFS-FIM-201:DI19-RFON-En-RB
 MBL-010RFC:RFS-FIM-201:DI19-RFON-Precond
-MBL-010RFC:RFS-FIM-201:DI19-Wave-PM
 MBL-010RFC:RFS-FIM-201:DI2-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-201:DI2-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-201:DI2-HVON-En-RB
@@ -593,7 +573,6 @@ MBL-010RFC:RFS-FIM-201:DI20-Input-RB
 MBL-010RFC:RFS-FIM-201:DI20-isFirstIlck
 MBL-010RFC:RFS-FIM-201:DI20-RFON-En-RB
 MBL-010RFC:RFS-FIM-201:DI20-RFON-Precond
-MBL-010RFC:RFS-FIM-201:DI20-Wave-PM
 MBL-010RFC:RFS-FIM-201:DI21-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-201:DI21-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-201:DI21-HVON-En-RB
@@ -640,7 +619,6 @@ MBL-010RFC:RFS-FIM-201:DI7-Input-RB
 MBL-010RFC:RFS-FIM-201:DI7-isFirstIlck
 MBL-010RFC:RFS-FIM-201:DI7-RFON-En-RB
 MBL-010RFC:RFS-FIM-201:DI7-RFON-Precond
-MBL-010RFC:RFS-FIM-201:DI7-Wave-PM
 MBL-010RFC:RFS-FIM-201:DI8-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-201:DI8-DIlckMode-RB
 MBL-010RFC:RFS-FIM-201:DI8-FastRst-IlckCnt
@@ -652,7 +630,6 @@ MBL-010RFC:RFS-FIM-201:DI8-Input-RB
 MBL-010RFC:RFS-FIM-201:DI8-isFirstIlck
 MBL-010RFC:RFS-FIM-201:DI8-RFON-En-RB
 MBL-010RFC:RFS-FIM-201:DI8-RFON-Precond
-MBL-010RFC:RFS-FIM-201:DI8-Wave-PM
 MBL-010RFC:RFS-FIM-201:DI9-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-201:DI9-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-201:DI9-HVON-En-RB
@@ -716,7 +693,6 @@ MBL-010RFC:RFS-FIM-201:RF10-Wave-Avg
 MBL-010RFC:RFS-FIM-201:RF10-Wave-High
 MBL-010RFC:RFS-FIM-201:RF10-Wave-Low
 MBL-010RFC:RFS-FIM-201:RF10-Wave-Med
-MBL-010RFC:RFS-FIM-201:RF10-Wave-PM
 MBL-010RFC:RFS-FIM-201:RF2-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-201:RF2-HVON-En-RB
 MBL-010RFC:RFS-FIM-201:RF2-HVON-Precond
@@ -803,7 +779,6 @@ MBL-010RFC:RFS-FIM-201:RF9-Wave-Avg
 MBL-010RFC:RFS-FIM-201:RF9-Wave-High
 MBL-010RFC:RFS-FIM-201:RF9-Wave-Low
 MBL-010RFC:RFS-FIM-201:RF9-Wave-Med
-MBL-010RFC:RFS-FIM-201:RF9-Wave-PM
 MBL-010RFC:RFS-FIM-201:RFON-Precond
 MBL-010RFC:RFS-FIM-201:RP1-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-201:RP1-HVON-En-RB
@@ -824,7 +799,6 @@ MBL-010RFC:RFS-FIM-201:RP1-RFON-En-RB
 MBL-010RFC:RFS-FIM-201:RP1-RFON-Precond
 MBL-010RFC:RFS-FIM-201:RP1-TrigSel-RB
 MBL-010RFC:RFS-FIM-201:RP1-TrigThre-RB
-MBL-010RFC:RFS-FIM-201:RP1-Wave-IlckPM
 MBL-010RFC:RFS-FIM-201:RP2-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-201:RP2-HVON-En-RB
 MBL-010RFC:RFS-FIM-201:RP2-HVON-Precond
@@ -844,7 +818,6 @@ MBL-010RFC:RFS-FIM-201:RP2-RFON-En-RB
 MBL-010RFC:RFS-FIM-201:RP2-RFON-Precond
 MBL-010RFC:RFS-FIM-201:RP2-TrigSel-RB
 MBL-010RFC:RFS-FIM-201:RP2-TrigThre-RB
-MBL-010RFC:RFS-FIM-201:RP2-Wave-IlckPM
 MBL-010RFC:RFS-FIM-201:TriggerLine-RB
 MBL-010RFC:RFS-Kly-210:PwrFwd-DevMonEval-RB
 MBL-010RFC:RFS-Kly-210:PwrFwd-DevMonFact-RB
@@ -884,7 +857,6 @@ MBL-010RFC:RFS-Kly-210:PwrFwd-Wave-Avg
 MBL-010RFC:RFS-Kly-210:PwrFwd-Wave-High
 MBL-010RFC:RFS-Kly-210:PwrFwd-Wave-Low
 MBL-010RFC:RFS-Kly-210:PwrFwd-Wave-Med
-MBL-010RFC:RFS-Kly-210:PwrFwd-Wave-PM
 MBL-010RFC:RFS-Kly-210:PwrRfl-DevMonEval-RB
 MBL-010RFC:RFS-Kly-210:PwrRfl-DevMonFact-RB
 MBL-010RFC:RFS-Kly-210:PwrRfl-DevMonIlck-RB
@@ -923,12 +895,10 @@ MBL-010RFC:RFS-Kly-210:PwrRfl-Wave-Avg
 MBL-010RFC:RFS-Kly-210:PwrRfl-Wave-High
 MBL-010RFC:RFS-Kly-210:PwrRfl-Wave-Low
 MBL-010RFC:RFS-Kly-210:PwrRfl-Wave-Med
-MBL-010RFC:RFS-Kly-210:PwrRfl-Wave-PM
 MBL-010RFC:RFS-LLRF-201:Status-DIlckMode-RB
 MBL-010RFC:RFS-LLRF-201:Status-Ilck-RB
 MBL-010RFC:RFS-LLRF-201:Status-Input-RB
 MBL-010RFC:RFS-LLRF-201:Status-isFirstIlck
-MBL-010RFC:RFS-LLRF-201:Status-Wave-PM
 MBL-010RFC:RFS-Load-220:PwrFwd-DevMonEval-RB
 MBL-010RFC:RFS-Load-220:PwrFwd-DevMonFact-RB
 MBL-010RFC:RFS-Load-220:PwrFwd-DevMonIlck-RB
@@ -967,7 +937,6 @@ MBL-010RFC:RFS-Load-220:PwrFwd-Wave-Avg
 MBL-010RFC:RFS-Load-220:PwrFwd-Wave-High
 MBL-010RFC:RFS-Load-220:PwrFwd-Wave-Low
 MBL-010RFC:RFS-Load-220:PwrFwd-Wave-Med
-MBL-010RFC:RFS-Load-220:PwrFwd-Wave-PM
 MBL-010RFC:RFS-Load-220:PwrRfl-DevMonEval-RB
 MBL-010RFC:RFS-Load-220:PwrRfl-DevMonFact-RB
 MBL-010RFC:RFS-Load-220:PwrRfl-DevMonIlck-RB
@@ -1006,7 +975,6 @@ MBL-010RFC:RFS-Load-220:PwrRfl-Wave-Avg
 MBL-010RFC:RFS-Load-220:PwrRfl-Wave-High
 MBL-010RFC:RFS-Load-220:PwrRfl-Wave-Low
 MBL-010RFC:RFS-Load-220:PwrRfl-Wave-Med
-MBL-010RFC:RFS-Load-220:PwrRfl-Wave-PM
 MBL-010RFC:RFS-Mod-210:Cur-DevMonEval-RB
 MBL-010RFC:RFS-Mod-210:Cur-DevMonFact-RB
 MBL-010RFC:RFS-Mod-210:Cur-DevMonIlck-RB
@@ -1045,17 +1013,14 @@ MBL-010RFC:RFS-Mod-210:Cur-Wave-Avg
 MBL-010RFC:RFS-Mod-210:Cur-Wave-High
 MBL-010RFC:RFS-Mod-210:Cur-Wave-Low
 MBL-010RFC:RFS-Mod-210:Cur-Wave-Med
-MBL-010RFC:RFS-Mod-210:Cur-Wave-PM
 MBL-010RFC:RFS-Mod-210:PCcon-DIlckMode-RB
 MBL-010RFC:RFS-Mod-210:PCcon-Ilck-RB
 MBL-010RFC:RFS-Mod-210:PCcon-Input-RB
 MBL-010RFC:RFS-Mod-210:PCcon-isFirstIlck
-MBL-010RFC:RFS-Mod-210:PCcon-Wave-PM
 MBL-010RFC:RFS-Mod-210:Ready-DIlckMode-RB
 MBL-010RFC:RFS-Mod-210:Ready-Ilck-RB
 MBL-010RFC:RFS-Mod-210:Ready-Input-RB
 MBL-010RFC:RFS-Mod-210:Ready-isFirstIlck
-MBL-010RFC:RFS-Mod-210:Ready-Wave-PM
 MBL-010RFC:RFS-Mod-210:Vol-DevMonEval-RB
 MBL-010RFC:RFS-Mod-210:Vol-DevMonFact-RB
 MBL-010RFC:RFS-Mod-210:Vol-DevMonIlck-RB
@@ -1094,7 +1059,6 @@ MBL-010RFC:RFS-Mod-210:Vol-Wave-Avg
 MBL-010RFC:RFS-Mod-210:Vol-Wave-High
 MBL-010RFC:RFS-Mod-210:Vol-Wave-Low
 MBL-010RFC:RFS-Mod-210:Vol-Wave-Med
-MBL-010RFC:RFS-Mod-210:Vol-Wave-PM
 MBL-010RFC:RFS-PAmp-210:PwrFwd-DevMonEval-RB
 MBL-010RFC:RFS-PAmp-210:PwrFwd-DevMonFact-RB
 MBL-010RFC:RFS-PAmp-210:PwrFwd-DevMonIlck-RB
@@ -1133,17 +1097,14 @@ MBL-010RFC:RFS-PAmp-210:PwrFwd-Wave-Avg
 MBL-010RFC:RFS-PAmp-210:PwrFwd-Wave-High
 MBL-010RFC:RFS-PAmp-210:PwrFwd-Wave-Low
 MBL-010RFC:RFS-PAmp-210:PwrFwd-Wave-Med
-MBL-010RFC:RFS-PAmp-210:PwrFwd-Wave-PM
 MBL-010RFC:RFS-SIM-210:HvEna-DIlckMode-RB
 MBL-010RFC:RFS-SIM-210:HvEna-Ilck-RB
 MBL-010RFC:RFS-SIM-210:HvEna-Input-RB
 MBL-010RFC:RFS-SIM-210:HvEna-isFirstIlck
-MBL-010RFC:RFS-SIM-210:HvEna-Wave-PM
 MBL-010RFC:RFS-SIM-210:RfEna-DIlckMode-RB
 MBL-010RFC:RFS-SIM-210:RfEna-Ilck-RB
 MBL-010RFC:RFS-SIM-210:RfEna-Input-RB
 MBL-010RFC:RFS-SIM-210:RfEna-isFirstIlck
-MBL-010RFC:RFS-SIM-210:RfEna-Wave-PM
 MBL-010RFC:RFS-SolPS-210:Cur-DevMonEval-RB
 MBL-010RFC:RFS-SolPS-210:Cur-DevMonFact-RB
 MBL-010RFC:RFS-SolPS-210:Cur-DevMonIlck-RB
@@ -1182,7 +1143,6 @@ MBL-010RFC:RFS-SolPS-210:Cur-Wave-Avg
 MBL-010RFC:RFS-SolPS-210:Cur-Wave-High
 MBL-010RFC:RFS-SolPS-210:Cur-Wave-Low
 MBL-010RFC:RFS-SolPS-210:Cur-Wave-Med
-MBL-010RFC:RFS-SolPS-210:Cur-Wave-PM
 MBL-010RFC:RFS-SolPS-220:Cur-DevMonEval-RB
 MBL-010RFC:RFS-SolPS-220:Cur-DevMonFact-RB
 MBL-010RFC:RFS-SolPS-220:Cur-DevMonIlck-RB
@@ -1221,24 +1181,19 @@ MBL-010RFC:RFS-SolPS-220:Cur-Wave-Avg
 MBL-010RFC:RFS-SolPS-220:Cur-Wave-High
 MBL-010RFC:RFS-SolPS-220:Cur-Wave-Low
 MBL-010RFC:RFS-SolPS-220:Cur-Wave-Med
-MBL-010RFC:RFS-SolPS-220:Cur-Wave-PM
 MBL-010RFC:RFS-VacBody-210:Status-DIlckMode-RB
 MBL-010RFC:RFS-VacBody-210:Status-Ilck-RB
 MBL-010RFC:RFS-VacBody-210:Status-Input-RB
 MBL-010RFC:RFS-VacBody-210:Status-isFirstIlck
-MBL-010RFC:RFS-VacBody-210:Status-Wave-PM
 MBL-010RFC:RFS-VacCav-210:Status-DIlckMode-RB
 MBL-010RFC:RFS-VacCav-210:Status-Ilck-RB
 MBL-010RFC:RFS-VacCav-210:Status-Input-RB
 MBL-010RFC:RFS-VacCav-210:Status-isFirstIlck
-MBL-010RFC:RFS-VacCav-210:Status-Wave-PM
 MBL-010RFC:RFS-VacPS-210:I-SP-DIlckMode-RB
 MBL-010RFC:RFS-VacPS-210:I-SP-Ilck-RB
 MBL-010RFC:RFS-VacPS-210:I-SP-Input-RB
 MBL-010RFC:RFS-VacPS-210:I-SP-isFirstIlck
-MBL-010RFC:RFS-VacPS-210:I-SP-Wave-PM
 MBL-010RFC:RFS-VacPS-220:I-SP-DIlckMode-RB
 MBL-010RFC:RFS-VacPS-220:I-SP-Ilck-RB
 MBL-010RFC:RFS-VacPS-220:I-SP-Input-RB
 MBL-010RFC:RFS-VacPS-220:I-SP-isFirstIlck
-MBL-010RFC:RFS-VacPS-220:I-SP-Wave-PM
diff --git a/files/MBL-010RFC_RFS-RFLPS-301.archive b/files/MBL-010RFC_RFS-RFLPS-301.archive
index 8bae64b..edf5736 100644
--- a/files/MBL-010RFC_RFS-RFLPS-301.archive
+++ b/files/MBL-010RFC_RFS-RFLPS-301.archive
@@ -2,12 +2,10 @@ MBL-010RFC:RFS-ADG-310:IlckStatus-DIlckMode-RB
 MBL-010RFC:RFS-ADG-310:IlckStatus-Ilck-RB
 MBL-010RFC:RFS-ADG-310:IlckStatus-Input-RB
 MBL-010RFC:RFS-ADG-310:IlckStatus-isFirstIlck
-MBL-010RFC:RFS-ADG-310:IlckStatus-Wave-PM
 MBL-010RFC:RFS-ADG-310:PwrFail-DIlckMode-RB
 MBL-010RFC:RFS-ADG-310:PwrFail-Ilck-RB
 MBL-010RFC:RFS-ADG-310:PwrFail-Input-RB
 MBL-010RFC:RFS-ADG-310:PwrFail-isFirstIlck
-MBL-010RFC:RFS-ADG-310:PwrFail-Wave-PM
 MBL-010RFC:RFS-Cav-310:Fld-DevMonEval-RB
 MBL-010RFC:RFS-Cav-310:Fld-DevMonFact-RB
 MBL-010RFC:RFS-Cav-310:Fld-DevMonIlck-RB
@@ -46,7 +44,6 @@ MBL-010RFC:RFS-Cav-310:Fld-Wave-Avg
 MBL-010RFC:RFS-Cav-310:Fld-Wave-High
 MBL-010RFC:RFS-Cav-310:Fld-Wave-Low
 MBL-010RFC:RFS-Cav-310:Fld-Wave-Med
-MBL-010RFC:RFS-Cav-310:Fld-Wave-PM
 MBL-010RFC:RFS-Cav-310:PwrFwd-DevMonEval-RB
 MBL-010RFC:RFS-Cav-310:PwrFwd-DevMonFact-RB
 MBL-010RFC:RFS-Cav-310:PwrFwd-DevMonIlck-RB
@@ -85,7 +82,6 @@ MBL-010RFC:RFS-Cav-310:PwrFwd-Wave-Avg
 MBL-010RFC:RFS-Cav-310:PwrFwd-Wave-High
 MBL-010RFC:RFS-Cav-310:PwrFwd-Wave-Low
 MBL-010RFC:RFS-Cav-310:PwrFwd-Wave-Med
-MBL-010RFC:RFS-Cav-310:PwrFwd-Wave-PM
 MBL-010RFC:RFS-Cav-310:PwrRfl-DevMonEval-RB
 MBL-010RFC:RFS-Cav-310:PwrRfl-DevMonFact-RB
 MBL-010RFC:RFS-Cav-310:PwrRfl-DevMonIlck-RB
@@ -124,7 +120,6 @@ MBL-010RFC:RFS-Cav-310:PwrRfl-Wave-Avg
 MBL-010RFC:RFS-Cav-310:PwrRfl-Wave-High
 MBL-010RFC:RFS-Cav-310:PwrRfl-Wave-Low
 MBL-010RFC:RFS-Cav-310:PwrRfl-Wave-Med
-MBL-010RFC:RFS-Cav-310:PwrRfl-Wave-PM
 MBL-010RFC:RFS-EPR-310:Cur-DevMonEval-RB
 MBL-010RFC:RFS-EPR-310:Cur-DevMonFact-RB
 MBL-010RFC:RFS-EPR-310:Cur-DevMonIlck-RB
@@ -163,7 +158,6 @@ MBL-010RFC:RFS-EPR-310:Cur-Wave-Avg
 MBL-010RFC:RFS-EPR-310:Cur-Wave-High
 MBL-010RFC:RFS-EPR-310:Cur-Wave-Low
 MBL-010RFC:RFS-EPR-310:Cur-Wave-Med
-MBL-010RFC:RFS-EPR-310:Cur-Wave-PM
 MBL-010RFC:RFS-FIM-301:AI1-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-301:AI1-HVON-En-RB
 MBL-010RFC:RFS-FIM-301:AI1-HVON-Precond
@@ -214,7 +208,6 @@ MBL-010RFC:RFS-FIM-301:AI10-Wave-Avg
 MBL-010RFC:RFS-FIM-301:AI10-Wave-High
 MBL-010RFC:RFS-FIM-301:AI10-Wave-Low
 MBL-010RFC:RFS-FIM-301:AI10-Wave-Med
-MBL-010RFC:RFS-FIM-301:AI10-Wave-PM
 MBL-010RFC:RFS-FIM-301:AI2-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-301:AI2-HVON-En-RB
 MBL-010RFC:RFS-FIM-301:AI2-HVON-Precond
@@ -277,7 +270,6 @@ MBL-010RFC:RFS-FIM-301:AI5-Wave-Avg
 MBL-010RFC:RFS-FIM-301:AI5-Wave-High
 MBL-010RFC:RFS-FIM-301:AI5-Wave-Low
 MBL-010RFC:RFS-FIM-301:AI5-Wave-Med
-MBL-010RFC:RFS-FIM-301:AI5-Wave-PM
 MBL-010RFC:RFS-FIM-301:AI6-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-301:AI6-HVON-En-RB
 MBL-010RFC:RFS-FIM-301:AI6-HVON-Precond
@@ -328,7 +320,6 @@ MBL-010RFC:RFS-FIM-301:AI7-Wave-Avg
 MBL-010RFC:RFS-FIM-301:AI7-Wave-High
 MBL-010RFC:RFS-FIM-301:AI7-Wave-Low
 MBL-010RFC:RFS-FIM-301:AI7-Wave-Med
-MBL-010RFC:RFS-FIM-301:AI7-Wave-PM
 MBL-010RFC:RFS-FIM-301:AI8-DevMonEval-RB
 MBL-010RFC:RFS-FIM-301:AI8-DevMonFact-RB
 MBL-010RFC:RFS-FIM-301:AI8-DevMonIlck-RB
@@ -373,7 +364,6 @@ MBL-010RFC:RFS-FIM-301:AI8-Wave-Avg
 MBL-010RFC:RFS-FIM-301:AI8-Wave-High
 MBL-010RFC:RFS-FIM-301:AI8-Wave-Low
 MBL-010RFC:RFS-FIM-301:AI8-Wave-Med
-MBL-010RFC:RFS-FIM-301:AI8-Wave-PM
 MBL-010RFC:RFS-FIM-301:AI9-DevMonEval-RB
 MBL-010RFC:RFS-FIM-301:AI9-DevMonFact-RB
 MBL-010RFC:RFS-FIM-301:AI9-DevMonIlck-RB
@@ -418,7 +408,6 @@ MBL-010RFC:RFS-FIM-301:AI9-Wave-Avg
 MBL-010RFC:RFS-FIM-301:AI9-Wave-High
 MBL-010RFC:RFS-FIM-301:AI9-Wave-Low
 MBL-010RFC:RFS-FIM-301:AI9-Wave-Med
-MBL-010RFC:RFS-FIM-301:AI9-Wave-PM
 MBL-010RFC:RFS-FIM-301:CD1-DevFactor-RB
 MBL-010RFC:RFS-FIM-301:CD1-DevPeriod-RB
 MBL-010RFC:RFS-FIM-301:CD1-FastRst-IlckCnt
@@ -440,7 +429,6 @@ MBL-010RFC:RFS-FIM-301:CD1-RFON-En-RB
 MBL-010RFC:RFS-FIM-301:CD1-RFON-Precond
 MBL-010RFC:RFS-FIM-301:CD1-TrigSel-RB
 MBL-010RFC:RFS-FIM-301:CD1-TrigThre-RB
-MBL-010RFC:RFS-FIM-301:CD1-Wave-IlckPM
 MBL-010RFC:RFS-FIM-301:CD2-DevFactor-RB
 MBL-010RFC:RFS-FIM-301:CD2-DevPeriod-RB
 MBL-010RFC:RFS-FIM-301:CD2-FastRst-IlckCnt
@@ -462,7 +450,6 @@ MBL-010RFC:RFS-FIM-301:CD2-RFON-En-RB
 MBL-010RFC:RFS-FIM-301:CD2-RFON-Precond
 MBL-010RFC:RFS-FIM-301:CD2-TrigSel-RB
 MBL-010RFC:RFS-FIM-301:CD2-TrigThre-RB
-MBL-010RFC:RFS-FIM-301:CD2-Wave-IlckPM
 MBL-010RFC:RFS-FIM-301:DI1-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-301:DI1-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-301:DI1-HVON-En-RB
@@ -481,7 +468,6 @@ MBL-010RFC:RFS-FIM-301:DI10-Input-RB
 MBL-010RFC:RFS-FIM-301:DI10-isFirstIlck
 MBL-010RFC:RFS-FIM-301:DI10-RFON-En-RB
 MBL-010RFC:RFS-FIM-301:DI10-RFON-Precond
-MBL-010RFC:RFS-FIM-301:DI10-Wave-PM
 MBL-010RFC:RFS-FIM-301:DI11-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-301:DI11-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-301:DI11-HVON-En-RB
@@ -500,7 +486,6 @@ MBL-010RFC:RFS-FIM-301:DI12-Input-RB
 MBL-010RFC:RFS-FIM-301:DI12-isFirstIlck
 MBL-010RFC:RFS-FIM-301:DI12-RFON-En-RB
 MBL-010RFC:RFS-FIM-301:DI12-RFON-Precond
-MBL-010RFC:RFS-FIM-301:DI12-Wave-PM
 MBL-010RFC:RFS-FIM-301:DI13-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-301:DI13-DIlckMode-RB
 MBL-010RFC:RFS-FIM-301:DI13-FastRst-IlckCnt
@@ -512,7 +497,6 @@ MBL-010RFC:RFS-FIM-301:DI13-Input-RB
 MBL-010RFC:RFS-FIM-301:DI13-isFirstIlck
 MBL-010RFC:RFS-FIM-301:DI13-RFON-En-RB
 MBL-010RFC:RFS-FIM-301:DI13-RFON-Precond
-MBL-010RFC:RFS-FIM-301:DI13-Wave-PM
 MBL-010RFC:RFS-FIM-301:DI14-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-301:DI14-DIlckMode-RB
 MBL-010RFC:RFS-FIM-301:DI14-FastRst-IlckCnt
@@ -524,7 +508,6 @@ MBL-010RFC:RFS-FIM-301:DI14-Input-RB
 MBL-010RFC:RFS-FIM-301:DI14-isFirstIlck
 MBL-010RFC:RFS-FIM-301:DI14-RFON-En-RB
 MBL-010RFC:RFS-FIM-301:DI14-RFON-Precond
-MBL-010RFC:RFS-FIM-301:DI14-Wave-PM
 MBL-010RFC:RFS-FIM-301:DI15-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-301:DI15-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-301:DI15-HVON-En-RB
@@ -550,7 +533,6 @@ MBL-010RFC:RFS-FIM-301:DI17-Input-RB
 MBL-010RFC:RFS-FIM-301:DI17-isFirstIlck
 MBL-010RFC:RFS-FIM-301:DI17-RFON-En-RB
 MBL-010RFC:RFS-FIM-301:DI17-RFON-Precond
-MBL-010RFC:RFS-FIM-301:DI17-Wave-PM
 MBL-010RFC:RFS-FIM-301:DI18-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-301:DI18-DIlckMode-RB
 MBL-010RFC:RFS-FIM-301:DI18-FastRst-IlckCnt
@@ -562,7 +544,6 @@ MBL-010RFC:RFS-FIM-301:DI18-Input-RB
 MBL-010RFC:RFS-FIM-301:DI18-isFirstIlck
 MBL-010RFC:RFS-FIM-301:DI18-RFON-En-RB
 MBL-010RFC:RFS-FIM-301:DI18-RFON-Precond
-MBL-010RFC:RFS-FIM-301:DI18-Wave-PM
 MBL-010RFC:RFS-FIM-301:DI19-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-301:DI19-DIlckMode-RB
 MBL-010RFC:RFS-FIM-301:DI19-FastRst-IlckCnt
@@ -574,7 +555,6 @@ MBL-010RFC:RFS-FIM-301:DI19-Input-RB
 MBL-010RFC:RFS-FIM-301:DI19-isFirstIlck
 MBL-010RFC:RFS-FIM-301:DI19-RFON-En-RB
 MBL-010RFC:RFS-FIM-301:DI19-RFON-Precond
-MBL-010RFC:RFS-FIM-301:DI19-Wave-PM
 MBL-010RFC:RFS-FIM-301:DI2-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-301:DI2-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-301:DI2-HVON-En-RB
@@ -593,7 +573,6 @@ MBL-010RFC:RFS-FIM-301:DI20-Input-RB
 MBL-010RFC:RFS-FIM-301:DI20-isFirstIlck
 MBL-010RFC:RFS-FIM-301:DI20-RFON-En-RB
 MBL-010RFC:RFS-FIM-301:DI20-RFON-Precond
-MBL-010RFC:RFS-FIM-301:DI20-Wave-PM
 MBL-010RFC:RFS-FIM-301:DI21-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-301:DI21-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-301:DI21-HVON-En-RB
@@ -640,7 +619,6 @@ MBL-010RFC:RFS-FIM-301:DI7-Input-RB
 MBL-010RFC:RFS-FIM-301:DI7-isFirstIlck
 MBL-010RFC:RFS-FIM-301:DI7-RFON-En-RB
 MBL-010RFC:RFS-FIM-301:DI7-RFON-Precond
-MBL-010RFC:RFS-FIM-301:DI7-Wave-PM
 MBL-010RFC:RFS-FIM-301:DI8-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-301:DI8-DIlckMode-RB
 MBL-010RFC:RFS-FIM-301:DI8-FastRst-IlckCnt
@@ -652,7 +630,6 @@ MBL-010RFC:RFS-FIM-301:DI8-Input-RB
 MBL-010RFC:RFS-FIM-301:DI8-isFirstIlck
 MBL-010RFC:RFS-FIM-301:DI8-RFON-En-RB
 MBL-010RFC:RFS-FIM-301:DI8-RFON-Precond
-MBL-010RFC:RFS-FIM-301:DI8-Wave-PM
 MBL-010RFC:RFS-FIM-301:DI9-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-301:DI9-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-301:DI9-HVON-En-RB
@@ -716,7 +693,6 @@ MBL-010RFC:RFS-FIM-301:RF10-Wave-Avg
 MBL-010RFC:RFS-FIM-301:RF10-Wave-High
 MBL-010RFC:RFS-FIM-301:RF10-Wave-Low
 MBL-010RFC:RFS-FIM-301:RF10-Wave-Med
-MBL-010RFC:RFS-FIM-301:RF10-Wave-PM
 MBL-010RFC:RFS-FIM-301:RF2-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-301:RF2-HVON-En-RB
 MBL-010RFC:RFS-FIM-301:RF2-HVON-Precond
@@ -803,7 +779,6 @@ MBL-010RFC:RFS-FIM-301:RF9-Wave-Avg
 MBL-010RFC:RFS-FIM-301:RF9-Wave-High
 MBL-010RFC:RFS-FIM-301:RF9-Wave-Low
 MBL-010RFC:RFS-FIM-301:RF9-Wave-Med
-MBL-010RFC:RFS-FIM-301:RF9-Wave-PM
 MBL-010RFC:RFS-FIM-301:RFON-Precond
 MBL-010RFC:RFS-FIM-301:RP1-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-301:RP1-HVON-En-RB
@@ -824,7 +799,6 @@ MBL-010RFC:RFS-FIM-301:RP1-RFON-En-RB
 MBL-010RFC:RFS-FIM-301:RP1-RFON-Precond
 MBL-010RFC:RFS-FIM-301:RP1-TrigSel-RB
 MBL-010RFC:RFS-FIM-301:RP1-TrigThre-RB
-MBL-010RFC:RFS-FIM-301:RP1-Wave-IlckPM
 MBL-010RFC:RFS-FIM-301:RP2-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-301:RP2-HVON-En-RB
 MBL-010RFC:RFS-FIM-301:RP2-HVON-Precond
@@ -844,7 +818,6 @@ MBL-010RFC:RFS-FIM-301:RP2-RFON-En-RB
 MBL-010RFC:RFS-FIM-301:RP2-RFON-Precond
 MBL-010RFC:RFS-FIM-301:RP2-TrigSel-RB
 MBL-010RFC:RFS-FIM-301:RP2-TrigThre-RB
-MBL-010RFC:RFS-FIM-301:RP2-Wave-IlckPM
 MBL-010RFC:RFS-FIM-301:TriggerLine-RB
 MBL-010RFC:RFS-Kly-310:PwrFwd-DevMonEval-RB
 MBL-010RFC:RFS-Kly-310:PwrFwd-DevMonFact-RB
@@ -884,7 +857,6 @@ MBL-010RFC:RFS-Kly-310:PwrFwd-Wave-Avg
 MBL-010RFC:RFS-Kly-310:PwrFwd-Wave-High
 MBL-010RFC:RFS-Kly-310:PwrFwd-Wave-Low
 MBL-010RFC:RFS-Kly-310:PwrFwd-Wave-Med
-MBL-010RFC:RFS-Kly-310:PwrFwd-Wave-PM
 MBL-010RFC:RFS-Kly-310:PwrRfl-DevMonEval-RB
 MBL-010RFC:RFS-Kly-310:PwrRfl-DevMonFact-RB
 MBL-010RFC:RFS-Kly-310:PwrRfl-DevMonIlck-RB
@@ -923,12 +895,10 @@ MBL-010RFC:RFS-Kly-310:PwrRfl-Wave-Avg
 MBL-010RFC:RFS-Kly-310:PwrRfl-Wave-High
 MBL-010RFC:RFS-Kly-310:PwrRfl-Wave-Low
 MBL-010RFC:RFS-Kly-310:PwrRfl-Wave-Med
-MBL-010RFC:RFS-Kly-310:PwrRfl-Wave-PM
 MBL-010RFC:RFS-LLRF-301:Status-DIlckMode-RB
 MBL-010RFC:RFS-LLRF-301:Status-Ilck-RB
 MBL-010RFC:RFS-LLRF-301:Status-Input-RB
 MBL-010RFC:RFS-LLRF-301:Status-isFirstIlck
-MBL-010RFC:RFS-LLRF-301:Status-Wave-PM
 MBL-010RFC:RFS-Load-320:PwrFwd-DevMonEval-RB
 MBL-010RFC:RFS-Load-320:PwrFwd-DevMonFact-RB
 MBL-010RFC:RFS-Load-320:PwrFwd-DevMonIlck-RB
@@ -967,7 +937,6 @@ MBL-010RFC:RFS-Load-320:PwrFwd-Wave-Avg
 MBL-010RFC:RFS-Load-320:PwrFwd-Wave-High
 MBL-010RFC:RFS-Load-320:PwrFwd-Wave-Low
 MBL-010RFC:RFS-Load-320:PwrFwd-Wave-Med
-MBL-010RFC:RFS-Load-320:PwrFwd-Wave-PM
 MBL-010RFC:RFS-Load-320:PwrRfl-DevMonEval-RB
 MBL-010RFC:RFS-Load-320:PwrRfl-DevMonFact-RB
 MBL-010RFC:RFS-Load-320:PwrRfl-DevMonIlck-RB
@@ -1006,7 +975,6 @@ MBL-010RFC:RFS-Load-320:PwrRfl-Wave-Avg
 MBL-010RFC:RFS-Load-320:PwrRfl-Wave-High
 MBL-010RFC:RFS-Load-320:PwrRfl-Wave-Low
 MBL-010RFC:RFS-Load-320:PwrRfl-Wave-Med
-MBL-010RFC:RFS-Load-320:PwrRfl-Wave-PM
 MBL-010RFC:RFS-Mod-310:Cur-DevMonEval-RB
 MBL-010RFC:RFS-Mod-310:Cur-DevMonFact-RB
 MBL-010RFC:RFS-Mod-310:Cur-DevMonIlck-RB
@@ -1045,17 +1013,14 @@ MBL-010RFC:RFS-Mod-310:Cur-Wave-Avg
 MBL-010RFC:RFS-Mod-310:Cur-Wave-High
 MBL-010RFC:RFS-Mod-310:Cur-Wave-Low
 MBL-010RFC:RFS-Mod-310:Cur-Wave-Med
-MBL-010RFC:RFS-Mod-310:Cur-Wave-PM
 MBL-010RFC:RFS-Mod-310:PCcon-DIlckMode-RB
 MBL-010RFC:RFS-Mod-310:PCcon-Ilck-RB
 MBL-010RFC:RFS-Mod-310:PCcon-Input-RB
 MBL-010RFC:RFS-Mod-310:PCcon-isFirstIlck
-MBL-010RFC:RFS-Mod-310:PCcon-Wave-PM
 MBL-010RFC:RFS-Mod-310:Ready-DIlckMode-RB
 MBL-010RFC:RFS-Mod-310:Ready-Ilck-RB
 MBL-010RFC:RFS-Mod-310:Ready-Input-RB
 MBL-010RFC:RFS-Mod-310:Ready-isFirstIlck
-MBL-010RFC:RFS-Mod-310:Ready-Wave-PM
 MBL-010RFC:RFS-Mod-310:Vol-DevMonEval-RB
 MBL-010RFC:RFS-Mod-310:Vol-DevMonFact-RB
 MBL-010RFC:RFS-Mod-310:Vol-DevMonIlck-RB
@@ -1094,7 +1059,6 @@ MBL-010RFC:RFS-Mod-310:Vol-Wave-Avg
 MBL-010RFC:RFS-Mod-310:Vol-Wave-High
 MBL-010RFC:RFS-Mod-310:Vol-Wave-Low
 MBL-010RFC:RFS-Mod-310:Vol-Wave-Med
-MBL-010RFC:RFS-Mod-310:Vol-Wave-PM
 MBL-010RFC:RFS-PAmp-310:PwrFwd-DevMonEval-RB
 MBL-010RFC:RFS-PAmp-310:PwrFwd-DevMonFact-RB
 MBL-010RFC:RFS-PAmp-310:PwrFwd-DevMonIlck-RB
@@ -1133,17 +1097,14 @@ MBL-010RFC:RFS-PAmp-310:PwrFwd-Wave-Avg
 MBL-010RFC:RFS-PAmp-310:PwrFwd-Wave-High
 MBL-010RFC:RFS-PAmp-310:PwrFwd-Wave-Low
 MBL-010RFC:RFS-PAmp-310:PwrFwd-Wave-Med
-MBL-010RFC:RFS-PAmp-310:PwrFwd-Wave-PM
 MBL-010RFC:RFS-SIM-310:HvEna-DIlckMode-RB
 MBL-010RFC:RFS-SIM-310:HvEna-Ilck-RB
 MBL-010RFC:RFS-SIM-310:HvEna-Input-RB
 MBL-010RFC:RFS-SIM-310:HvEna-isFirstIlck
-MBL-010RFC:RFS-SIM-310:HvEna-Wave-PM
 MBL-010RFC:RFS-SIM-310:RfEna-DIlckMode-RB
 MBL-010RFC:RFS-SIM-310:RfEna-Ilck-RB
 MBL-010RFC:RFS-SIM-310:RfEna-Input-RB
 MBL-010RFC:RFS-SIM-310:RfEna-isFirstIlck
-MBL-010RFC:RFS-SIM-310:RfEna-Wave-PM
 MBL-010RFC:RFS-SolPS-310:Cur-DevMonEval-RB
 MBL-010RFC:RFS-SolPS-310:Cur-DevMonFact-RB
 MBL-010RFC:RFS-SolPS-310:Cur-DevMonIlck-RB
@@ -1182,7 +1143,6 @@ MBL-010RFC:RFS-SolPS-310:Cur-Wave-Avg
 MBL-010RFC:RFS-SolPS-310:Cur-Wave-High
 MBL-010RFC:RFS-SolPS-310:Cur-Wave-Low
 MBL-010RFC:RFS-SolPS-310:Cur-Wave-Med
-MBL-010RFC:RFS-SolPS-310:Cur-Wave-PM
 MBL-010RFC:RFS-SolPS-320:Cur-DevMonEval-RB
 MBL-010RFC:RFS-SolPS-320:Cur-DevMonFact-RB
 MBL-010RFC:RFS-SolPS-320:Cur-DevMonIlck-RB
@@ -1221,24 +1181,19 @@ MBL-010RFC:RFS-SolPS-320:Cur-Wave-Avg
 MBL-010RFC:RFS-SolPS-320:Cur-Wave-High
 MBL-010RFC:RFS-SolPS-320:Cur-Wave-Low
 MBL-010RFC:RFS-SolPS-320:Cur-Wave-Med
-MBL-010RFC:RFS-SolPS-320:Cur-Wave-PM
 MBL-010RFC:RFS-VacBody-310:Status-DIlckMode-RB
 MBL-010RFC:RFS-VacBody-310:Status-Ilck-RB
 MBL-010RFC:RFS-VacBody-310:Status-Input-RB
 MBL-010RFC:RFS-VacBody-310:Status-isFirstIlck
-MBL-010RFC:RFS-VacBody-310:Status-Wave-PM
 MBL-010RFC:RFS-VacCav-310:Status-DIlckMode-RB
 MBL-010RFC:RFS-VacCav-310:Status-Ilck-RB
 MBL-010RFC:RFS-VacCav-310:Status-Input-RB
 MBL-010RFC:RFS-VacCav-310:Status-isFirstIlck
-MBL-010RFC:RFS-VacCav-310:Status-Wave-PM
 MBL-010RFC:RFS-VacPS-310:I-SP-DIlckMode-RB
 MBL-010RFC:RFS-VacPS-310:I-SP-Ilck-RB
 MBL-010RFC:RFS-VacPS-310:I-SP-Input-RB
 MBL-010RFC:RFS-VacPS-310:I-SP-isFirstIlck
-MBL-010RFC:RFS-VacPS-310:I-SP-Wave-PM
 MBL-010RFC:RFS-VacPS-320:I-SP-DIlckMode-RB
 MBL-010RFC:RFS-VacPS-320:I-SP-Ilck-RB
 MBL-010RFC:RFS-VacPS-320:I-SP-Input-RB
 MBL-010RFC:RFS-VacPS-320:I-SP-isFirstIlck
-MBL-010RFC:RFS-VacPS-320:I-SP-Wave-PM
diff --git a/files/MBL-010RFC_RFS-RFLPS-401.archive b/files/MBL-010RFC_RFS-RFLPS-401.archive
index 3c01796..28ea8da 100644
--- a/files/MBL-010RFC_RFS-RFLPS-401.archive
+++ b/files/MBL-010RFC_RFS-RFLPS-401.archive
@@ -2,12 +2,10 @@ MBL-010RFC:RFS-ADG-410:IlckStatus-DIlckMode-RB
 MBL-010RFC:RFS-ADG-410:IlckStatus-Ilck-RB
 MBL-010RFC:RFS-ADG-410:IlckStatus-Input-RB
 MBL-010RFC:RFS-ADG-410:IlckStatus-isFirstIlck
-MBL-010RFC:RFS-ADG-410:IlckStatus-Wave-PM
 MBL-010RFC:RFS-ADG-410:PwrFail-DIlckMode-RB
 MBL-010RFC:RFS-ADG-410:PwrFail-Ilck-RB
 MBL-010RFC:RFS-ADG-410:PwrFail-Input-RB
 MBL-010RFC:RFS-ADG-410:PwrFail-isFirstIlck
-MBL-010RFC:RFS-ADG-410:PwrFail-Wave-PM
 MBL-010RFC:RFS-Cav-410:Fld-DevMonEval-RB
 MBL-010RFC:RFS-Cav-410:Fld-DevMonFact-RB
 MBL-010RFC:RFS-Cav-410:Fld-DevMonIlck-RB
@@ -46,7 +44,6 @@ MBL-010RFC:RFS-Cav-410:Fld-Wave-Avg
 MBL-010RFC:RFS-Cav-410:Fld-Wave-High
 MBL-010RFC:RFS-Cav-410:Fld-Wave-Low
 MBL-010RFC:RFS-Cav-410:Fld-Wave-Med
-MBL-010RFC:RFS-Cav-410:Fld-Wave-PM
 MBL-010RFC:RFS-Cav-410:PwrFwd-DevMonEval-RB
 MBL-010RFC:RFS-Cav-410:PwrFwd-DevMonFact-RB
 MBL-010RFC:RFS-Cav-410:PwrFwd-DevMonIlck-RB
@@ -85,7 +82,6 @@ MBL-010RFC:RFS-Cav-410:PwrFwd-Wave-Avg
 MBL-010RFC:RFS-Cav-410:PwrFwd-Wave-High
 MBL-010RFC:RFS-Cav-410:PwrFwd-Wave-Low
 MBL-010RFC:RFS-Cav-410:PwrFwd-Wave-Med
-MBL-010RFC:RFS-Cav-410:PwrFwd-Wave-PM
 MBL-010RFC:RFS-Cav-410:PwrRfl-DevMonEval-RB
 MBL-010RFC:RFS-Cav-410:PwrRfl-DevMonFact-RB
 MBL-010RFC:RFS-Cav-410:PwrRfl-DevMonIlck-RB
@@ -124,7 +120,6 @@ MBL-010RFC:RFS-Cav-410:PwrRfl-Wave-Avg
 MBL-010RFC:RFS-Cav-410:PwrRfl-Wave-High
 MBL-010RFC:RFS-Cav-410:PwrRfl-Wave-Low
 MBL-010RFC:RFS-Cav-410:PwrRfl-Wave-Med
-MBL-010RFC:RFS-Cav-410:PwrRfl-Wave-PM
 MBL-010RFC:RFS-EPR-410:Cur-DevMonEval-RB
 MBL-010RFC:RFS-EPR-410:Cur-DevMonFact-RB
 MBL-010RFC:RFS-EPR-410:Cur-DevMonIlck-RB
@@ -163,7 +158,6 @@ MBL-010RFC:RFS-EPR-410:Cur-Wave-Avg
 MBL-010RFC:RFS-EPR-410:Cur-Wave-High
 MBL-010RFC:RFS-EPR-410:Cur-Wave-Low
 MBL-010RFC:RFS-EPR-410:Cur-Wave-Med
-MBL-010RFC:RFS-EPR-410:Cur-Wave-PM
 MBL-010RFC:RFS-FIM-401:AI1-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-401:AI1-HVON-En-RB
 MBL-010RFC:RFS-FIM-401:AI1-HVON-Precond
@@ -214,7 +208,6 @@ MBL-010RFC:RFS-FIM-401:AI10-Wave-Avg
 MBL-010RFC:RFS-FIM-401:AI10-Wave-High
 MBL-010RFC:RFS-FIM-401:AI10-Wave-Low
 MBL-010RFC:RFS-FIM-401:AI10-Wave-Med
-MBL-010RFC:RFS-FIM-401:AI10-Wave-PM
 MBL-010RFC:RFS-FIM-401:AI2-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-401:AI2-HVON-En-RB
 MBL-010RFC:RFS-FIM-401:AI2-HVON-Precond
@@ -277,7 +270,6 @@ MBL-010RFC:RFS-FIM-401:AI5-Wave-Avg
 MBL-010RFC:RFS-FIM-401:AI5-Wave-High
 MBL-010RFC:RFS-FIM-401:AI5-Wave-Low
 MBL-010RFC:RFS-FIM-401:AI5-Wave-Med
-MBL-010RFC:RFS-FIM-401:AI5-Wave-PM
 MBL-010RFC:RFS-FIM-401:AI6-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-401:AI6-HVON-En-RB
 MBL-010RFC:RFS-FIM-401:AI6-HVON-Precond
@@ -328,7 +320,6 @@ MBL-010RFC:RFS-FIM-401:AI7-Wave-Avg
 MBL-010RFC:RFS-FIM-401:AI7-Wave-High
 MBL-010RFC:RFS-FIM-401:AI7-Wave-Low
 MBL-010RFC:RFS-FIM-401:AI7-Wave-Med
-MBL-010RFC:RFS-FIM-401:AI7-Wave-PM
 MBL-010RFC:RFS-FIM-401:AI8-DevMonEval-RB
 MBL-010RFC:RFS-FIM-401:AI8-DevMonFact-RB
 MBL-010RFC:RFS-FIM-401:AI8-DevMonIlck-RB
@@ -373,7 +364,6 @@ MBL-010RFC:RFS-FIM-401:AI8-Wave-Avg
 MBL-010RFC:RFS-FIM-401:AI8-Wave-High
 MBL-010RFC:RFS-FIM-401:AI8-Wave-Low
 MBL-010RFC:RFS-FIM-401:AI8-Wave-Med
-MBL-010RFC:RFS-FIM-401:AI8-Wave-PM
 MBL-010RFC:RFS-FIM-401:AI9-DevMonEval-RB
 MBL-010RFC:RFS-FIM-401:AI9-DevMonFact-RB
 MBL-010RFC:RFS-FIM-401:AI9-DevMonIlck-RB
@@ -418,7 +408,6 @@ MBL-010RFC:RFS-FIM-401:AI9-Wave-Avg
 MBL-010RFC:RFS-FIM-401:AI9-Wave-High
 MBL-010RFC:RFS-FIM-401:AI9-Wave-Low
 MBL-010RFC:RFS-FIM-401:AI9-Wave-Med
-MBL-010RFC:RFS-FIM-401:AI9-Wave-PM
 MBL-010RFC:RFS-FIM-401:CD1-DevFactor-RB
 MBL-010RFC:RFS-FIM-401:CD1-DevPeriod-RB
 MBL-010RFC:RFS-FIM-401:CD1-FastRst-IlckCnt
@@ -440,7 +429,6 @@ MBL-010RFC:RFS-FIM-401:CD1-RFON-En-RB
 MBL-010RFC:RFS-FIM-401:CD1-RFON-Precond
 MBL-010RFC:RFS-FIM-401:CD1-TrigSel-RB
 MBL-010RFC:RFS-FIM-401:CD1-TrigThre-RB
-MBL-010RFC:RFS-FIM-401:CD1-Wave-IlckPM
 MBL-010RFC:RFS-FIM-401:CD2-DevFactor-RB
 MBL-010RFC:RFS-FIM-401:CD2-DevPeriod-RB
 MBL-010RFC:RFS-FIM-401:CD2-FastRst-IlckCnt
@@ -462,7 +450,6 @@ MBL-010RFC:RFS-FIM-401:CD2-RFON-En-RB
 MBL-010RFC:RFS-FIM-401:CD2-RFON-Precond
 MBL-010RFC:RFS-FIM-401:CD2-TrigSel-RB
 MBL-010RFC:RFS-FIM-401:CD2-TrigThre-RB
-MBL-010RFC:RFS-FIM-401:CD2-Wave-IlckPM
 MBL-010RFC:RFS-FIM-401:DI1-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-401:DI1-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-401:DI1-HVON-En-RB
@@ -481,7 +468,6 @@ MBL-010RFC:RFS-FIM-401:DI10-Input-RB
 MBL-010RFC:RFS-FIM-401:DI10-isFirstIlck
 MBL-010RFC:RFS-FIM-401:DI10-RFON-En-RB
 MBL-010RFC:RFS-FIM-401:DI10-RFON-Precond
-MBL-010RFC:RFS-FIM-401:DI10-Wave-PM
 MBL-010RFC:RFS-FIM-401:DI11-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-401:DI11-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-401:DI11-HVON-En-RB
@@ -500,7 +486,6 @@ MBL-010RFC:RFS-FIM-401:DI12-Input-RB
 MBL-010RFC:RFS-FIM-401:DI12-isFirstIlck
 MBL-010RFC:RFS-FIM-401:DI12-RFON-En-RB
 MBL-010RFC:RFS-FIM-401:DI12-RFON-Precond
-MBL-010RFC:RFS-FIM-401:DI12-Wave-PM
 MBL-010RFC:RFS-FIM-401:DI13-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-401:DI13-DIlckMode-RB
 MBL-010RFC:RFS-FIM-401:DI13-FastRst-IlckCnt
@@ -512,7 +497,6 @@ MBL-010RFC:RFS-FIM-401:DI13-Input-RB
 MBL-010RFC:RFS-FIM-401:DI13-isFirstIlck
 MBL-010RFC:RFS-FIM-401:DI13-RFON-En-RB
 MBL-010RFC:RFS-FIM-401:DI13-RFON-Precond
-MBL-010RFC:RFS-FIM-401:DI13-Wave-PM
 MBL-010RFC:RFS-FIM-401:DI14-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-401:DI14-DIlckMode-RB
 MBL-010RFC:RFS-FIM-401:DI14-FastRst-IlckCnt
@@ -524,7 +508,6 @@ MBL-010RFC:RFS-FIM-401:DI14-Input-RB
 MBL-010RFC:RFS-FIM-401:DI14-isFirstIlck
 MBL-010RFC:RFS-FIM-401:DI14-RFON-En-RB
 MBL-010RFC:RFS-FIM-401:DI14-RFON-Precond
-MBL-010RFC:RFS-FIM-401:DI14-Wave-PM
 MBL-010RFC:RFS-FIM-401:DI15-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-401:DI15-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-401:DI15-HVON-En-RB
@@ -550,7 +533,6 @@ MBL-010RFC:RFS-FIM-401:DI17-Input-RB
 MBL-010RFC:RFS-FIM-401:DI17-isFirstIlck
 MBL-010RFC:RFS-FIM-401:DI17-RFON-En-RB
 MBL-010RFC:RFS-FIM-401:DI17-RFON-Precond
-MBL-010RFC:RFS-FIM-401:DI17-Wave-PM
 MBL-010RFC:RFS-FIM-401:DI18-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-401:DI18-DIlckMode-RB
 MBL-010RFC:RFS-FIM-401:DI18-FastRst-IlckCnt
@@ -562,7 +544,6 @@ MBL-010RFC:RFS-FIM-401:DI18-Input-RB
 MBL-010RFC:RFS-FIM-401:DI18-isFirstIlck
 MBL-010RFC:RFS-FIM-401:DI18-RFON-En-RB
 MBL-010RFC:RFS-FIM-401:DI18-RFON-Precond
-MBL-010RFC:RFS-FIM-401:DI18-Wave-PM
 MBL-010RFC:RFS-FIM-401:DI19-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-401:DI19-DIlckMode-RB
 MBL-010RFC:RFS-FIM-401:DI19-FastRst-IlckCnt
@@ -574,7 +555,6 @@ MBL-010RFC:RFS-FIM-401:DI19-Input-RB
 MBL-010RFC:RFS-FIM-401:DI19-isFirstIlck
 MBL-010RFC:RFS-FIM-401:DI19-RFON-En-RB
 MBL-010RFC:RFS-FIM-401:DI19-RFON-Precond
-MBL-010RFC:RFS-FIM-401:DI19-Wave-PM
 MBL-010RFC:RFS-FIM-401:DI2-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-401:DI2-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-401:DI2-HVON-En-RB
@@ -593,7 +573,6 @@ MBL-010RFC:RFS-FIM-401:DI20-Input-RB
 MBL-010RFC:RFS-FIM-401:DI20-isFirstIlck
 MBL-010RFC:RFS-FIM-401:DI20-RFON-En-RB
 MBL-010RFC:RFS-FIM-401:DI20-RFON-Precond
-MBL-010RFC:RFS-FIM-401:DI20-Wave-PM
 MBL-010RFC:RFS-FIM-401:DI21-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-401:DI21-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-401:DI21-HVON-En-RB
@@ -640,7 +619,6 @@ MBL-010RFC:RFS-FIM-401:DI7-Input-RB
 MBL-010RFC:RFS-FIM-401:DI7-isFirstIlck
 MBL-010RFC:RFS-FIM-401:DI7-RFON-En-RB
 MBL-010RFC:RFS-FIM-401:DI7-RFON-Precond
-MBL-010RFC:RFS-FIM-401:DI7-Wave-PM
 MBL-010RFC:RFS-FIM-401:DI8-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-401:DI8-DIlckMode-RB
 MBL-010RFC:RFS-FIM-401:DI8-FastRst-IlckCnt
@@ -652,7 +630,6 @@ MBL-010RFC:RFS-FIM-401:DI8-Input-RB
 MBL-010RFC:RFS-FIM-401:DI8-isFirstIlck
 MBL-010RFC:RFS-FIM-401:DI8-RFON-En-RB
 MBL-010RFC:RFS-FIM-401:DI8-RFON-Precond
-MBL-010RFC:RFS-FIM-401:DI8-Wave-PM
 MBL-010RFC:RFS-FIM-401:DI9-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-401:DI9-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-401:DI9-HVON-En-RB
@@ -716,7 +693,6 @@ MBL-010RFC:RFS-FIM-401:RF10-Wave-Avg
 MBL-010RFC:RFS-FIM-401:RF10-Wave-High
 MBL-010RFC:RFS-FIM-401:RF10-Wave-Low
 MBL-010RFC:RFS-FIM-401:RF10-Wave-Med
-MBL-010RFC:RFS-FIM-401:RF10-Wave-PM
 MBL-010RFC:RFS-FIM-401:RF2-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-401:RF2-HVON-En-RB
 MBL-010RFC:RFS-FIM-401:RF2-HVON-Precond
@@ -803,7 +779,6 @@ MBL-010RFC:RFS-FIM-401:RF9-Wave-Avg
 MBL-010RFC:RFS-FIM-401:RF9-Wave-High
 MBL-010RFC:RFS-FIM-401:RF9-Wave-Low
 MBL-010RFC:RFS-FIM-401:RF9-Wave-Med
-MBL-010RFC:RFS-FIM-401:RF9-Wave-PM
 MBL-010RFC:RFS-FIM-401:RFON-Precond
 MBL-010RFC:RFS-FIM-401:RP1-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-401:RP1-HVON-En-RB
@@ -824,7 +799,6 @@ MBL-010RFC:RFS-FIM-401:RP1-RFON-En-RB
 MBL-010RFC:RFS-FIM-401:RP1-RFON-Precond
 MBL-010RFC:RFS-FIM-401:RP1-TrigSel-RB
 MBL-010RFC:RFS-FIM-401:RP1-TrigThre-RB
-MBL-010RFC:RFS-FIM-401:RP1-Wave-IlckPM
 MBL-010RFC:RFS-FIM-401:RP2-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-401:RP2-HVON-En-RB
 MBL-010RFC:RFS-FIM-401:RP2-HVON-Precond
@@ -844,7 +818,6 @@ MBL-010RFC:RFS-FIM-401:RP2-RFON-En-RB
 MBL-010RFC:RFS-FIM-401:RP2-RFON-Precond
 MBL-010RFC:RFS-FIM-401:RP2-TrigSel-RB
 MBL-010RFC:RFS-FIM-401:RP2-TrigThre-RB
-MBL-010RFC:RFS-FIM-401:RP2-Wave-IlckPM
 MBL-010RFC:RFS-FIM-401:TriggerLine-RB
 MBL-010RFC:RFS-Kly-410:PwrFwd-DevMonEval-RB
 MBL-010RFC:RFS-Kly-410:PwrFwd-DevMonFact-RB
@@ -884,7 +857,6 @@ MBL-010RFC:RFS-Kly-410:PwrFwd-Wave-Avg
 MBL-010RFC:RFS-Kly-410:PwrFwd-Wave-High
 MBL-010RFC:RFS-Kly-410:PwrFwd-Wave-Low
 MBL-010RFC:RFS-Kly-410:PwrFwd-Wave-Med
-MBL-010RFC:RFS-Kly-410:PwrFwd-Wave-PM
 MBL-010RFC:RFS-Kly-410:PwrRfl-DevMonEval-RB
 MBL-010RFC:RFS-Kly-410:PwrRfl-DevMonFact-RB
 MBL-010RFC:RFS-Kly-410:PwrRfl-DevMonIlck-RB
@@ -923,12 +895,10 @@ MBL-010RFC:RFS-Kly-410:PwrRfl-Wave-Avg
 MBL-010RFC:RFS-Kly-410:PwrRfl-Wave-High
 MBL-010RFC:RFS-Kly-410:PwrRfl-Wave-Low
 MBL-010RFC:RFS-Kly-410:PwrRfl-Wave-Med
-MBL-010RFC:RFS-Kly-410:PwrRfl-Wave-PM
 MBL-010RFC:RFS-LLRF-401:Status-DIlckMode-RB
 MBL-010RFC:RFS-LLRF-401:Status-Ilck-RB
 MBL-010RFC:RFS-LLRF-401:Status-Input-RB
 MBL-010RFC:RFS-LLRF-401:Status-isFirstIlck
-MBL-010RFC:RFS-LLRF-401:Status-Wave-PM
 MBL-010RFC:RFS-Load-420:PwrFwd-DevMonEval-RB
 MBL-010RFC:RFS-Load-420:PwrFwd-DevMonFact-RB
 MBL-010RFC:RFS-Load-420:PwrFwd-DevMonIlck-RB
@@ -967,7 +937,6 @@ MBL-010RFC:RFS-Load-420:PwrFwd-Wave-Avg
 MBL-010RFC:RFS-Load-420:PwrFwd-Wave-High
 MBL-010RFC:RFS-Load-420:PwrFwd-Wave-Low
 MBL-010RFC:RFS-Load-420:PwrFwd-Wave-Med
-MBL-010RFC:RFS-Load-420:PwrFwd-Wave-PM
 MBL-010RFC:RFS-Load-420:PwrRfl-DevMonEval-RB
 MBL-010RFC:RFS-Load-420:PwrRfl-DevMonFact-RB
 MBL-010RFC:RFS-Load-420:PwrRfl-DevMonIlck-RB
@@ -1006,7 +975,6 @@ MBL-010RFC:RFS-Load-420:PwrRfl-Wave-Avg
 MBL-010RFC:RFS-Load-420:PwrRfl-Wave-High
 MBL-010RFC:RFS-Load-420:PwrRfl-Wave-Low
 MBL-010RFC:RFS-Load-420:PwrRfl-Wave-Med
-MBL-010RFC:RFS-Load-420:PwrRfl-Wave-PM
 MBL-010RFC:RFS-Mod-410:Cur-DevMonEval-RB
 MBL-010RFC:RFS-Mod-410:Cur-DevMonFact-RB
 MBL-010RFC:RFS-Mod-410:Cur-DevMonIlck-RB
@@ -1045,17 +1013,14 @@ MBL-010RFC:RFS-Mod-410:Cur-Wave-Avg
 MBL-010RFC:RFS-Mod-410:Cur-Wave-High
 MBL-010RFC:RFS-Mod-410:Cur-Wave-Low
 MBL-010RFC:RFS-Mod-410:Cur-Wave-Med
-MBL-010RFC:RFS-Mod-410:Cur-Wave-PM
 MBL-010RFC:RFS-Mod-410:PCcon-DIlckMode-RB
 MBL-010RFC:RFS-Mod-410:PCcon-Ilck-RB
 MBL-010RFC:RFS-Mod-410:PCcon-Input-RB
 MBL-010RFC:RFS-Mod-410:PCcon-isFirstIlck
-MBL-010RFC:RFS-Mod-410:PCcon-Wave-PM
 MBL-010RFC:RFS-Mod-410:Ready-DIlckMode-RB
 MBL-010RFC:RFS-Mod-410:Ready-Ilck-RB
 MBL-010RFC:RFS-Mod-410:Ready-Input-RB
 MBL-010RFC:RFS-Mod-410:Ready-isFirstIlck
-MBL-010RFC:RFS-Mod-410:Ready-Wave-PM
 MBL-010RFC:RFS-Mod-410:Vol-DevMonEval-RB
 MBL-010RFC:RFS-Mod-410:Vol-DevMonFact-RB
 MBL-010RFC:RFS-Mod-410:Vol-DevMonIlck-RB
@@ -1094,7 +1059,6 @@ MBL-010RFC:RFS-Mod-410:Vol-Wave-Avg
 MBL-010RFC:RFS-Mod-410:Vol-Wave-High
 MBL-010RFC:RFS-Mod-410:Vol-Wave-Low
 MBL-010RFC:RFS-Mod-410:Vol-Wave-Med
-MBL-010RFC:RFS-Mod-410:Vol-Wave-PM
 MBL-010RFC:RFS-PAmp-410:PwrFwd-DevMonEval-RB
 MBL-010RFC:RFS-PAmp-410:PwrFwd-DevMonFact-RB
 MBL-010RFC:RFS-PAmp-410:PwrFwd-DevMonIlck-RB
@@ -1133,17 +1097,14 @@ MBL-010RFC:RFS-PAmp-410:PwrFwd-Wave-Avg
 MBL-010RFC:RFS-PAmp-410:PwrFwd-Wave-High
 MBL-010RFC:RFS-PAmp-410:PwrFwd-Wave-Low
 MBL-010RFC:RFS-PAmp-410:PwrFwd-Wave-Med
-MBL-010RFC:RFS-PAmp-410:PwrFwd-Wave-PM
 MBL-010RFC:RFS-SIM-410:HvEna-DIlckMode-RB
 MBL-010RFC:RFS-SIM-410:HvEna-Ilck-RB
 MBL-010RFC:RFS-SIM-410:HvEna-Input-RB
 MBL-010RFC:RFS-SIM-410:HvEna-isFirstIlck
-MBL-010RFC:RFS-SIM-410:HvEna-Wave-PM
 MBL-010RFC:RFS-SIM-410:RfEna-DIlckMode-RB
 MBL-010RFC:RFS-SIM-410:RfEna-Ilck-RB
 MBL-010RFC:RFS-SIM-410:RfEna-Input-RB
 MBL-010RFC:RFS-SIM-410:RfEna-isFirstIlck
-MBL-010RFC:RFS-SIM-410:RfEna-Wave-PM
 MBL-010RFC:RFS-SolPS-410:Cur-DevMonEval-RB
 MBL-010RFC:RFS-SolPS-410:Cur-DevMonFact-RB
 MBL-010RFC:RFS-SolPS-410:Cur-DevMonIlck-RB
@@ -1182,7 +1143,6 @@ MBL-010RFC:RFS-SolPS-410:Cur-Wave-Avg
 MBL-010RFC:RFS-SolPS-410:Cur-Wave-High
 MBL-010RFC:RFS-SolPS-410:Cur-Wave-Low
 MBL-010RFC:RFS-SolPS-410:Cur-Wave-Med
-MBL-010RFC:RFS-SolPS-410:Cur-Wave-PM
 MBL-010RFC:RFS-SolPS-420:Cur-DevMonEval-RB
 MBL-010RFC:RFS-SolPS-420:Cur-DevMonFact-RB
 MBL-010RFC:RFS-SolPS-420:Cur-DevMonIlck-RB
@@ -1221,24 +1181,19 @@ MBL-010RFC:RFS-SolPS-420:Cur-Wave-Avg
 MBL-010RFC:RFS-SolPS-420:Cur-Wave-High
 MBL-010RFC:RFS-SolPS-420:Cur-Wave-Low
 MBL-010RFC:RFS-SolPS-420:Cur-Wave-Med
-MBL-010RFC:RFS-SolPS-420:Cur-Wave-PM
 MBL-010RFC:RFS-VacBody-410:Status-DIlckMode-RB
 MBL-010RFC:RFS-VacBody-410:Status-Ilck-RB
 MBL-010RFC:RFS-VacBody-410:Status-Input-RB
 MBL-010RFC:RFS-VacBody-410:Status-isFirstIlck
-MBL-010RFC:RFS-VacBody-410:Status-Wave-PM
 MBL-010RFC:RFS-VacCav-410:Status-DIlckMode-RB
 MBL-010RFC:RFS-VacCav-410:Status-Ilck-RB
 MBL-010RFC:RFS-VacCav-410:Status-Input-RB
 MBL-010RFC:RFS-VacCav-410:Status-isFirstIlck
-MBL-010RFC:RFS-VacCav-410:Status-Wave-PM
 MBL-010RFC:RFS-VacPS-410:I-SP-DIlckMode-RB
 MBL-010RFC:RFS-VacPS-410:I-SP-Ilck-RB
 MBL-010RFC:RFS-VacPS-410:I-SP-Input-RB
 MBL-010RFC:RFS-VacPS-410:I-SP-isFirstIlck
-MBL-010RFC:RFS-VacPS-410:I-SP-Wave-PM
 MBL-010RFC:RFS-VacPS-420:I-SP-DIlckMode-RB
 MBL-010RFC:RFS-VacPS-420:I-SP-Ilck-RB
 MBL-010RFC:RFS-VacPS-420:I-SP-Input-RB
 MBL-010RFC:RFS-VacPS-420:I-SP-isFirstIlck
-MBL-010RFC:RFS-VacPS-420:I-SP-Wave-PM
diff --git a/files/MBL-010RFC_SC-IOC-102.archive b/files/MBL-010RFC_SC-IOC-102.archive
index fa35436..f15d6ea 100644
--- a/files/MBL-010RFC_SC-IOC-102.archive
+++ b/files/MBL-010RFC_SC-IOC-102.archive
@@ -2,12 +2,10 @@ MBL-010RFC:RFS-ADG-110:IlckStatus-DIlckMode-RB
 MBL-010RFC:RFS-ADG-110:IlckStatus-Ilck-RB
 MBL-010RFC:RFS-ADG-110:IlckStatus-Input-RB
 MBL-010RFC:RFS-ADG-110:IlckStatus-isFirstIlck
-MBL-010RFC:RFS-ADG-110:IlckStatus-Wave-PM
 MBL-010RFC:RFS-ADG-110:PwrFail-DIlckMode-RB
 MBL-010RFC:RFS-ADG-110:PwrFail-Ilck-RB
 MBL-010RFC:RFS-ADG-110:PwrFail-Input-RB
 MBL-010RFC:RFS-ADG-110:PwrFail-isFirstIlck
-MBL-010RFC:RFS-ADG-110:PwrFail-Wave-PM
 MBL-010RFC:RFS-Cav-110:Fld-DevMonEval-RB
 MBL-010RFC:RFS-Cav-110:Fld-DevMonFact-RB
 MBL-010RFC:RFS-Cav-110:Fld-DevMonIlck-RB
@@ -46,7 +44,6 @@ MBL-010RFC:RFS-Cav-110:Fld-Wave-Avg
 MBL-010RFC:RFS-Cav-110:Fld-Wave-High
 MBL-010RFC:RFS-Cav-110:Fld-Wave-Low
 MBL-010RFC:RFS-Cav-110:Fld-Wave-Med
-MBL-010RFC:RFS-Cav-110:Fld-Wave-PM
 MBL-010RFC:RFS-Cav-110:PwrFwd-DevMonEval-RB
 MBL-010RFC:RFS-Cav-110:PwrFwd-DevMonFact-RB
 MBL-010RFC:RFS-Cav-110:PwrFwd-DevMonIlck-RB
@@ -85,7 +82,6 @@ MBL-010RFC:RFS-Cav-110:PwrFwd-Wave-Avg
 MBL-010RFC:RFS-Cav-110:PwrFwd-Wave-High
 MBL-010RFC:RFS-Cav-110:PwrFwd-Wave-Low
 MBL-010RFC:RFS-Cav-110:PwrFwd-Wave-Med
-MBL-010RFC:RFS-Cav-110:PwrFwd-Wave-PM
 MBL-010RFC:RFS-Cav-110:PwrRfl-DevMonEval-RB
 MBL-010RFC:RFS-Cav-110:PwrRfl-DevMonFact-RB
 MBL-010RFC:RFS-Cav-110:PwrRfl-DevMonIlck-RB
@@ -124,7 +120,6 @@ MBL-010RFC:RFS-Cav-110:PwrRfl-Wave-Avg
 MBL-010RFC:RFS-Cav-110:PwrRfl-Wave-High
 MBL-010RFC:RFS-Cav-110:PwrRfl-Wave-Low
 MBL-010RFC:RFS-Cav-110:PwrRfl-Wave-Med
-MBL-010RFC:RFS-Cav-110:PwrRfl-Wave-PM
 MBL-010RFC:RFS-EPR-110:Cur-DevMonEval-RB
 MBL-010RFC:RFS-EPR-110:Cur-DevMonFact-RB
 MBL-010RFC:RFS-EPR-110:Cur-DevMonIlck-RB
@@ -163,7 +158,6 @@ MBL-010RFC:RFS-EPR-110:Cur-Wave-Avg
 MBL-010RFC:RFS-EPR-110:Cur-Wave-High
 MBL-010RFC:RFS-EPR-110:Cur-Wave-Low
 MBL-010RFC:RFS-EPR-110:Cur-Wave-Med
-MBL-010RFC:RFS-EPR-110:Cur-Wave-PM
 MBL-010RFC:RFS-FIM-101:AI10-DevMonEval-RB
 MBL-010RFC:RFS-FIM-101:AI10-DevMonFact-RB
 MBL-010RFC:RFS-FIM-101:AI10-DevMonIlck-RB
@@ -208,7 +202,6 @@ MBL-010RFC:RFS-FIM-101:AI10-Wave-Avg
 MBL-010RFC:RFS-FIM-101:AI10-Wave-High
 MBL-010RFC:RFS-FIM-101:AI10-Wave-Low
 MBL-010RFC:RFS-FIM-101:AI10-Wave-Med
-MBL-010RFC:RFS-FIM-101:AI10-Wave-PM
 MBL-010RFC:RFS-FIM-101:AI1-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-101:AI1-HVON-En-RB
 MBL-010RFC:RFS-FIM-101:AI1-HVON-Precond
@@ -277,7 +270,6 @@ MBL-010RFC:RFS-FIM-101:AI5-Wave-Avg
 MBL-010RFC:RFS-FIM-101:AI5-Wave-High
 MBL-010RFC:RFS-FIM-101:AI5-Wave-Low
 MBL-010RFC:RFS-FIM-101:AI5-Wave-Med
-MBL-010RFC:RFS-FIM-101:AI5-Wave-PM
 MBL-010RFC:RFS-FIM-101:AI6-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-101:AI6-HVON-En-RB
 MBL-010RFC:RFS-FIM-101:AI6-HVON-Precond
@@ -328,7 +320,6 @@ MBL-010RFC:RFS-FIM-101:AI7-Wave-Avg
 MBL-010RFC:RFS-FIM-101:AI7-Wave-High
 MBL-010RFC:RFS-FIM-101:AI7-Wave-Low
 MBL-010RFC:RFS-FIM-101:AI7-Wave-Med
-MBL-010RFC:RFS-FIM-101:AI7-Wave-PM
 MBL-010RFC:RFS-FIM-101:AI8-DevMonEval-RB
 MBL-010RFC:RFS-FIM-101:AI8-DevMonFact-RB
 MBL-010RFC:RFS-FIM-101:AI8-DevMonIlck-RB
@@ -373,7 +364,6 @@ MBL-010RFC:RFS-FIM-101:AI8-Wave-Avg
 MBL-010RFC:RFS-FIM-101:AI8-Wave-High
 MBL-010RFC:RFS-FIM-101:AI8-Wave-Low
 MBL-010RFC:RFS-FIM-101:AI8-Wave-Med
-MBL-010RFC:RFS-FIM-101:AI8-Wave-PM
 MBL-010RFC:RFS-FIM-101:AI9-DevMonEval-RB
 MBL-010RFC:RFS-FIM-101:AI9-DevMonFact-RB
 MBL-010RFC:RFS-FIM-101:AI9-DevMonIlck-RB
@@ -418,7 +408,6 @@ MBL-010RFC:RFS-FIM-101:AI9-Wave-Avg
 MBL-010RFC:RFS-FIM-101:AI9-Wave-High
 MBL-010RFC:RFS-FIM-101:AI9-Wave-Low
 MBL-010RFC:RFS-FIM-101:AI9-Wave-Med
-MBL-010RFC:RFS-FIM-101:AI9-Wave-PM
 MBL-010RFC:RFS-FIM-101:CD1-DevFactor-RB
 MBL-010RFC:RFS-FIM-101:CD1-DevPeriod-RB
 MBL-010RFC:RFS-FIM-101:CD1-FastRst-IlckCnt
@@ -440,7 +429,6 @@ MBL-010RFC:RFS-FIM-101:CD1-RFON-En-RB
 MBL-010RFC:RFS-FIM-101:CD1-RFON-Precond
 MBL-010RFC:RFS-FIM-101:CD1-TrigSel-RB
 MBL-010RFC:RFS-FIM-101:CD1-TrigThre-RB
-MBL-010RFC:RFS-FIM-101:CD1-Wave-IlckPM
 MBL-010RFC:RFS-FIM-101:CD2-DevFactor-RB
 MBL-010RFC:RFS-FIM-101:CD2-DevPeriod-RB
 MBL-010RFC:RFS-FIM-101:CD2-FastRst-IlckCnt
@@ -462,7 +450,6 @@ MBL-010RFC:RFS-FIM-101:CD2-RFON-En-RB
 MBL-010RFC:RFS-FIM-101:CD2-RFON-Precond
 MBL-010RFC:RFS-FIM-101:CD2-TrigSel-RB
 MBL-010RFC:RFS-FIM-101:CD2-TrigThre-RB
-MBL-010RFC:RFS-FIM-101:CD2-Wave-IlckPM
 MBL-010RFC:RFS-FIM-101:DI10-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-101:DI10-DIlckMode-RB
 MBL-010RFC:RFS-FIM-101:DI10-FastRst-IlckCnt
@@ -474,7 +461,6 @@ MBL-010RFC:RFS-FIM-101:DI10-Input-RB
 MBL-010RFC:RFS-FIM-101:DI10-isFirstIlck
 MBL-010RFC:RFS-FIM-101:DI10-RFON-En-RB
 MBL-010RFC:RFS-FIM-101:DI10-RFON-Precond
-MBL-010RFC:RFS-FIM-101:DI10-Wave-PM
 MBL-010RFC:RFS-FIM-101:DI11-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-101:DI11-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-101:DI11-HVON-En-RB
@@ -493,7 +479,6 @@ MBL-010RFC:RFS-FIM-101:DI12-Input-RB
 MBL-010RFC:RFS-FIM-101:DI12-isFirstIlck
 MBL-010RFC:RFS-FIM-101:DI12-RFON-En-RB
 MBL-010RFC:RFS-FIM-101:DI12-RFON-Precond
-MBL-010RFC:RFS-FIM-101:DI12-Wave-PM
 MBL-010RFC:RFS-FIM-101:DI13-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-101:DI13-DIlckMode-RB
 MBL-010RFC:RFS-FIM-101:DI13-FastRst-IlckCnt
@@ -505,7 +490,6 @@ MBL-010RFC:RFS-FIM-101:DI13-Input-RB
 MBL-010RFC:RFS-FIM-101:DI13-isFirstIlck
 MBL-010RFC:RFS-FIM-101:DI13-RFON-En-RB
 MBL-010RFC:RFS-FIM-101:DI13-RFON-Precond
-MBL-010RFC:RFS-FIM-101:DI13-Wave-PM
 MBL-010RFC:RFS-FIM-101:DI14-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-101:DI14-DIlckMode-RB
 MBL-010RFC:RFS-FIM-101:DI14-FastRst-IlckCnt
@@ -517,7 +501,6 @@ MBL-010RFC:RFS-FIM-101:DI14-Input-RB
 MBL-010RFC:RFS-FIM-101:DI14-isFirstIlck
 MBL-010RFC:RFS-FIM-101:DI14-RFON-En-RB
 MBL-010RFC:RFS-FIM-101:DI14-RFON-Precond
-MBL-010RFC:RFS-FIM-101:DI14-Wave-PM
 MBL-010RFC:RFS-FIM-101:DI15-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-101:DI15-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-101:DI15-HVON-En-RB
@@ -543,7 +526,6 @@ MBL-010RFC:RFS-FIM-101:DI17-Input-RB
 MBL-010RFC:RFS-FIM-101:DI17-isFirstIlck
 MBL-010RFC:RFS-FIM-101:DI17-RFON-En-RB
 MBL-010RFC:RFS-FIM-101:DI17-RFON-Precond
-MBL-010RFC:RFS-FIM-101:DI17-Wave-PM
 MBL-010RFC:RFS-FIM-101:DI18-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-101:DI18-DIlckMode-RB
 MBL-010RFC:RFS-FIM-101:DI18-FastRst-IlckCnt
@@ -555,7 +537,6 @@ MBL-010RFC:RFS-FIM-101:DI18-Input-RB
 MBL-010RFC:RFS-FIM-101:DI18-isFirstIlck
 MBL-010RFC:RFS-FIM-101:DI18-RFON-En-RB
 MBL-010RFC:RFS-FIM-101:DI18-RFON-Precond
-MBL-010RFC:RFS-FIM-101:DI18-Wave-PM
 MBL-010RFC:RFS-FIM-101:DI19-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-101:DI19-DIlckMode-RB
 MBL-010RFC:RFS-FIM-101:DI19-FastRst-IlckCnt
@@ -567,7 +548,6 @@ MBL-010RFC:RFS-FIM-101:DI19-Input-RB
 MBL-010RFC:RFS-FIM-101:DI19-isFirstIlck
 MBL-010RFC:RFS-FIM-101:DI19-RFON-En-RB
 MBL-010RFC:RFS-FIM-101:DI19-RFON-Precond
-MBL-010RFC:RFS-FIM-101:DI19-Wave-PM
 MBL-010RFC:RFS-FIM-101:DI1-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-101:DI1-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-101:DI1-HVON-En-RB
@@ -586,7 +566,6 @@ MBL-010RFC:RFS-FIM-101:DI20-Input-RB
 MBL-010RFC:RFS-FIM-101:DI20-isFirstIlck
 MBL-010RFC:RFS-FIM-101:DI20-RFON-En-RB
 MBL-010RFC:RFS-FIM-101:DI20-RFON-Precond
-MBL-010RFC:RFS-FIM-101:DI20-Wave-PM
 MBL-010RFC:RFS-FIM-101:DI21-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-101:DI21-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-101:DI21-HVON-En-RB
@@ -640,7 +619,6 @@ MBL-010RFC:RFS-FIM-101:DI7-Input-RB
 MBL-010RFC:RFS-FIM-101:DI7-isFirstIlck
 MBL-010RFC:RFS-FIM-101:DI7-RFON-En-RB
 MBL-010RFC:RFS-FIM-101:DI7-RFON-Precond
-MBL-010RFC:RFS-FIM-101:DI7-Wave-PM
 MBL-010RFC:RFS-FIM-101:DI8-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-101:DI8-DIlckMode-RB
 MBL-010RFC:RFS-FIM-101:DI8-FastRst-IlckCnt
@@ -652,7 +630,6 @@ MBL-010RFC:RFS-FIM-101:DI8-Input-RB
 MBL-010RFC:RFS-FIM-101:DI8-isFirstIlck
 MBL-010RFC:RFS-FIM-101:DI8-RFON-En-RB
 MBL-010RFC:RFS-FIM-101:DI8-RFON-Precond
-MBL-010RFC:RFS-FIM-101:DI8-Wave-PM
 MBL-010RFC:RFS-FIM-101:DI9-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-101:DI9-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-101:DI9-HVON-En-RB
@@ -710,7 +687,6 @@ MBL-010RFC:RFS-FIM-101:RF10-Wave-Avg
 MBL-010RFC:RFS-FIM-101:RF10-Wave-High
 MBL-010RFC:RFS-FIM-101:RF10-Wave-Low
 MBL-010RFC:RFS-FIM-101:RF10-Wave-Med
-MBL-010RFC:RFS-FIM-101:RF10-Wave-PM
 MBL-010RFC:RFS-FIM-101:RF1-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-101:RF1-HVON-En-RB
 MBL-010RFC:RFS-FIM-101:RF1-HVON-Precond
@@ -803,7 +779,6 @@ MBL-010RFC:RFS-FIM-101:RF9-Wave-Avg
 MBL-010RFC:RFS-FIM-101:RF9-Wave-High
 MBL-010RFC:RFS-FIM-101:RF9-Wave-Low
 MBL-010RFC:RFS-FIM-101:RF9-Wave-Med
-MBL-010RFC:RFS-FIM-101:RF9-Wave-PM
 MBL-010RFC:RFS-FIM-101:RFON-Precond
 MBL-010RFC:RFS-FIM-101:RP1-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-101:RP1-HVON-En-RB
@@ -824,7 +799,6 @@ MBL-010RFC:RFS-FIM-101:RP1-RFON-En-RB
 MBL-010RFC:RFS-FIM-101:RP1-RFON-Precond
 MBL-010RFC:RFS-FIM-101:RP1-TrigSel-RB
 MBL-010RFC:RFS-FIM-101:RP1-TrigThre-RB
-MBL-010RFC:RFS-FIM-101:RP1-Wave-IlckPM
 MBL-010RFC:RFS-FIM-101:RP2-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-101:RP2-HVON-En-RB
 MBL-010RFC:RFS-FIM-101:RP2-HVON-Precond
@@ -844,7 +818,6 @@ MBL-010RFC:RFS-FIM-101:RP2-RFON-En-RB
 MBL-010RFC:RFS-FIM-101:RP2-RFON-Precond
 MBL-010RFC:RFS-FIM-101:RP2-TrigSel-RB
 MBL-010RFC:RFS-FIM-101:RP2-TrigThre-RB
-MBL-010RFC:RFS-FIM-101:RP2-Wave-IlckPM
 MBL-010RFC:RFS-FIM-101:TriggerLine-RB
 MBL-010RFC:RFS-Kly-110:PwrFwd-DevMonEval-RB
 MBL-010RFC:RFS-Kly-110:PwrFwd-DevMonFact-RB
@@ -884,7 +857,6 @@ MBL-010RFC:RFS-Kly-110:PwrFwd-Wave-Avg
 MBL-010RFC:RFS-Kly-110:PwrFwd-Wave-High
 MBL-010RFC:RFS-Kly-110:PwrFwd-Wave-Low
 MBL-010RFC:RFS-Kly-110:PwrFwd-Wave-Med
-MBL-010RFC:RFS-Kly-110:PwrFwd-Wave-PM
 MBL-010RFC:RFS-Kly-110:PwrRfl-DevMonEval-RB
 MBL-010RFC:RFS-Kly-110:PwrRfl-DevMonFact-RB
 MBL-010RFC:RFS-Kly-110:PwrRfl-DevMonIlck-RB
@@ -923,12 +895,10 @@ MBL-010RFC:RFS-Kly-110:PwrRfl-Wave-Avg
 MBL-010RFC:RFS-Kly-110:PwrRfl-Wave-High
 MBL-010RFC:RFS-Kly-110:PwrRfl-Wave-Low
 MBL-010RFC:RFS-Kly-110:PwrRfl-Wave-Med
-MBL-010RFC:RFS-Kly-110:PwrRfl-Wave-PM
 MBL-010RFC:RFS-LLRF-101:Status-DIlckMode-RB
 MBL-010RFC:RFS-LLRF-101:Status-Ilck-RB
 MBL-010RFC:RFS-LLRF-101:Status-Input-RB
 MBL-010RFC:RFS-LLRF-101:Status-isFirstIlck
-MBL-010RFC:RFS-LLRF-101:Status-Wave-PM
 MBL-010RFC:RFS-Load-120:PwrFwd-DevMonEval-RB
 MBL-010RFC:RFS-Load-120:PwrFwd-DevMonFact-RB
 MBL-010RFC:RFS-Load-120:PwrFwd-DevMonIlck-RB
@@ -967,7 +937,6 @@ MBL-010RFC:RFS-Load-120:PwrFwd-Wave-Avg
 MBL-010RFC:RFS-Load-120:PwrFwd-Wave-High
 MBL-010RFC:RFS-Load-120:PwrFwd-Wave-Low
 MBL-010RFC:RFS-Load-120:PwrFwd-Wave-Med
-MBL-010RFC:RFS-Load-120:PwrFwd-Wave-PM
 MBL-010RFC:RFS-Load-120:PwrRfl-DevMonEval-RB
 MBL-010RFC:RFS-Load-120:PwrRfl-DevMonFact-RB
 MBL-010RFC:RFS-Load-120:PwrRfl-DevMonIlck-RB
@@ -1006,7 +975,6 @@ MBL-010RFC:RFS-Load-120:PwrRfl-Wave-Avg
 MBL-010RFC:RFS-Load-120:PwrRfl-Wave-High
 MBL-010RFC:RFS-Load-120:PwrRfl-Wave-Low
 MBL-010RFC:RFS-Load-120:PwrRfl-Wave-Med
-MBL-010RFC:RFS-Load-120:PwrRfl-Wave-PM
 MBL-010RFC:RFS-Mod-110:Cur-DevMonEval-RB
 MBL-010RFC:RFS-Mod-110:Cur-DevMonFact-RB
 MBL-010RFC:RFS-Mod-110:Cur-DevMonIlck-RB
@@ -1045,17 +1013,14 @@ MBL-010RFC:RFS-Mod-110:Cur-Wave-Avg
 MBL-010RFC:RFS-Mod-110:Cur-Wave-High
 MBL-010RFC:RFS-Mod-110:Cur-Wave-Low
 MBL-010RFC:RFS-Mod-110:Cur-Wave-Med
-MBL-010RFC:RFS-Mod-110:Cur-Wave-PM
 MBL-010RFC:RFS-Mod-110:PCcon-DIlckMode-RB
 MBL-010RFC:RFS-Mod-110:PCcon-Ilck-RB
 MBL-010RFC:RFS-Mod-110:PCcon-Input-RB
 MBL-010RFC:RFS-Mod-110:PCcon-isFirstIlck
-MBL-010RFC:RFS-Mod-110:PCcon-Wave-PM
 MBL-010RFC:RFS-Mod-110:Ready-DIlckMode-RB
 MBL-010RFC:RFS-Mod-110:Ready-Ilck-RB
 MBL-010RFC:RFS-Mod-110:Ready-Input-RB
 MBL-010RFC:RFS-Mod-110:Ready-isFirstIlck
-MBL-010RFC:RFS-Mod-110:Ready-Wave-PM
 MBL-010RFC:RFS-Mod-110:Vol-DevMonEval-RB
 MBL-010RFC:RFS-Mod-110:Vol-DevMonFact-RB
 MBL-010RFC:RFS-Mod-110:Vol-DevMonIlck-RB
@@ -1094,7 +1059,6 @@ MBL-010RFC:RFS-Mod-110:Vol-Wave-Avg
 MBL-010RFC:RFS-Mod-110:Vol-Wave-High
 MBL-010RFC:RFS-Mod-110:Vol-Wave-Low
 MBL-010RFC:RFS-Mod-110:Vol-Wave-Med
-MBL-010RFC:RFS-Mod-110:Vol-Wave-PM
 MBL-010RFC:RFS-PAmp-110:PwrFwd-DevMonEval-RB
 MBL-010RFC:RFS-PAmp-110:PwrFwd-DevMonFact-RB
 MBL-010RFC:RFS-PAmp-110:PwrFwd-DevMonIlck-RB
@@ -1133,17 +1097,14 @@ MBL-010RFC:RFS-PAmp-110:PwrFwd-Wave-Avg
 MBL-010RFC:RFS-PAmp-110:PwrFwd-Wave-High
 MBL-010RFC:RFS-PAmp-110:PwrFwd-Wave-Low
 MBL-010RFC:RFS-PAmp-110:PwrFwd-Wave-Med
-MBL-010RFC:RFS-PAmp-110:PwrFwd-Wave-PM
 MBL-010RFC:RFS-SIM-110:HvEna-DIlckMode-RB
 MBL-010RFC:RFS-SIM-110:HvEna-Ilck-RB
 MBL-010RFC:RFS-SIM-110:HvEna-Input-RB
 MBL-010RFC:RFS-SIM-110:HvEna-isFirstIlck
-MBL-010RFC:RFS-SIM-110:HvEna-Wave-PM
 MBL-010RFC:RFS-SIM-110:RfEna-DIlckMode-RB
 MBL-010RFC:RFS-SIM-110:RfEna-Ilck-RB
 MBL-010RFC:RFS-SIM-110:RfEna-Input-RB
 MBL-010RFC:RFS-SIM-110:RfEna-isFirstIlck
-MBL-010RFC:RFS-SIM-110:RfEna-Wave-PM
 MBL-010RFC:RFS-SolPS-110:Cur-DevMonEval-RB
 MBL-010RFC:RFS-SolPS-110:Cur-DevMonFact-RB
 MBL-010RFC:RFS-SolPS-110:Cur-DevMonIlck-RB
@@ -1182,7 +1143,6 @@ MBL-010RFC:RFS-SolPS-110:Cur-Wave-Avg
 MBL-010RFC:RFS-SolPS-110:Cur-Wave-High
 MBL-010RFC:RFS-SolPS-110:Cur-Wave-Low
 MBL-010RFC:RFS-SolPS-110:Cur-Wave-Med
-MBL-010RFC:RFS-SolPS-110:Cur-Wave-PM
 MBL-010RFC:RFS-SolPS-120:Cur-DevMonEval-RB
 MBL-010RFC:RFS-SolPS-120:Cur-DevMonFact-RB
 MBL-010RFC:RFS-SolPS-120:Cur-DevMonIlck-RB
@@ -1221,24 +1181,19 @@ MBL-010RFC:RFS-SolPS-120:Cur-Wave-Avg
 MBL-010RFC:RFS-SolPS-120:Cur-Wave-High
 MBL-010RFC:RFS-SolPS-120:Cur-Wave-Low
 MBL-010RFC:RFS-SolPS-120:Cur-Wave-Med
-MBL-010RFC:RFS-SolPS-120:Cur-Wave-PM
 MBL-010RFC:RFS-VacBody-110:Status-DIlckMode-RB
 MBL-010RFC:RFS-VacBody-110:Status-Ilck-RB
 MBL-010RFC:RFS-VacBody-110:Status-Input-RB
 MBL-010RFC:RFS-VacBody-110:Status-isFirstIlck
-MBL-010RFC:RFS-VacBody-110:Status-Wave-PM
 MBL-010RFC:RFS-VacCav-110:Status-DIlckMode-RB
 MBL-010RFC:RFS-VacCav-110:Status-Ilck-RB
 MBL-010RFC:RFS-VacCav-110:Status-Input-RB
 MBL-010RFC:RFS-VacCav-110:Status-isFirstIlck
-MBL-010RFC:RFS-VacCav-110:Status-Wave-PM
 MBL-010RFC:RFS-VacPS-110:I-SP-DIlckMode-RB
 MBL-010RFC:RFS-VacPS-110:I-SP-Ilck-RB
 MBL-010RFC:RFS-VacPS-110:I-SP-Input-RB
 MBL-010RFC:RFS-VacPS-110:I-SP-isFirstIlck
-MBL-010RFC:RFS-VacPS-110:I-SP-Wave-PM
 MBL-010RFC:RFS-VacPS-120:I-SP-DIlckMode-RB
 MBL-010RFC:RFS-VacPS-120:I-SP-Ilck-RB
 MBL-010RFC:RFS-VacPS-120:I-SP-Input-RB
 MBL-010RFC:RFS-VacPS-120:I-SP-isFirstIlck
-MBL-010RFC:RFS-VacPS-120:I-SP-Wave-PM
diff --git a/files/MBL-010RFC_SC-IOC-202.archive b/files/MBL-010RFC_SC-IOC-202.archive
index b578edd..aef3fef 100644
--- a/files/MBL-010RFC_SC-IOC-202.archive
+++ b/files/MBL-010RFC_SC-IOC-202.archive
@@ -2,12 +2,10 @@ MBL-010RFC:RFS-ADG-210:IlckStatus-DIlckMode-RB
 MBL-010RFC:RFS-ADG-210:IlckStatus-Ilck-RB
 MBL-010RFC:RFS-ADG-210:IlckStatus-Input-RB
 MBL-010RFC:RFS-ADG-210:IlckStatus-isFirstIlck
-MBL-010RFC:RFS-ADG-210:IlckStatus-Wave-PM
 MBL-010RFC:RFS-ADG-210:PwrFail-DIlckMode-RB
 MBL-010RFC:RFS-ADG-210:PwrFail-Ilck-RB
 MBL-010RFC:RFS-ADG-210:PwrFail-Input-RB
 MBL-010RFC:RFS-ADG-210:PwrFail-isFirstIlck
-MBL-010RFC:RFS-ADG-210:PwrFail-Wave-PM
 MBL-010RFC:RFS-Cav-210:Fld-DevMonEval-RB
 MBL-010RFC:RFS-Cav-210:Fld-DevMonFact-RB
 MBL-010RFC:RFS-Cav-210:Fld-DevMonIlck-RB
@@ -46,7 +44,6 @@ MBL-010RFC:RFS-Cav-210:Fld-Wave-Avg
 MBL-010RFC:RFS-Cav-210:Fld-Wave-High
 MBL-010RFC:RFS-Cav-210:Fld-Wave-Low
 MBL-010RFC:RFS-Cav-210:Fld-Wave-Med
-MBL-010RFC:RFS-Cav-210:Fld-Wave-PM
 MBL-010RFC:RFS-Cav-210:PwrFwd-DevMonEval-RB
 MBL-010RFC:RFS-Cav-210:PwrFwd-DevMonFact-RB
 MBL-010RFC:RFS-Cav-210:PwrFwd-DevMonIlck-RB
@@ -85,7 +82,6 @@ MBL-010RFC:RFS-Cav-210:PwrFwd-Wave-Avg
 MBL-010RFC:RFS-Cav-210:PwrFwd-Wave-High
 MBL-010RFC:RFS-Cav-210:PwrFwd-Wave-Low
 MBL-010RFC:RFS-Cav-210:PwrFwd-Wave-Med
-MBL-010RFC:RFS-Cav-210:PwrFwd-Wave-PM
 MBL-010RFC:RFS-Cav-210:PwrRfl-DevMonEval-RB
 MBL-010RFC:RFS-Cav-210:PwrRfl-DevMonFact-RB
 MBL-010RFC:RFS-Cav-210:PwrRfl-DevMonIlck-RB
@@ -124,7 +120,6 @@ MBL-010RFC:RFS-Cav-210:PwrRfl-Wave-Avg
 MBL-010RFC:RFS-Cav-210:PwrRfl-Wave-High
 MBL-010RFC:RFS-Cav-210:PwrRfl-Wave-Low
 MBL-010RFC:RFS-Cav-210:PwrRfl-Wave-Med
-MBL-010RFC:RFS-Cav-210:PwrRfl-Wave-PM
 MBL-010RFC:RFS-EPR-210:Cur-DevMonEval-RB
 MBL-010RFC:RFS-EPR-210:Cur-DevMonFact-RB
 MBL-010RFC:RFS-EPR-210:Cur-DevMonIlck-RB
@@ -163,7 +158,6 @@ MBL-010RFC:RFS-EPR-210:Cur-Wave-Avg
 MBL-010RFC:RFS-EPR-210:Cur-Wave-High
 MBL-010RFC:RFS-EPR-210:Cur-Wave-Low
 MBL-010RFC:RFS-EPR-210:Cur-Wave-Med
-MBL-010RFC:RFS-EPR-210:Cur-Wave-PM
 MBL-010RFC:RFS-FIM-201:AI10-DevMonEval-RB
 MBL-010RFC:RFS-FIM-201:AI10-DevMonFact-RB
 MBL-010RFC:RFS-FIM-201:AI10-DevMonIlck-RB
@@ -208,7 +202,6 @@ MBL-010RFC:RFS-FIM-201:AI10-Wave-Avg
 MBL-010RFC:RFS-FIM-201:AI10-Wave-High
 MBL-010RFC:RFS-FIM-201:AI10-Wave-Low
 MBL-010RFC:RFS-FIM-201:AI10-Wave-Med
-MBL-010RFC:RFS-FIM-201:AI10-Wave-PM
 MBL-010RFC:RFS-FIM-201:AI1-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-201:AI1-HVON-En-RB
 MBL-010RFC:RFS-FIM-201:AI1-HVON-Precond
@@ -277,7 +270,6 @@ MBL-010RFC:RFS-FIM-201:AI5-Wave-Avg
 MBL-010RFC:RFS-FIM-201:AI5-Wave-High
 MBL-010RFC:RFS-FIM-201:AI5-Wave-Low
 MBL-010RFC:RFS-FIM-201:AI5-Wave-Med
-MBL-010RFC:RFS-FIM-201:AI5-Wave-PM
 MBL-010RFC:RFS-FIM-201:AI6-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-201:AI6-HVON-En-RB
 MBL-010RFC:RFS-FIM-201:AI6-HVON-Precond
@@ -328,7 +320,6 @@ MBL-010RFC:RFS-FIM-201:AI7-Wave-Avg
 MBL-010RFC:RFS-FIM-201:AI7-Wave-High
 MBL-010RFC:RFS-FIM-201:AI7-Wave-Low
 MBL-010RFC:RFS-FIM-201:AI7-Wave-Med
-MBL-010RFC:RFS-FIM-201:AI7-Wave-PM
 MBL-010RFC:RFS-FIM-201:AI8-DevMonEval-RB
 MBL-010RFC:RFS-FIM-201:AI8-DevMonFact-RB
 MBL-010RFC:RFS-FIM-201:AI8-DevMonIlck-RB
@@ -373,7 +364,6 @@ MBL-010RFC:RFS-FIM-201:AI8-Wave-Avg
 MBL-010RFC:RFS-FIM-201:AI8-Wave-High
 MBL-010RFC:RFS-FIM-201:AI8-Wave-Low
 MBL-010RFC:RFS-FIM-201:AI8-Wave-Med
-MBL-010RFC:RFS-FIM-201:AI8-Wave-PM
 MBL-010RFC:RFS-FIM-201:AI9-DevMonEval-RB
 MBL-010RFC:RFS-FIM-201:AI9-DevMonFact-RB
 MBL-010RFC:RFS-FIM-201:AI9-DevMonIlck-RB
@@ -418,7 +408,6 @@ MBL-010RFC:RFS-FIM-201:AI9-Wave-Avg
 MBL-010RFC:RFS-FIM-201:AI9-Wave-High
 MBL-010RFC:RFS-FIM-201:AI9-Wave-Low
 MBL-010RFC:RFS-FIM-201:AI9-Wave-Med
-MBL-010RFC:RFS-FIM-201:AI9-Wave-PM
 MBL-010RFC:RFS-FIM-201:CD1-DevFactor-RB
 MBL-010RFC:RFS-FIM-201:CD1-DevPeriod-RB
 MBL-010RFC:RFS-FIM-201:CD1-FastRst-IlckCnt
@@ -440,7 +429,6 @@ MBL-010RFC:RFS-FIM-201:CD1-RFON-En-RB
 MBL-010RFC:RFS-FIM-201:CD1-RFON-Precond
 MBL-010RFC:RFS-FIM-201:CD1-TrigSel-RB
 MBL-010RFC:RFS-FIM-201:CD1-TrigThre-RB
-MBL-010RFC:RFS-FIM-201:CD1-Wave-IlckPM
 MBL-010RFC:RFS-FIM-201:CD2-DevFactor-RB
 MBL-010RFC:RFS-FIM-201:CD2-DevPeriod-RB
 MBL-010RFC:RFS-FIM-201:CD2-FastRst-IlckCnt
@@ -462,7 +450,6 @@ MBL-010RFC:RFS-FIM-201:CD2-RFON-En-RB
 MBL-010RFC:RFS-FIM-201:CD2-RFON-Precond
 MBL-010RFC:RFS-FIM-201:CD2-TrigSel-RB
 MBL-010RFC:RFS-FIM-201:CD2-TrigThre-RB
-MBL-010RFC:RFS-FIM-201:CD2-Wave-IlckPM
 MBL-010RFC:RFS-FIM-201:DI10-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-201:DI10-DIlckMode-RB
 MBL-010RFC:RFS-FIM-201:DI10-FastRst-IlckCnt
@@ -474,7 +461,6 @@ MBL-010RFC:RFS-FIM-201:DI10-Input-RB
 MBL-010RFC:RFS-FIM-201:DI10-isFirstIlck
 MBL-010RFC:RFS-FIM-201:DI10-RFON-En-RB
 MBL-010RFC:RFS-FIM-201:DI10-RFON-Precond
-MBL-010RFC:RFS-FIM-201:DI10-Wave-PM
 MBL-010RFC:RFS-FIM-201:DI11-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-201:DI11-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-201:DI11-HVON-En-RB
@@ -493,7 +479,6 @@ MBL-010RFC:RFS-FIM-201:DI12-Input-RB
 MBL-010RFC:RFS-FIM-201:DI12-isFirstIlck
 MBL-010RFC:RFS-FIM-201:DI12-RFON-En-RB
 MBL-010RFC:RFS-FIM-201:DI12-RFON-Precond
-MBL-010RFC:RFS-FIM-201:DI12-Wave-PM
 MBL-010RFC:RFS-FIM-201:DI13-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-201:DI13-DIlckMode-RB
 MBL-010RFC:RFS-FIM-201:DI13-FastRst-IlckCnt
@@ -505,7 +490,6 @@ MBL-010RFC:RFS-FIM-201:DI13-Input-RB
 MBL-010RFC:RFS-FIM-201:DI13-isFirstIlck
 MBL-010RFC:RFS-FIM-201:DI13-RFON-En-RB
 MBL-010RFC:RFS-FIM-201:DI13-RFON-Precond
-MBL-010RFC:RFS-FIM-201:DI13-Wave-PM
 MBL-010RFC:RFS-FIM-201:DI14-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-201:DI14-DIlckMode-RB
 MBL-010RFC:RFS-FIM-201:DI14-FastRst-IlckCnt
@@ -517,7 +501,6 @@ MBL-010RFC:RFS-FIM-201:DI14-Input-RB
 MBL-010RFC:RFS-FIM-201:DI14-isFirstIlck
 MBL-010RFC:RFS-FIM-201:DI14-RFON-En-RB
 MBL-010RFC:RFS-FIM-201:DI14-RFON-Precond
-MBL-010RFC:RFS-FIM-201:DI14-Wave-PM
 MBL-010RFC:RFS-FIM-201:DI15-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-201:DI15-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-201:DI15-HVON-En-RB
@@ -543,7 +526,6 @@ MBL-010RFC:RFS-FIM-201:DI17-Input-RB
 MBL-010RFC:RFS-FIM-201:DI17-isFirstIlck
 MBL-010RFC:RFS-FIM-201:DI17-RFON-En-RB
 MBL-010RFC:RFS-FIM-201:DI17-RFON-Precond
-MBL-010RFC:RFS-FIM-201:DI17-Wave-PM
 MBL-010RFC:RFS-FIM-201:DI18-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-201:DI18-DIlckMode-RB
 MBL-010RFC:RFS-FIM-201:DI18-FastRst-IlckCnt
@@ -555,7 +537,6 @@ MBL-010RFC:RFS-FIM-201:DI18-Input-RB
 MBL-010RFC:RFS-FIM-201:DI18-isFirstIlck
 MBL-010RFC:RFS-FIM-201:DI18-RFON-En-RB
 MBL-010RFC:RFS-FIM-201:DI18-RFON-Precond
-MBL-010RFC:RFS-FIM-201:DI18-Wave-PM
 MBL-010RFC:RFS-FIM-201:DI19-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-201:DI19-DIlckMode-RB
 MBL-010RFC:RFS-FIM-201:DI19-FastRst-IlckCnt
@@ -567,7 +548,6 @@ MBL-010RFC:RFS-FIM-201:DI19-Input-RB
 MBL-010RFC:RFS-FIM-201:DI19-isFirstIlck
 MBL-010RFC:RFS-FIM-201:DI19-RFON-En-RB
 MBL-010RFC:RFS-FIM-201:DI19-RFON-Precond
-MBL-010RFC:RFS-FIM-201:DI19-Wave-PM
 MBL-010RFC:RFS-FIM-201:DI1-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-201:DI1-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-201:DI1-HVON-En-RB
@@ -586,7 +566,6 @@ MBL-010RFC:RFS-FIM-201:DI20-Input-RB
 MBL-010RFC:RFS-FIM-201:DI20-isFirstIlck
 MBL-010RFC:RFS-FIM-201:DI20-RFON-En-RB
 MBL-010RFC:RFS-FIM-201:DI20-RFON-Precond
-MBL-010RFC:RFS-FIM-201:DI20-Wave-PM
 MBL-010RFC:RFS-FIM-201:DI21-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-201:DI21-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-201:DI21-HVON-En-RB
@@ -640,7 +619,6 @@ MBL-010RFC:RFS-FIM-201:DI7-Input-RB
 MBL-010RFC:RFS-FIM-201:DI7-isFirstIlck
 MBL-010RFC:RFS-FIM-201:DI7-RFON-En-RB
 MBL-010RFC:RFS-FIM-201:DI7-RFON-Precond
-MBL-010RFC:RFS-FIM-201:DI7-Wave-PM
 MBL-010RFC:RFS-FIM-201:DI8-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-201:DI8-DIlckMode-RB
 MBL-010RFC:RFS-FIM-201:DI8-FastRst-IlckCnt
@@ -652,7 +630,6 @@ MBL-010RFC:RFS-FIM-201:DI8-Input-RB
 MBL-010RFC:RFS-FIM-201:DI8-isFirstIlck
 MBL-010RFC:RFS-FIM-201:DI8-RFON-En-RB
 MBL-010RFC:RFS-FIM-201:DI8-RFON-Precond
-MBL-010RFC:RFS-FIM-201:DI8-Wave-PM
 MBL-010RFC:RFS-FIM-201:DI9-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-201:DI9-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-201:DI9-HVON-En-RB
@@ -710,7 +687,6 @@ MBL-010RFC:RFS-FIM-201:RF10-Wave-Avg
 MBL-010RFC:RFS-FIM-201:RF10-Wave-High
 MBL-010RFC:RFS-FIM-201:RF10-Wave-Low
 MBL-010RFC:RFS-FIM-201:RF10-Wave-Med
-MBL-010RFC:RFS-FIM-201:RF10-Wave-PM
 MBL-010RFC:RFS-FIM-201:RF1-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-201:RF1-HVON-En-RB
 MBL-010RFC:RFS-FIM-201:RF1-HVON-Precond
@@ -803,7 +779,6 @@ MBL-010RFC:RFS-FIM-201:RF9-Wave-Avg
 MBL-010RFC:RFS-FIM-201:RF9-Wave-High
 MBL-010RFC:RFS-FIM-201:RF9-Wave-Low
 MBL-010RFC:RFS-FIM-201:RF9-Wave-Med
-MBL-010RFC:RFS-FIM-201:RF9-Wave-PM
 MBL-010RFC:RFS-FIM-201:RFON-Precond
 MBL-010RFC:RFS-FIM-201:RP1-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-201:RP1-HVON-En-RB
@@ -824,7 +799,6 @@ MBL-010RFC:RFS-FIM-201:RP1-RFON-En-RB
 MBL-010RFC:RFS-FIM-201:RP1-RFON-Precond
 MBL-010RFC:RFS-FIM-201:RP1-TrigSel-RB
 MBL-010RFC:RFS-FIM-201:RP1-TrigThre-RB
-MBL-010RFC:RFS-FIM-201:RP1-Wave-IlckPM
 MBL-010RFC:RFS-FIM-201:RP2-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-201:RP2-HVON-En-RB
 MBL-010RFC:RFS-FIM-201:RP2-HVON-Precond
@@ -844,7 +818,6 @@ MBL-010RFC:RFS-FIM-201:RP2-RFON-En-RB
 MBL-010RFC:RFS-FIM-201:RP2-RFON-Precond
 MBL-010RFC:RFS-FIM-201:RP2-TrigSel-RB
 MBL-010RFC:RFS-FIM-201:RP2-TrigThre-RB
-MBL-010RFC:RFS-FIM-201:RP2-Wave-IlckPM
 MBL-010RFC:RFS-FIM-201:TriggerLine-RB
 MBL-010RFC:RFS-Kly-210:PwrFwd-DevMonEval-RB
 MBL-010RFC:RFS-Kly-210:PwrFwd-DevMonFact-RB
@@ -884,7 +857,6 @@ MBL-010RFC:RFS-Kly-210:PwrFwd-Wave-Avg
 MBL-010RFC:RFS-Kly-210:PwrFwd-Wave-High
 MBL-010RFC:RFS-Kly-210:PwrFwd-Wave-Low
 MBL-010RFC:RFS-Kly-210:PwrFwd-Wave-Med
-MBL-010RFC:RFS-Kly-210:PwrFwd-Wave-PM
 MBL-010RFC:RFS-Kly-210:PwrRfl-DevMonEval-RB
 MBL-010RFC:RFS-Kly-210:PwrRfl-DevMonFact-RB
 MBL-010RFC:RFS-Kly-210:PwrRfl-DevMonIlck-RB
@@ -923,12 +895,10 @@ MBL-010RFC:RFS-Kly-210:PwrRfl-Wave-Avg
 MBL-010RFC:RFS-Kly-210:PwrRfl-Wave-High
 MBL-010RFC:RFS-Kly-210:PwrRfl-Wave-Low
 MBL-010RFC:RFS-Kly-210:PwrRfl-Wave-Med
-MBL-010RFC:RFS-Kly-210:PwrRfl-Wave-PM
 MBL-010RFC:RFS-LLRF-201:Status-DIlckMode-RB
 MBL-010RFC:RFS-LLRF-201:Status-Ilck-RB
 MBL-010RFC:RFS-LLRF-201:Status-Input-RB
 MBL-010RFC:RFS-LLRF-201:Status-isFirstIlck
-MBL-010RFC:RFS-LLRF-201:Status-Wave-PM
 MBL-010RFC:RFS-Load-220:PwrFwd-DevMonEval-RB
 MBL-010RFC:RFS-Load-220:PwrFwd-DevMonFact-RB
 MBL-010RFC:RFS-Load-220:PwrFwd-DevMonIlck-RB
@@ -967,7 +937,6 @@ MBL-010RFC:RFS-Load-220:PwrFwd-Wave-Avg
 MBL-010RFC:RFS-Load-220:PwrFwd-Wave-High
 MBL-010RFC:RFS-Load-220:PwrFwd-Wave-Low
 MBL-010RFC:RFS-Load-220:PwrFwd-Wave-Med
-MBL-010RFC:RFS-Load-220:PwrFwd-Wave-PM
 MBL-010RFC:RFS-Load-220:PwrRfl-DevMonEval-RB
 MBL-010RFC:RFS-Load-220:PwrRfl-DevMonFact-RB
 MBL-010RFC:RFS-Load-220:PwrRfl-DevMonIlck-RB
@@ -1006,7 +975,6 @@ MBL-010RFC:RFS-Load-220:PwrRfl-Wave-Avg
 MBL-010RFC:RFS-Load-220:PwrRfl-Wave-High
 MBL-010RFC:RFS-Load-220:PwrRfl-Wave-Low
 MBL-010RFC:RFS-Load-220:PwrRfl-Wave-Med
-MBL-010RFC:RFS-Load-220:PwrRfl-Wave-PM
 MBL-010RFC:RFS-Mod-210:Cur-DevMonEval-RB
 MBL-010RFC:RFS-Mod-210:Cur-DevMonFact-RB
 MBL-010RFC:RFS-Mod-210:Cur-DevMonIlck-RB
@@ -1045,17 +1013,14 @@ MBL-010RFC:RFS-Mod-210:Cur-Wave-Avg
 MBL-010RFC:RFS-Mod-210:Cur-Wave-High
 MBL-010RFC:RFS-Mod-210:Cur-Wave-Low
 MBL-010RFC:RFS-Mod-210:Cur-Wave-Med
-MBL-010RFC:RFS-Mod-210:Cur-Wave-PM
 MBL-010RFC:RFS-Mod-210:PCcon-DIlckMode-RB
 MBL-010RFC:RFS-Mod-210:PCcon-Ilck-RB
 MBL-010RFC:RFS-Mod-210:PCcon-Input-RB
 MBL-010RFC:RFS-Mod-210:PCcon-isFirstIlck
-MBL-010RFC:RFS-Mod-210:PCcon-Wave-PM
 MBL-010RFC:RFS-Mod-210:Ready-DIlckMode-RB
 MBL-010RFC:RFS-Mod-210:Ready-Ilck-RB
 MBL-010RFC:RFS-Mod-210:Ready-Input-RB
 MBL-010RFC:RFS-Mod-210:Ready-isFirstIlck
-MBL-010RFC:RFS-Mod-210:Ready-Wave-PM
 MBL-010RFC:RFS-Mod-210:Vol-DevMonEval-RB
 MBL-010RFC:RFS-Mod-210:Vol-DevMonFact-RB
 MBL-010RFC:RFS-Mod-210:Vol-DevMonIlck-RB
@@ -1094,7 +1059,6 @@ MBL-010RFC:RFS-Mod-210:Vol-Wave-Avg
 MBL-010RFC:RFS-Mod-210:Vol-Wave-High
 MBL-010RFC:RFS-Mod-210:Vol-Wave-Low
 MBL-010RFC:RFS-Mod-210:Vol-Wave-Med
-MBL-010RFC:RFS-Mod-210:Vol-Wave-PM
 MBL-010RFC:RFS-PAmp-210:PwrFwd-DevMonEval-RB
 MBL-010RFC:RFS-PAmp-210:PwrFwd-DevMonFact-RB
 MBL-010RFC:RFS-PAmp-210:PwrFwd-DevMonIlck-RB
@@ -1133,17 +1097,14 @@ MBL-010RFC:RFS-PAmp-210:PwrFwd-Wave-Avg
 MBL-010RFC:RFS-PAmp-210:PwrFwd-Wave-High
 MBL-010RFC:RFS-PAmp-210:PwrFwd-Wave-Low
 MBL-010RFC:RFS-PAmp-210:PwrFwd-Wave-Med
-MBL-010RFC:RFS-PAmp-210:PwrFwd-Wave-PM
 MBL-010RFC:RFS-SIM-210:HvEna-DIlckMode-RB
 MBL-010RFC:RFS-SIM-210:HvEna-Ilck-RB
 MBL-010RFC:RFS-SIM-210:HvEna-Input-RB
 MBL-010RFC:RFS-SIM-210:HvEna-isFirstIlck
-MBL-010RFC:RFS-SIM-210:HvEna-Wave-PM
 MBL-010RFC:RFS-SIM-210:RfEna-DIlckMode-RB
 MBL-010RFC:RFS-SIM-210:RfEna-Ilck-RB
 MBL-010RFC:RFS-SIM-210:RfEna-Input-RB
 MBL-010RFC:RFS-SIM-210:RfEna-isFirstIlck
-MBL-010RFC:RFS-SIM-210:RfEna-Wave-PM
 MBL-010RFC:RFS-SolPS-210:Cur-DevMonEval-RB
 MBL-010RFC:RFS-SolPS-210:Cur-DevMonFact-RB
 MBL-010RFC:RFS-SolPS-210:Cur-DevMonIlck-RB
@@ -1182,7 +1143,6 @@ MBL-010RFC:RFS-SolPS-210:Cur-Wave-Avg
 MBL-010RFC:RFS-SolPS-210:Cur-Wave-High
 MBL-010RFC:RFS-SolPS-210:Cur-Wave-Low
 MBL-010RFC:RFS-SolPS-210:Cur-Wave-Med
-MBL-010RFC:RFS-SolPS-210:Cur-Wave-PM
 MBL-010RFC:RFS-SolPS-220:Cur-DevMonEval-RB
 MBL-010RFC:RFS-SolPS-220:Cur-DevMonFact-RB
 MBL-010RFC:RFS-SolPS-220:Cur-DevMonIlck-RB
@@ -1221,24 +1181,19 @@ MBL-010RFC:RFS-SolPS-220:Cur-Wave-Avg
 MBL-010RFC:RFS-SolPS-220:Cur-Wave-High
 MBL-010RFC:RFS-SolPS-220:Cur-Wave-Low
 MBL-010RFC:RFS-SolPS-220:Cur-Wave-Med
-MBL-010RFC:RFS-SolPS-220:Cur-Wave-PM
 MBL-010RFC:RFS-VacBody-210:Status-DIlckMode-RB
 MBL-010RFC:RFS-VacBody-210:Status-Ilck-RB
 MBL-010RFC:RFS-VacBody-210:Status-Input-RB
 MBL-010RFC:RFS-VacBody-210:Status-isFirstIlck
-MBL-010RFC:RFS-VacBody-210:Status-Wave-PM
 MBL-010RFC:RFS-VacCav-210:Status-DIlckMode-RB
 MBL-010RFC:RFS-VacCav-210:Status-Ilck-RB
 MBL-010RFC:RFS-VacCav-210:Status-Input-RB
 MBL-010RFC:RFS-VacCav-210:Status-isFirstIlck
-MBL-010RFC:RFS-VacCav-210:Status-Wave-PM
 MBL-010RFC:RFS-VacPS-210:I-SP-DIlckMode-RB
 MBL-010RFC:RFS-VacPS-210:I-SP-Ilck-RB
 MBL-010RFC:RFS-VacPS-210:I-SP-Input-RB
 MBL-010RFC:RFS-VacPS-210:I-SP-isFirstIlck
-MBL-010RFC:RFS-VacPS-210:I-SP-Wave-PM
 MBL-010RFC:RFS-VacPS-220:I-SP-DIlckMode-RB
 MBL-010RFC:RFS-VacPS-220:I-SP-Ilck-RB
 MBL-010RFC:RFS-VacPS-220:I-SP-Input-RB
 MBL-010RFC:RFS-VacPS-220:I-SP-isFirstIlck
-MBL-010RFC:RFS-VacPS-220:I-SP-Wave-PM
diff --git a/files/MBL-010RFC_SC-IOC-302.archive b/files/MBL-010RFC_SC-IOC-302.archive
index cbaf63e..9897f98 100644
--- a/files/MBL-010RFC_SC-IOC-302.archive
+++ b/files/MBL-010RFC_SC-IOC-302.archive
@@ -2,12 +2,10 @@ MBL-010RFC:RFS-ADG-310:IlckStatus-DIlckMode-RB
 MBL-010RFC:RFS-ADG-310:IlckStatus-Ilck-RB
 MBL-010RFC:RFS-ADG-310:IlckStatus-Input-RB
 MBL-010RFC:RFS-ADG-310:IlckStatus-isFirstIlck
-MBL-010RFC:RFS-ADG-310:IlckStatus-Wave-PM
 MBL-010RFC:RFS-ADG-310:PwrFail-DIlckMode-RB
 MBL-010RFC:RFS-ADG-310:PwrFail-Ilck-RB
 MBL-010RFC:RFS-ADG-310:PwrFail-Input-RB
 MBL-010RFC:RFS-ADG-310:PwrFail-isFirstIlck
-MBL-010RFC:RFS-ADG-310:PwrFail-Wave-PM
 MBL-010RFC:RFS-Cav-310:Fld-DevMonEval-RB
 MBL-010RFC:RFS-Cav-310:Fld-DevMonFact-RB
 MBL-010RFC:RFS-Cav-310:Fld-DevMonIlck-RB
@@ -46,7 +44,6 @@ MBL-010RFC:RFS-Cav-310:Fld-Wave-Avg
 MBL-010RFC:RFS-Cav-310:Fld-Wave-High
 MBL-010RFC:RFS-Cav-310:Fld-Wave-Low
 MBL-010RFC:RFS-Cav-310:Fld-Wave-Med
-MBL-010RFC:RFS-Cav-310:Fld-Wave-PM
 MBL-010RFC:RFS-Cav-310:PwrFwd-DevMonEval-RB
 MBL-010RFC:RFS-Cav-310:PwrFwd-DevMonFact-RB
 MBL-010RFC:RFS-Cav-310:PwrFwd-DevMonIlck-RB
@@ -85,7 +82,6 @@ MBL-010RFC:RFS-Cav-310:PwrFwd-Wave-Avg
 MBL-010RFC:RFS-Cav-310:PwrFwd-Wave-High
 MBL-010RFC:RFS-Cav-310:PwrFwd-Wave-Low
 MBL-010RFC:RFS-Cav-310:PwrFwd-Wave-Med
-MBL-010RFC:RFS-Cav-310:PwrFwd-Wave-PM
 MBL-010RFC:RFS-Cav-310:PwrRfl-DevMonEval-RB
 MBL-010RFC:RFS-Cav-310:PwrRfl-DevMonFact-RB
 MBL-010RFC:RFS-Cav-310:PwrRfl-DevMonIlck-RB
@@ -124,7 +120,6 @@ MBL-010RFC:RFS-Cav-310:PwrRfl-Wave-Avg
 MBL-010RFC:RFS-Cav-310:PwrRfl-Wave-High
 MBL-010RFC:RFS-Cav-310:PwrRfl-Wave-Low
 MBL-010RFC:RFS-Cav-310:PwrRfl-Wave-Med
-MBL-010RFC:RFS-Cav-310:PwrRfl-Wave-PM
 MBL-010RFC:RFS-EPR-310:Cur-DevMonEval-RB
 MBL-010RFC:RFS-EPR-310:Cur-DevMonFact-RB
 MBL-010RFC:RFS-EPR-310:Cur-DevMonIlck-RB
@@ -163,7 +158,6 @@ MBL-010RFC:RFS-EPR-310:Cur-Wave-Avg
 MBL-010RFC:RFS-EPR-310:Cur-Wave-High
 MBL-010RFC:RFS-EPR-310:Cur-Wave-Low
 MBL-010RFC:RFS-EPR-310:Cur-Wave-Med
-MBL-010RFC:RFS-EPR-310:Cur-Wave-PM
 MBL-010RFC:RFS-FIM-301:AI10-DevMonEval-RB
 MBL-010RFC:RFS-FIM-301:AI10-DevMonFact-RB
 MBL-010RFC:RFS-FIM-301:AI10-DevMonIlck-RB
@@ -208,7 +202,6 @@ MBL-010RFC:RFS-FIM-301:AI10-Wave-Avg
 MBL-010RFC:RFS-FIM-301:AI10-Wave-High
 MBL-010RFC:RFS-FIM-301:AI10-Wave-Low
 MBL-010RFC:RFS-FIM-301:AI10-Wave-Med
-MBL-010RFC:RFS-FIM-301:AI10-Wave-PM
 MBL-010RFC:RFS-FIM-301:AI1-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-301:AI1-HVON-En-RB
 MBL-010RFC:RFS-FIM-301:AI1-HVON-Precond
@@ -277,7 +270,6 @@ MBL-010RFC:RFS-FIM-301:AI5-Wave-Avg
 MBL-010RFC:RFS-FIM-301:AI5-Wave-High
 MBL-010RFC:RFS-FIM-301:AI5-Wave-Low
 MBL-010RFC:RFS-FIM-301:AI5-Wave-Med
-MBL-010RFC:RFS-FIM-301:AI5-Wave-PM
 MBL-010RFC:RFS-FIM-301:AI6-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-301:AI6-HVON-En-RB
 MBL-010RFC:RFS-FIM-301:AI6-HVON-Precond
@@ -328,7 +320,6 @@ MBL-010RFC:RFS-FIM-301:AI7-Wave-Avg
 MBL-010RFC:RFS-FIM-301:AI7-Wave-High
 MBL-010RFC:RFS-FIM-301:AI7-Wave-Low
 MBL-010RFC:RFS-FIM-301:AI7-Wave-Med
-MBL-010RFC:RFS-FIM-301:AI7-Wave-PM
 MBL-010RFC:RFS-FIM-301:AI8-DevMonEval-RB
 MBL-010RFC:RFS-FIM-301:AI8-DevMonFact-RB
 MBL-010RFC:RFS-FIM-301:AI8-DevMonIlck-RB
@@ -373,7 +364,6 @@ MBL-010RFC:RFS-FIM-301:AI8-Wave-Avg
 MBL-010RFC:RFS-FIM-301:AI8-Wave-High
 MBL-010RFC:RFS-FIM-301:AI8-Wave-Low
 MBL-010RFC:RFS-FIM-301:AI8-Wave-Med
-MBL-010RFC:RFS-FIM-301:AI8-Wave-PM
 MBL-010RFC:RFS-FIM-301:AI9-DevMonEval-RB
 MBL-010RFC:RFS-FIM-301:AI9-DevMonFact-RB
 MBL-010RFC:RFS-FIM-301:AI9-DevMonIlck-RB
@@ -418,7 +408,6 @@ MBL-010RFC:RFS-FIM-301:AI9-Wave-Avg
 MBL-010RFC:RFS-FIM-301:AI9-Wave-High
 MBL-010RFC:RFS-FIM-301:AI9-Wave-Low
 MBL-010RFC:RFS-FIM-301:AI9-Wave-Med
-MBL-010RFC:RFS-FIM-301:AI9-Wave-PM
 MBL-010RFC:RFS-FIM-301:CD1-DevFactor-RB
 MBL-010RFC:RFS-FIM-301:CD1-DevPeriod-RB
 MBL-010RFC:RFS-FIM-301:CD1-FastRst-IlckCnt
@@ -440,7 +429,6 @@ MBL-010RFC:RFS-FIM-301:CD1-RFON-En-RB
 MBL-010RFC:RFS-FIM-301:CD1-RFON-Precond
 MBL-010RFC:RFS-FIM-301:CD1-TrigSel-RB
 MBL-010RFC:RFS-FIM-301:CD1-TrigThre-RB
-MBL-010RFC:RFS-FIM-301:CD1-Wave-IlckPM
 MBL-010RFC:RFS-FIM-301:CD2-DevFactor-RB
 MBL-010RFC:RFS-FIM-301:CD2-DevPeriod-RB
 MBL-010RFC:RFS-FIM-301:CD2-FastRst-IlckCnt
@@ -462,7 +450,6 @@ MBL-010RFC:RFS-FIM-301:CD2-RFON-En-RB
 MBL-010RFC:RFS-FIM-301:CD2-RFON-Precond
 MBL-010RFC:RFS-FIM-301:CD2-TrigSel-RB
 MBL-010RFC:RFS-FIM-301:CD2-TrigThre-RB
-MBL-010RFC:RFS-FIM-301:CD2-Wave-IlckPM
 MBL-010RFC:RFS-FIM-301:DI10-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-301:DI10-DIlckMode-RB
 MBL-010RFC:RFS-FIM-301:DI10-FastRst-IlckCnt
@@ -474,7 +461,6 @@ MBL-010RFC:RFS-FIM-301:DI10-Input-RB
 MBL-010RFC:RFS-FIM-301:DI10-isFirstIlck
 MBL-010RFC:RFS-FIM-301:DI10-RFON-En-RB
 MBL-010RFC:RFS-FIM-301:DI10-RFON-Precond
-MBL-010RFC:RFS-FIM-301:DI10-Wave-PM
 MBL-010RFC:RFS-FIM-301:DI11-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-301:DI11-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-301:DI11-HVON-En-RB
@@ -493,7 +479,6 @@ MBL-010RFC:RFS-FIM-301:DI12-Input-RB
 MBL-010RFC:RFS-FIM-301:DI12-isFirstIlck
 MBL-010RFC:RFS-FIM-301:DI12-RFON-En-RB
 MBL-010RFC:RFS-FIM-301:DI12-RFON-Precond
-MBL-010RFC:RFS-FIM-301:DI12-Wave-PM
 MBL-010RFC:RFS-FIM-301:DI13-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-301:DI13-DIlckMode-RB
 MBL-010RFC:RFS-FIM-301:DI13-FastRst-IlckCnt
@@ -505,7 +490,6 @@ MBL-010RFC:RFS-FIM-301:DI13-Input-RB
 MBL-010RFC:RFS-FIM-301:DI13-isFirstIlck
 MBL-010RFC:RFS-FIM-301:DI13-RFON-En-RB
 MBL-010RFC:RFS-FIM-301:DI13-RFON-Precond
-MBL-010RFC:RFS-FIM-301:DI13-Wave-PM
 MBL-010RFC:RFS-FIM-301:DI14-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-301:DI14-DIlckMode-RB
 MBL-010RFC:RFS-FIM-301:DI14-FastRst-IlckCnt
@@ -517,7 +501,6 @@ MBL-010RFC:RFS-FIM-301:DI14-Input-RB
 MBL-010RFC:RFS-FIM-301:DI14-isFirstIlck
 MBL-010RFC:RFS-FIM-301:DI14-RFON-En-RB
 MBL-010RFC:RFS-FIM-301:DI14-RFON-Precond
-MBL-010RFC:RFS-FIM-301:DI14-Wave-PM
 MBL-010RFC:RFS-FIM-301:DI15-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-301:DI15-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-301:DI15-HVON-En-RB
@@ -543,7 +526,6 @@ MBL-010RFC:RFS-FIM-301:DI17-Input-RB
 MBL-010RFC:RFS-FIM-301:DI17-isFirstIlck
 MBL-010RFC:RFS-FIM-301:DI17-RFON-En-RB
 MBL-010RFC:RFS-FIM-301:DI17-RFON-Precond
-MBL-010RFC:RFS-FIM-301:DI17-Wave-PM
 MBL-010RFC:RFS-FIM-301:DI18-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-301:DI18-DIlckMode-RB
 MBL-010RFC:RFS-FIM-301:DI18-FastRst-IlckCnt
@@ -555,7 +537,6 @@ MBL-010RFC:RFS-FIM-301:DI18-Input-RB
 MBL-010RFC:RFS-FIM-301:DI18-isFirstIlck
 MBL-010RFC:RFS-FIM-301:DI18-RFON-En-RB
 MBL-010RFC:RFS-FIM-301:DI18-RFON-Precond
-MBL-010RFC:RFS-FIM-301:DI18-Wave-PM
 MBL-010RFC:RFS-FIM-301:DI19-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-301:DI19-DIlckMode-RB
 MBL-010RFC:RFS-FIM-301:DI19-FastRst-IlckCnt
@@ -567,7 +548,6 @@ MBL-010RFC:RFS-FIM-301:DI19-Input-RB
 MBL-010RFC:RFS-FIM-301:DI19-isFirstIlck
 MBL-010RFC:RFS-FIM-301:DI19-RFON-En-RB
 MBL-010RFC:RFS-FIM-301:DI19-RFON-Precond
-MBL-010RFC:RFS-FIM-301:DI19-Wave-PM
 MBL-010RFC:RFS-FIM-301:DI1-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-301:DI1-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-301:DI1-HVON-En-RB
@@ -586,7 +566,6 @@ MBL-010RFC:RFS-FIM-301:DI20-Input-RB
 MBL-010RFC:RFS-FIM-301:DI20-isFirstIlck
 MBL-010RFC:RFS-FIM-301:DI20-RFON-En-RB
 MBL-010RFC:RFS-FIM-301:DI20-RFON-Precond
-MBL-010RFC:RFS-FIM-301:DI20-Wave-PM
 MBL-010RFC:RFS-FIM-301:DI21-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-301:DI21-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-301:DI21-HVON-En-RB
@@ -640,7 +619,6 @@ MBL-010RFC:RFS-FIM-301:DI7-Input-RB
 MBL-010RFC:RFS-FIM-301:DI7-isFirstIlck
 MBL-010RFC:RFS-FIM-301:DI7-RFON-En-RB
 MBL-010RFC:RFS-FIM-301:DI7-RFON-Precond
-MBL-010RFC:RFS-FIM-301:DI7-Wave-PM
 MBL-010RFC:RFS-FIM-301:DI8-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-301:DI8-DIlckMode-RB
 MBL-010RFC:RFS-FIM-301:DI8-FastRst-IlckCnt
@@ -652,7 +630,6 @@ MBL-010RFC:RFS-FIM-301:DI8-Input-RB
 MBL-010RFC:RFS-FIM-301:DI8-isFirstIlck
 MBL-010RFC:RFS-FIM-301:DI8-RFON-En-RB
 MBL-010RFC:RFS-FIM-301:DI8-RFON-Precond
-MBL-010RFC:RFS-FIM-301:DI8-Wave-PM
 MBL-010RFC:RFS-FIM-301:DI9-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-301:DI9-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-301:DI9-HVON-En-RB
@@ -710,7 +687,6 @@ MBL-010RFC:RFS-FIM-301:RF10-Wave-Avg
 MBL-010RFC:RFS-FIM-301:RF10-Wave-High
 MBL-010RFC:RFS-FIM-301:RF10-Wave-Low
 MBL-010RFC:RFS-FIM-301:RF10-Wave-Med
-MBL-010RFC:RFS-FIM-301:RF10-Wave-PM
 MBL-010RFC:RFS-FIM-301:RF1-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-301:RF1-HVON-En-RB
 MBL-010RFC:RFS-FIM-301:RF1-HVON-Precond
@@ -803,7 +779,6 @@ MBL-010RFC:RFS-FIM-301:RF9-Wave-Avg
 MBL-010RFC:RFS-FIM-301:RF9-Wave-High
 MBL-010RFC:RFS-FIM-301:RF9-Wave-Low
 MBL-010RFC:RFS-FIM-301:RF9-Wave-Med
-MBL-010RFC:RFS-FIM-301:RF9-Wave-PM
 MBL-010RFC:RFS-FIM-301:RFON-Precond
 MBL-010RFC:RFS-FIM-301:RP1-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-301:RP1-HVON-En-RB
@@ -824,7 +799,6 @@ MBL-010RFC:RFS-FIM-301:RP1-RFON-En-RB
 MBL-010RFC:RFS-FIM-301:RP1-RFON-Precond
 MBL-010RFC:RFS-FIM-301:RP1-TrigSel-RB
 MBL-010RFC:RFS-FIM-301:RP1-TrigThre-RB
-MBL-010RFC:RFS-FIM-301:RP1-Wave-IlckPM
 MBL-010RFC:RFS-FIM-301:RP2-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-301:RP2-HVON-En-RB
 MBL-010RFC:RFS-FIM-301:RP2-HVON-Precond
@@ -844,7 +818,6 @@ MBL-010RFC:RFS-FIM-301:RP2-RFON-En-RB
 MBL-010RFC:RFS-FIM-301:RP2-RFON-Precond
 MBL-010RFC:RFS-FIM-301:RP2-TrigSel-RB
 MBL-010RFC:RFS-FIM-301:RP2-TrigThre-RB
-MBL-010RFC:RFS-FIM-301:RP2-Wave-IlckPM
 MBL-010RFC:RFS-FIM-301:TriggerLine-RB
 MBL-010RFC:RFS-Kly-310:PwrFwd-DevMonEval-RB
 MBL-010RFC:RFS-Kly-310:PwrFwd-DevMonFact-RB
@@ -884,7 +857,6 @@ MBL-010RFC:RFS-Kly-310:PwrFwd-Wave-Avg
 MBL-010RFC:RFS-Kly-310:PwrFwd-Wave-High
 MBL-010RFC:RFS-Kly-310:PwrFwd-Wave-Low
 MBL-010RFC:RFS-Kly-310:PwrFwd-Wave-Med
-MBL-010RFC:RFS-Kly-310:PwrFwd-Wave-PM
 MBL-010RFC:RFS-Kly-310:PwrRfl-DevMonEval-RB
 MBL-010RFC:RFS-Kly-310:PwrRfl-DevMonFact-RB
 MBL-010RFC:RFS-Kly-310:PwrRfl-DevMonIlck-RB
@@ -923,12 +895,10 @@ MBL-010RFC:RFS-Kly-310:PwrRfl-Wave-Avg
 MBL-010RFC:RFS-Kly-310:PwrRfl-Wave-High
 MBL-010RFC:RFS-Kly-310:PwrRfl-Wave-Low
 MBL-010RFC:RFS-Kly-310:PwrRfl-Wave-Med
-MBL-010RFC:RFS-Kly-310:PwrRfl-Wave-PM
 MBL-010RFC:RFS-LLRF-301:Status-DIlckMode-RB
 MBL-010RFC:RFS-LLRF-301:Status-Ilck-RB
 MBL-010RFC:RFS-LLRF-301:Status-Input-RB
 MBL-010RFC:RFS-LLRF-301:Status-isFirstIlck
-MBL-010RFC:RFS-LLRF-301:Status-Wave-PM
 MBL-010RFC:RFS-Load-320:PwrFwd-DevMonEval-RB
 MBL-010RFC:RFS-Load-320:PwrFwd-DevMonFact-RB
 MBL-010RFC:RFS-Load-320:PwrFwd-DevMonIlck-RB
@@ -967,7 +937,6 @@ MBL-010RFC:RFS-Load-320:PwrFwd-Wave-Avg
 MBL-010RFC:RFS-Load-320:PwrFwd-Wave-High
 MBL-010RFC:RFS-Load-320:PwrFwd-Wave-Low
 MBL-010RFC:RFS-Load-320:PwrFwd-Wave-Med
-MBL-010RFC:RFS-Load-320:PwrFwd-Wave-PM
 MBL-010RFC:RFS-Load-320:PwrRfl-DevMonEval-RB
 MBL-010RFC:RFS-Load-320:PwrRfl-DevMonFact-RB
 MBL-010RFC:RFS-Load-320:PwrRfl-DevMonIlck-RB
@@ -1006,7 +975,6 @@ MBL-010RFC:RFS-Load-320:PwrRfl-Wave-Avg
 MBL-010RFC:RFS-Load-320:PwrRfl-Wave-High
 MBL-010RFC:RFS-Load-320:PwrRfl-Wave-Low
 MBL-010RFC:RFS-Load-320:PwrRfl-Wave-Med
-MBL-010RFC:RFS-Load-320:PwrRfl-Wave-PM
 MBL-010RFC:RFS-Mod-310:Cur-DevMonEval-RB
 MBL-010RFC:RFS-Mod-310:Cur-DevMonFact-RB
 MBL-010RFC:RFS-Mod-310:Cur-DevMonIlck-RB
@@ -1045,17 +1013,14 @@ MBL-010RFC:RFS-Mod-310:Cur-Wave-Avg
 MBL-010RFC:RFS-Mod-310:Cur-Wave-High
 MBL-010RFC:RFS-Mod-310:Cur-Wave-Low
 MBL-010RFC:RFS-Mod-310:Cur-Wave-Med
-MBL-010RFC:RFS-Mod-310:Cur-Wave-PM
 MBL-010RFC:RFS-Mod-310:PCcon-DIlckMode-RB
 MBL-010RFC:RFS-Mod-310:PCcon-Ilck-RB
 MBL-010RFC:RFS-Mod-310:PCcon-Input-RB
 MBL-010RFC:RFS-Mod-310:PCcon-isFirstIlck
-MBL-010RFC:RFS-Mod-310:PCcon-Wave-PM
 MBL-010RFC:RFS-Mod-310:Ready-DIlckMode-RB
 MBL-010RFC:RFS-Mod-310:Ready-Ilck-RB
 MBL-010RFC:RFS-Mod-310:Ready-Input-RB
 MBL-010RFC:RFS-Mod-310:Ready-isFirstIlck
-MBL-010RFC:RFS-Mod-310:Ready-Wave-PM
 MBL-010RFC:RFS-Mod-310:Vol-DevMonEval-RB
 MBL-010RFC:RFS-Mod-310:Vol-DevMonFact-RB
 MBL-010RFC:RFS-Mod-310:Vol-DevMonIlck-RB
@@ -1094,7 +1059,6 @@ MBL-010RFC:RFS-Mod-310:Vol-Wave-Avg
 MBL-010RFC:RFS-Mod-310:Vol-Wave-High
 MBL-010RFC:RFS-Mod-310:Vol-Wave-Low
 MBL-010RFC:RFS-Mod-310:Vol-Wave-Med
-MBL-010RFC:RFS-Mod-310:Vol-Wave-PM
 MBL-010RFC:RFS-PAmp-310:PwrFwd-DevMonEval-RB
 MBL-010RFC:RFS-PAmp-310:PwrFwd-DevMonFact-RB
 MBL-010RFC:RFS-PAmp-310:PwrFwd-DevMonIlck-RB
@@ -1133,17 +1097,14 @@ MBL-010RFC:RFS-PAmp-310:PwrFwd-Wave-Avg
 MBL-010RFC:RFS-PAmp-310:PwrFwd-Wave-High
 MBL-010RFC:RFS-PAmp-310:PwrFwd-Wave-Low
 MBL-010RFC:RFS-PAmp-310:PwrFwd-Wave-Med
-MBL-010RFC:RFS-PAmp-310:PwrFwd-Wave-PM
 MBL-010RFC:RFS-SIM-310:HvEna-DIlckMode-RB
 MBL-010RFC:RFS-SIM-310:HvEna-Ilck-RB
 MBL-010RFC:RFS-SIM-310:HvEna-Input-RB
 MBL-010RFC:RFS-SIM-310:HvEna-isFirstIlck
-MBL-010RFC:RFS-SIM-310:HvEna-Wave-PM
 MBL-010RFC:RFS-SIM-310:RfEna-DIlckMode-RB
 MBL-010RFC:RFS-SIM-310:RfEna-Ilck-RB
 MBL-010RFC:RFS-SIM-310:RfEna-Input-RB
 MBL-010RFC:RFS-SIM-310:RfEna-isFirstIlck
-MBL-010RFC:RFS-SIM-310:RfEna-Wave-PM
 MBL-010RFC:RFS-SolPS-310:Cur-DevMonEval-RB
 MBL-010RFC:RFS-SolPS-310:Cur-DevMonFact-RB
 MBL-010RFC:RFS-SolPS-310:Cur-DevMonIlck-RB
@@ -1182,7 +1143,6 @@ MBL-010RFC:RFS-SolPS-310:Cur-Wave-Avg
 MBL-010RFC:RFS-SolPS-310:Cur-Wave-High
 MBL-010RFC:RFS-SolPS-310:Cur-Wave-Low
 MBL-010RFC:RFS-SolPS-310:Cur-Wave-Med
-MBL-010RFC:RFS-SolPS-310:Cur-Wave-PM
 MBL-010RFC:RFS-SolPS-320:Cur-DevMonEval-RB
 MBL-010RFC:RFS-SolPS-320:Cur-DevMonFact-RB
 MBL-010RFC:RFS-SolPS-320:Cur-DevMonIlck-RB
@@ -1221,24 +1181,19 @@ MBL-010RFC:RFS-SolPS-320:Cur-Wave-Avg
 MBL-010RFC:RFS-SolPS-320:Cur-Wave-High
 MBL-010RFC:RFS-SolPS-320:Cur-Wave-Low
 MBL-010RFC:RFS-SolPS-320:Cur-Wave-Med
-MBL-010RFC:RFS-SolPS-320:Cur-Wave-PM
 MBL-010RFC:RFS-VacBody-310:Status-DIlckMode-RB
 MBL-010RFC:RFS-VacBody-310:Status-Ilck-RB
 MBL-010RFC:RFS-VacBody-310:Status-Input-RB
 MBL-010RFC:RFS-VacBody-310:Status-isFirstIlck
-MBL-010RFC:RFS-VacBody-310:Status-Wave-PM
 MBL-010RFC:RFS-VacCav-310:Status-DIlckMode-RB
 MBL-010RFC:RFS-VacCav-310:Status-Ilck-RB
 MBL-010RFC:RFS-VacCav-310:Status-Input-RB
 MBL-010RFC:RFS-VacCav-310:Status-isFirstIlck
-MBL-010RFC:RFS-VacCav-310:Status-Wave-PM
 MBL-010RFC:RFS-VacPS-310:I-SP-DIlckMode-RB
 MBL-010RFC:RFS-VacPS-310:I-SP-Ilck-RB
 MBL-010RFC:RFS-VacPS-310:I-SP-Input-RB
 MBL-010RFC:RFS-VacPS-310:I-SP-isFirstIlck
-MBL-010RFC:RFS-VacPS-310:I-SP-Wave-PM
 MBL-010RFC:RFS-VacPS-320:I-SP-DIlckMode-RB
 MBL-010RFC:RFS-VacPS-320:I-SP-Ilck-RB
 MBL-010RFC:RFS-VacPS-320:I-SP-Input-RB
 MBL-010RFC:RFS-VacPS-320:I-SP-isFirstIlck
-MBL-010RFC:RFS-VacPS-320:I-SP-Wave-PM
diff --git a/files/MBL-010RFC_SC-IOC-402.archive b/files/MBL-010RFC_SC-IOC-402.archive
index 1c51cb9..c3e9b65 100644
--- a/files/MBL-010RFC_SC-IOC-402.archive
+++ b/files/MBL-010RFC_SC-IOC-402.archive
@@ -2,12 +2,10 @@ MBL-010RFC:RFS-ADG-410:IlckStatus-DIlckMode-RB
 MBL-010RFC:RFS-ADG-410:IlckStatus-Ilck-RB
 MBL-010RFC:RFS-ADG-410:IlckStatus-Input-RB
 MBL-010RFC:RFS-ADG-410:IlckStatus-isFirstIlck
-MBL-010RFC:RFS-ADG-410:IlckStatus-Wave-PM
 MBL-010RFC:RFS-ADG-410:PwrFail-DIlckMode-RB
 MBL-010RFC:RFS-ADG-410:PwrFail-Ilck-RB
 MBL-010RFC:RFS-ADG-410:PwrFail-Input-RB
 MBL-010RFC:RFS-ADG-410:PwrFail-isFirstIlck
-MBL-010RFC:RFS-ADG-410:PwrFail-Wave-PM
 MBL-010RFC:RFS-Cav-410:Fld-DevMonEval-RB
 MBL-010RFC:RFS-Cav-410:Fld-DevMonFact-RB
 MBL-010RFC:RFS-Cav-410:Fld-DevMonIlck-RB
@@ -46,7 +44,6 @@ MBL-010RFC:RFS-Cav-410:Fld-Wave-Avg
 MBL-010RFC:RFS-Cav-410:Fld-Wave-High
 MBL-010RFC:RFS-Cav-410:Fld-Wave-Low
 MBL-010RFC:RFS-Cav-410:Fld-Wave-Med
-MBL-010RFC:RFS-Cav-410:Fld-Wave-PM
 MBL-010RFC:RFS-Cav-410:PwrFwd-DevMonEval-RB
 MBL-010RFC:RFS-Cav-410:PwrFwd-DevMonFact-RB
 MBL-010RFC:RFS-Cav-410:PwrFwd-DevMonIlck-RB
@@ -85,7 +82,6 @@ MBL-010RFC:RFS-Cav-410:PwrFwd-Wave-Avg
 MBL-010RFC:RFS-Cav-410:PwrFwd-Wave-High
 MBL-010RFC:RFS-Cav-410:PwrFwd-Wave-Low
 MBL-010RFC:RFS-Cav-410:PwrFwd-Wave-Med
-MBL-010RFC:RFS-Cav-410:PwrFwd-Wave-PM
 MBL-010RFC:RFS-Cav-410:PwrRfl-DevMonEval-RB
 MBL-010RFC:RFS-Cav-410:PwrRfl-DevMonFact-RB
 MBL-010RFC:RFS-Cav-410:PwrRfl-DevMonIlck-RB
@@ -124,7 +120,6 @@ MBL-010RFC:RFS-Cav-410:PwrRfl-Wave-Avg
 MBL-010RFC:RFS-Cav-410:PwrRfl-Wave-High
 MBL-010RFC:RFS-Cav-410:PwrRfl-Wave-Low
 MBL-010RFC:RFS-Cav-410:PwrRfl-Wave-Med
-MBL-010RFC:RFS-Cav-410:PwrRfl-Wave-PM
 MBL-010RFC:RFS-EPR-410:Cur-DevMonEval-RB
 MBL-010RFC:RFS-EPR-410:Cur-DevMonFact-RB
 MBL-010RFC:RFS-EPR-410:Cur-DevMonIlck-RB
@@ -163,7 +158,6 @@ MBL-010RFC:RFS-EPR-410:Cur-Wave-Avg
 MBL-010RFC:RFS-EPR-410:Cur-Wave-High
 MBL-010RFC:RFS-EPR-410:Cur-Wave-Low
 MBL-010RFC:RFS-EPR-410:Cur-Wave-Med
-MBL-010RFC:RFS-EPR-410:Cur-Wave-PM
 MBL-010RFC:RFS-FIM-401:AI10-DevMonEval-RB
 MBL-010RFC:RFS-FIM-401:AI10-DevMonFact-RB
 MBL-010RFC:RFS-FIM-401:AI10-DevMonIlck-RB
@@ -208,7 +202,6 @@ MBL-010RFC:RFS-FIM-401:AI10-Wave-Avg
 MBL-010RFC:RFS-FIM-401:AI10-Wave-High
 MBL-010RFC:RFS-FIM-401:AI10-Wave-Low
 MBL-010RFC:RFS-FIM-401:AI10-Wave-Med
-MBL-010RFC:RFS-FIM-401:AI10-Wave-PM
 MBL-010RFC:RFS-FIM-401:AI1-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-401:AI1-HVON-En-RB
 MBL-010RFC:RFS-FIM-401:AI1-HVON-Precond
@@ -277,7 +270,6 @@ MBL-010RFC:RFS-FIM-401:AI5-Wave-Avg
 MBL-010RFC:RFS-FIM-401:AI5-Wave-High
 MBL-010RFC:RFS-FIM-401:AI5-Wave-Low
 MBL-010RFC:RFS-FIM-401:AI5-Wave-Med
-MBL-010RFC:RFS-FIM-401:AI5-Wave-PM
 MBL-010RFC:RFS-FIM-401:AI6-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-401:AI6-HVON-En-RB
 MBL-010RFC:RFS-FIM-401:AI6-HVON-Precond
@@ -328,7 +320,6 @@ MBL-010RFC:RFS-FIM-401:AI7-Wave-Avg
 MBL-010RFC:RFS-FIM-401:AI7-Wave-High
 MBL-010RFC:RFS-FIM-401:AI7-Wave-Low
 MBL-010RFC:RFS-FIM-401:AI7-Wave-Med
-MBL-010RFC:RFS-FIM-401:AI7-Wave-PM
 MBL-010RFC:RFS-FIM-401:AI8-DevMonEval-RB
 MBL-010RFC:RFS-FIM-401:AI8-DevMonFact-RB
 MBL-010RFC:RFS-FIM-401:AI8-DevMonIlck-RB
@@ -373,7 +364,6 @@ MBL-010RFC:RFS-FIM-401:AI8-Wave-Avg
 MBL-010RFC:RFS-FIM-401:AI8-Wave-High
 MBL-010RFC:RFS-FIM-401:AI8-Wave-Low
 MBL-010RFC:RFS-FIM-401:AI8-Wave-Med
-MBL-010RFC:RFS-FIM-401:AI8-Wave-PM
 MBL-010RFC:RFS-FIM-401:AI9-DevMonEval-RB
 MBL-010RFC:RFS-FIM-401:AI9-DevMonFact-RB
 MBL-010RFC:RFS-FIM-401:AI9-DevMonIlck-RB
@@ -418,7 +408,6 @@ MBL-010RFC:RFS-FIM-401:AI9-Wave-Avg
 MBL-010RFC:RFS-FIM-401:AI9-Wave-High
 MBL-010RFC:RFS-FIM-401:AI9-Wave-Low
 MBL-010RFC:RFS-FIM-401:AI9-Wave-Med
-MBL-010RFC:RFS-FIM-401:AI9-Wave-PM
 MBL-010RFC:RFS-FIM-401:CD1-DevFactor-RB
 MBL-010RFC:RFS-FIM-401:CD1-DevPeriod-RB
 MBL-010RFC:RFS-FIM-401:CD1-FastRst-IlckCnt
@@ -440,7 +429,6 @@ MBL-010RFC:RFS-FIM-401:CD1-RFON-En-RB
 MBL-010RFC:RFS-FIM-401:CD1-RFON-Precond
 MBL-010RFC:RFS-FIM-401:CD1-TrigSel-RB
 MBL-010RFC:RFS-FIM-401:CD1-TrigThre-RB
-MBL-010RFC:RFS-FIM-401:CD1-Wave-IlckPM
 MBL-010RFC:RFS-FIM-401:CD2-DevFactor-RB
 MBL-010RFC:RFS-FIM-401:CD2-DevPeriod-RB
 MBL-010RFC:RFS-FIM-401:CD2-FastRst-IlckCnt
@@ -462,7 +450,6 @@ MBL-010RFC:RFS-FIM-401:CD2-RFON-En-RB
 MBL-010RFC:RFS-FIM-401:CD2-RFON-Precond
 MBL-010RFC:RFS-FIM-401:CD2-TrigSel-RB
 MBL-010RFC:RFS-FIM-401:CD2-TrigThre-RB
-MBL-010RFC:RFS-FIM-401:CD2-Wave-IlckPM
 MBL-010RFC:RFS-FIM-401:DI10-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-401:DI10-DIlckMode-RB
 MBL-010RFC:RFS-FIM-401:DI10-FastRst-IlckCnt
@@ -474,7 +461,6 @@ MBL-010RFC:RFS-FIM-401:DI10-Input-RB
 MBL-010RFC:RFS-FIM-401:DI10-isFirstIlck
 MBL-010RFC:RFS-FIM-401:DI10-RFON-En-RB
 MBL-010RFC:RFS-FIM-401:DI10-RFON-Precond
-MBL-010RFC:RFS-FIM-401:DI10-Wave-PM
 MBL-010RFC:RFS-FIM-401:DI11-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-401:DI11-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-401:DI11-HVON-En-RB
@@ -493,7 +479,6 @@ MBL-010RFC:RFS-FIM-401:DI12-Input-RB
 MBL-010RFC:RFS-FIM-401:DI12-isFirstIlck
 MBL-010RFC:RFS-FIM-401:DI12-RFON-En-RB
 MBL-010RFC:RFS-FIM-401:DI12-RFON-Precond
-MBL-010RFC:RFS-FIM-401:DI12-Wave-PM
 MBL-010RFC:RFS-FIM-401:DI13-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-401:DI13-DIlckMode-RB
 MBL-010RFC:RFS-FIM-401:DI13-FastRst-IlckCnt
@@ -505,7 +490,6 @@ MBL-010RFC:RFS-FIM-401:DI13-Input-RB
 MBL-010RFC:RFS-FIM-401:DI13-isFirstIlck
 MBL-010RFC:RFS-FIM-401:DI13-RFON-En-RB
 MBL-010RFC:RFS-FIM-401:DI13-RFON-Precond
-MBL-010RFC:RFS-FIM-401:DI13-Wave-PM
 MBL-010RFC:RFS-FIM-401:DI14-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-401:DI14-DIlckMode-RB
 MBL-010RFC:RFS-FIM-401:DI14-FastRst-IlckCnt
@@ -517,7 +501,6 @@ MBL-010RFC:RFS-FIM-401:DI14-Input-RB
 MBL-010RFC:RFS-FIM-401:DI14-isFirstIlck
 MBL-010RFC:RFS-FIM-401:DI14-RFON-En-RB
 MBL-010RFC:RFS-FIM-401:DI14-RFON-Precond
-MBL-010RFC:RFS-FIM-401:DI14-Wave-PM
 MBL-010RFC:RFS-FIM-401:DI15-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-401:DI15-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-401:DI15-HVON-En-RB
@@ -543,7 +526,6 @@ MBL-010RFC:RFS-FIM-401:DI17-Input-RB
 MBL-010RFC:RFS-FIM-401:DI17-isFirstIlck
 MBL-010RFC:RFS-FIM-401:DI17-RFON-En-RB
 MBL-010RFC:RFS-FIM-401:DI17-RFON-Precond
-MBL-010RFC:RFS-FIM-401:DI17-Wave-PM
 MBL-010RFC:RFS-FIM-401:DI18-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-401:DI18-DIlckMode-RB
 MBL-010RFC:RFS-FIM-401:DI18-FastRst-IlckCnt
@@ -555,7 +537,6 @@ MBL-010RFC:RFS-FIM-401:DI18-Input-RB
 MBL-010RFC:RFS-FIM-401:DI18-isFirstIlck
 MBL-010RFC:RFS-FIM-401:DI18-RFON-En-RB
 MBL-010RFC:RFS-FIM-401:DI18-RFON-Precond
-MBL-010RFC:RFS-FIM-401:DI18-Wave-PM
 MBL-010RFC:RFS-FIM-401:DI19-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-401:DI19-DIlckMode-RB
 MBL-010RFC:RFS-FIM-401:DI19-FastRst-IlckCnt
@@ -567,7 +548,6 @@ MBL-010RFC:RFS-FIM-401:DI19-Input-RB
 MBL-010RFC:RFS-FIM-401:DI19-isFirstIlck
 MBL-010RFC:RFS-FIM-401:DI19-RFON-En-RB
 MBL-010RFC:RFS-FIM-401:DI19-RFON-Precond
-MBL-010RFC:RFS-FIM-401:DI19-Wave-PM
 MBL-010RFC:RFS-FIM-401:DI1-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-401:DI1-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-401:DI1-HVON-En-RB
@@ -586,7 +566,6 @@ MBL-010RFC:RFS-FIM-401:DI20-Input-RB
 MBL-010RFC:RFS-FIM-401:DI20-isFirstIlck
 MBL-010RFC:RFS-FIM-401:DI20-RFON-En-RB
 MBL-010RFC:RFS-FIM-401:DI20-RFON-Precond
-MBL-010RFC:RFS-FIM-401:DI20-Wave-PM
 MBL-010RFC:RFS-FIM-401:DI21-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-401:DI21-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-401:DI21-HVON-En-RB
@@ -640,7 +619,6 @@ MBL-010RFC:RFS-FIM-401:DI7-Input-RB
 MBL-010RFC:RFS-FIM-401:DI7-isFirstIlck
 MBL-010RFC:RFS-FIM-401:DI7-RFON-En-RB
 MBL-010RFC:RFS-FIM-401:DI7-RFON-Precond
-MBL-010RFC:RFS-FIM-401:DI7-Wave-PM
 MBL-010RFC:RFS-FIM-401:DI8-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-401:DI8-DIlckMode-RB
 MBL-010RFC:RFS-FIM-401:DI8-FastRst-IlckCnt
@@ -652,7 +630,6 @@ MBL-010RFC:RFS-FIM-401:DI8-Input-RB
 MBL-010RFC:RFS-FIM-401:DI8-isFirstIlck
 MBL-010RFC:RFS-FIM-401:DI8-RFON-En-RB
 MBL-010RFC:RFS-FIM-401:DI8-RFON-Precond
-MBL-010RFC:RFS-FIM-401:DI8-Wave-PM
 MBL-010RFC:RFS-FIM-401:DI9-DIlckLatch-RB
 MBL-010RFC:RFS-FIM-401:DI9-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-401:DI9-HVON-En-RB
@@ -710,7 +687,6 @@ MBL-010RFC:RFS-FIM-401:RF10-Wave-Avg
 MBL-010RFC:RFS-FIM-401:RF10-Wave-High
 MBL-010RFC:RFS-FIM-401:RF10-Wave-Low
 MBL-010RFC:RFS-FIM-401:RF10-Wave-Med
-MBL-010RFC:RFS-FIM-401:RF10-Wave-PM
 MBL-010RFC:RFS-FIM-401:RF1-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-401:RF1-HVON-En-RB
 MBL-010RFC:RFS-FIM-401:RF1-HVON-Precond
@@ -803,7 +779,6 @@ MBL-010RFC:RFS-FIM-401:RF9-Wave-Avg
 MBL-010RFC:RFS-FIM-401:RF9-Wave-High
 MBL-010RFC:RFS-FIM-401:RF9-Wave-Low
 MBL-010RFC:RFS-FIM-401:RF9-Wave-Med
-MBL-010RFC:RFS-FIM-401:RF9-Wave-PM
 MBL-010RFC:RFS-FIM-401:RFON-Precond
 MBL-010RFC:RFS-FIM-401:RP1-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-401:RP1-HVON-En-RB
@@ -824,7 +799,6 @@ MBL-010RFC:RFS-FIM-401:RP1-RFON-En-RB
 MBL-010RFC:RFS-FIM-401:RP1-RFON-Precond
 MBL-010RFC:RFS-FIM-401:RP1-TrigSel-RB
 MBL-010RFC:RFS-FIM-401:RP1-TrigThre-RB
-MBL-010RFC:RFS-FIM-401:RP1-Wave-IlckPM
 MBL-010RFC:RFS-FIM-401:RP2-FastRst-IlckCnt
 MBL-010RFC:RFS-FIM-401:RP2-HVON-En-RB
 MBL-010RFC:RFS-FIM-401:RP2-HVON-Precond
@@ -844,7 +818,6 @@ MBL-010RFC:RFS-FIM-401:RP2-RFON-En-RB
 MBL-010RFC:RFS-FIM-401:RP2-RFON-Precond
 MBL-010RFC:RFS-FIM-401:RP2-TrigSel-RB
 MBL-010RFC:RFS-FIM-401:RP2-TrigThre-RB
-MBL-010RFC:RFS-FIM-401:RP2-Wave-IlckPM
 MBL-010RFC:RFS-FIM-401:TriggerLine-RB
 MBL-010RFC:RFS-Kly-410:PwrFwd-DevMonEval-RB
 MBL-010RFC:RFS-Kly-410:PwrFwd-DevMonFact-RB
@@ -884,7 +857,6 @@ MBL-010RFC:RFS-Kly-410:PwrFwd-Wave-Avg
 MBL-010RFC:RFS-Kly-410:PwrFwd-Wave-High
 MBL-010RFC:RFS-Kly-410:PwrFwd-Wave-Low
 MBL-010RFC:RFS-Kly-410:PwrFwd-Wave-Med
-MBL-010RFC:RFS-Kly-410:PwrFwd-Wave-PM
 MBL-010RFC:RFS-Kly-410:PwrRfl-DevMonEval-RB
 MBL-010RFC:RFS-Kly-410:PwrRfl-DevMonFact-RB
 MBL-010RFC:RFS-Kly-410:PwrRfl-DevMonIlck-RB
@@ -923,12 +895,10 @@ MBL-010RFC:RFS-Kly-410:PwrRfl-Wave-Avg
 MBL-010RFC:RFS-Kly-410:PwrRfl-Wave-High
 MBL-010RFC:RFS-Kly-410:PwrRfl-Wave-Low
 MBL-010RFC:RFS-Kly-410:PwrRfl-Wave-Med
-MBL-010RFC:RFS-Kly-410:PwrRfl-Wave-PM
 MBL-010RFC:RFS-LLRF-401:Status-DIlckMode-RB
 MBL-010RFC:RFS-LLRF-401:Status-Ilck-RB
 MBL-010RFC:RFS-LLRF-401:Status-Input-RB
 MBL-010RFC:RFS-LLRF-401:Status-isFirstIlck
-MBL-010RFC:RFS-LLRF-401:Status-Wave-PM
 MBL-010RFC:RFS-Load-420:PwrFwd-DevMonEval-RB
 MBL-010RFC:RFS-Load-420:PwrFwd-DevMonFact-RB
 MBL-010RFC:RFS-Load-420:PwrFwd-DevMonIlck-RB
@@ -967,7 +937,6 @@ MBL-010RFC:RFS-Load-420:PwrFwd-Wave-Avg
 MBL-010RFC:RFS-Load-420:PwrFwd-Wave-High
 MBL-010RFC:RFS-Load-420:PwrFwd-Wave-Low
 MBL-010RFC:RFS-Load-420:PwrFwd-Wave-Med
-MBL-010RFC:RFS-Load-420:PwrFwd-Wave-PM
 MBL-010RFC:RFS-Load-420:PwrRfl-DevMonEval-RB
 MBL-010RFC:RFS-Load-420:PwrRfl-DevMonFact-RB
 MBL-010RFC:RFS-Load-420:PwrRfl-DevMonIlck-RB
@@ -1006,7 +975,6 @@ MBL-010RFC:RFS-Load-420:PwrRfl-Wave-Avg
 MBL-010RFC:RFS-Load-420:PwrRfl-Wave-High
 MBL-010RFC:RFS-Load-420:PwrRfl-Wave-Low
 MBL-010RFC:RFS-Load-420:PwrRfl-Wave-Med
-MBL-010RFC:RFS-Load-420:PwrRfl-Wave-PM
 MBL-010RFC:RFS-Mod-410:Cur-DevMonEval-RB
 MBL-010RFC:RFS-Mod-410:Cur-DevMonFact-RB
 MBL-010RFC:RFS-Mod-410:Cur-DevMonIlck-RB
@@ -1045,17 +1013,14 @@ MBL-010RFC:RFS-Mod-410:Cur-Wave-Avg
 MBL-010RFC:RFS-Mod-410:Cur-Wave-High
 MBL-010RFC:RFS-Mod-410:Cur-Wave-Low
 MBL-010RFC:RFS-Mod-410:Cur-Wave-Med
-MBL-010RFC:RFS-Mod-410:Cur-Wave-PM
 MBL-010RFC:RFS-Mod-410:PCcon-DIlckMode-RB
 MBL-010RFC:RFS-Mod-410:PCcon-Ilck-RB
 MBL-010RFC:RFS-Mod-410:PCcon-Input-RB
 MBL-010RFC:RFS-Mod-410:PCcon-isFirstIlck
-MBL-010RFC:RFS-Mod-410:PCcon-Wave-PM
 MBL-010RFC:RFS-Mod-410:Ready-DIlckMode-RB
 MBL-010RFC:RFS-Mod-410:Ready-Ilck-RB
 MBL-010RFC:RFS-Mod-410:Ready-Input-RB
 MBL-010RFC:RFS-Mod-410:Ready-isFirstIlck
-MBL-010RFC:RFS-Mod-410:Ready-Wave-PM
 MBL-010RFC:RFS-Mod-410:Vol-DevMonEval-RB
 MBL-010RFC:RFS-Mod-410:Vol-DevMonFact-RB
 MBL-010RFC:RFS-Mod-410:Vol-DevMonIlck-RB
@@ -1094,7 +1059,6 @@ MBL-010RFC:RFS-Mod-410:Vol-Wave-Avg
 MBL-010RFC:RFS-Mod-410:Vol-Wave-High
 MBL-010RFC:RFS-Mod-410:Vol-Wave-Low
 MBL-010RFC:RFS-Mod-410:Vol-Wave-Med
-MBL-010RFC:RFS-Mod-410:Vol-Wave-PM
 MBL-010RFC:RFS-PAmp-410:PwrFwd-DevMonEval-RB
 MBL-010RFC:RFS-PAmp-410:PwrFwd-DevMonFact-RB
 MBL-010RFC:RFS-PAmp-410:PwrFwd-DevMonIlck-RB
@@ -1133,17 +1097,14 @@ MBL-010RFC:RFS-PAmp-410:PwrFwd-Wave-Avg
 MBL-010RFC:RFS-PAmp-410:PwrFwd-Wave-High
 MBL-010RFC:RFS-PAmp-410:PwrFwd-Wave-Low
 MBL-010RFC:RFS-PAmp-410:PwrFwd-Wave-Med
-MBL-010RFC:RFS-PAmp-410:PwrFwd-Wave-PM
 MBL-010RFC:RFS-SIM-410:HvEna-DIlckMode-RB
 MBL-010RFC:RFS-SIM-410:HvEna-Ilck-RB
 MBL-010RFC:RFS-SIM-410:HvEna-Input-RB
 MBL-010RFC:RFS-SIM-410:HvEna-isFirstIlck
-MBL-010RFC:RFS-SIM-410:HvEna-Wave-PM
 MBL-010RFC:RFS-SIM-410:RfEna-DIlckMode-RB
 MBL-010RFC:RFS-SIM-410:RfEna-Ilck-RB
 MBL-010RFC:RFS-SIM-410:RfEna-Input-RB
 MBL-010RFC:RFS-SIM-410:RfEna-isFirstIlck
-MBL-010RFC:RFS-SIM-410:RfEna-Wave-PM
 MBL-010RFC:RFS-SolPS-410:Cur-DevMonEval-RB
 MBL-010RFC:RFS-SolPS-410:Cur-DevMonFact-RB
 MBL-010RFC:RFS-SolPS-410:Cur-DevMonIlck-RB
@@ -1182,7 +1143,6 @@ MBL-010RFC:RFS-SolPS-410:Cur-Wave-Avg
 MBL-010RFC:RFS-SolPS-410:Cur-Wave-High
 MBL-010RFC:RFS-SolPS-410:Cur-Wave-Low
 MBL-010RFC:RFS-SolPS-410:Cur-Wave-Med
-MBL-010RFC:RFS-SolPS-410:Cur-Wave-PM
 MBL-010RFC:RFS-SolPS-420:Cur-DevMonEval-RB
 MBL-010RFC:RFS-SolPS-420:Cur-DevMonFact-RB
 MBL-010RFC:RFS-SolPS-420:Cur-DevMonIlck-RB
@@ -1221,24 +1181,19 @@ MBL-010RFC:RFS-SolPS-420:Cur-Wave-Avg
 MBL-010RFC:RFS-SolPS-420:Cur-Wave-High
 MBL-010RFC:RFS-SolPS-420:Cur-Wave-Low
 MBL-010RFC:RFS-SolPS-420:Cur-Wave-Med
-MBL-010RFC:RFS-SolPS-420:Cur-Wave-PM
 MBL-010RFC:RFS-VacBody-410:Status-DIlckMode-RB
 MBL-010RFC:RFS-VacBody-410:Status-Ilck-RB
 MBL-010RFC:RFS-VacBody-410:Status-Input-RB
 MBL-010RFC:RFS-VacBody-410:Status-isFirstIlck
-MBL-010RFC:RFS-VacBody-410:Status-Wave-PM
 MBL-010RFC:RFS-VacCav-410:Status-DIlckMode-RB
 MBL-010RFC:RFS-VacCav-410:Status-Ilck-RB
 MBL-010RFC:RFS-VacCav-410:Status-Input-RB
 MBL-010RFC:RFS-VacCav-410:Status-isFirstIlck
-MBL-010RFC:RFS-VacCav-410:Status-Wave-PM
 MBL-010RFC:RFS-VacPS-410:I-SP-DIlckMode-RB
 MBL-010RFC:RFS-VacPS-410:I-SP-Ilck-RB
 MBL-010RFC:RFS-VacPS-410:I-SP-Input-RB
 MBL-010RFC:RFS-VacPS-410:I-SP-isFirstIlck
-MBL-010RFC:RFS-VacPS-410:I-SP-Wave-PM
 MBL-010RFC:RFS-VacPS-420:I-SP-DIlckMode-RB
 MBL-010RFC:RFS-VacPS-420:I-SP-Ilck-RB
 MBL-010RFC:RFS-VacPS-420:I-SP-Input-RB
 MBL-010RFC:RFS-VacPS-420:I-SP-isFirstIlck
-MBL-010RFC:RFS-VacPS-420:I-SP-Wave-PM
diff --git a/files/MBL-050RFC_SC-IOC-202.archive b/files/MBL-050RFC_SC-IOC-202.archive
index 4dd23f6..4848c89 100644
--- a/files/MBL-050RFC_SC-IOC-202.archive
+++ b/files/MBL-050RFC_SC-IOC-202.archive
@@ -2,12 +2,10 @@ MBL-050RFC:RFS-ADG-210:IlckStatus-DIlckMode-RB
 MBL-050RFC:RFS-ADG-210:IlckStatus-Ilck-RB
 MBL-050RFC:RFS-ADG-210:IlckStatus-Input-RB
 MBL-050RFC:RFS-ADG-210:IlckStatus-isFirstIlck
-MBL-050RFC:RFS-ADG-210:IlckStatus-Wave-PM
 MBL-050RFC:RFS-ADG-210:PwrFail-DIlckMode-RB
 MBL-050RFC:RFS-ADG-210:PwrFail-Ilck-RB
 MBL-050RFC:RFS-ADG-210:PwrFail-Input-RB
 MBL-050RFC:RFS-ADG-210:PwrFail-isFirstIlck
-MBL-050RFC:RFS-ADG-210:PwrFail-Wave-PM
 MBL-050RFC:RFS-Cav-210:Fld-DevMonEval-RB
 MBL-050RFC:RFS-Cav-210:Fld-DevMonFact-RB
 MBL-050RFC:RFS-Cav-210:Fld-DevMonIlck-RB
@@ -46,7 +44,6 @@ MBL-050RFC:RFS-Cav-210:Fld-Wave-Avg
 MBL-050RFC:RFS-Cav-210:Fld-Wave-High
 MBL-050RFC:RFS-Cav-210:Fld-Wave-Low
 MBL-050RFC:RFS-Cav-210:Fld-Wave-Med
-MBL-050RFC:RFS-Cav-210:Fld-Wave-PM
 MBL-050RFC:RFS-Cav-210:PwrFwd-DevMonEval-RB
 MBL-050RFC:RFS-Cav-210:PwrFwd-DevMonFact-RB
 MBL-050RFC:RFS-Cav-210:PwrFwd-DevMonIlck-RB
@@ -85,7 +82,6 @@ MBL-050RFC:RFS-Cav-210:PwrFwd-Wave-Avg
 MBL-050RFC:RFS-Cav-210:PwrFwd-Wave-High
 MBL-050RFC:RFS-Cav-210:PwrFwd-Wave-Low
 MBL-050RFC:RFS-Cav-210:PwrFwd-Wave-Med
-MBL-050RFC:RFS-Cav-210:PwrFwd-Wave-PM
 MBL-050RFC:RFS-Cav-210:PwrRfl-DevMonEval-RB
 MBL-050RFC:RFS-Cav-210:PwrRfl-DevMonFact-RB
 MBL-050RFC:RFS-Cav-210:PwrRfl-DevMonIlck-RB
@@ -124,7 +120,6 @@ MBL-050RFC:RFS-Cav-210:PwrRfl-Wave-Avg
 MBL-050RFC:RFS-Cav-210:PwrRfl-Wave-High
 MBL-050RFC:RFS-Cav-210:PwrRfl-Wave-Low
 MBL-050RFC:RFS-Cav-210:PwrRfl-Wave-Med
-MBL-050RFC:RFS-Cav-210:PwrRfl-Wave-PM
 MBL-050RFC:RFS-EPR-210:Cur-DevMonEval-RB
 MBL-050RFC:RFS-EPR-210:Cur-DevMonFact-RB
 MBL-050RFC:RFS-EPR-210:Cur-DevMonIlck-RB
@@ -163,7 +158,6 @@ MBL-050RFC:RFS-EPR-210:Cur-Wave-Avg
 MBL-050RFC:RFS-EPR-210:Cur-Wave-High
 MBL-050RFC:RFS-EPR-210:Cur-Wave-Low
 MBL-050RFC:RFS-EPR-210:Cur-Wave-Med
-MBL-050RFC:RFS-EPR-210:Cur-Wave-PM
 MBL-050RFC:RFS-FIM-201:AI1-FastRst-IlckCnt
 MBL-050RFC:RFS-FIM-201:AI1-HVON-En-RB
 MBL-050RFC:RFS-FIM-201:AI1-HVON-Precond
@@ -214,7 +208,6 @@ MBL-050RFC:RFS-FIM-201:AI10-Wave-Avg
 MBL-050RFC:RFS-FIM-201:AI10-Wave-High
 MBL-050RFC:RFS-FIM-201:AI10-Wave-Low
 MBL-050RFC:RFS-FIM-201:AI10-Wave-Med
-MBL-050RFC:RFS-FIM-201:AI10-Wave-PM
 MBL-050RFC:RFS-FIM-201:AI2-FastRst-IlckCnt
 MBL-050RFC:RFS-FIM-201:AI2-HVON-En-RB
 MBL-050RFC:RFS-FIM-201:AI2-HVON-Precond
@@ -277,7 +270,6 @@ MBL-050RFC:RFS-FIM-201:AI5-Wave-Avg
 MBL-050RFC:RFS-FIM-201:AI5-Wave-High
 MBL-050RFC:RFS-FIM-201:AI5-Wave-Low
 MBL-050RFC:RFS-FIM-201:AI5-Wave-Med
-MBL-050RFC:RFS-FIM-201:AI5-Wave-PM
 MBL-050RFC:RFS-FIM-201:AI6-FastRst-IlckCnt
 MBL-050RFC:RFS-FIM-201:AI6-HVON-En-RB
 MBL-050RFC:RFS-FIM-201:AI6-HVON-Precond
@@ -328,7 +320,6 @@ MBL-050RFC:RFS-FIM-201:AI7-Wave-Avg
 MBL-050RFC:RFS-FIM-201:AI7-Wave-High
 MBL-050RFC:RFS-FIM-201:AI7-Wave-Low
 MBL-050RFC:RFS-FIM-201:AI7-Wave-Med
-MBL-050RFC:RFS-FIM-201:AI7-Wave-PM
 MBL-050RFC:RFS-FIM-201:AI8-DevMonEval-RB
 MBL-050RFC:RFS-FIM-201:AI8-DevMonFact-RB
 MBL-050RFC:RFS-FIM-201:AI8-DevMonIlck-RB
@@ -373,7 +364,6 @@ MBL-050RFC:RFS-FIM-201:AI8-Wave-Avg
 MBL-050RFC:RFS-FIM-201:AI8-Wave-High
 MBL-050RFC:RFS-FIM-201:AI8-Wave-Low
 MBL-050RFC:RFS-FIM-201:AI8-Wave-Med
-MBL-050RFC:RFS-FIM-201:AI8-Wave-PM
 MBL-050RFC:RFS-FIM-201:AI9-DevMonEval-RB
 MBL-050RFC:RFS-FIM-201:AI9-DevMonFact-RB
 MBL-050RFC:RFS-FIM-201:AI9-DevMonIlck-RB
@@ -418,7 +408,6 @@ MBL-050RFC:RFS-FIM-201:AI9-Wave-Avg
 MBL-050RFC:RFS-FIM-201:AI9-Wave-High
 MBL-050RFC:RFS-FIM-201:AI9-Wave-Low
 MBL-050RFC:RFS-FIM-201:AI9-Wave-Med
-MBL-050RFC:RFS-FIM-201:AI9-Wave-PM
 MBL-050RFC:RFS-FIM-201:CD1-DevFactor-RB
 MBL-050RFC:RFS-FIM-201:CD1-DevPeriod-RB
 MBL-050RFC:RFS-FIM-201:CD1-FastRst-IlckCnt
@@ -440,7 +429,6 @@ MBL-050RFC:RFS-FIM-201:CD1-RFON-En-RB
 MBL-050RFC:RFS-FIM-201:CD1-RFON-Precond
 MBL-050RFC:RFS-FIM-201:CD1-TrigSel-RB
 MBL-050RFC:RFS-FIM-201:CD1-TrigThre-RB
-MBL-050RFC:RFS-FIM-201:CD1-Wave-IlckPM
 MBL-050RFC:RFS-FIM-201:CD2-DevFactor-RB
 MBL-050RFC:RFS-FIM-201:CD2-DevPeriod-RB
 MBL-050RFC:RFS-FIM-201:CD2-FastRst-IlckCnt
@@ -462,7 +450,6 @@ MBL-050RFC:RFS-FIM-201:CD2-RFON-En-RB
 MBL-050RFC:RFS-FIM-201:CD2-RFON-Precond
 MBL-050RFC:RFS-FIM-201:CD2-TrigSel-RB
 MBL-050RFC:RFS-FIM-201:CD2-TrigThre-RB
-MBL-050RFC:RFS-FIM-201:CD2-Wave-IlckPM
 MBL-050RFC:RFS-FIM-201:DI1-DIlckLatch-RB
 MBL-050RFC:RFS-FIM-201:DI1-FastRst-IlckCnt
 MBL-050RFC:RFS-FIM-201:DI1-HVON-En-RB
@@ -481,7 +468,6 @@ MBL-050RFC:RFS-FIM-201:DI10-Input-RB
 MBL-050RFC:RFS-FIM-201:DI10-isFirstIlck
 MBL-050RFC:RFS-FIM-201:DI10-RFON-En-RB
 MBL-050RFC:RFS-FIM-201:DI10-RFON-Precond
-MBL-050RFC:RFS-FIM-201:DI10-Wave-PM
 MBL-050RFC:RFS-FIM-201:DI11-DIlckLatch-RB
 MBL-050RFC:RFS-FIM-201:DI11-FastRst-IlckCnt
 MBL-050RFC:RFS-FIM-201:DI11-HVON-En-RB
@@ -500,7 +486,6 @@ MBL-050RFC:RFS-FIM-201:DI12-Input-RB
 MBL-050RFC:RFS-FIM-201:DI12-isFirstIlck
 MBL-050RFC:RFS-FIM-201:DI12-RFON-En-RB
 MBL-050RFC:RFS-FIM-201:DI12-RFON-Precond
-MBL-050RFC:RFS-FIM-201:DI12-Wave-PM
 MBL-050RFC:RFS-FIM-201:DI13-DIlckLatch-RB
 MBL-050RFC:RFS-FIM-201:DI13-DIlckMode-RB
 MBL-050RFC:RFS-FIM-201:DI13-FastRst-IlckCnt
@@ -512,7 +497,6 @@ MBL-050RFC:RFS-FIM-201:DI13-Input-RB
 MBL-050RFC:RFS-FIM-201:DI13-isFirstIlck
 MBL-050RFC:RFS-FIM-201:DI13-RFON-En-RB
 MBL-050RFC:RFS-FIM-201:DI13-RFON-Precond
-MBL-050RFC:RFS-FIM-201:DI13-Wave-PM
 MBL-050RFC:RFS-FIM-201:DI14-DIlckLatch-RB
 MBL-050RFC:RFS-FIM-201:DI14-DIlckMode-RB
 MBL-050RFC:RFS-FIM-201:DI14-FastRst-IlckCnt
@@ -524,7 +508,6 @@ MBL-050RFC:RFS-FIM-201:DI14-Input-RB
 MBL-050RFC:RFS-FIM-201:DI14-isFirstIlck
 MBL-050RFC:RFS-FIM-201:DI14-RFON-En-RB
 MBL-050RFC:RFS-FIM-201:DI14-RFON-Precond
-MBL-050RFC:RFS-FIM-201:DI14-Wave-PM
 MBL-050RFC:RFS-FIM-201:DI15-DIlckLatch-RB
 MBL-050RFC:RFS-FIM-201:DI15-FastRst-IlckCnt
 MBL-050RFC:RFS-FIM-201:DI15-HVON-En-RB
@@ -550,7 +533,6 @@ MBL-050RFC:RFS-FIM-201:DI17-Input-RB
 MBL-050RFC:RFS-FIM-201:DI17-isFirstIlck
 MBL-050RFC:RFS-FIM-201:DI17-RFON-En-RB
 MBL-050RFC:RFS-FIM-201:DI17-RFON-Precond
-MBL-050RFC:RFS-FIM-201:DI17-Wave-PM
 MBL-050RFC:RFS-FIM-201:DI18-DIlckLatch-RB
 MBL-050RFC:RFS-FIM-201:DI18-DIlckMode-RB
 MBL-050RFC:RFS-FIM-201:DI18-FastRst-IlckCnt
@@ -562,7 +544,6 @@ MBL-050RFC:RFS-FIM-201:DI18-Input-RB
 MBL-050RFC:RFS-FIM-201:DI18-isFirstIlck
 MBL-050RFC:RFS-FIM-201:DI18-RFON-En-RB
 MBL-050RFC:RFS-FIM-201:DI18-RFON-Precond
-MBL-050RFC:RFS-FIM-201:DI18-Wave-PM
 MBL-050RFC:RFS-FIM-201:DI19-DIlckLatch-RB
 MBL-050RFC:RFS-FIM-201:DI19-DIlckMode-RB
 MBL-050RFC:RFS-FIM-201:DI19-FastRst-IlckCnt
@@ -574,7 +555,6 @@ MBL-050RFC:RFS-FIM-201:DI19-Input-RB
 MBL-050RFC:RFS-FIM-201:DI19-isFirstIlck
 MBL-050RFC:RFS-FIM-201:DI19-RFON-En-RB
 MBL-050RFC:RFS-FIM-201:DI19-RFON-Precond
-MBL-050RFC:RFS-FIM-201:DI19-Wave-PM
 MBL-050RFC:RFS-FIM-201:DI2-DIlckLatch-RB
 MBL-050RFC:RFS-FIM-201:DI2-FastRst-IlckCnt
 MBL-050RFC:RFS-FIM-201:DI2-HVON-En-RB
@@ -593,7 +573,6 @@ MBL-050RFC:RFS-FIM-201:DI20-Input-RB
 MBL-050RFC:RFS-FIM-201:DI20-isFirstIlck
 MBL-050RFC:RFS-FIM-201:DI20-RFON-En-RB
 MBL-050RFC:RFS-FIM-201:DI20-RFON-Precond
-MBL-050RFC:RFS-FIM-201:DI20-Wave-PM
 MBL-050RFC:RFS-FIM-201:DI21-DIlckLatch-RB
 MBL-050RFC:RFS-FIM-201:DI21-FastRst-IlckCnt
 MBL-050RFC:RFS-FIM-201:DI21-HVON-En-RB
@@ -640,7 +619,6 @@ MBL-050RFC:RFS-FIM-201:DI7-Input-RB
 MBL-050RFC:RFS-FIM-201:DI7-isFirstIlck
 MBL-050RFC:RFS-FIM-201:DI7-RFON-En-RB
 MBL-050RFC:RFS-FIM-201:DI7-RFON-Precond
-MBL-050RFC:RFS-FIM-201:DI7-Wave-PM
 MBL-050RFC:RFS-FIM-201:DI8-DIlckLatch-RB
 MBL-050RFC:RFS-FIM-201:DI8-DIlckMode-RB
 MBL-050RFC:RFS-FIM-201:DI8-FastRst-IlckCnt
@@ -652,7 +630,6 @@ MBL-050RFC:RFS-FIM-201:DI8-Input-RB
 MBL-050RFC:RFS-FIM-201:DI8-isFirstIlck
 MBL-050RFC:RFS-FIM-201:DI8-RFON-En-RB
 MBL-050RFC:RFS-FIM-201:DI8-RFON-Precond
-MBL-050RFC:RFS-FIM-201:DI8-Wave-PM
 MBL-050RFC:RFS-FIM-201:DI9-DIlckLatch-RB
 MBL-050RFC:RFS-FIM-201:DI9-FastRst-IlckCnt
 MBL-050RFC:RFS-FIM-201:DI9-HVON-En-RB
@@ -716,7 +693,6 @@ MBL-050RFC:RFS-FIM-201:RF10-Wave-Avg
 MBL-050RFC:RFS-FIM-201:RF10-Wave-High
 MBL-050RFC:RFS-FIM-201:RF10-Wave-Low
 MBL-050RFC:RFS-FIM-201:RF10-Wave-Med
-MBL-050RFC:RFS-FIM-201:RF10-Wave-PM
 MBL-050RFC:RFS-FIM-201:RF2-FastRst-IlckCnt
 MBL-050RFC:RFS-FIM-201:RF2-HVON-En-RB
 MBL-050RFC:RFS-FIM-201:RF2-HVON-Precond
@@ -803,7 +779,6 @@ MBL-050RFC:RFS-FIM-201:RF9-Wave-Avg
 MBL-050RFC:RFS-FIM-201:RF9-Wave-High
 MBL-050RFC:RFS-FIM-201:RF9-Wave-Low
 MBL-050RFC:RFS-FIM-201:RF9-Wave-Med
-MBL-050RFC:RFS-FIM-201:RF9-Wave-PM
 MBL-050RFC:RFS-FIM-201:RFON-Precond
 MBL-050RFC:RFS-FIM-201:RP1-FastRst-IlckCnt
 MBL-050RFC:RFS-FIM-201:RP1-HVON-En-RB
@@ -824,7 +799,6 @@ MBL-050RFC:RFS-FIM-201:RP1-RFON-En-RB
 MBL-050RFC:RFS-FIM-201:RP1-RFON-Precond
 MBL-050RFC:RFS-FIM-201:RP1-TrigSel-RB
 MBL-050RFC:RFS-FIM-201:RP1-TrigThre-RB
-MBL-050RFC:RFS-FIM-201:RP1-Wave-IlckPM
 MBL-050RFC:RFS-FIM-201:RP2-FastRst-IlckCnt
 MBL-050RFC:RFS-FIM-201:RP2-HVON-En-RB
 MBL-050RFC:RFS-FIM-201:RP2-HVON-Precond
@@ -844,7 +818,6 @@ MBL-050RFC:RFS-FIM-201:RP2-RFON-En-RB
 MBL-050RFC:RFS-FIM-201:RP2-RFON-Precond
 MBL-050RFC:RFS-FIM-201:RP2-TrigSel-RB
 MBL-050RFC:RFS-FIM-201:RP2-TrigThre-RB
-MBL-050RFC:RFS-FIM-201:RP2-Wave-IlckPM
 MBL-050RFC:RFS-FIM-201:TriggerLine-RB
 MBL-050RFC:RFS-Kly-210:PwrFwd-DevMonEval-RB
 MBL-050RFC:RFS-Kly-210:PwrFwd-DevMonFact-RB
@@ -884,7 +857,6 @@ MBL-050RFC:RFS-Kly-210:PwrFwd-Wave-Avg
 MBL-050RFC:RFS-Kly-210:PwrFwd-Wave-High
 MBL-050RFC:RFS-Kly-210:PwrFwd-Wave-Low
 MBL-050RFC:RFS-Kly-210:PwrFwd-Wave-Med
-MBL-050RFC:RFS-Kly-210:PwrFwd-Wave-PM
 MBL-050RFC:RFS-Kly-210:PwrRfl-DevMonEval-RB
 MBL-050RFC:RFS-Kly-210:PwrRfl-DevMonFact-RB
 MBL-050RFC:RFS-Kly-210:PwrRfl-DevMonIlck-RB
@@ -923,12 +895,10 @@ MBL-050RFC:RFS-Kly-210:PwrRfl-Wave-Avg
 MBL-050RFC:RFS-Kly-210:PwrRfl-Wave-High
 MBL-050RFC:RFS-Kly-210:PwrRfl-Wave-Low
 MBL-050RFC:RFS-Kly-210:PwrRfl-Wave-Med
-MBL-050RFC:RFS-Kly-210:PwrRfl-Wave-PM
 MBL-050RFC:RFS-LLRF-201:Status-DIlckMode-RB
 MBL-050RFC:RFS-LLRF-201:Status-Ilck-RB
 MBL-050RFC:RFS-LLRF-201:Status-Input-RB
 MBL-050RFC:RFS-LLRF-201:Status-isFirstIlck
-MBL-050RFC:RFS-LLRF-201:Status-Wave-PM
 MBL-050RFC:RFS-Load-220:PwrFwd-DevMonEval-RB
 MBL-050RFC:RFS-Load-220:PwrFwd-DevMonFact-RB
 MBL-050RFC:RFS-Load-220:PwrFwd-DevMonIlck-RB
@@ -967,7 +937,6 @@ MBL-050RFC:RFS-Load-220:PwrFwd-Wave-Avg
 MBL-050RFC:RFS-Load-220:PwrFwd-Wave-High
 MBL-050RFC:RFS-Load-220:PwrFwd-Wave-Low
 MBL-050RFC:RFS-Load-220:PwrFwd-Wave-Med
-MBL-050RFC:RFS-Load-220:PwrFwd-Wave-PM
 MBL-050RFC:RFS-Load-220:PwrRfl-DevMonEval-RB
 MBL-050RFC:RFS-Load-220:PwrRfl-DevMonFact-RB
 MBL-050RFC:RFS-Load-220:PwrRfl-DevMonIlck-RB
@@ -1006,7 +975,6 @@ MBL-050RFC:RFS-Load-220:PwrRfl-Wave-Avg
 MBL-050RFC:RFS-Load-220:PwrRfl-Wave-High
 MBL-050RFC:RFS-Load-220:PwrRfl-Wave-Low
 MBL-050RFC:RFS-Load-220:PwrRfl-Wave-Med
-MBL-050RFC:RFS-Load-220:PwrRfl-Wave-PM
 MBL-050RFC:RFS-Mod-210:Cur-DevMonEval-RB
 MBL-050RFC:RFS-Mod-210:Cur-DevMonFact-RB
 MBL-050RFC:RFS-Mod-210:Cur-DevMonIlck-RB
@@ -1045,17 +1013,14 @@ MBL-050RFC:RFS-Mod-210:Cur-Wave-Avg
 MBL-050RFC:RFS-Mod-210:Cur-Wave-High
 MBL-050RFC:RFS-Mod-210:Cur-Wave-Low
 MBL-050RFC:RFS-Mod-210:Cur-Wave-Med
-MBL-050RFC:RFS-Mod-210:Cur-Wave-PM
 MBL-050RFC:RFS-Mod-210:PCcon-DIlckMode-RB
 MBL-050RFC:RFS-Mod-210:PCcon-Ilck-RB
 MBL-050RFC:RFS-Mod-210:PCcon-Input-RB
 MBL-050RFC:RFS-Mod-210:PCcon-isFirstIlck
-MBL-050RFC:RFS-Mod-210:PCcon-Wave-PM
 MBL-050RFC:RFS-Mod-210:Ready-DIlckMode-RB
 MBL-050RFC:RFS-Mod-210:Ready-Ilck-RB
 MBL-050RFC:RFS-Mod-210:Ready-Input-RB
 MBL-050RFC:RFS-Mod-210:Ready-isFirstIlck
-MBL-050RFC:RFS-Mod-210:Ready-Wave-PM
 MBL-050RFC:RFS-Mod-210:Vol-DevMonEval-RB
 MBL-050RFC:RFS-Mod-210:Vol-DevMonFact-RB
 MBL-050RFC:RFS-Mod-210:Vol-DevMonIlck-RB
@@ -1094,7 +1059,6 @@ MBL-050RFC:RFS-Mod-210:Vol-Wave-Avg
 MBL-050RFC:RFS-Mod-210:Vol-Wave-High
 MBL-050RFC:RFS-Mod-210:Vol-Wave-Low
 MBL-050RFC:RFS-Mod-210:Vol-Wave-Med
-MBL-050RFC:RFS-Mod-210:Vol-Wave-PM
 MBL-050RFC:RFS-PAmp-210:PwrFwd-DevMonEval-RB
 MBL-050RFC:RFS-PAmp-210:PwrFwd-DevMonFact-RB
 MBL-050RFC:RFS-PAmp-210:PwrFwd-DevMonIlck-RB
@@ -1133,17 +1097,14 @@ MBL-050RFC:RFS-PAmp-210:PwrFwd-Wave-Avg
 MBL-050RFC:RFS-PAmp-210:PwrFwd-Wave-High
 MBL-050RFC:RFS-PAmp-210:PwrFwd-Wave-Low
 MBL-050RFC:RFS-PAmp-210:PwrFwd-Wave-Med
-MBL-050RFC:RFS-PAmp-210:PwrFwd-Wave-PM
 MBL-050RFC:RFS-SIM-210:HvEna-DIlckMode-RB
 MBL-050RFC:RFS-SIM-210:HvEna-Ilck-RB
 MBL-050RFC:RFS-SIM-210:HvEna-Input-RB
 MBL-050RFC:RFS-SIM-210:HvEna-isFirstIlck
-MBL-050RFC:RFS-SIM-210:HvEna-Wave-PM
 MBL-050RFC:RFS-SIM-210:RfEna-DIlckMode-RB
 MBL-050RFC:RFS-SIM-210:RfEna-Ilck-RB
 MBL-050RFC:RFS-SIM-210:RfEna-Input-RB
 MBL-050RFC:RFS-SIM-210:RfEna-isFirstIlck
-MBL-050RFC:RFS-SIM-210:RfEna-Wave-PM
 MBL-050RFC:RFS-SolPS-210:Cur-DevMonEval-RB
 MBL-050RFC:RFS-SolPS-210:Cur-DevMonFact-RB
 MBL-050RFC:RFS-SolPS-210:Cur-DevMonIlck-RB
@@ -1182,7 +1143,6 @@ MBL-050RFC:RFS-SolPS-210:Cur-Wave-Avg
 MBL-050RFC:RFS-SolPS-210:Cur-Wave-High
 MBL-050RFC:RFS-SolPS-210:Cur-Wave-Low
 MBL-050RFC:RFS-SolPS-210:Cur-Wave-Med
-MBL-050RFC:RFS-SolPS-210:Cur-Wave-PM
 MBL-050RFC:RFS-SolPS-220:Cur-DevMonEval-RB
 MBL-050RFC:RFS-SolPS-220:Cur-DevMonFact-RB
 MBL-050RFC:RFS-SolPS-220:Cur-DevMonIlck-RB
@@ -1221,24 +1181,19 @@ MBL-050RFC:RFS-SolPS-220:Cur-Wave-Avg
 MBL-050RFC:RFS-SolPS-220:Cur-Wave-High
 MBL-050RFC:RFS-SolPS-220:Cur-Wave-Low
 MBL-050RFC:RFS-SolPS-220:Cur-Wave-Med
-MBL-050RFC:RFS-SolPS-220:Cur-Wave-PM
 MBL-050RFC:RFS-VacBody-210:Status-DIlckMode-RB
 MBL-050RFC:RFS-VacBody-210:Status-Ilck-RB
 MBL-050RFC:RFS-VacBody-210:Status-Input-RB
 MBL-050RFC:RFS-VacBody-210:Status-isFirstIlck
-MBL-050RFC:RFS-VacBody-210:Status-Wave-PM
 MBL-050RFC:RFS-VacCav-210:Status-DIlckMode-RB
 MBL-050RFC:RFS-VacCav-210:Status-Ilck-RB
 MBL-050RFC:RFS-VacCav-210:Status-Input-RB
 MBL-050RFC:RFS-VacCav-210:Status-isFirstIlck
-MBL-050RFC:RFS-VacCav-210:Status-Wave-PM
 MBL-050RFC:RFS-VacPS-210:I-SP-DIlckMode-RB
 MBL-050RFC:RFS-VacPS-210:I-SP-Ilck-RB
 MBL-050RFC:RFS-VacPS-210:I-SP-Input-RB
 MBL-050RFC:RFS-VacPS-210:I-SP-isFirstIlck
-MBL-050RFC:RFS-VacPS-210:I-SP-Wave-PM
 MBL-050RFC:RFS-VacPS-220:I-SP-DIlckMode-RB
 MBL-050RFC:RFS-VacPS-220:I-SP-Ilck-RB
 MBL-050RFC:RFS-VacPS-220:I-SP-Input-RB
 MBL-050RFC:RFS-VacPS-220:I-SP-isFirstIlck
-MBL-050RFC:RFS-VacPS-220:I-SP-Wave-PM
diff --git a/files/MBL-060RFC_RFS-RFLPS-101.archive b/files/MBL-060RFC_RFS-RFLPS-101.archive
index fe04377..dee94f4 100644
--- a/files/MBL-060RFC_RFS-RFLPS-101.archive
+++ b/files/MBL-060RFC_RFS-RFLPS-101.archive
@@ -2,12 +2,10 @@ MBL-060RFC:RFS-ADG-110:IlckStatus-DIlckMode-RB
 MBL-060RFC:RFS-ADG-110:IlckStatus-Ilck-RB
 MBL-060RFC:RFS-ADG-110:IlckStatus-Input-RB
 MBL-060RFC:RFS-ADG-110:IlckStatus-isFirstIlck
-MBL-060RFC:RFS-ADG-110:IlckStatus-Wave-PM
 MBL-060RFC:RFS-ADG-110:PwrFail-DIlckMode-RB
 MBL-060RFC:RFS-ADG-110:PwrFail-Ilck-RB
 MBL-060RFC:RFS-ADG-110:PwrFail-Input-RB
 MBL-060RFC:RFS-ADG-110:PwrFail-isFirstIlck
-MBL-060RFC:RFS-ADG-110:PwrFail-Wave-PM
 MBL-060RFC:RFS-Cav-110:Fld-DevMonEval-RB
 MBL-060RFC:RFS-Cav-110:Fld-DevMonFact-RB
 MBL-060RFC:RFS-Cav-110:Fld-DevMonIlck-RB
@@ -46,7 +44,6 @@ MBL-060RFC:RFS-Cav-110:Fld-Wave-Avg
 MBL-060RFC:RFS-Cav-110:Fld-Wave-High
 MBL-060RFC:RFS-Cav-110:Fld-Wave-Low
 MBL-060RFC:RFS-Cav-110:Fld-Wave-Med
-MBL-060RFC:RFS-Cav-110:Fld-Wave-PM
 MBL-060RFC:RFS-Cav-110:PwrFwd-DevMonEval-RB
 MBL-060RFC:RFS-Cav-110:PwrFwd-DevMonFact-RB
 MBL-060RFC:RFS-Cav-110:PwrFwd-DevMonIlck-RB
@@ -85,7 +82,6 @@ MBL-060RFC:RFS-Cav-110:PwrFwd-Wave-Avg
 MBL-060RFC:RFS-Cav-110:PwrFwd-Wave-High
 MBL-060RFC:RFS-Cav-110:PwrFwd-Wave-Low
 MBL-060RFC:RFS-Cav-110:PwrFwd-Wave-Med
-MBL-060RFC:RFS-Cav-110:PwrFwd-Wave-PM
 MBL-060RFC:RFS-Cav-110:PwrRfl-DevMonEval-RB
 MBL-060RFC:RFS-Cav-110:PwrRfl-DevMonFact-RB
 MBL-060RFC:RFS-Cav-110:PwrRfl-DevMonIlck-RB
@@ -124,7 +120,6 @@ MBL-060RFC:RFS-Cav-110:PwrRfl-Wave-Avg
 MBL-060RFC:RFS-Cav-110:PwrRfl-Wave-High
 MBL-060RFC:RFS-Cav-110:PwrRfl-Wave-Low
 MBL-060RFC:RFS-Cav-110:PwrRfl-Wave-Med
-MBL-060RFC:RFS-Cav-110:PwrRfl-Wave-PM
 MBL-060RFC:RFS-EPR-110:Cur-DevMonEval-RB
 MBL-060RFC:RFS-EPR-110:Cur-DevMonFact-RB
 MBL-060RFC:RFS-EPR-110:Cur-DevMonIlck-RB
@@ -163,7 +158,6 @@ MBL-060RFC:RFS-EPR-110:Cur-Wave-Avg
 MBL-060RFC:RFS-EPR-110:Cur-Wave-High
 MBL-060RFC:RFS-EPR-110:Cur-Wave-Low
 MBL-060RFC:RFS-EPR-110:Cur-Wave-Med
-MBL-060RFC:RFS-EPR-110:Cur-Wave-PM
 MBL-060RFC:RFS-FIM-101:AI1-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-101:AI1-HVON-En-RB
 MBL-060RFC:RFS-FIM-101:AI1-HVON-Precond
@@ -214,7 +208,6 @@ MBL-060RFC:RFS-FIM-101:AI10-Wave-Avg
 MBL-060RFC:RFS-FIM-101:AI10-Wave-High
 MBL-060RFC:RFS-FIM-101:AI10-Wave-Low
 MBL-060RFC:RFS-FIM-101:AI10-Wave-Med
-MBL-060RFC:RFS-FIM-101:AI10-Wave-PM
 MBL-060RFC:RFS-FIM-101:AI2-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-101:AI2-HVON-En-RB
 MBL-060RFC:RFS-FIM-101:AI2-HVON-Precond
@@ -277,7 +270,6 @@ MBL-060RFC:RFS-FIM-101:AI5-Wave-Avg
 MBL-060RFC:RFS-FIM-101:AI5-Wave-High
 MBL-060RFC:RFS-FIM-101:AI5-Wave-Low
 MBL-060RFC:RFS-FIM-101:AI5-Wave-Med
-MBL-060RFC:RFS-FIM-101:AI5-Wave-PM
 MBL-060RFC:RFS-FIM-101:AI6-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-101:AI6-HVON-En-RB
 MBL-060RFC:RFS-FIM-101:AI6-HVON-Precond
@@ -328,7 +320,6 @@ MBL-060RFC:RFS-FIM-101:AI7-Wave-Avg
 MBL-060RFC:RFS-FIM-101:AI7-Wave-High
 MBL-060RFC:RFS-FIM-101:AI7-Wave-Low
 MBL-060RFC:RFS-FIM-101:AI7-Wave-Med
-MBL-060RFC:RFS-FIM-101:AI7-Wave-PM
 MBL-060RFC:RFS-FIM-101:AI8-DevMonEval-RB
 MBL-060RFC:RFS-FIM-101:AI8-DevMonFact-RB
 MBL-060RFC:RFS-FIM-101:AI8-DevMonIlck-RB
@@ -373,7 +364,6 @@ MBL-060RFC:RFS-FIM-101:AI8-Wave-Avg
 MBL-060RFC:RFS-FIM-101:AI8-Wave-High
 MBL-060RFC:RFS-FIM-101:AI8-Wave-Low
 MBL-060RFC:RFS-FIM-101:AI8-Wave-Med
-MBL-060RFC:RFS-FIM-101:AI8-Wave-PM
 MBL-060RFC:RFS-FIM-101:AI9-DevMonEval-RB
 MBL-060RFC:RFS-FIM-101:AI9-DevMonFact-RB
 MBL-060RFC:RFS-FIM-101:AI9-DevMonIlck-RB
@@ -418,7 +408,6 @@ MBL-060RFC:RFS-FIM-101:AI9-Wave-Avg
 MBL-060RFC:RFS-FIM-101:AI9-Wave-High
 MBL-060RFC:RFS-FIM-101:AI9-Wave-Low
 MBL-060RFC:RFS-FIM-101:AI9-Wave-Med
-MBL-060RFC:RFS-FIM-101:AI9-Wave-PM
 MBL-060RFC:RFS-FIM-101:CD1-DevFactor-RB
 MBL-060RFC:RFS-FIM-101:CD1-DevPeriod-RB
 MBL-060RFC:RFS-FIM-101:CD1-FastRst-IlckCnt
@@ -440,7 +429,6 @@ MBL-060RFC:RFS-FIM-101:CD1-RFON-En-RB
 MBL-060RFC:RFS-FIM-101:CD1-RFON-Precond
 MBL-060RFC:RFS-FIM-101:CD1-TrigSel-RB
 MBL-060RFC:RFS-FIM-101:CD1-TrigThre-RB
-MBL-060RFC:RFS-FIM-101:CD1-Wave-IlckPM
 MBL-060RFC:RFS-FIM-101:CD2-DevFactor-RB
 MBL-060RFC:RFS-FIM-101:CD2-DevPeriod-RB
 MBL-060RFC:RFS-FIM-101:CD2-FastRst-IlckCnt
@@ -462,7 +450,6 @@ MBL-060RFC:RFS-FIM-101:CD2-RFON-En-RB
 MBL-060RFC:RFS-FIM-101:CD2-RFON-Precond
 MBL-060RFC:RFS-FIM-101:CD2-TrigSel-RB
 MBL-060RFC:RFS-FIM-101:CD2-TrigThre-RB
-MBL-060RFC:RFS-FIM-101:CD2-Wave-IlckPM
 MBL-060RFC:RFS-FIM-101:DI1-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-101:DI1-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-101:DI1-HVON-En-RB
@@ -481,7 +468,6 @@ MBL-060RFC:RFS-FIM-101:DI10-Input-RB
 MBL-060RFC:RFS-FIM-101:DI10-isFirstIlck
 MBL-060RFC:RFS-FIM-101:DI10-RFON-En-RB
 MBL-060RFC:RFS-FIM-101:DI10-RFON-Precond
-MBL-060RFC:RFS-FIM-101:DI10-Wave-PM
 MBL-060RFC:RFS-FIM-101:DI11-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-101:DI11-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-101:DI11-HVON-En-RB
@@ -500,7 +486,6 @@ MBL-060RFC:RFS-FIM-101:DI12-Input-RB
 MBL-060RFC:RFS-FIM-101:DI12-isFirstIlck
 MBL-060RFC:RFS-FIM-101:DI12-RFON-En-RB
 MBL-060RFC:RFS-FIM-101:DI12-RFON-Precond
-MBL-060RFC:RFS-FIM-101:DI12-Wave-PM
 MBL-060RFC:RFS-FIM-101:DI13-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-101:DI13-DIlckMode-RB
 MBL-060RFC:RFS-FIM-101:DI13-FastRst-IlckCnt
@@ -512,7 +497,6 @@ MBL-060RFC:RFS-FIM-101:DI13-Input-RB
 MBL-060RFC:RFS-FIM-101:DI13-isFirstIlck
 MBL-060RFC:RFS-FIM-101:DI13-RFON-En-RB
 MBL-060RFC:RFS-FIM-101:DI13-RFON-Precond
-MBL-060RFC:RFS-FIM-101:DI13-Wave-PM
 MBL-060RFC:RFS-FIM-101:DI14-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-101:DI14-DIlckMode-RB
 MBL-060RFC:RFS-FIM-101:DI14-FastRst-IlckCnt
@@ -524,7 +508,6 @@ MBL-060RFC:RFS-FIM-101:DI14-Input-RB
 MBL-060RFC:RFS-FIM-101:DI14-isFirstIlck
 MBL-060RFC:RFS-FIM-101:DI14-RFON-En-RB
 MBL-060RFC:RFS-FIM-101:DI14-RFON-Precond
-MBL-060RFC:RFS-FIM-101:DI14-Wave-PM
 MBL-060RFC:RFS-FIM-101:DI15-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-101:DI15-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-101:DI15-HVON-En-RB
@@ -550,7 +533,6 @@ MBL-060RFC:RFS-FIM-101:DI17-Input-RB
 MBL-060RFC:RFS-FIM-101:DI17-isFirstIlck
 MBL-060RFC:RFS-FIM-101:DI17-RFON-En-RB
 MBL-060RFC:RFS-FIM-101:DI17-RFON-Precond
-MBL-060RFC:RFS-FIM-101:DI17-Wave-PM
 MBL-060RFC:RFS-FIM-101:DI18-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-101:DI18-DIlckMode-RB
 MBL-060RFC:RFS-FIM-101:DI18-FastRst-IlckCnt
@@ -562,7 +544,6 @@ MBL-060RFC:RFS-FIM-101:DI18-Input-RB
 MBL-060RFC:RFS-FIM-101:DI18-isFirstIlck
 MBL-060RFC:RFS-FIM-101:DI18-RFON-En-RB
 MBL-060RFC:RFS-FIM-101:DI18-RFON-Precond
-MBL-060RFC:RFS-FIM-101:DI18-Wave-PM
 MBL-060RFC:RFS-FIM-101:DI19-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-101:DI19-DIlckMode-RB
 MBL-060RFC:RFS-FIM-101:DI19-FastRst-IlckCnt
@@ -574,7 +555,6 @@ MBL-060RFC:RFS-FIM-101:DI19-Input-RB
 MBL-060RFC:RFS-FIM-101:DI19-isFirstIlck
 MBL-060RFC:RFS-FIM-101:DI19-RFON-En-RB
 MBL-060RFC:RFS-FIM-101:DI19-RFON-Precond
-MBL-060RFC:RFS-FIM-101:DI19-Wave-PM
 MBL-060RFC:RFS-FIM-101:DI2-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-101:DI2-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-101:DI2-HVON-En-RB
@@ -593,7 +573,6 @@ MBL-060RFC:RFS-FIM-101:DI20-Input-RB
 MBL-060RFC:RFS-FIM-101:DI20-isFirstIlck
 MBL-060RFC:RFS-FIM-101:DI20-RFON-En-RB
 MBL-060RFC:RFS-FIM-101:DI20-RFON-Precond
-MBL-060RFC:RFS-FIM-101:DI20-Wave-PM
 MBL-060RFC:RFS-FIM-101:DI21-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-101:DI21-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-101:DI21-HVON-En-RB
@@ -640,7 +619,6 @@ MBL-060RFC:RFS-FIM-101:DI7-Input-RB
 MBL-060RFC:RFS-FIM-101:DI7-isFirstIlck
 MBL-060RFC:RFS-FIM-101:DI7-RFON-En-RB
 MBL-060RFC:RFS-FIM-101:DI7-RFON-Precond
-MBL-060RFC:RFS-FIM-101:DI7-Wave-PM
 MBL-060RFC:RFS-FIM-101:DI8-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-101:DI8-DIlckMode-RB
 MBL-060RFC:RFS-FIM-101:DI8-FastRst-IlckCnt
@@ -652,7 +630,6 @@ MBL-060RFC:RFS-FIM-101:DI8-Input-RB
 MBL-060RFC:RFS-FIM-101:DI8-isFirstIlck
 MBL-060RFC:RFS-FIM-101:DI8-RFON-En-RB
 MBL-060RFC:RFS-FIM-101:DI8-RFON-Precond
-MBL-060RFC:RFS-FIM-101:DI8-Wave-PM
 MBL-060RFC:RFS-FIM-101:DI9-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-101:DI9-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-101:DI9-HVON-En-RB
@@ -716,7 +693,6 @@ MBL-060RFC:RFS-FIM-101:RF10-Wave-Avg
 MBL-060RFC:RFS-FIM-101:RF10-Wave-High
 MBL-060RFC:RFS-FIM-101:RF10-Wave-Low
 MBL-060RFC:RFS-FIM-101:RF10-Wave-Med
-MBL-060RFC:RFS-FIM-101:RF10-Wave-PM
 MBL-060RFC:RFS-FIM-101:RF2-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-101:RF2-HVON-En-RB
 MBL-060RFC:RFS-FIM-101:RF2-HVON-Precond
@@ -803,7 +779,6 @@ MBL-060RFC:RFS-FIM-101:RF9-Wave-Avg
 MBL-060RFC:RFS-FIM-101:RF9-Wave-High
 MBL-060RFC:RFS-FIM-101:RF9-Wave-Low
 MBL-060RFC:RFS-FIM-101:RF9-Wave-Med
-MBL-060RFC:RFS-FIM-101:RF9-Wave-PM
 MBL-060RFC:RFS-FIM-101:RFON-Precond
 MBL-060RFC:RFS-FIM-101:RP1-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-101:RP1-HVON-En-RB
@@ -824,7 +799,6 @@ MBL-060RFC:RFS-FIM-101:RP1-RFON-En-RB
 MBL-060RFC:RFS-FIM-101:RP1-RFON-Precond
 MBL-060RFC:RFS-FIM-101:RP1-TrigSel-RB
 MBL-060RFC:RFS-FIM-101:RP1-TrigThre-RB
-MBL-060RFC:RFS-FIM-101:RP1-Wave-IlckPM
 MBL-060RFC:RFS-FIM-101:RP2-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-101:RP2-HVON-En-RB
 MBL-060RFC:RFS-FIM-101:RP2-HVON-Precond
@@ -844,7 +818,6 @@ MBL-060RFC:RFS-FIM-101:RP2-RFON-En-RB
 MBL-060RFC:RFS-FIM-101:RP2-RFON-Precond
 MBL-060RFC:RFS-FIM-101:RP2-TrigSel-RB
 MBL-060RFC:RFS-FIM-101:RP2-TrigThre-RB
-MBL-060RFC:RFS-FIM-101:RP2-Wave-IlckPM
 MBL-060RFC:RFS-FIM-101:TriggerLine-RB
 MBL-060RFC:RFS-Kly-110:PwrFwd-DevMonEval-RB
 MBL-060RFC:RFS-Kly-110:PwrFwd-DevMonFact-RB
@@ -884,7 +857,6 @@ MBL-060RFC:RFS-Kly-110:PwrFwd-Wave-Avg
 MBL-060RFC:RFS-Kly-110:PwrFwd-Wave-High
 MBL-060RFC:RFS-Kly-110:PwrFwd-Wave-Low
 MBL-060RFC:RFS-Kly-110:PwrFwd-Wave-Med
-MBL-060RFC:RFS-Kly-110:PwrFwd-Wave-PM
 MBL-060RFC:RFS-Kly-110:PwrRfl-DevMonEval-RB
 MBL-060RFC:RFS-Kly-110:PwrRfl-DevMonFact-RB
 MBL-060RFC:RFS-Kly-110:PwrRfl-DevMonIlck-RB
@@ -923,12 +895,10 @@ MBL-060RFC:RFS-Kly-110:PwrRfl-Wave-Avg
 MBL-060RFC:RFS-Kly-110:PwrRfl-Wave-High
 MBL-060RFC:RFS-Kly-110:PwrRfl-Wave-Low
 MBL-060RFC:RFS-Kly-110:PwrRfl-Wave-Med
-MBL-060RFC:RFS-Kly-110:PwrRfl-Wave-PM
 MBL-060RFC:RFS-LLRF-101:Status-DIlckMode-RB
 MBL-060RFC:RFS-LLRF-101:Status-Ilck-RB
 MBL-060RFC:RFS-LLRF-101:Status-Input-RB
 MBL-060RFC:RFS-LLRF-101:Status-isFirstIlck
-MBL-060RFC:RFS-LLRF-101:Status-Wave-PM
 MBL-060RFC:RFS-Load-120:PwrFwd-DevMonEval-RB
 MBL-060RFC:RFS-Load-120:PwrFwd-DevMonFact-RB
 MBL-060RFC:RFS-Load-120:PwrFwd-DevMonIlck-RB
@@ -967,7 +937,6 @@ MBL-060RFC:RFS-Load-120:PwrFwd-Wave-Avg
 MBL-060RFC:RFS-Load-120:PwrFwd-Wave-High
 MBL-060RFC:RFS-Load-120:PwrFwd-Wave-Low
 MBL-060RFC:RFS-Load-120:PwrFwd-Wave-Med
-MBL-060RFC:RFS-Load-120:PwrFwd-Wave-PM
 MBL-060RFC:RFS-Load-120:PwrRfl-DevMonEval-RB
 MBL-060RFC:RFS-Load-120:PwrRfl-DevMonFact-RB
 MBL-060RFC:RFS-Load-120:PwrRfl-DevMonIlck-RB
@@ -1006,7 +975,6 @@ MBL-060RFC:RFS-Load-120:PwrRfl-Wave-Avg
 MBL-060RFC:RFS-Load-120:PwrRfl-Wave-High
 MBL-060RFC:RFS-Load-120:PwrRfl-Wave-Low
 MBL-060RFC:RFS-Load-120:PwrRfl-Wave-Med
-MBL-060RFC:RFS-Load-120:PwrRfl-Wave-PM
 MBL-060RFC:RFS-Mod-110:Cur-DevMonEval-RB
 MBL-060RFC:RFS-Mod-110:Cur-DevMonFact-RB
 MBL-060RFC:RFS-Mod-110:Cur-DevMonIlck-RB
@@ -1045,17 +1013,14 @@ MBL-060RFC:RFS-Mod-110:Cur-Wave-Avg
 MBL-060RFC:RFS-Mod-110:Cur-Wave-High
 MBL-060RFC:RFS-Mod-110:Cur-Wave-Low
 MBL-060RFC:RFS-Mod-110:Cur-Wave-Med
-MBL-060RFC:RFS-Mod-110:Cur-Wave-PM
 MBL-060RFC:RFS-Mod-110:PCcon-DIlckMode-RB
 MBL-060RFC:RFS-Mod-110:PCcon-Ilck-RB
 MBL-060RFC:RFS-Mod-110:PCcon-Input-RB
 MBL-060RFC:RFS-Mod-110:PCcon-isFirstIlck
-MBL-060RFC:RFS-Mod-110:PCcon-Wave-PM
 MBL-060RFC:RFS-Mod-110:Ready-DIlckMode-RB
 MBL-060RFC:RFS-Mod-110:Ready-Ilck-RB
 MBL-060RFC:RFS-Mod-110:Ready-Input-RB
 MBL-060RFC:RFS-Mod-110:Ready-isFirstIlck
-MBL-060RFC:RFS-Mod-110:Ready-Wave-PM
 MBL-060RFC:RFS-Mod-110:Vol-DevMonEval-RB
 MBL-060RFC:RFS-Mod-110:Vol-DevMonFact-RB
 MBL-060RFC:RFS-Mod-110:Vol-DevMonIlck-RB
@@ -1094,7 +1059,6 @@ MBL-060RFC:RFS-Mod-110:Vol-Wave-Avg
 MBL-060RFC:RFS-Mod-110:Vol-Wave-High
 MBL-060RFC:RFS-Mod-110:Vol-Wave-Low
 MBL-060RFC:RFS-Mod-110:Vol-Wave-Med
-MBL-060RFC:RFS-Mod-110:Vol-Wave-PM
 MBL-060RFC:RFS-PAmp-110:PwrFwd-DevMonEval-RB
 MBL-060RFC:RFS-PAmp-110:PwrFwd-DevMonFact-RB
 MBL-060RFC:RFS-PAmp-110:PwrFwd-DevMonIlck-RB
@@ -1133,17 +1097,14 @@ MBL-060RFC:RFS-PAmp-110:PwrFwd-Wave-Avg
 MBL-060RFC:RFS-PAmp-110:PwrFwd-Wave-High
 MBL-060RFC:RFS-PAmp-110:PwrFwd-Wave-Low
 MBL-060RFC:RFS-PAmp-110:PwrFwd-Wave-Med
-MBL-060RFC:RFS-PAmp-110:PwrFwd-Wave-PM
 MBL-060RFC:RFS-SIM-110:HvEna-DIlckMode-RB
 MBL-060RFC:RFS-SIM-110:HvEna-Ilck-RB
 MBL-060RFC:RFS-SIM-110:HvEna-Input-RB
 MBL-060RFC:RFS-SIM-110:HvEna-isFirstIlck
-MBL-060RFC:RFS-SIM-110:HvEna-Wave-PM
 MBL-060RFC:RFS-SIM-110:RfEna-DIlckMode-RB
 MBL-060RFC:RFS-SIM-110:RfEna-Ilck-RB
 MBL-060RFC:RFS-SIM-110:RfEna-Input-RB
 MBL-060RFC:RFS-SIM-110:RfEna-isFirstIlck
-MBL-060RFC:RFS-SIM-110:RfEna-Wave-PM
 MBL-060RFC:RFS-SolPS-110:Cur-DevMonEval-RB
 MBL-060RFC:RFS-SolPS-110:Cur-DevMonFact-RB
 MBL-060RFC:RFS-SolPS-110:Cur-DevMonIlck-RB
@@ -1182,7 +1143,6 @@ MBL-060RFC:RFS-SolPS-110:Cur-Wave-Avg
 MBL-060RFC:RFS-SolPS-110:Cur-Wave-High
 MBL-060RFC:RFS-SolPS-110:Cur-Wave-Low
 MBL-060RFC:RFS-SolPS-110:Cur-Wave-Med
-MBL-060RFC:RFS-SolPS-110:Cur-Wave-PM
 MBL-060RFC:RFS-SolPS-120:Cur-DevMonEval-RB
 MBL-060RFC:RFS-SolPS-120:Cur-DevMonFact-RB
 MBL-060RFC:RFS-SolPS-120:Cur-DevMonIlck-RB
@@ -1221,24 +1181,19 @@ MBL-060RFC:RFS-SolPS-120:Cur-Wave-Avg
 MBL-060RFC:RFS-SolPS-120:Cur-Wave-High
 MBL-060RFC:RFS-SolPS-120:Cur-Wave-Low
 MBL-060RFC:RFS-SolPS-120:Cur-Wave-Med
-MBL-060RFC:RFS-SolPS-120:Cur-Wave-PM
 MBL-060RFC:RFS-VacBody-110:Status-DIlckMode-RB
 MBL-060RFC:RFS-VacBody-110:Status-Ilck-RB
 MBL-060RFC:RFS-VacBody-110:Status-Input-RB
 MBL-060RFC:RFS-VacBody-110:Status-isFirstIlck
-MBL-060RFC:RFS-VacBody-110:Status-Wave-PM
 MBL-060RFC:RFS-VacCav-110:Status-DIlckMode-RB
 MBL-060RFC:RFS-VacCav-110:Status-Ilck-RB
 MBL-060RFC:RFS-VacCav-110:Status-Input-RB
 MBL-060RFC:RFS-VacCav-110:Status-isFirstIlck
-MBL-060RFC:RFS-VacCav-110:Status-Wave-PM
 MBL-060RFC:RFS-VacPS-110:I-SP-DIlckMode-RB
 MBL-060RFC:RFS-VacPS-110:I-SP-Ilck-RB
 MBL-060RFC:RFS-VacPS-110:I-SP-Input-RB
 MBL-060RFC:RFS-VacPS-110:I-SP-isFirstIlck
-MBL-060RFC:RFS-VacPS-110:I-SP-Wave-PM
 MBL-060RFC:RFS-VacPS-120:I-SP-DIlckMode-RB
 MBL-060RFC:RFS-VacPS-120:I-SP-Ilck-RB
 MBL-060RFC:RFS-VacPS-120:I-SP-Input-RB
 MBL-060RFC:RFS-VacPS-120:I-SP-isFirstIlck
-MBL-060RFC:RFS-VacPS-120:I-SP-Wave-PM
diff --git a/files/MBL-060RFC_RFS-RFLPS-201.archive b/files/MBL-060RFC_RFS-RFLPS-201.archive
index 9151139..0a80309 100644
--- a/files/MBL-060RFC_RFS-RFLPS-201.archive
+++ b/files/MBL-060RFC_RFS-RFLPS-201.archive
@@ -2,12 +2,10 @@ MBL-060RFC:RFS-ADG-210:IlckStatus-DIlckMode-RB
 MBL-060RFC:RFS-ADG-210:IlckStatus-Ilck-RB
 MBL-060RFC:RFS-ADG-210:IlckStatus-Input-RB
 MBL-060RFC:RFS-ADG-210:IlckStatus-isFirstIlck
-MBL-060RFC:RFS-ADG-210:IlckStatus-Wave-PM
 MBL-060RFC:RFS-ADG-210:PwrFail-DIlckMode-RB
 MBL-060RFC:RFS-ADG-210:PwrFail-Ilck-RB
 MBL-060RFC:RFS-ADG-210:PwrFail-Input-RB
 MBL-060RFC:RFS-ADG-210:PwrFail-isFirstIlck
-MBL-060RFC:RFS-ADG-210:PwrFail-Wave-PM
 MBL-060RFC:RFS-Cav-210:Fld-DevMonEval-RB
 MBL-060RFC:RFS-Cav-210:Fld-DevMonFact-RB
 MBL-060RFC:RFS-Cav-210:Fld-DevMonIlck-RB
@@ -46,7 +44,6 @@ MBL-060RFC:RFS-Cav-210:Fld-Wave-Avg
 MBL-060RFC:RFS-Cav-210:Fld-Wave-High
 MBL-060RFC:RFS-Cav-210:Fld-Wave-Low
 MBL-060RFC:RFS-Cav-210:Fld-Wave-Med
-MBL-060RFC:RFS-Cav-210:Fld-Wave-PM
 MBL-060RFC:RFS-Cav-210:PwrFwd-DevMonEval-RB
 MBL-060RFC:RFS-Cav-210:PwrFwd-DevMonFact-RB
 MBL-060RFC:RFS-Cav-210:PwrFwd-DevMonIlck-RB
@@ -85,7 +82,6 @@ MBL-060RFC:RFS-Cav-210:PwrFwd-Wave-Avg
 MBL-060RFC:RFS-Cav-210:PwrFwd-Wave-High
 MBL-060RFC:RFS-Cav-210:PwrFwd-Wave-Low
 MBL-060RFC:RFS-Cav-210:PwrFwd-Wave-Med
-MBL-060RFC:RFS-Cav-210:PwrFwd-Wave-PM
 MBL-060RFC:RFS-Cav-210:PwrRfl-DevMonEval-RB
 MBL-060RFC:RFS-Cav-210:PwrRfl-DevMonFact-RB
 MBL-060RFC:RFS-Cav-210:PwrRfl-DevMonIlck-RB
@@ -124,7 +120,6 @@ MBL-060RFC:RFS-Cav-210:PwrRfl-Wave-Avg
 MBL-060RFC:RFS-Cav-210:PwrRfl-Wave-High
 MBL-060RFC:RFS-Cav-210:PwrRfl-Wave-Low
 MBL-060RFC:RFS-Cav-210:PwrRfl-Wave-Med
-MBL-060RFC:RFS-Cav-210:PwrRfl-Wave-PM
 MBL-060RFC:RFS-EPR-210:Cur-DevMonEval-RB
 MBL-060RFC:RFS-EPR-210:Cur-DevMonFact-RB
 MBL-060RFC:RFS-EPR-210:Cur-DevMonIlck-RB
@@ -163,7 +158,6 @@ MBL-060RFC:RFS-EPR-210:Cur-Wave-Avg
 MBL-060RFC:RFS-EPR-210:Cur-Wave-High
 MBL-060RFC:RFS-EPR-210:Cur-Wave-Low
 MBL-060RFC:RFS-EPR-210:Cur-Wave-Med
-MBL-060RFC:RFS-EPR-210:Cur-Wave-PM
 MBL-060RFC:RFS-FIM-201:AI1-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-201:AI1-HVON-En-RB
 MBL-060RFC:RFS-FIM-201:AI1-HVON-Precond
@@ -214,7 +208,6 @@ MBL-060RFC:RFS-FIM-201:AI10-Wave-Avg
 MBL-060RFC:RFS-FIM-201:AI10-Wave-High
 MBL-060RFC:RFS-FIM-201:AI10-Wave-Low
 MBL-060RFC:RFS-FIM-201:AI10-Wave-Med
-MBL-060RFC:RFS-FIM-201:AI10-Wave-PM
 MBL-060RFC:RFS-FIM-201:AI2-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-201:AI2-HVON-En-RB
 MBL-060RFC:RFS-FIM-201:AI2-HVON-Precond
@@ -277,7 +270,6 @@ MBL-060RFC:RFS-FIM-201:AI5-Wave-Avg
 MBL-060RFC:RFS-FIM-201:AI5-Wave-High
 MBL-060RFC:RFS-FIM-201:AI5-Wave-Low
 MBL-060RFC:RFS-FIM-201:AI5-Wave-Med
-MBL-060RFC:RFS-FIM-201:AI5-Wave-PM
 MBL-060RFC:RFS-FIM-201:AI6-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-201:AI6-HVON-En-RB
 MBL-060RFC:RFS-FIM-201:AI6-HVON-Precond
@@ -328,7 +320,6 @@ MBL-060RFC:RFS-FIM-201:AI7-Wave-Avg
 MBL-060RFC:RFS-FIM-201:AI7-Wave-High
 MBL-060RFC:RFS-FIM-201:AI7-Wave-Low
 MBL-060RFC:RFS-FIM-201:AI7-Wave-Med
-MBL-060RFC:RFS-FIM-201:AI7-Wave-PM
 MBL-060RFC:RFS-FIM-201:AI8-DevMonEval-RB
 MBL-060RFC:RFS-FIM-201:AI8-DevMonFact-RB
 MBL-060RFC:RFS-FIM-201:AI8-DevMonIlck-RB
@@ -373,7 +364,6 @@ MBL-060RFC:RFS-FIM-201:AI8-Wave-Avg
 MBL-060RFC:RFS-FIM-201:AI8-Wave-High
 MBL-060RFC:RFS-FIM-201:AI8-Wave-Low
 MBL-060RFC:RFS-FIM-201:AI8-Wave-Med
-MBL-060RFC:RFS-FIM-201:AI8-Wave-PM
 MBL-060RFC:RFS-FIM-201:AI9-DevMonEval-RB
 MBL-060RFC:RFS-FIM-201:AI9-DevMonFact-RB
 MBL-060RFC:RFS-FIM-201:AI9-DevMonIlck-RB
@@ -418,7 +408,6 @@ MBL-060RFC:RFS-FIM-201:AI9-Wave-Avg
 MBL-060RFC:RFS-FIM-201:AI9-Wave-High
 MBL-060RFC:RFS-FIM-201:AI9-Wave-Low
 MBL-060RFC:RFS-FIM-201:AI9-Wave-Med
-MBL-060RFC:RFS-FIM-201:AI9-Wave-PM
 MBL-060RFC:RFS-FIM-201:CD1-DevFactor-RB
 MBL-060RFC:RFS-FIM-201:CD1-DevPeriod-RB
 MBL-060RFC:RFS-FIM-201:CD1-FastRst-IlckCnt
@@ -440,7 +429,6 @@ MBL-060RFC:RFS-FIM-201:CD1-RFON-En-RB
 MBL-060RFC:RFS-FIM-201:CD1-RFON-Precond
 MBL-060RFC:RFS-FIM-201:CD1-TrigSel-RB
 MBL-060RFC:RFS-FIM-201:CD1-TrigThre-RB
-MBL-060RFC:RFS-FIM-201:CD1-Wave-IlckPM
 MBL-060RFC:RFS-FIM-201:CD2-DevFactor-RB
 MBL-060RFC:RFS-FIM-201:CD2-DevPeriod-RB
 MBL-060RFC:RFS-FIM-201:CD2-FastRst-IlckCnt
@@ -462,7 +450,6 @@ MBL-060RFC:RFS-FIM-201:CD2-RFON-En-RB
 MBL-060RFC:RFS-FIM-201:CD2-RFON-Precond
 MBL-060RFC:RFS-FIM-201:CD2-TrigSel-RB
 MBL-060RFC:RFS-FIM-201:CD2-TrigThre-RB
-MBL-060RFC:RFS-FIM-201:CD2-Wave-IlckPM
 MBL-060RFC:RFS-FIM-201:DI1-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-201:DI1-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-201:DI1-HVON-En-RB
@@ -481,7 +468,6 @@ MBL-060RFC:RFS-FIM-201:DI10-Input-RB
 MBL-060RFC:RFS-FIM-201:DI10-isFirstIlck
 MBL-060RFC:RFS-FIM-201:DI10-RFON-En-RB
 MBL-060RFC:RFS-FIM-201:DI10-RFON-Precond
-MBL-060RFC:RFS-FIM-201:DI10-Wave-PM
 MBL-060RFC:RFS-FIM-201:DI11-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-201:DI11-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-201:DI11-HVON-En-RB
@@ -500,7 +486,6 @@ MBL-060RFC:RFS-FIM-201:DI12-Input-RB
 MBL-060RFC:RFS-FIM-201:DI12-isFirstIlck
 MBL-060RFC:RFS-FIM-201:DI12-RFON-En-RB
 MBL-060RFC:RFS-FIM-201:DI12-RFON-Precond
-MBL-060RFC:RFS-FIM-201:DI12-Wave-PM
 MBL-060RFC:RFS-FIM-201:DI13-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-201:DI13-DIlckMode-RB
 MBL-060RFC:RFS-FIM-201:DI13-FastRst-IlckCnt
@@ -512,7 +497,6 @@ MBL-060RFC:RFS-FIM-201:DI13-Input-RB
 MBL-060RFC:RFS-FIM-201:DI13-isFirstIlck
 MBL-060RFC:RFS-FIM-201:DI13-RFON-En-RB
 MBL-060RFC:RFS-FIM-201:DI13-RFON-Precond
-MBL-060RFC:RFS-FIM-201:DI13-Wave-PM
 MBL-060RFC:RFS-FIM-201:DI14-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-201:DI14-DIlckMode-RB
 MBL-060RFC:RFS-FIM-201:DI14-FastRst-IlckCnt
@@ -524,7 +508,6 @@ MBL-060RFC:RFS-FIM-201:DI14-Input-RB
 MBL-060RFC:RFS-FIM-201:DI14-isFirstIlck
 MBL-060RFC:RFS-FIM-201:DI14-RFON-En-RB
 MBL-060RFC:RFS-FIM-201:DI14-RFON-Precond
-MBL-060RFC:RFS-FIM-201:DI14-Wave-PM
 MBL-060RFC:RFS-FIM-201:DI15-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-201:DI15-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-201:DI15-HVON-En-RB
@@ -550,7 +533,6 @@ MBL-060RFC:RFS-FIM-201:DI17-Input-RB
 MBL-060RFC:RFS-FIM-201:DI17-isFirstIlck
 MBL-060RFC:RFS-FIM-201:DI17-RFON-En-RB
 MBL-060RFC:RFS-FIM-201:DI17-RFON-Precond
-MBL-060RFC:RFS-FIM-201:DI17-Wave-PM
 MBL-060RFC:RFS-FIM-201:DI18-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-201:DI18-DIlckMode-RB
 MBL-060RFC:RFS-FIM-201:DI18-FastRst-IlckCnt
@@ -562,7 +544,6 @@ MBL-060RFC:RFS-FIM-201:DI18-Input-RB
 MBL-060RFC:RFS-FIM-201:DI18-isFirstIlck
 MBL-060RFC:RFS-FIM-201:DI18-RFON-En-RB
 MBL-060RFC:RFS-FIM-201:DI18-RFON-Precond
-MBL-060RFC:RFS-FIM-201:DI18-Wave-PM
 MBL-060RFC:RFS-FIM-201:DI19-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-201:DI19-DIlckMode-RB
 MBL-060RFC:RFS-FIM-201:DI19-FastRst-IlckCnt
@@ -574,7 +555,6 @@ MBL-060RFC:RFS-FIM-201:DI19-Input-RB
 MBL-060RFC:RFS-FIM-201:DI19-isFirstIlck
 MBL-060RFC:RFS-FIM-201:DI19-RFON-En-RB
 MBL-060RFC:RFS-FIM-201:DI19-RFON-Precond
-MBL-060RFC:RFS-FIM-201:DI19-Wave-PM
 MBL-060RFC:RFS-FIM-201:DI2-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-201:DI2-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-201:DI2-HVON-En-RB
@@ -593,7 +573,6 @@ MBL-060RFC:RFS-FIM-201:DI20-Input-RB
 MBL-060RFC:RFS-FIM-201:DI20-isFirstIlck
 MBL-060RFC:RFS-FIM-201:DI20-RFON-En-RB
 MBL-060RFC:RFS-FIM-201:DI20-RFON-Precond
-MBL-060RFC:RFS-FIM-201:DI20-Wave-PM
 MBL-060RFC:RFS-FIM-201:DI21-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-201:DI21-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-201:DI21-HVON-En-RB
@@ -640,7 +619,6 @@ MBL-060RFC:RFS-FIM-201:DI7-Input-RB
 MBL-060RFC:RFS-FIM-201:DI7-isFirstIlck
 MBL-060RFC:RFS-FIM-201:DI7-RFON-En-RB
 MBL-060RFC:RFS-FIM-201:DI7-RFON-Precond
-MBL-060RFC:RFS-FIM-201:DI7-Wave-PM
 MBL-060RFC:RFS-FIM-201:DI8-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-201:DI8-DIlckMode-RB
 MBL-060RFC:RFS-FIM-201:DI8-FastRst-IlckCnt
@@ -652,7 +630,6 @@ MBL-060RFC:RFS-FIM-201:DI8-Input-RB
 MBL-060RFC:RFS-FIM-201:DI8-isFirstIlck
 MBL-060RFC:RFS-FIM-201:DI8-RFON-En-RB
 MBL-060RFC:RFS-FIM-201:DI8-RFON-Precond
-MBL-060RFC:RFS-FIM-201:DI8-Wave-PM
 MBL-060RFC:RFS-FIM-201:DI9-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-201:DI9-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-201:DI9-HVON-En-RB
@@ -716,7 +693,6 @@ MBL-060RFC:RFS-FIM-201:RF10-Wave-Avg
 MBL-060RFC:RFS-FIM-201:RF10-Wave-High
 MBL-060RFC:RFS-FIM-201:RF10-Wave-Low
 MBL-060RFC:RFS-FIM-201:RF10-Wave-Med
-MBL-060RFC:RFS-FIM-201:RF10-Wave-PM
 MBL-060RFC:RFS-FIM-201:RF2-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-201:RF2-HVON-En-RB
 MBL-060RFC:RFS-FIM-201:RF2-HVON-Precond
@@ -803,7 +779,6 @@ MBL-060RFC:RFS-FIM-201:RF9-Wave-Avg
 MBL-060RFC:RFS-FIM-201:RF9-Wave-High
 MBL-060RFC:RFS-FIM-201:RF9-Wave-Low
 MBL-060RFC:RFS-FIM-201:RF9-Wave-Med
-MBL-060RFC:RFS-FIM-201:RF9-Wave-PM
 MBL-060RFC:RFS-FIM-201:RFON-Precond
 MBL-060RFC:RFS-FIM-201:RP1-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-201:RP1-HVON-En-RB
@@ -824,7 +799,6 @@ MBL-060RFC:RFS-FIM-201:RP1-RFON-En-RB
 MBL-060RFC:RFS-FIM-201:RP1-RFON-Precond
 MBL-060RFC:RFS-FIM-201:RP1-TrigSel-RB
 MBL-060RFC:RFS-FIM-201:RP1-TrigThre-RB
-MBL-060RFC:RFS-FIM-201:RP1-Wave-IlckPM
 MBL-060RFC:RFS-FIM-201:RP2-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-201:RP2-HVON-En-RB
 MBL-060RFC:RFS-FIM-201:RP2-HVON-Precond
@@ -844,7 +818,6 @@ MBL-060RFC:RFS-FIM-201:RP2-RFON-En-RB
 MBL-060RFC:RFS-FIM-201:RP2-RFON-Precond
 MBL-060RFC:RFS-FIM-201:RP2-TrigSel-RB
 MBL-060RFC:RFS-FIM-201:RP2-TrigThre-RB
-MBL-060RFC:RFS-FIM-201:RP2-Wave-IlckPM
 MBL-060RFC:RFS-FIM-201:TriggerLine-RB
 MBL-060RFC:RFS-Kly-210:PwrFwd-DevMonEval-RB
 MBL-060RFC:RFS-Kly-210:PwrFwd-DevMonFact-RB
@@ -884,7 +857,6 @@ MBL-060RFC:RFS-Kly-210:PwrFwd-Wave-Avg
 MBL-060RFC:RFS-Kly-210:PwrFwd-Wave-High
 MBL-060RFC:RFS-Kly-210:PwrFwd-Wave-Low
 MBL-060RFC:RFS-Kly-210:PwrFwd-Wave-Med
-MBL-060RFC:RFS-Kly-210:PwrFwd-Wave-PM
 MBL-060RFC:RFS-Kly-210:PwrRfl-DevMonEval-RB
 MBL-060RFC:RFS-Kly-210:PwrRfl-DevMonFact-RB
 MBL-060RFC:RFS-Kly-210:PwrRfl-DevMonIlck-RB
@@ -923,12 +895,10 @@ MBL-060RFC:RFS-Kly-210:PwrRfl-Wave-Avg
 MBL-060RFC:RFS-Kly-210:PwrRfl-Wave-High
 MBL-060RFC:RFS-Kly-210:PwrRfl-Wave-Low
 MBL-060RFC:RFS-Kly-210:PwrRfl-Wave-Med
-MBL-060RFC:RFS-Kly-210:PwrRfl-Wave-PM
 MBL-060RFC:RFS-LLRF-201:Status-DIlckMode-RB
 MBL-060RFC:RFS-LLRF-201:Status-Ilck-RB
 MBL-060RFC:RFS-LLRF-201:Status-Input-RB
 MBL-060RFC:RFS-LLRF-201:Status-isFirstIlck
-MBL-060RFC:RFS-LLRF-201:Status-Wave-PM
 MBL-060RFC:RFS-Load-220:PwrFwd-DevMonEval-RB
 MBL-060RFC:RFS-Load-220:PwrFwd-DevMonFact-RB
 MBL-060RFC:RFS-Load-220:PwrFwd-DevMonIlck-RB
@@ -967,7 +937,6 @@ MBL-060RFC:RFS-Load-220:PwrFwd-Wave-Avg
 MBL-060RFC:RFS-Load-220:PwrFwd-Wave-High
 MBL-060RFC:RFS-Load-220:PwrFwd-Wave-Low
 MBL-060RFC:RFS-Load-220:PwrFwd-Wave-Med
-MBL-060RFC:RFS-Load-220:PwrFwd-Wave-PM
 MBL-060RFC:RFS-Load-220:PwrRfl-DevMonEval-RB
 MBL-060RFC:RFS-Load-220:PwrRfl-DevMonFact-RB
 MBL-060RFC:RFS-Load-220:PwrRfl-DevMonIlck-RB
@@ -1006,7 +975,6 @@ MBL-060RFC:RFS-Load-220:PwrRfl-Wave-Avg
 MBL-060RFC:RFS-Load-220:PwrRfl-Wave-High
 MBL-060RFC:RFS-Load-220:PwrRfl-Wave-Low
 MBL-060RFC:RFS-Load-220:PwrRfl-Wave-Med
-MBL-060RFC:RFS-Load-220:PwrRfl-Wave-PM
 MBL-060RFC:RFS-Mod-210:Cur-DevMonEval-RB
 MBL-060RFC:RFS-Mod-210:Cur-DevMonFact-RB
 MBL-060RFC:RFS-Mod-210:Cur-DevMonIlck-RB
@@ -1045,17 +1013,14 @@ MBL-060RFC:RFS-Mod-210:Cur-Wave-Avg
 MBL-060RFC:RFS-Mod-210:Cur-Wave-High
 MBL-060RFC:RFS-Mod-210:Cur-Wave-Low
 MBL-060RFC:RFS-Mod-210:Cur-Wave-Med
-MBL-060RFC:RFS-Mod-210:Cur-Wave-PM
 MBL-060RFC:RFS-Mod-210:PCcon-DIlckMode-RB
 MBL-060RFC:RFS-Mod-210:PCcon-Ilck-RB
 MBL-060RFC:RFS-Mod-210:PCcon-Input-RB
 MBL-060RFC:RFS-Mod-210:PCcon-isFirstIlck
-MBL-060RFC:RFS-Mod-210:PCcon-Wave-PM
 MBL-060RFC:RFS-Mod-210:Ready-DIlckMode-RB
 MBL-060RFC:RFS-Mod-210:Ready-Ilck-RB
 MBL-060RFC:RFS-Mod-210:Ready-Input-RB
 MBL-060RFC:RFS-Mod-210:Ready-isFirstIlck
-MBL-060RFC:RFS-Mod-210:Ready-Wave-PM
 MBL-060RFC:RFS-Mod-210:Vol-DevMonEval-RB
 MBL-060RFC:RFS-Mod-210:Vol-DevMonFact-RB
 MBL-060RFC:RFS-Mod-210:Vol-DevMonIlck-RB
@@ -1094,7 +1059,6 @@ MBL-060RFC:RFS-Mod-210:Vol-Wave-Avg
 MBL-060RFC:RFS-Mod-210:Vol-Wave-High
 MBL-060RFC:RFS-Mod-210:Vol-Wave-Low
 MBL-060RFC:RFS-Mod-210:Vol-Wave-Med
-MBL-060RFC:RFS-Mod-210:Vol-Wave-PM
 MBL-060RFC:RFS-PAmp-210:PwrFwd-DevMonEval-RB
 MBL-060RFC:RFS-PAmp-210:PwrFwd-DevMonFact-RB
 MBL-060RFC:RFS-PAmp-210:PwrFwd-DevMonIlck-RB
@@ -1133,17 +1097,14 @@ MBL-060RFC:RFS-PAmp-210:PwrFwd-Wave-Avg
 MBL-060RFC:RFS-PAmp-210:PwrFwd-Wave-High
 MBL-060RFC:RFS-PAmp-210:PwrFwd-Wave-Low
 MBL-060RFC:RFS-PAmp-210:PwrFwd-Wave-Med
-MBL-060RFC:RFS-PAmp-210:PwrFwd-Wave-PM
 MBL-060RFC:RFS-SIM-210:HvEna-DIlckMode-RB
 MBL-060RFC:RFS-SIM-210:HvEna-Ilck-RB
 MBL-060RFC:RFS-SIM-210:HvEna-Input-RB
 MBL-060RFC:RFS-SIM-210:HvEna-isFirstIlck
-MBL-060RFC:RFS-SIM-210:HvEna-Wave-PM
 MBL-060RFC:RFS-SIM-210:RfEna-DIlckMode-RB
 MBL-060RFC:RFS-SIM-210:RfEna-Ilck-RB
 MBL-060RFC:RFS-SIM-210:RfEna-Input-RB
 MBL-060RFC:RFS-SIM-210:RfEna-isFirstIlck
-MBL-060RFC:RFS-SIM-210:RfEna-Wave-PM
 MBL-060RFC:RFS-SolPS-210:Cur-DevMonEval-RB
 MBL-060RFC:RFS-SolPS-210:Cur-DevMonFact-RB
 MBL-060RFC:RFS-SolPS-210:Cur-DevMonIlck-RB
@@ -1182,7 +1143,6 @@ MBL-060RFC:RFS-SolPS-210:Cur-Wave-Avg
 MBL-060RFC:RFS-SolPS-210:Cur-Wave-High
 MBL-060RFC:RFS-SolPS-210:Cur-Wave-Low
 MBL-060RFC:RFS-SolPS-210:Cur-Wave-Med
-MBL-060RFC:RFS-SolPS-210:Cur-Wave-PM
 MBL-060RFC:RFS-SolPS-220:Cur-DevMonEval-RB
 MBL-060RFC:RFS-SolPS-220:Cur-DevMonFact-RB
 MBL-060RFC:RFS-SolPS-220:Cur-DevMonIlck-RB
@@ -1221,24 +1181,19 @@ MBL-060RFC:RFS-SolPS-220:Cur-Wave-Avg
 MBL-060RFC:RFS-SolPS-220:Cur-Wave-High
 MBL-060RFC:RFS-SolPS-220:Cur-Wave-Low
 MBL-060RFC:RFS-SolPS-220:Cur-Wave-Med
-MBL-060RFC:RFS-SolPS-220:Cur-Wave-PM
 MBL-060RFC:RFS-VacBody-210:Status-DIlckMode-RB
 MBL-060RFC:RFS-VacBody-210:Status-Ilck-RB
 MBL-060RFC:RFS-VacBody-210:Status-Input-RB
 MBL-060RFC:RFS-VacBody-210:Status-isFirstIlck
-MBL-060RFC:RFS-VacBody-210:Status-Wave-PM
 MBL-060RFC:RFS-VacCav-210:Status-DIlckMode-RB
 MBL-060RFC:RFS-VacCav-210:Status-Ilck-RB
 MBL-060RFC:RFS-VacCav-210:Status-Input-RB
 MBL-060RFC:RFS-VacCav-210:Status-isFirstIlck
-MBL-060RFC:RFS-VacCav-210:Status-Wave-PM
 MBL-060RFC:RFS-VacPS-210:I-SP-DIlckMode-RB
 MBL-060RFC:RFS-VacPS-210:I-SP-Ilck-RB
 MBL-060RFC:RFS-VacPS-210:I-SP-Input-RB
 MBL-060RFC:RFS-VacPS-210:I-SP-isFirstIlck
-MBL-060RFC:RFS-VacPS-210:I-SP-Wave-PM
 MBL-060RFC:RFS-VacPS-220:I-SP-DIlckMode-RB
 MBL-060RFC:RFS-VacPS-220:I-SP-Ilck-RB
 MBL-060RFC:RFS-VacPS-220:I-SP-Input-RB
 MBL-060RFC:RFS-VacPS-220:I-SP-isFirstIlck
-MBL-060RFC:RFS-VacPS-220:I-SP-Wave-PM
diff --git a/files/MBL-060RFC_RFS-RFLPS-301.archive b/files/MBL-060RFC_RFS-RFLPS-301.archive
index 9d05a0e..7e1f834 100644
--- a/files/MBL-060RFC_RFS-RFLPS-301.archive
+++ b/files/MBL-060RFC_RFS-RFLPS-301.archive
@@ -2,12 +2,10 @@ MBL-060RFC:RFS-ADG-310:IlckStatus-DIlckMode-RB
 MBL-060RFC:RFS-ADG-310:IlckStatus-Ilck-RB
 MBL-060RFC:RFS-ADG-310:IlckStatus-Input-RB
 MBL-060RFC:RFS-ADG-310:IlckStatus-isFirstIlck
-MBL-060RFC:RFS-ADG-310:IlckStatus-Wave-PM
 MBL-060RFC:RFS-ADG-310:PwrFail-DIlckMode-RB
 MBL-060RFC:RFS-ADG-310:PwrFail-Ilck-RB
 MBL-060RFC:RFS-ADG-310:PwrFail-Input-RB
 MBL-060RFC:RFS-ADG-310:PwrFail-isFirstIlck
-MBL-060RFC:RFS-ADG-310:PwrFail-Wave-PM
 MBL-060RFC:RFS-Cav-310:Fld-DevMonEval-RB
 MBL-060RFC:RFS-Cav-310:Fld-DevMonFact-RB
 MBL-060RFC:RFS-Cav-310:Fld-DevMonIlck-RB
@@ -46,7 +44,6 @@ MBL-060RFC:RFS-Cav-310:Fld-Wave-Avg
 MBL-060RFC:RFS-Cav-310:Fld-Wave-High
 MBL-060RFC:RFS-Cav-310:Fld-Wave-Low
 MBL-060RFC:RFS-Cav-310:Fld-Wave-Med
-MBL-060RFC:RFS-Cav-310:Fld-Wave-PM
 MBL-060RFC:RFS-Cav-310:PwrFwd-DevMonEval-RB
 MBL-060RFC:RFS-Cav-310:PwrFwd-DevMonFact-RB
 MBL-060RFC:RFS-Cav-310:PwrFwd-DevMonIlck-RB
@@ -85,7 +82,6 @@ MBL-060RFC:RFS-Cav-310:PwrFwd-Wave-Avg
 MBL-060RFC:RFS-Cav-310:PwrFwd-Wave-High
 MBL-060RFC:RFS-Cav-310:PwrFwd-Wave-Low
 MBL-060RFC:RFS-Cav-310:PwrFwd-Wave-Med
-MBL-060RFC:RFS-Cav-310:PwrFwd-Wave-PM
 MBL-060RFC:RFS-Cav-310:PwrRfl-DevMonEval-RB
 MBL-060RFC:RFS-Cav-310:PwrRfl-DevMonFact-RB
 MBL-060RFC:RFS-Cav-310:PwrRfl-DevMonIlck-RB
@@ -124,7 +120,6 @@ MBL-060RFC:RFS-Cav-310:PwrRfl-Wave-Avg
 MBL-060RFC:RFS-Cav-310:PwrRfl-Wave-High
 MBL-060RFC:RFS-Cav-310:PwrRfl-Wave-Low
 MBL-060RFC:RFS-Cav-310:PwrRfl-Wave-Med
-MBL-060RFC:RFS-Cav-310:PwrRfl-Wave-PM
 MBL-060RFC:RFS-EPR-310:Cur-DevMonEval-RB
 MBL-060RFC:RFS-EPR-310:Cur-DevMonFact-RB
 MBL-060RFC:RFS-EPR-310:Cur-DevMonIlck-RB
@@ -163,7 +158,6 @@ MBL-060RFC:RFS-EPR-310:Cur-Wave-Avg
 MBL-060RFC:RFS-EPR-310:Cur-Wave-High
 MBL-060RFC:RFS-EPR-310:Cur-Wave-Low
 MBL-060RFC:RFS-EPR-310:Cur-Wave-Med
-MBL-060RFC:RFS-EPR-310:Cur-Wave-PM
 MBL-060RFC:RFS-FIM-301:AI1-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-301:AI1-HVON-En-RB
 MBL-060RFC:RFS-FIM-301:AI1-HVON-Precond
@@ -214,7 +208,6 @@ MBL-060RFC:RFS-FIM-301:AI10-Wave-Avg
 MBL-060RFC:RFS-FIM-301:AI10-Wave-High
 MBL-060RFC:RFS-FIM-301:AI10-Wave-Low
 MBL-060RFC:RFS-FIM-301:AI10-Wave-Med
-MBL-060RFC:RFS-FIM-301:AI10-Wave-PM
 MBL-060RFC:RFS-FIM-301:AI2-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-301:AI2-HVON-En-RB
 MBL-060RFC:RFS-FIM-301:AI2-HVON-Precond
@@ -277,7 +270,6 @@ MBL-060RFC:RFS-FIM-301:AI5-Wave-Avg
 MBL-060RFC:RFS-FIM-301:AI5-Wave-High
 MBL-060RFC:RFS-FIM-301:AI5-Wave-Low
 MBL-060RFC:RFS-FIM-301:AI5-Wave-Med
-MBL-060RFC:RFS-FIM-301:AI5-Wave-PM
 MBL-060RFC:RFS-FIM-301:AI6-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-301:AI6-HVON-En-RB
 MBL-060RFC:RFS-FIM-301:AI6-HVON-Precond
@@ -328,7 +320,6 @@ MBL-060RFC:RFS-FIM-301:AI7-Wave-Avg
 MBL-060RFC:RFS-FIM-301:AI7-Wave-High
 MBL-060RFC:RFS-FIM-301:AI7-Wave-Low
 MBL-060RFC:RFS-FIM-301:AI7-Wave-Med
-MBL-060RFC:RFS-FIM-301:AI7-Wave-PM
 MBL-060RFC:RFS-FIM-301:AI8-DevMonEval-RB
 MBL-060RFC:RFS-FIM-301:AI8-DevMonFact-RB
 MBL-060RFC:RFS-FIM-301:AI8-DevMonIlck-RB
@@ -373,7 +364,6 @@ MBL-060RFC:RFS-FIM-301:AI8-Wave-Avg
 MBL-060RFC:RFS-FIM-301:AI8-Wave-High
 MBL-060RFC:RFS-FIM-301:AI8-Wave-Low
 MBL-060RFC:RFS-FIM-301:AI8-Wave-Med
-MBL-060RFC:RFS-FIM-301:AI8-Wave-PM
 MBL-060RFC:RFS-FIM-301:AI9-DevMonEval-RB
 MBL-060RFC:RFS-FIM-301:AI9-DevMonFact-RB
 MBL-060RFC:RFS-FIM-301:AI9-DevMonIlck-RB
@@ -418,7 +408,6 @@ MBL-060RFC:RFS-FIM-301:AI9-Wave-Avg
 MBL-060RFC:RFS-FIM-301:AI9-Wave-High
 MBL-060RFC:RFS-FIM-301:AI9-Wave-Low
 MBL-060RFC:RFS-FIM-301:AI9-Wave-Med
-MBL-060RFC:RFS-FIM-301:AI9-Wave-PM
 MBL-060RFC:RFS-FIM-301:CD1-DevFactor-RB
 MBL-060RFC:RFS-FIM-301:CD1-DevPeriod-RB
 MBL-060RFC:RFS-FIM-301:CD1-FastRst-IlckCnt
@@ -440,7 +429,6 @@ MBL-060RFC:RFS-FIM-301:CD1-RFON-En-RB
 MBL-060RFC:RFS-FIM-301:CD1-RFON-Precond
 MBL-060RFC:RFS-FIM-301:CD1-TrigSel-RB
 MBL-060RFC:RFS-FIM-301:CD1-TrigThre-RB
-MBL-060RFC:RFS-FIM-301:CD1-Wave-IlckPM
 MBL-060RFC:RFS-FIM-301:CD2-DevFactor-RB
 MBL-060RFC:RFS-FIM-301:CD2-DevPeriod-RB
 MBL-060RFC:RFS-FIM-301:CD2-FastRst-IlckCnt
@@ -462,7 +450,6 @@ MBL-060RFC:RFS-FIM-301:CD2-RFON-En-RB
 MBL-060RFC:RFS-FIM-301:CD2-RFON-Precond
 MBL-060RFC:RFS-FIM-301:CD2-TrigSel-RB
 MBL-060RFC:RFS-FIM-301:CD2-TrigThre-RB
-MBL-060RFC:RFS-FIM-301:CD2-Wave-IlckPM
 MBL-060RFC:RFS-FIM-301:DI1-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-301:DI1-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-301:DI1-HVON-En-RB
@@ -481,7 +468,6 @@ MBL-060RFC:RFS-FIM-301:DI10-Input-RB
 MBL-060RFC:RFS-FIM-301:DI10-isFirstIlck
 MBL-060RFC:RFS-FIM-301:DI10-RFON-En-RB
 MBL-060RFC:RFS-FIM-301:DI10-RFON-Precond
-MBL-060RFC:RFS-FIM-301:DI10-Wave-PM
 MBL-060RFC:RFS-FIM-301:DI11-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-301:DI11-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-301:DI11-HVON-En-RB
@@ -500,7 +486,6 @@ MBL-060RFC:RFS-FIM-301:DI12-Input-RB
 MBL-060RFC:RFS-FIM-301:DI12-isFirstIlck
 MBL-060RFC:RFS-FIM-301:DI12-RFON-En-RB
 MBL-060RFC:RFS-FIM-301:DI12-RFON-Precond
-MBL-060RFC:RFS-FIM-301:DI12-Wave-PM
 MBL-060RFC:RFS-FIM-301:DI13-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-301:DI13-DIlckMode-RB
 MBL-060RFC:RFS-FIM-301:DI13-FastRst-IlckCnt
@@ -512,7 +497,6 @@ MBL-060RFC:RFS-FIM-301:DI13-Input-RB
 MBL-060RFC:RFS-FIM-301:DI13-isFirstIlck
 MBL-060RFC:RFS-FIM-301:DI13-RFON-En-RB
 MBL-060RFC:RFS-FIM-301:DI13-RFON-Precond
-MBL-060RFC:RFS-FIM-301:DI13-Wave-PM
 MBL-060RFC:RFS-FIM-301:DI14-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-301:DI14-DIlckMode-RB
 MBL-060RFC:RFS-FIM-301:DI14-FastRst-IlckCnt
@@ -524,7 +508,6 @@ MBL-060RFC:RFS-FIM-301:DI14-Input-RB
 MBL-060RFC:RFS-FIM-301:DI14-isFirstIlck
 MBL-060RFC:RFS-FIM-301:DI14-RFON-En-RB
 MBL-060RFC:RFS-FIM-301:DI14-RFON-Precond
-MBL-060RFC:RFS-FIM-301:DI14-Wave-PM
 MBL-060RFC:RFS-FIM-301:DI15-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-301:DI15-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-301:DI15-HVON-En-RB
@@ -550,7 +533,6 @@ MBL-060RFC:RFS-FIM-301:DI17-Input-RB
 MBL-060RFC:RFS-FIM-301:DI17-isFirstIlck
 MBL-060RFC:RFS-FIM-301:DI17-RFON-En-RB
 MBL-060RFC:RFS-FIM-301:DI17-RFON-Precond
-MBL-060RFC:RFS-FIM-301:DI17-Wave-PM
 MBL-060RFC:RFS-FIM-301:DI18-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-301:DI18-DIlckMode-RB
 MBL-060RFC:RFS-FIM-301:DI18-FastRst-IlckCnt
@@ -562,7 +544,6 @@ MBL-060RFC:RFS-FIM-301:DI18-Input-RB
 MBL-060RFC:RFS-FIM-301:DI18-isFirstIlck
 MBL-060RFC:RFS-FIM-301:DI18-RFON-En-RB
 MBL-060RFC:RFS-FIM-301:DI18-RFON-Precond
-MBL-060RFC:RFS-FIM-301:DI18-Wave-PM
 MBL-060RFC:RFS-FIM-301:DI19-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-301:DI19-DIlckMode-RB
 MBL-060RFC:RFS-FIM-301:DI19-FastRst-IlckCnt
@@ -574,7 +555,6 @@ MBL-060RFC:RFS-FIM-301:DI19-Input-RB
 MBL-060RFC:RFS-FIM-301:DI19-isFirstIlck
 MBL-060RFC:RFS-FIM-301:DI19-RFON-En-RB
 MBL-060RFC:RFS-FIM-301:DI19-RFON-Precond
-MBL-060RFC:RFS-FIM-301:DI19-Wave-PM
 MBL-060RFC:RFS-FIM-301:DI2-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-301:DI2-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-301:DI2-HVON-En-RB
@@ -593,7 +573,6 @@ MBL-060RFC:RFS-FIM-301:DI20-Input-RB
 MBL-060RFC:RFS-FIM-301:DI20-isFirstIlck
 MBL-060RFC:RFS-FIM-301:DI20-RFON-En-RB
 MBL-060RFC:RFS-FIM-301:DI20-RFON-Precond
-MBL-060RFC:RFS-FIM-301:DI20-Wave-PM
 MBL-060RFC:RFS-FIM-301:DI21-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-301:DI21-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-301:DI21-HVON-En-RB
@@ -640,7 +619,6 @@ MBL-060RFC:RFS-FIM-301:DI7-Input-RB
 MBL-060RFC:RFS-FIM-301:DI7-isFirstIlck
 MBL-060RFC:RFS-FIM-301:DI7-RFON-En-RB
 MBL-060RFC:RFS-FIM-301:DI7-RFON-Precond
-MBL-060RFC:RFS-FIM-301:DI7-Wave-PM
 MBL-060RFC:RFS-FIM-301:DI8-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-301:DI8-DIlckMode-RB
 MBL-060RFC:RFS-FIM-301:DI8-FastRst-IlckCnt
@@ -652,7 +630,6 @@ MBL-060RFC:RFS-FIM-301:DI8-Input-RB
 MBL-060RFC:RFS-FIM-301:DI8-isFirstIlck
 MBL-060RFC:RFS-FIM-301:DI8-RFON-En-RB
 MBL-060RFC:RFS-FIM-301:DI8-RFON-Precond
-MBL-060RFC:RFS-FIM-301:DI8-Wave-PM
 MBL-060RFC:RFS-FIM-301:DI9-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-301:DI9-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-301:DI9-HVON-En-RB
@@ -716,7 +693,6 @@ MBL-060RFC:RFS-FIM-301:RF10-Wave-Avg
 MBL-060RFC:RFS-FIM-301:RF10-Wave-High
 MBL-060RFC:RFS-FIM-301:RF10-Wave-Low
 MBL-060RFC:RFS-FIM-301:RF10-Wave-Med
-MBL-060RFC:RFS-FIM-301:RF10-Wave-PM
 MBL-060RFC:RFS-FIM-301:RF2-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-301:RF2-HVON-En-RB
 MBL-060RFC:RFS-FIM-301:RF2-HVON-Precond
@@ -803,7 +779,6 @@ MBL-060RFC:RFS-FIM-301:RF9-Wave-Avg
 MBL-060RFC:RFS-FIM-301:RF9-Wave-High
 MBL-060RFC:RFS-FIM-301:RF9-Wave-Low
 MBL-060RFC:RFS-FIM-301:RF9-Wave-Med
-MBL-060RFC:RFS-FIM-301:RF9-Wave-PM
 MBL-060RFC:RFS-FIM-301:RFON-Precond
 MBL-060RFC:RFS-FIM-301:RP1-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-301:RP1-HVON-En-RB
@@ -824,7 +799,6 @@ MBL-060RFC:RFS-FIM-301:RP1-RFON-En-RB
 MBL-060RFC:RFS-FIM-301:RP1-RFON-Precond
 MBL-060RFC:RFS-FIM-301:RP1-TrigSel-RB
 MBL-060RFC:RFS-FIM-301:RP1-TrigThre-RB
-MBL-060RFC:RFS-FIM-301:RP1-Wave-IlckPM
 MBL-060RFC:RFS-FIM-301:RP2-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-301:RP2-HVON-En-RB
 MBL-060RFC:RFS-FIM-301:RP2-HVON-Precond
@@ -844,7 +818,6 @@ MBL-060RFC:RFS-FIM-301:RP2-RFON-En-RB
 MBL-060RFC:RFS-FIM-301:RP2-RFON-Precond
 MBL-060RFC:RFS-FIM-301:RP2-TrigSel-RB
 MBL-060RFC:RFS-FIM-301:RP2-TrigThre-RB
-MBL-060RFC:RFS-FIM-301:RP2-Wave-IlckPM
 MBL-060RFC:RFS-FIM-301:TriggerLine-RB
 MBL-060RFC:RFS-Kly-310:PwrFwd-DevMonEval-RB
 MBL-060RFC:RFS-Kly-310:PwrFwd-DevMonFact-RB
@@ -884,7 +857,6 @@ MBL-060RFC:RFS-Kly-310:PwrFwd-Wave-Avg
 MBL-060RFC:RFS-Kly-310:PwrFwd-Wave-High
 MBL-060RFC:RFS-Kly-310:PwrFwd-Wave-Low
 MBL-060RFC:RFS-Kly-310:PwrFwd-Wave-Med
-MBL-060RFC:RFS-Kly-310:PwrFwd-Wave-PM
 MBL-060RFC:RFS-Kly-310:PwrRfl-DevMonEval-RB
 MBL-060RFC:RFS-Kly-310:PwrRfl-DevMonFact-RB
 MBL-060RFC:RFS-Kly-310:PwrRfl-DevMonIlck-RB
@@ -923,12 +895,10 @@ MBL-060RFC:RFS-Kly-310:PwrRfl-Wave-Avg
 MBL-060RFC:RFS-Kly-310:PwrRfl-Wave-High
 MBL-060RFC:RFS-Kly-310:PwrRfl-Wave-Low
 MBL-060RFC:RFS-Kly-310:PwrRfl-Wave-Med
-MBL-060RFC:RFS-Kly-310:PwrRfl-Wave-PM
 MBL-060RFC:RFS-LLRF-301:Status-DIlckMode-RB
 MBL-060RFC:RFS-LLRF-301:Status-Ilck-RB
 MBL-060RFC:RFS-LLRF-301:Status-Input-RB
 MBL-060RFC:RFS-LLRF-301:Status-isFirstIlck
-MBL-060RFC:RFS-LLRF-301:Status-Wave-PM
 MBL-060RFC:RFS-Load-320:PwrFwd-DevMonEval-RB
 MBL-060RFC:RFS-Load-320:PwrFwd-DevMonFact-RB
 MBL-060RFC:RFS-Load-320:PwrFwd-DevMonIlck-RB
@@ -967,7 +937,6 @@ MBL-060RFC:RFS-Load-320:PwrFwd-Wave-Avg
 MBL-060RFC:RFS-Load-320:PwrFwd-Wave-High
 MBL-060RFC:RFS-Load-320:PwrFwd-Wave-Low
 MBL-060RFC:RFS-Load-320:PwrFwd-Wave-Med
-MBL-060RFC:RFS-Load-320:PwrFwd-Wave-PM
 MBL-060RFC:RFS-Load-320:PwrRfl-DevMonEval-RB
 MBL-060RFC:RFS-Load-320:PwrRfl-DevMonFact-RB
 MBL-060RFC:RFS-Load-320:PwrRfl-DevMonIlck-RB
@@ -1006,7 +975,6 @@ MBL-060RFC:RFS-Load-320:PwrRfl-Wave-Avg
 MBL-060RFC:RFS-Load-320:PwrRfl-Wave-High
 MBL-060RFC:RFS-Load-320:PwrRfl-Wave-Low
 MBL-060RFC:RFS-Load-320:PwrRfl-Wave-Med
-MBL-060RFC:RFS-Load-320:PwrRfl-Wave-PM
 MBL-060RFC:RFS-Mod-310:Cur-DevMonEval-RB
 MBL-060RFC:RFS-Mod-310:Cur-DevMonFact-RB
 MBL-060RFC:RFS-Mod-310:Cur-DevMonIlck-RB
@@ -1045,17 +1013,14 @@ MBL-060RFC:RFS-Mod-310:Cur-Wave-Avg
 MBL-060RFC:RFS-Mod-310:Cur-Wave-High
 MBL-060RFC:RFS-Mod-310:Cur-Wave-Low
 MBL-060RFC:RFS-Mod-310:Cur-Wave-Med
-MBL-060RFC:RFS-Mod-310:Cur-Wave-PM
 MBL-060RFC:RFS-Mod-310:PCcon-DIlckMode-RB
 MBL-060RFC:RFS-Mod-310:PCcon-Ilck-RB
 MBL-060RFC:RFS-Mod-310:PCcon-Input-RB
 MBL-060RFC:RFS-Mod-310:PCcon-isFirstIlck
-MBL-060RFC:RFS-Mod-310:PCcon-Wave-PM
 MBL-060RFC:RFS-Mod-310:Ready-DIlckMode-RB
 MBL-060RFC:RFS-Mod-310:Ready-Ilck-RB
 MBL-060RFC:RFS-Mod-310:Ready-Input-RB
 MBL-060RFC:RFS-Mod-310:Ready-isFirstIlck
-MBL-060RFC:RFS-Mod-310:Ready-Wave-PM
 MBL-060RFC:RFS-Mod-310:Vol-DevMonEval-RB
 MBL-060RFC:RFS-Mod-310:Vol-DevMonFact-RB
 MBL-060RFC:RFS-Mod-310:Vol-DevMonIlck-RB
@@ -1094,7 +1059,6 @@ MBL-060RFC:RFS-Mod-310:Vol-Wave-Avg
 MBL-060RFC:RFS-Mod-310:Vol-Wave-High
 MBL-060RFC:RFS-Mod-310:Vol-Wave-Low
 MBL-060RFC:RFS-Mod-310:Vol-Wave-Med
-MBL-060RFC:RFS-Mod-310:Vol-Wave-PM
 MBL-060RFC:RFS-PAmp-310:PwrFwd-DevMonEval-RB
 MBL-060RFC:RFS-PAmp-310:PwrFwd-DevMonFact-RB
 MBL-060RFC:RFS-PAmp-310:PwrFwd-DevMonIlck-RB
@@ -1133,17 +1097,14 @@ MBL-060RFC:RFS-PAmp-310:PwrFwd-Wave-Avg
 MBL-060RFC:RFS-PAmp-310:PwrFwd-Wave-High
 MBL-060RFC:RFS-PAmp-310:PwrFwd-Wave-Low
 MBL-060RFC:RFS-PAmp-310:PwrFwd-Wave-Med
-MBL-060RFC:RFS-PAmp-310:PwrFwd-Wave-PM
 MBL-060RFC:RFS-SIM-310:HvEna-DIlckMode-RB
 MBL-060RFC:RFS-SIM-310:HvEna-Ilck-RB
 MBL-060RFC:RFS-SIM-310:HvEna-Input-RB
 MBL-060RFC:RFS-SIM-310:HvEna-isFirstIlck
-MBL-060RFC:RFS-SIM-310:HvEna-Wave-PM
 MBL-060RFC:RFS-SIM-310:RfEna-DIlckMode-RB
 MBL-060RFC:RFS-SIM-310:RfEna-Ilck-RB
 MBL-060RFC:RFS-SIM-310:RfEna-Input-RB
 MBL-060RFC:RFS-SIM-310:RfEna-isFirstIlck
-MBL-060RFC:RFS-SIM-310:RfEna-Wave-PM
 MBL-060RFC:RFS-SolPS-310:Cur-DevMonEval-RB
 MBL-060RFC:RFS-SolPS-310:Cur-DevMonFact-RB
 MBL-060RFC:RFS-SolPS-310:Cur-DevMonIlck-RB
@@ -1182,7 +1143,6 @@ MBL-060RFC:RFS-SolPS-310:Cur-Wave-Avg
 MBL-060RFC:RFS-SolPS-310:Cur-Wave-High
 MBL-060RFC:RFS-SolPS-310:Cur-Wave-Low
 MBL-060RFC:RFS-SolPS-310:Cur-Wave-Med
-MBL-060RFC:RFS-SolPS-310:Cur-Wave-PM
 MBL-060RFC:RFS-SolPS-320:Cur-DevMonEval-RB
 MBL-060RFC:RFS-SolPS-320:Cur-DevMonFact-RB
 MBL-060RFC:RFS-SolPS-320:Cur-DevMonIlck-RB
@@ -1221,24 +1181,19 @@ MBL-060RFC:RFS-SolPS-320:Cur-Wave-Avg
 MBL-060RFC:RFS-SolPS-320:Cur-Wave-High
 MBL-060RFC:RFS-SolPS-320:Cur-Wave-Low
 MBL-060RFC:RFS-SolPS-320:Cur-Wave-Med
-MBL-060RFC:RFS-SolPS-320:Cur-Wave-PM
 MBL-060RFC:RFS-VacBody-310:Status-DIlckMode-RB
 MBL-060RFC:RFS-VacBody-310:Status-Ilck-RB
 MBL-060RFC:RFS-VacBody-310:Status-Input-RB
 MBL-060RFC:RFS-VacBody-310:Status-isFirstIlck
-MBL-060RFC:RFS-VacBody-310:Status-Wave-PM
 MBL-060RFC:RFS-VacCav-310:Status-DIlckMode-RB
 MBL-060RFC:RFS-VacCav-310:Status-Ilck-RB
 MBL-060RFC:RFS-VacCav-310:Status-Input-RB
 MBL-060RFC:RFS-VacCav-310:Status-isFirstIlck
-MBL-060RFC:RFS-VacCav-310:Status-Wave-PM
 MBL-060RFC:RFS-VacPS-310:I-SP-DIlckMode-RB
 MBL-060RFC:RFS-VacPS-310:I-SP-Ilck-RB
 MBL-060RFC:RFS-VacPS-310:I-SP-Input-RB
 MBL-060RFC:RFS-VacPS-310:I-SP-isFirstIlck
-MBL-060RFC:RFS-VacPS-310:I-SP-Wave-PM
 MBL-060RFC:RFS-VacPS-320:I-SP-DIlckMode-RB
 MBL-060RFC:RFS-VacPS-320:I-SP-Ilck-RB
 MBL-060RFC:RFS-VacPS-320:I-SP-Input-RB
 MBL-060RFC:RFS-VacPS-320:I-SP-isFirstIlck
-MBL-060RFC:RFS-VacPS-320:I-SP-Wave-PM
diff --git a/files/MBL-060RFC_RFS-RFLPS-401.archive b/files/MBL-060RFC_RFS-RFLPS-401.archive
index d87243e..e5d45bf 100644
--- a/files/MBL-060RFC_RFS-RFLPS-401.archive
+++ b/files/MBL-060RFC_RFS-RFLPS-401.archive
@@ -2,12 +2,10 @@ MBL-060RFC:RFS-ADG-410:IlckStatus-DIlckMode-RB
 MBL-060RFC:RFS-ADG-410:IlckStatus-Ilck-RB
 MBL-060RFC:RFS-ADG-410:IlckStatus-Input-RB
 MBL-060RFC:RFS-ADG-410:IlckStatus-isFirstIlck
-MBL-060RFC:RFS-ADG-410:IlckStatus-Wave-PM
 MBL-060RFC:RFS-ADG-410:PwrFail-DIlckMode-RB
 MBL-060RFC:RFS-ADG-410:PwrFail-Ilck-RB
 MBL-060RFC:RFS-ADG-410:PwrFail-Input-RB
 MBL-060RFC:RFS-ADG-410:PwrFail-isFirstIlck
-MBL-060RFC:RFS-ADG-410:PwrFail-Wave-PM
 MBL-060RFC:RFS-Cav-410:Fld-DevMonEval-RB
 MBL-060RFC:RFS-Cav-410:Fld-DevMonFact-RB
 MBL-060RFC:RFS-Cav-410:Fld-DevMonIlck-RB
@@ -46,7 +44,6 @@ MBL-060RFC:RFS-Cav-410:Fld-Wave-Avg
 MBL-060RFC:RFS-Cav-410:Fld-Wave-High
 MBL-060RFC:RFS-Cav-410:Fld-Wave-Low
 MBL-060RFC:RFS-Cav-410:Fld-Wave-Med
-MBL-060RFC:RFS-Cav-410:Fld-Wave-PM
 MBL-060RFC:RFS-Cav-410:PwrFwd-DevMonEval-RB
 MBL-060RFC:RFS-Cav-410:PwrFwd-DevMonFact-RB
 MBL-060RFC:RFS-Cav-410:PwrFwd-DevMonIlck-RB
@@ -85,7 +82,6 @@ MBL-060RFC:RFS-Cav-410:PwrFwd-Wave-Avg
 MBL-060RFC:RFS-Cav-410:PwrFwd-Wave-High
 MBL-060RFC:RFS-Cav-410:PwrFwd-Wave-Low
 MBL-060RFC:RFS-Cav-410:PwrFwd-Wave-Med
-MBL-060RFC:RFS-Cav-410:PwrFwd-Wave-PM
 MBL-060RFC:RFS-Cav-410:PwrRfl-DevMonEval-RB
 MBL-060RFC:RFS-Cav-410:PwrRfl-DevMonFact-RB
 MBL-060RFC:RFS-Cav-410:PwrRfl-DevMonIlck-RB
@@ -124,7 +120,6 @@ MBL-060RFC:RFS-Cav-410:PwrRfl-Wave-Avg
 MBL-060RFC:RFS-Cav-410:PwrRfl-Wave-High
 MBL-060RFC:RFS-Cav-410:PwrRfl-Wave-Low
 MBL-060RFC:RFS-Cav-410:PwrRfl-Wave-Med
-MBL-060RFC:RFS-Cav-410:PwrRfl-Wave-PM
 MBL-060RFC:RFS-EPR-410:Cur-DevMonEval-RB
 MBL-060RFC:RFS-EPR-410:Cur-DevMonFact-RB
 MBL-060RFC:RFS-EPR-410:Cur-DevMonIlck-RB
@@ -163,7 +158,6 @@ MBL-060RFC:RFS-EPR-410:Cur-Wave-Avg
 MBL-060RFC:RFS-EPR-410:Cur-Wave-High
 MBL-060RFC:RFS-EPR-410:Cur-Wave-Low
 MBL-060RFC:RFS-EPR-410:Cur-Wave-Med
-MBL-060RFC:RFS-EPR-410:Cur-Wave-PM
 MBL-060RFC:RFS-FIM-401:AI1-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-401:AI1-HVON-En-RB
 MBL-060RFC:RFS-FIM-401:AI1-HVON-Precond
@@ -214,7 +208,6 @@ MBL-060RFC:RFS-FIM-401:AI10-Wave-Avg
 MBL-060RFC:RFS-FIM-401:AI10-Wave-High
 MBL-060RFC:RFS-FIM-401:AI10-Wave-Low
 MBL-060RFC:RFS-FIM-401:AI10-Wave-Med
-MBL-060RFC:RFS-FIM-401:AI10-Wave-PM
 MBL-060RFC:RFS-FIM-401:AI2-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-401:AI2-HVON-En-RB
 MBL-060RFC:RFS-FIM-401:AI2-HVON-Precond
@@ -277,7 +270,6 @@ MBL-060RFC:RFS-FIM-401:AI5-Wave-Avg
 MBL-060RFC:RFS-FIM-401:AI5-Wave-High
 MBL-060RFC:RFS-FIM-401:AI5-Wave-Low
 MBL-060RFC:RFS-FIM-401:AI5-Wave-Med
-MBL-060RFC:RFS-FIM-401:AI5-Wave-PM
 MBL-060RFC:RFS-FIM-401:AI6-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-401:AI6-HVON-En-RB
 MBL-060RFC:RFS-FIM-401:AI6-HVON-Precond
@@ -328,7 +320,6 @@ MBL-060RFC:RFS-FIM-401:AI7-Wave-Avg
 MBL-060RFC:RFS-FIM-401:AI7-Wave-High
 MBL-060RFC:RFS-FIM-401:AI7-Wave-Low
 MBL-060RFC:RFS-FIM-401:AI7-Wave-Med
-MBL-060RFC:RFS-FIM-401:AI7-Wave-PM
 MBL-060RFC:RFS-FIM-401:AI8-DevMonEval-RB
 MBL-060RFC:RFS-FIM-401:AI8-DevMonFact-RB
 MBL-060RFC:RFS-FIM-401:AI8-DevMonIlck-RB
@@ -373,7 +364,6 @@ MBL-060RFC:RFS-FIM-401:AI8-Wave-Avg
 MBL-060RFC:RFS-FIM-401:AI8-Wave-High
 MBL-060RFC:RFS-FIM-401:AI8-Wave-Low
 MBL-060RFC:RFS-FIM-401:AI8-Wave-Med
-MBL-060RFC:RFS-FIM-401:AI8-Wave-PM
 MBL-060RFC:RFS-FIM-401:AI9-DevMonEval-RB
 MBL-060RFC:RFS-FIM-401:AI9-DevMonFact-RB
 MBL-060RFC:RFS-FIM-401:AI9-DevMonIlck-RB
@@ -418,7 +408,6 @@ MBL-060RFC:RFS-FIM-401:AI9-Wave-Avg
 MBL-060RFC:RFS-FIM-401:AI9-Wave-High
 MBL-060RFC:RFS-FIM-401:AI9-Wave-Low
 MBL-060RFC:RFS-FIM-401:AI9-Wave-Med
-MBL-060RFC:RFS-FIM-401:AI9-Wave-PM
 MBL-060RFC:RFS-FIM-401:CD1-DevFactor-RB
 MBL-060RFC:RFS-FIM-401:CD1-DevPeriod-RB
 MBL-060RFC:RFS-FIM-401:CD1-FastRst-IlckCnt
@@ -440,7 +429,6 @@ MBL-060RFC:RFS-FIM-401:CD1-RFON-En-RB
 MBL-060RFC:RFS-FIM-401:CD1-RFON-Precond
 MBL-060RFC:RFS-FIM-401:CD1-TrigSel-RB
 MBL-060RFC:RFS-FIM-401:CD1-TrigThre-RB
-MBL-060RFC:RFS-FIM-401:CD1-Wave-IlckPM
 MBL-060RFC:RFS-FIM-401:CD2-DevFactor-RB
 MBL-060RFC:RFS-FIM-401:CD2-DevPeriod-RB
 MBL-060RFC:RFS-FIM-401:CD2-FastRst-IlckCnt
@@ -462,7 +450,6 @@ MBL-060RFC:RFS-FIM-401:CD2-RFON-En-RB
 MBL-060RFC:RFS-FIM-401:CD2-RFON-Precond
 MBL-060RFC:RFS-FIM-401:CD2-TrigSel-RB
 MBL-060RFC:RFS-FIM-401:CD2-TrigThre-RB
-MBL-060RFC:RFS-FIM-401:CD2-Wave-IlckPM
 MBL-060RFC:RFS-FIM-401:DI1-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-401:DI1-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-401:DI1-HVON-En-RB
@@ -481,7 +468,6 @@ MBL-060RFC:RFS-FIM-401:DI10-Input-RB
 MBL-060RFC:RFS-FIM-401:DI10-isFirstIlck
 MBL-060RFC:RFS-FIM-401:DI10-RFON-En-RB
 MBL-060RFC:RFS-FIM-401:DI10-RFON-Precond
-MBL-060RFC:RFS-FIM-401:DI10-Wave-PM
 MBL-060RFC:RFS-FIM-401:DI11-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-401:DI11-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-401:DI11-HVON-En-RB
@@ -500,7 +486,6 @@ MBL-060RFC:RFS-FIM-401:DI12-Input-RB
 MBL-060RFC:RFS-FIM-401:DI12-isFirstIlck
 MBL-060RFC:RFS-FIM-401:DI12-RFON-En-RB
 MBL-060RFC:RFS-FIM-401:DI12-RFON-Precond
-MBL-060RFC:RFS-FIM-401:DI12-Wave-PM
 MBL-060RFC:RFS-FIM-401:DI13-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-401:DI13-DIlckMode-RB
 MBL-060RFC:RFS-FIM-401:DI13-FastRst-IlckCnt
@@ -512,7 +497,6 @@ MBL-060RFC:RFS-FIM-401:DI13-Input-RB
 MBL-060RFC:RFS-FIM-401:DI13-isFirstIlck
 MBL-060RFC:RFS-FIM-401:DI13-RFON-En-RB
 MBL-060RFC:RFS-FIM-401:DI13-RFON-Precond
-MBL-060RFC:RFS-FIM-401:DI13-Wave-PM
 MBL-060RFC:RFS-FIM-401:DI14-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-401:DI14-DIlckMode-RB
 MBL-060RFC:RFS-FIM-401:DI14-FastRst-IlckCnt
@@ -524,7 +508,6 @@ MBL-060RFC:RFS-FIM-401:DI14-Input-RB
 MBL-060RFC:RFS-FIM-401:DI14-isFirstIlck
 MBL-060RFC:RFS-FIM-401:DI14-RFON-En-RB
 MBL-060RFC:RFS-FIM-401:DI14-RFON-Precond
-MBL-060RFC:RFS-FIM-401:DI14-Wave-PM
 MBL-060RFC:RFS-FIM-401:DI15-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-401:DI15-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-401:DI15-HVON-En-RB
@@ -550,7 +533,6 @@ MBL-060RFC:RFS-FIM-401:DI17-Input-RB
 MBL-060RFC:RFS-FIM-401:DI17-isFirstIlck
 MBL-060RFC:RFS-FIM-401:DI17-RFON-En-RB
 MBL-060RFC:RFS-FIM-401:DI17-RFON-Precond
-MBL-060RFC:RFS-FIM-401:DI17-Wave-PM
 MBL-060RFC:RFS-FIM-401:DI18-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-401:DI18-DIlckMode-RB
 MBL-060RFC:RFS-FIM-401:DI18-FastRst-IlckCnt
@@ -562,7 +544,6 @@ MBL-060RFC:RFS-FIM-401:DI18-Input-RB
 MBL-060RFC:RFS-FIM-401:DI18-isFirstIlck
 MBL-060RFC:RFS-FIM-401:DI18-RFON-En-RB
 MBL-060RFC:RFS-FIM-401:DI18-RFON-Precond
-MBL-060RFC:RFS-FIM-401:DI18-Wave-PM
 MBL-060RFC:RFS-FIM-401:DI19-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-401:DI19-DIlckMode-RB
 MBL-060RFC:RFS-FIM-401:DI19-FastRst-IlckCnt
@@ -574,7 +555,6 @@ MBL-060RFC:RFS-FIM-401:DI19-Input-RB
 MBL-060RFC:RFS-FIM-401:DI19-isFirstIlck
 MBL-060RFC:RFS-FIM-401:DI19-RFON-En-RB
 MBL-060RFC:RFS-FIM-401:DI19-RFON-Precond
-MBL-060RFC:RFS-FIM-401:DI19-Wave-PM
 MBL-060RFC:RFS-FIM-401:DI2-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-401:DI2-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-401:DI2-HVON-En-RB
@@ -593,7 +573,6 @@ MBL-060RFC:RFS-FIM-401:DI20-Input-RB
 MBL-060RFC:RFS-FIM-401:DI20-isFirstIlck
 MBL-060RFC:RFS-FIM-401:DI20-RFON-En-RB
 MBL-060RFC:RFS-FIM-401:DI20-RFON-Precond
-MBL-060RFC:RFS-FIM-401:DI20-Wave-PM
 MBL-060RFC:RFS-FIM-401:DI21-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-401:DI21-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-401:DI21-HVON-En-RB
@@ -640,7 +619,6 @@ MBL-060RFC:RFS-FIM-401:DI7-Input-RB
 MBL-060RFC:RFS-FIM-401:DI7-isFirstIlck
 MBL-060RFC:RFS-FIM-401:DI7-RFON-En-RB
 MBL-060RFC:RFS-FIM-401:DI7-RFON-Precond
-MBL-060RFC:RFS-FIM-401:DI7-Wave-PM
 MBL-060RFC:RFS-FIM-401:DI8-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-401:DI8-DIlckMode-RB
 MBL-060RFC:RFS-FIM-401:DI8-FastRst-IlckCnt
@@ -652,7 +630,6 @@ MBL-060RFC:RFS-FIM-401:DI8-Input-RB
 MBL-060RFC:RFS-FIM-401:DI8-isFirstIlck
 MBL-060RFC:RFS-FIM-401:DI8-RFON-En-RB
 MBL-060RFC:RFS-FIM-401:DI8-RFON-Precond
-MBL-060RFC:RFS-FIM-401:DI8-Wave-PM
 MBL-060RFC:RFS-FIM-401:DI9-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-401:DI9-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-401:DI9-HVON-En-RB
@@ -716,7 +693,6 @@ MBL-060RFC:RFS-FIM-401:RF10-Wave-Avg
 MBL-060RFC:RFS-FIM-401:RF10-Wave-High
 MBL-060RFC:RFS-FIM-401:RF10-Wave-Low
 MBL-060RFC:RFS-FIM-401:RF10-Wave-Med
-MBL-060RFC:RFS-FIM-401:RF10-Wave-PM
 MBL-060RFC:RFS-FIM-401:RF2-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-401:RF2-HVON-En-RB
 MBL-060RFC:RFS-FIM-401:RF2-HVON-Precond
@@ -803,7 +779,6 @@ MBL-060RFC:RFS-FIM-401:RF9-Wave-Avg
 MBL-060RFC:RFS-FIM-401:RF9-Wave-High
 MBL-060RFC:RFS-FIM-401:RF9-Wave-Low
 MBL-060RFC:RFS-FIM-401:RF9-Wave-Med
-MBL-060RFC:RFS-FIM-401:RF9-Wave-PM
 MBL-060RFC:RFS-FIM-401:RFON-Precond
 MBL-060RFC:RFS-FIM-401:RP1-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-401:RP1-HVON-En-RB
@@ -824,7 +799,6 @@ MBL-060RFC:RFS-FIM-401:RP1-RFON-En-RB
 MBL-060RFC:RFS-FIM-401:RP1-RFON-Precond
 MBL-060RFC:RFS-FIM-401:RP1-TrigSel-RB
 MBL-060RFC:RFS-FIM-401:RP1-TrigThre-RB
-MBL-060RFC:RFS-FIM-401:RP1-Wave-IlckPM
 MBL-060RFC:RFS-FIM-401:RP2-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-401:RP2-HVON-En-RB
 MBL-060RFC:RFS-FIM-401:RP2-HVON-Precond
@@ -844,7 +818,6 @@ MBL-060RFC:RFS-FIM-401:RP2-RFON-En-RB
 MBL-060RFC:RFS-FIM-401:RP2-RFON-Precond
 MBL-060RFC:RFS-FIM-401:RP2-TrigSel-RB
 MBL-060RFC:RFS-FIM-401:RP2-TrigThre-RB
-MBL-060RFC:RFS-FIM-401:RP2-Wave-IlckPM
 MBL-060RFC:RFS-FIM-401:TriggerLine-RB
 MBL-060RFC:RFS-Kly-410:PwrFwd-DevMonEval-RB
 MBL-060RFC:RFS-Kly-410:PwrFwd-DevMonFact-RB
@@ -884,7 +857,6 @@ MBL-060RFC:RFS-Kly-410:PwrFwd-Wave-Avg
 MBL-060RFC:RFS-Kly-410:PwrFwd-Wave-High
 MBL-060RFC:RFS-Kly-410:PwrFwd-Wave-Low
 MBL-060RFC:RFS-Kly-410:PwrFwd-Wave-Med
-MBL-060RFC:RFS-Kly-410:PwrFwd-Wave-PM
 MBL-060RFC:RFS-Kly-410:PwrRfl-DevMonEval-RB
 MBL-060RFC:RFS-Kly-410:PwrRfl-DevMonFact-RB
 MBL-060RFC:RFS-Kly-410:PwrRfl-DevMonIlck-RB
@@ -923,12 +895,10 @@ MBL-060RFC:RFS-Kly-410:PwrRfl-Wave-Avg
 MBL-060RFC:RFS-Kly-410:PwrRfl-Wave-High
 MBL-060RFC:RFS-Kly-410:PwrRfl-Wave-Low
 MBL-060RFC:RFS-Kly-410:PwrRfl-Wave-Med
-MBL-060RFC:RFS-Kly-410:PwrRfl-Wave-PM
 MBL-060RFC:RFS-LLRF-401:Status-DIlckMode-RB
 MBL-060RFC:RFS-LLRF-401:Status-Ilck-RB
 MBL-060RFC:RFS-LLRF-401:Status-Input-RB
 MBL-060RFC:RFS-LLRF-401:Status-isFirstIlck
-MBL-060RFC:RFS-LLRF-401:Status-Wave-PM
 MBL-060RFC:RFS-Load-420:PwrFwd-DevMonEval-RB
 MBL-060RFC:RFS-Load-420:PwrFwd-DevMonFact-RB
 MBL-060RFC:RFS-Load-420:PwrFwd-DevMonIlck-RB
@@ -967,7 +937,6 @@ MBL-060RFC:RFS-Load-420:PwrFwd-Wave-Avg
 MBL-060RFC:RFS-Load-420:PwrFwd-Wave-High
 MBL-060RFC:RFS-Load-420:PwrFwd-Wave-Low
 MBL-060RFC:RFS-Load-420:PwrFwd-Wave-Med
-MBL-060RFC:RFS-Load-420:PwrFwd-Wave-PM
 MBL-060RFC:RFS-Load-420:PwrRfl-DevMonEval-RB
 MBL-060RFC:RFS-Load-420:PwrRfl-DevMonFact-RB
 MBL-060RFC:RFS-Load-420:PwrRfl-DevMonIlck-RB
@@ -1006,7 +975,6 @@ MBL-060RFC:RFS-Load-420:PwrRfl-Wave-Avg
 MBL-060RFC:RFS-Load-420:PwrRfl-Wave-High
 MBL-060RFC:RFS-Load-420:PwrRfl-Wave-Low
 MBL-060RFC:RFS-Load-420:PwrRfl-Wave-Med
-MBL-060RFC:RFS-Load-420:PwrRfl-Wave-PM
 MBL-060RFC:RFS-Mod-410:Cur-DevMonEval-RB
 MBL-060RFC:RFS-Mod-410:Cur-DevMonFact-RB
 MBL-060RFC:RFS-Mod-410:Cur-DevMonIlck-RB
@@ -1045,17 +1013,14 @@ MBL-060RFC:RFS-Mod-410:Cur-Wave-Avg
 MBL-060RFC:RFS-Mod-410:Cur-Wave-High
 MBL-060RFC:RFS-Mod-410:Cur-Wave-Low
 MBL-060RFC:RFS-Mod-410:Cur-Wave-Med
-MBL-060RFC:RFS-Mod-410:Cur-Wave-PM
 MBL-060RFC:RFS-Mod-410:PCcon-DIlckMode-RB
 MBL-060RFC:RFS-Mod-410:PCcon-Ilck-RB
 MBL-060RFC:RFS-Mod-410:PCcon-Input-RB
 MBL-060RFC:RFS-Mod-410:PCcon-isFirstIlck
-MBL-060RFC:RFS-Mod-410:PCcon-Wave-PM
 MBL-060RFC:RFS-Mod-410:Ready-DIlckMode-RB
 MBL-060RFC:RFS-Mod-410:Ready-Ilck-RB
 MBL-060RFC:RFS-Mod-410:Ready-Input-RB
 MBL-060RFC:RFS-Mod-410:Ready-isFirstIlck
-MBL-060RFC:RFS-Mod-410:Ready-Wave-PM
 MBL-060RFC:RFS-Mod-410:Vol-DevMonEval-RB
 MBL-060RFC:RFS-Mod-410:Vol-DevMonFact-RB
 MBL-060RFC:RFS-Mod-410:Vol-DevMonIlck-RB
@@ -1094,7 +1059,6 @@ MBL-060RFC:RFS-Mod-410:Vol-Wave-Avg
 MBL-060RFC:RFS-Mod-410:Vol-Wave-High
 MBL-060RFC:RFS-Mod-410:Vol-Wave-Low
 MBL-060RFC:RFS-Mod-410:Vol-Wave-Med
-MBL-060RFC:RFS-Mod-410:Vol-Wave-PM
 MBL-060RFC:RFS-PAmp-410:PwrFwd-DevMonEval-RB
 MBL-060RFC:RFS-PAmp-410:PwrFwd-DevMonFact-RB
 MBL-060RFC:RFS-PAmp-410:PwrFwd-DevMonIlck-RB
@@ -1133,17 +1097,14 @@ MBL-060RFC:RFS-PAmp-410:PwrFwd-Wave-Avg
 MBL-060RFC:RFS-PAmp-410:PwrFwd-Wave-High
 MBL-060RFC:RFS-PAmp-410:PwrFwd-Wave-Low
 MBL-060RFC:RFS-PAmp-410:PwrFwd-Wave-Med
-MBL-060RFC:RFS-PAmp-410:PwrFwd-Wave-PM
 MBL-060RFC:RFS-SIM-410:HvEna-DIlckMode-RB
 MBL-060RFC:RFS-SIM-410:HvEna-Ilck-RB
 MBL-060RFC:RFS-SIM-410:HvEna-Input-RB
 MBL-060RFC:RFS-SIM-410:HvEna-isFirstIlck
-MBL-060RFC:RFS-SIM-410:HvEna-Wave-PM
 MBL-060RFC:RFS-SIM-410:RfEna-DIlckMode-RB
 MBL-060RFC:RFS-SIM-410:RfEna-Ilck-RB
 MBL-060RFC:RFS-SIM-410:RfEna-Input-RB
 MBL-060RFC:RFS-SIM-410:RfEna-isFirstIlck
-MBL-060RFC:RFS-SIM-410:RfEna-Wave-PM
 MBL-060RFC:RFS-SolPS-410:Cur-DevMonEval-RB
 MBL-060RFC:RFS-SolPS-410:Cur-DevMonFact-RB
 MBL-060RFC:RFS-SolPS-410:Cur-DevMonIlck-RB
@@ -1182,7 +1143,6 @@ MBL-060RFC:RFS-SolPS-410:Cur-Wave-Avg
 MBL-060RFC:RFS-SolPS-410:Cur-Wave-High
 MBL-060RFC:RFS-SolPS-410:Cur-Wave-Low
 MBL-060RFC:RFS-SolPS-410:Cur-Wave-Med
-MBL-060RFC:RFS-SolPS-410:Cur-Wave-PM
 MBL-060RFC:RFS-SolPS-420:Cur-DevMonEval-RB
 MBL-060RFC:RFS-SolPS-420:Cur-DevMonFact-RB
 MBL-060RFC:RFS-SolPS-420:Cur-DevMonIlck-RB
@@ -1221,24 +1181,19 @@ MBL-060RFC:RFS-SolPS-420:Cur-Wave-Avg
 MBL-060RFC:RFS-SolPS-420:Cur-Wave-High
 MBL-060RFC:RFS-SolPS-420:Cur-Wave-Low
 MBL-060RFC:RFS-SolPS-420:Cur-Wave-Med
-MBL-060RFC:RFS-SolPS-420:Cur-Wave-PM
 MBL-060RFC:RFS-VacBody-410:Status-DIlckMode-RB
 MBL-060RFC:RFS-VacBody-410:Status-Ilck-RB
 MBL-060RFC:RFS-VacBody-410:Status-Input-RB
 MBL-060RFC:RFS-VacBody-410:Status-isFirstIlck
-MBL-060RFC:RFS-VacBody-410:Status-Wave-PM
 MBL-060RFC:RFS-VacCav-410:Status-DIlckMode-RB
 MBL-060RFC:RFS-VacCav-410:Status-Ilck-RB
 MBL-060RFC:RFS-VacCav-410:Status-Input-RB
 MBL-060RFC:RFS-VacCav-410:Status-isFirstIlck
-MBL-060RFC:RFS-VacCav-410:Status-Wave-PM
 MBL-060RFC:RFS-VacPS-410:I-SP-DIlckMode-RB
 MBL-060RFC:RFS-VacPS-410:I-SP-Ilck-RB
 MBL-060RFC:RFS-VacPS-410:I-SP-Input-RB
 MBL-060RFC:RFS-VacPS-410:I-SP-isFirstIlck
-MBL-060RFC:RFS-VacPS-410:I-SP-Wave-PM
 MBL-060RFC:RFS-VacPS-420:I-SP-DIlckMode-RB
 MBL-060RFC:RFS-VacPS-420:I-SP-Ilck-RB
 MBL-060RFC:RFS-VacPS-420:I-SP-Input-RB
 MBL-060RFC:RFS-VacPS-420:I-SP-isFirstIlck
-MBL-060RFC:RFS-VacPS-420:I-SP-Wave-PM
diff --git a/files/MBL-060RFC_SC-IOC-102.archive b/files/MBL-060RFC_SC-IOC-102.archive
index f36e86b..54bb726 100644
--- a/files/MBL-060RFC_SC-IOC-102.archive
+++ b/files/MBL-060RFC_SC-IOC-102.archive
@@ -2,12 +2,10 @@ MBL-060RFC:RFS-ADG-110:IlckStatus-DIlckMode-RB
 MBL-060RFC:RFS-ADG-110:IlckStatus-Ilck-RB
 MBL-060RFC:RFS-ADG-110:IlckStatus-Input-RB
 MBL-060RFC:RFS-ADG-110:IlckStatus-isFirstIlck
-MBL-060RFC:RFS-ADG-110:IlckStatus-Wave-PM
 MBL-060RFC:RFS-ADG-110:PwrFail-DIlckMode-RB
 MBL-060RFC:RFS-ADG-110:PwrFail-Ilck-RB
 MBL-060RFC:RFS-ADG-110:PwrFail-Input-RB
 MBL-060RFC:RFS-ADG-110:PwrFail-isFirstIlck
-MBL-060RFC:RFS-ADG-110:PwrFail-Wave-PM
 MBL-060RFC:RFS-Cav-110:Fld-DevMonEval-RB
 MBL-060RFC:RFS-Cav-110:Fld-DevMonFact-RB
 MBL-060RFC:RFS-Cav-110:Fld-DevMonIlck-RB
@@ -46,7 +44,6 @@ MBL-060RFC:RFS-Cav-110:Fld-Wave-Avg
 MBL-060RFC:RFS-Cav-110:Fld-Wave-High
 MBL-060RFC:RFS-Cav-110:Fld-Wave-Low
 MBL-060RFC:RFS-Cav-110:Fld-Wave-Med
-MBL-060RFC:RFS-Cav-110:Fld-Wave-PM
 MBL-060RFC:RFS-Cav-110:PwrFwd-DevMonEval-RB
 MBL-060RFC:RFS-Cav-110:PwrFwd-DevMonFact-RB
 MBL-060RFC:RFS-Cav-110:PwrFwd-DevMonIlck-RB
@@ -85,7 +82,6 @@ MBL-060RFC:RFS-Cav-110:PwrFwd-Wave-Avg
 MBL-060RFC:RFS-Cav-110:PwrFwd-Wave-High
 MBL-060RFC:RFS-Cav-110:PwrFwd-Wave-Low
 MBL-060RFC:RFS-Cav-110:PwrFwd-Wave-Med
-MBL-060RFC:RFS-Cav-110:PwrFwd-Wave-PM
 MBL-060RFC:RFS-Cav-110:PwrRfl-DevMonEval-RB
 MBL-060RFC:RFS-Cav-110:PwrRfl-DevMonFact-RB
 MBL-060RFC:RFS-Cav-110:PwrRfl-DevMonIlck-RB
@@ -124,7 +120,6 @@ MBL-060RFC:RFS-Cav-110:PwrRfl-Wave-Avg
 MBL-060RFC:RFS-Cav-110:PwrRfl-Wave-High
 MBL-060RFC:RFS-Cav-110:PwrRfl-Wave-Low
 MBL-060RFC:RFS-Cav-110:PwrRfl-Wave-Med
-MBL-060RFC:RFS-Cav-110:PwrRfl-Wave-PM
 MBL-060RFC:RFS-EPR-110:Cur-DevMonEval-RB
 MBL-060RFC:RFS-EPR-110:Cur-DevMonFact-RB
 MBL-060RFC:RFS-EPR-110:Cur-DevMonIlck-RB
@@ -163,7 +158,6 @@ MBL-060RFC:RFS-EPR-110:Cur-Wave-Avg
 MBL-060RFC:RFS-EPR-110:Cur-Wave-High
 MBL-060RFC:RFS-EPR-110:Cur-Wave-Low
 MBL-060RFC:RFS-EPR-110:Cur-Wave-Med
-MBL-060RFC:RFS-EPR-110:Cur-Wave-PM
 MBL-060RFC:RFS-FIM-101:AI10-DevMonEval-RB
 MBL-060RFC:RFS-FIM-101:AI10-DevMonFact-RB
 MBL-060RFC:RFS-FIM-101:AI10-DevMonIlck-RB
@@ -208,7 +202,6 @@ MBL-060RFC:RFS-FIM-101:AI10-Wave-Avg
 MBL-060RFC:RFS-FIM-101:AI10-Wave-High
 MBL-060RFC:RFS-FIM-101:AI10-Wave-Low
 MBL-060RFC:RFS-FIM-101:AI10-Wave-Med
-MBL-060RFC:RFS-FIM-101:AI10-Wave-PM
 MBL-060RFC:RFS-FIM-101:AI1-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-101:AI1-HVON-En-RB
 MBL-060RFC:RFS-FIM-101:AI1-HVON-Precond
@@ -277,7 +270,6 @@ MBL-060RFC:RFS-FIM-101:AI5-Wave-Avg
 MBL-060RFC:RFS-FIM-101:AI5-Wave-High
 MBL-060RFC:RFS-FIM-101:AI5-Wave-Low
 MBL-060RFC:RFS-FIM-101:AI5-Wave-Med
-MBL-060RFC:RFS-FIM-101:AI5-Wave-PM
 MBL-060RFC:RFS-FIM-101:AI6-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-101:AI6-HVON-En-RB
 MBL-060RFC:RFS-FIM-101:AI6-HVON-Precond
@@ -328,7 +320,6 @@ MBL-060RFC:RFS-FIM-101:AI7-Wave-Avg
 MBL-060RFC:RFS-FIM-101:AI7-Wave-High
 MBL-060RFC:RFS-FIM-101:AI7-Wave-Low
 MBL-060RFC:RFS-FIM-101:AI7-Wave-Med
-MBL-060RFC:RFS-FIM-101:AI7-Wave-PM
 MBL-060RFC:RFS-FIM-101:AI8-DevMonEval-RB
 MBL-060RFC:RFS-FIM-101:AI8-DevMonFact-RB
 MBL-060RFC:RFS-FIM-101:AI8-DevMonIlck-RB
@@ -373,7 +364,6 @@ MBL-060RFC:RFS-FIM-101:AI8-Wave-Avg
 MBL-060RFC:RFS-FIM-101:AI8-Wave-High
 MBL-060RFC:RFS-FIM-101:AI8-Wave-Low
 MBL-060RFC:RFS-FIM-101:AI8-Wave-Med
-MBL-060RFC:RFS-FIM-101:AI8-Wave-PM
 MBL-060RFC:RFS-FIM-101:AI9-DevMonEval-RB
 MBL-060RFC:RFS-FIM-101:AI9-DevMonFact-RB
 MBL-060RFC:RFS-FIM-101:AI9-DevMonIlck-RB
@@ -418,7 +408,6 @@ MBL-060RFC:RFS-FIM-101:AI9-Wave-Avg
 MBL-060RFC:RFS-FIM-101:AI9-Wave-High
 MBL-060RFC:RFS-FIM-101:AI9-Wave-Low
 MBL-060RFC:RFS-FIM-101:AI9-Wave-Med
-MBL-060RFC:RFS-FIM-101:AI9-Wave-PM
 MBL-060RFC:RFS-FIM-101:CD1-DevFactor-RB
 MBL-060RFC:RFS-FIM-101:CD1-DevPeriod-RB
 MBL-060RFC:RFS-FIM-101:CD1-FastRst-IlckCnt
@@ -440,7 +429,6 @@ MBL-060RFC:RFS-FIM-101:CD1-RFON-En-RB
 MBL-060RFC:RFS-FIM-101:CD1-RFON-Precond
 MBL-060RFC:RFS-FIM-101:CD1-TrigSel-RB
 MBL-060RFC:RFS-FIM-101:CD1-TrigThre-RB
-MBL-060RFC:RFS-FIM-101:CD1-Wave-IlckPM
 MBL-060RFC:RFS-FIM-101:CD2-DevFactor-RB
 MBL-060RFC:RFS-FIM-101:CD2-DevPeriod-RB
 MBL-060RFC:RFS-FIM-101:CD2-FastRst-IlckCnt
@@ -462,7 +450,6 @@ MBL-060RFC:RFS-FIM-101:CD2-RFON-En-RB
 MBL-060RFC:RFS-FIM-101:CD2-RFON-Precond
 MBL-060RFC:RFS-FIM-101:CD2-TrigSel-RB
 MBL-060RFC:RFS-FIM-101:CD2-TrigThre-RB
-MBL-060RFC:RFS-FIM-101:CD2-Wave-IlckPM
 MBL-060RFC:RFS-FIM-101:DI10-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-101:DI10-DIlckMode-RB
 MBL-060RFC:RFS-FIM-101:DI10-FastRst-IlckCnt
@@ -474,7 +461,6 @@ MBL-060RFC:RFS-FIM-101:DI10-Input-RB
 MBL-060RFC:RFS-FIM-101:DI10-isFirstIlck
 MBL-060RFC:RFS-FIM-101:DI10-RFON-En-RB
 MBL-060RFC:RFS-FIM-101:DI10-RFON-Precond
-MBL-060RFC:RFS-FIM-101:DI10-Wave-PM
 MBL-060RFC:RFS-FIM-101:DI11-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-101:DI11-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-101:DI11-HVON-En-RB
@@ -493,7 +479,6 @@ MBL-060RFC:RFS-FIM-101:DI12-Input-RB
 MBL-060RFC:RFS-FIM-101:DI12-isFirstIlck
 MBL-060RFC:RFS-FIM-101:DI12-RFON-En-RB
 MBL-060RFC:RFS-FIM-101:DI12-RFON-Precond
-MBL-060RFC:RFS-FIM-101:DI12-Wave-PM
 MBL-060RFC:RFS-FIM-101:DI13-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-101:DI13-DIlckMode-RB
 MBL-060RFC:RFS-FIM-101:DI13-FastRst-IlckCnt
@@ -505,7 +490,6 @@ MBL-060RFC:RFS-FIM-101:DI13-Input-RB
 MBL-060RFC:RFS-FIM-101:DI13-isFirstIlck
 MBL-060RFC:RFS-FIM-101:DI13-RFON-En-RB
 MBL-060RFC:RFS-FIM-101:DI13-RFON-Precond
-MBL-060RFC:RFS-FIM-101:DI13-Wave-PM
 MBL-060RFC:RFS-FIM-101:DI14-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-101:DI14-DIlckMode-RB
 MBL-060RFC:RFS-FIM-101:DI14-FastRst-IlckCnt
@@ -517,7 +501,6 @@ MBL-060RFC:RFS-FIM-101:DI14-Input-RB
 MBL-060RFC:RFS-FIM-101:DI14-isFirstIlck
 MBL-060RFC:RFS-FIM-101:DI14-RFON-En-RB
 MBL-060RFC:RFS-FIM-101:DI14-RFON-Precond
-MBL-060RFC:RFS-FIM-101:DI14-Wave-PM
 MBL-060RFC:RFS-FIM-101:DI15-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-101:DI15-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-101:DI15-HVON-En-RB
@@ -543,7 +526,6 @@ MBL-060RFC:RFS-FIM-101:DI17-Input-RB
 MBL-060RFC:RFS-FIM-101:DI17-isFirstIlck
 MBL-060RFC:RFS-FIM-101:DI17-RFON-En-RB
 MBL-060RFC:RFS-FIM-101:DI17-RFON-Precond
-MBL-060RFC:RFS-FIM-101:DI17-Wave-PM
 MBL-060RFC:RFS-FIM-101:DI18-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-101:DI18-DIlckMode-RB
 MBL-060RFC:RFS-FIM-101:DI18-FastRst-IlckCnt
@@ -555,7 +537,6 @@ MBL-060RFC:RFS-FIM-101:DI18-Input-RB
 MBL-060RFC:RFS-FIM-101:DI18-isFirstIlck
 MBL-060RFC:RFS-FIM-101:DI18-RFON-En-RB
 MBL-060RFC:RFS-FIM-101:DI18-RFON-Precond
-MBL-060RFC:RFS-FIM-101:DI18-Wave-PM
 MBL-060RFC:RFS-FIM-101:DI19-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-101:DI19-DIlckMode-RB
 MBL-060RFC:RFS-FIM-101:DI19-FastRst-IlckCnt
@@ -567,7 +548,6 @@ MBL-060RFC:RFS-FIM-101:DI19-Input-RB
 MBL-060RFC:RFS-FIM-101:DI19-isFirstIlck
 MBL-060RFC:RFS-FIM-101:DI19-RFON-En-RB
 MBL-060RFC:RFS-FIM-101:DI19-RFON-Precond
-MBL-060RFC:RFS-FIM-101:DI19-Wave-PM
 MBL-060RFC:RFS-FIM-101:DI1-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-101:DI1-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-101:DI1-HVON-En-RB
@@ -586,7 +566,6 @@ MBL-060RFC:RFS-FIM-101:DI20-Input-RB
 MBL-060RFC:RFS-FIM-101:DI20-isFirstIlck
 MBL-060RFC:RFS-FIM-101:DI20-RFON-En-RB
 MBL-060RFC:RFS-FIM-101:DI20-RFON-Precond
-MBL-060RFC:RFS-FIM-101:DI20-Wave-PM
 MBL-060RFC:RFS-FIM-101:DI21-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-101:DI21-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-101:DI21-HVON-En-RB
@@ -640,7 +619,6 @@ MBL-060RFC:RFS-FIM-101:DI7-Input-RB
 MBL-060RFC:RFS-FIM-101:DI7-isFirstIlck
 MBL-060RFC:RFS-FIM-101:DI7-RFON-En-RB
 MBL-060RFC:RFS-FIM-101:DI7-RFON-Precond
-MBL-060RFC:RFS-FIM-101:DI7-Wave-PM
 MBL-060RFC:RFS-FIM-101:DI8-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-101:DI8-DIlckMode-RB
 MBL-060RFC:RFS-FIM-101:DI8-FastRst-IlckCnt
@@ -652,7 +630,6 @@ MBL-060RFC:RFS-FIM-101:DI8-Input-RB
 MBL-060RFC:RFS-FIM-101:DI8-isFirstIlck
 MBL-060RFC:RFS-FIM-101:DI8-RFON-En-RB
 MBL-060RFC:RFS-FIM-101:DI8-RFON-Precond
-MBL-060RFC:RFS-FIM-101:DI8-Wave-PM
 MBL-060RFC:RFS-FIM-101:DI9-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-101:DI9-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-101:DI9-HVON-En-RB
@@ -710,7 +687,6 @@ MBL-060RFC:RFS-FIM-101:RF10-Wave-Avg
 MBL-060RFC:RFS-FIM-101:RF10-Wave-High
 MBL-060RFC:RFS-FIM-101:RF10-Wave-Low
 MBL-060RFC:RFS-FIM-101:RF10-Wave-Med
-MBL-060RFC:RFS-FIM-101:RF10-Wave-PM
 MBL-060RFC:RFS-FIM-101:RF1-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-101:RF1-HVON-En-RB
 MBL-060RFC:RFS-FIM-101:RF1-HVON-Precond
@@ -803,7 +779,6 @@ MBL-060RFC:RFS-FIM-101:RF9-Wave-Avg
 MBL-060RFC:RFS-FIM-101:RF9-Wave-High
 MBL-060RFC:RFS-FIM-101:RF9-Wave-Low
 MBL-060RFC:RFS-FIM-101:RF9-Wave-Med
-MBL-060RFC:RFS-FIM-101:RF9-Wave-PM
 MBL-060RFC:RFS-FIM-101:RFON-Precond
 MBL-060RFC:RFS-FIM-101:RP1-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-101:RP1-HVON-En-RB
@@ -824,7 +799,6 @@ MBL-060RFC:RFS-FIM-101:RP1-RFON-En-RB
 MBL-060RFC:RFS-FIM-101:RP1-RFON-Precond
 MBL-060RFC:RFS-FIM-101:RP1-TrigSel-RB
 MBL-060RFC:RFS-FIM-101:RP1-TrigThre-RB
-MBL-060RFC:RFS-FIM-101:RP1-Wave-IlckPM
 MBL-060RFC:RFS-FIM-101:RP2-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-101:RP2-HVON-En-RB
 MBL-060RFC:RFS-FIM-101:RP2-HVON-Precond
@@ -844,7 +818,6 @@ MBL-060RFC:RFS-FIM-101:RP2-RFON-En-RB
 MBL-060RFC:RFS-FIM-101:RP2-RFON-Precond
 MBL-060RFC:RFS-FIM-101:RP2-TrigSel-RB
 MBL-060RFC:RFS-FIM-101:RP2-TrigThre-RB
-MBL-060RFC:RFS-FIM-101:RP2-Wave-IlckPM
 MBL-060RFC:RFS-FIM-101:TriggerLine-RB
 MBL-060RFC:RFS-Kly-110:PwrFwd-DevMonEval-RB
 MBL-060RFC:RFS-Kly-110:PwrFwd-DevMonFact-RB
@@ -884,7 +857,6 @@ MBL-060RFC:RFS-Kly-110:PwrFwd-Wave-Avg
 MBL-060RFC:RFS-Kly-110:PwrFwd-Wave-High
 MBL-060RFC:RFS-Kly-110:PwrFwd-Wave-Low
 MBL-060RFC:RFS-Kly-110:PwrFwd-Wave-Med
-MBL-060RFC:RFS-Kly-110:PwrFwd-Wave-PM
 MBL-060RFC:RFS-Kly-110:PwrRfl-DevMonEval-RB
 MBL-060RFC:RFS-Kly-110:PwrRfl-DevMonFact-RB
 MBL-060RFC:RFS-Kly-110:PwrRfl-DevMonIlck-RB
@@ -923,12 +895,10 @@ MBL-060RFC:RFS-Kly-110:PwrRfl-Wave-Avg
 MBL-060RFC:RFS-Kly-110:PwrRfl-Wave-High
 MBL-060RFC:RFS-Kly-110:PwrRfl-Wave-Low
 MBL-060RFC:RFS-Kly-110:PwrRfl-Wave-Med
-MBL-060RFC:RFS-Kly-110:PwrRfl-Wave-PM
 MBL-060RFC:RFS-LLRF-101:Status-DIlckMode-RB
 MBL-060RFC:RFS-LLRF-101:Status-Ilck-RB
 MBL-060RFC:RFS-LLRF-101:Status-Input-RB
 MBL-060RFC:RFS-LLRF-101:Status-isFirstIlck
-MBL-060RFC:RFS-LLRF-101:Status-Wave-PM
 MBL-060RFC:RFS-Load-120:PwrFwd-DevMonEval-RB
 MBL-060RFC:RFS-Load-120:PwrFwd-DevMonFact-RB
 MBL-060RFC:RFS-Load-120:PwrFwd-DevMonIlck-RB
@@ -967,7 +937,6 @@ MBL-060RFC:RFS-Load-120:PwrFwd-Wave-Avg
 MBL-060RFC:RFS-Load-120:PwrFwd-Wave-High
 MBL-060RFC:RFS-Load-120:PwrFwd-Wave-Low
 MBL-060RFC:RFS-Load-120:PwrFwd-Wave-Med
-MBL-060RFC:RFS-Load-120:PwrFwd-Wave-PM
 MBL-060RFC:RFS-Load-120:PwrRfl-DevMonEval-RB
 MBL-060RFC:RFS-Load-120:PwrRfl-DevMonFact-RB
 MBL-060RFC:RFS-Load-120:PwrRfl-DevMonIlck-RB
@@ -1006,7 +975,6 @@ MBL-060RFC:RFS-Load-120:PwrRfl-Wave-Avg
 MBL-060RFC:RFS-Load-120:PwrRfl-Wave-High
 MBL-060RFC:RFS-Load-120:PwrRfl-Wave-Low
 MBL-060RFC:RFS-Load-120:PwrRfl-Wave-Med
-MBL-060RFC:RFS-Load-120:PwrRfl-Wave-PM
 MBL-060RFC:RFS-Mod-110:Cur-DevMonEval-RB
 MBL-060RFC:RFS-Mod-110:Cur-DevMonFact-RB
 MBL-060RFC:RFS-Mod-110:Cur-DevMonIlck-RB
@@ -1045,17 +1013,14 @@ MBL-060RFC:RFS-Mod-110:Cur-Wave-Avg
 MBL-060RFC:RFS-Mod-110:Cur-Wave-High
 MBL-060RFC:RFS-Mod-110:Cur-Wave-Low
 MBL-060RFC:RFS-Mod-110:Cur-Wave-Med
-MBL-060RFC:RFS-Mod-110:Cur-Wave-PM
 MBL-060RFC:RFS-Mod-110:PCcon-DIlckMode-RB
 MBL-060RFC:RFS-Mod-110:PCcon-Ilck-RB
 MBL-060RFC:RFS-Mod-110:PCcon-Input-RB
 MBL-060RFC:RFS-Mod-110:PCcon-isFirstIlck
-MBL-060RFC:RFS-Mod-110:PCcon-Wave-PM
 MBL-060RFC:RFS-Mod-110:Ready-DIlckMode-RB
 MBL-060RFC:RFS-Mod-110:Ready-Ilck-RB
 MBL-060RFC:RFS-Mod-110:Ready-Input-RB
 MBL-060RFC:RFS-Mod-110:Ready-isFirstIlck
-MBL-060RFC:RFS-Mod-110:Ready-Wave-PM
 MBL-060RFC:RFS-Mod-110:Vol-DevMonEval-RB
 MBL-060RFC:RFS-Mod-110:Vol-DevMonFact-RB
 MBL-060RFC:RFS-Mod-110:Vol-DevMonIlck-RB
@@ -1094,7 +1059,6 @@ MBL-060RFC:RFS-Mod-110:Vol-Wave-Avg
 MBL-060RFC:RFS-Mod-110:Vol-Wave-High
 MBL-060RFC:RFS-Mod-110:Vol-Wave-Low
 MBL-060RFC:RFS-Mod-110:Vol-Wave-Med
-MBL-060RFC:RFS-Mod-110:Vol-Wave-PM
 MBL-060RFC:RFS-PAmp-110:PwrFwd-DevMonEval-RB
 MBL-060RFC:RFS-PAmp-110:PwrFwd-DevMonFact-RB
 MBL-060RFC:RFS-PAmp-110:PwrFwd-DevMonIlck-RB
@@ -1133,17 +1097,14 @@ MBL-060RFC:RFS-PAmp-110:PwrFwd-Wave-Avg
 MBL-060RFC:RFS-PAmp-110:PwrFwd-Wave-High
 MBL-060RFC:RFS-PAmp-110:PwrFwd-Wave-Low
 MBL-060RFC:RFS-PAmp-110:PwrFwd-Wave-Med
-MBL-060RFC:RFS-PAmp-110:PwrFwd-Wave-PM
 MBL-060RFC:RFS-SIM-110:HvEna-DIlckMode-RB
 MBL-060RFC:RFS-SIM-110:HvEna-Ilck-RB
 MBL-060RFC:RFS-SIM-110:HvEna-Input-RB
 MBL-060RFC:RFS-SIM-110:HvEna-isFirstIlck
-MBL-060RFC:RFS-SIM-110:HvEna-Wave-PM
 MBL-060RFC:RFS-SIM-110:RfEna-DIlckMode-RB
 MBL-060RFC:RFS-SIM-110:RfEna-Ilck-RB
 MBL-060RFC:RFS-SIM-110:RfEna-Input-RB
 MBL-060RFC:RFS-SIM-110:RfEna-isFirstIlck
-MBL-060RFC:RFS-SIM-110:RfEna-Wave-PM
 MBL-060RFC:RFS-SolPS-110:Cur-DevMonEval-RB
 MBL-060RFC:RFS-SolPS-110:Cur-DevMonFact-RB
 MBL-060RFC:RFS-SolPS-110:Cur-DevMonIlck-RB
@@ -1182,7 +1143,6 @@ MBL-060RFC:RFS-SolPS-110:Cur-Wave-Avg
 MBL-060RFC:RFS-SolPS-110:Cur-Wave-High
 MBL-060RFC:RFS-SolPS-110:Cur-Wave-Low
 MBL-060RFC:RFS-SolPS-110:Cur-Wave-Med
-MBL-060RFC:RFS-SolPS-110:Cur-Wave-PM
 MBL-060RFC:RFS-SolPS-120:Cur-DevMonEval-RB
 MBL-060RFC:RFS-SolPS-120:Cur-DevMonFact-RB
 MBL-060RFC:RFS-SolPS-120:Cur-DevMonIlck-RB
@@ -1221,24 +1181,19 @@ MBL-060RFC:RFS-SolPS-120:Cur-Wave-Avg
 MBL-060RFC:RFS-SolPS-120:Cur-Wave-High
 MBL-060RFC:RFS-SolPS-120:Cur-Wave-Low
 MBL-060RFC:RFS-SolPS-120:Cur-Wave-Med
-MBL-060RFC:RFS-SolPS-120:Cur-Wave-PM
 MBL-060RFC:RFS-VacBody-110:Status-DIlckMode-RB
 MBL-060RFC:RFS-VacBody-110:Status-Ilck-RB
 MBL-060RFC:RFS-VacBody-110:Status-Input-RB
 MBL-060RFC:RFS-VacBody-110:Status-isFirstIlck
-MBL-060RFC:RFS-VacBody-110:Status-Wave-PM
 MBL-060RFC:RFS-VacCav-110:Status-DIlckMode-RB
 MBL-060RFC:RFS-VacCav-110:Status-Ilck-RB
 MBL-060RFC:RFS-VacCav-110:Status-Input-RB
 MBL-060RFC:RFS-VacCav-110:Status-isFirstIlck
-MBL-060RFC:RFS-VacCav-110:Status-Wave-PM
 MBL-060RFC:RFS-VacPS-110:I-SP-DIlckMode-RB
 MBL-060RFC:RFS-VacPS-110:I-SP-Ilck-RB
 MBL-060RFC:RFS-VacPS-110:I-SP-Input-RB
 MBL-060RFC:RFS-VacPS-110:I-SP-isFirstIlck
-MBL-060RFC:RFS-VacPS-110:I-SP-Wave-PM
 MBL-060RFC:RFS-VacPS-120:I-SP-DIlckMode-RB
 MBL-060RFC:RFS-VacPS-120:I-SP-Ilck-RB
 MBL-060RFC:RFS-VacPS-120:I-SP-Input-RB
 MBL-060RFC:RFS-VacPS-120:I-SP-isFirstIlck
-MBL-060RFC:RFS-VacPS-120:I-SP-Wave-PM
diff --git a/files/MBL-060RFC_SC-IOC-202.archive b/files/MBL-060RFC_SC-IOC-202.archive
index 4a9680b..824bf61 100644
--- a/files/MBL-060RFC_SC-IOC-202.archive
+++ b/files/MBL-060RFC_SC-IOC-202.archive
@@ -2,12 +2,10 @@ MBL-060RFC:RFS-ADG-210:IlckStatus-DIlckMode-RB
 MBL-060RFC:RFS-ADG-210:IlckStatus-Ilck-RB
 MBL-060RFC:RFS-ADG-210:IlckStatus-Input-RB
 MBL-060RFC:RFS-ADG-210:IlckStatus-isFirstIlck
-MBL-060RFC:RFS-ADG-210:IlckStatus-Wave-PM
 MBL-060RFC:RFS-ADG-210:PwrFail-DIlckMode-RB
 MBL-060RFC:RFS-ADG-210:PwrFail-Ilck-RB
 MBL-060RFC:RFS-ADG-210:PwrFail-Input-RB
 MBL-060RFC:RFS-ADG-210:PwrFail-isFirstIlck
-MBL-060RFC:RFS-ADG-210:PwrFail-Wave-PM
 MBL-060RFC:RFS-Cav-210:Fld-DevMonEval-RB
 MBL-060RFC:RFS-Cav-210:Fld-DevMonFact-RB
 MBL-060RFC:RFS-Cav-210:Fld-DevMonIlck-RB
@@ -46,7 +44,6 @@ MBL-060RFC:RFS-Cav-210:Fld-Wave-Avg
 MBL-060RFC:RFS-Cav-210:Fld-Wave-High
 MBL-060RFC:RFS-Cav-210:Fld-Wave-Low
 MBL-060RFC:RFS-Cav-210:Fld-Wave-Med
-MBL-060RFC:RFS-Cav-210:Fld-Wave-PM
 MBL-060RFC:RFS-Cav-210:PwrFwd-DevMonEval-RB
 MBL-060RFC:RFS-Cav-210:PwrFwd-DevMonFact-RB
 MBL-060RFC:RFS-Cav-210:PwrFwd-DevMonIlck-RB
@@ -85,7 +82,6 @@ MBL-060RFC:RFS-Cav-210:PwrFwd-Wave-Avg
 MBL-060RFC:RFS-Cav-210:PwrFwd-Wave-High
 MBL-060RFC:RFS-Cav-210:PwrFwd-Wave-Low
 MBL-060RFC:RFS-Cav-210:PwrFwd-Wave-Med
-MBL-060RFC:RFS-Cav-210:PwrFwd-Wave-PM
 MBL-060RFC:RFS-Cav-210:PwrRfl-DevMonEval-RB
 MBL-060RFC:RFS-Cav-210:PwrRfl-DevMonFact-RB
 MBL-060RFC:RFS-Cav-210:PwrRfl-DevMonIlck-RB
@@ -124,7 +120,6 @@ MBL-060RFC:RFS-Cav-210:PwrRfl-Wave-Avg
 MBL-060RFC:RFS-Cav-210:PwrRfl-Wave-High
 MBL-060RFC:RFS-Cav-210:PwrRfl-Wave-Low
 MBL-060RFC:RFS-Cav-210:PwrRfl-Wave-Med
-MBL-060RFC:RFS-Cav-210:PwrRfl-Wave-PM
 MBL-060RFC:RFS-EPR-210:Cur-DevMonEval-RB
 MBL-060RFC:RFS-EPR-210:Cur-DevMonFact-RB
 MBL-060RFC:RFS-EPR-210:Cur-DevMonIlck-RB
@@ -163,7 +158,6 @@ MBL-060RFC:RFS-EPR-210:Cur-Wave-Avg
 MBL-060RFC:RFS-EPR-210:Cur-Wave-High
 MBL-060RFC:RFS-EPR-210:Cur-Wave-Low
 MBL-060RFC:RFS-EPR-210:Cur-Wave-Med
-MBL-060RFC:RFS-EPR-210:Cur-Wave-PM
 MBL-060RFC:RFS-FIM-201:AI10-DevMonEval-RB
 MBL-060RFC:RFS-FIM-201:AI10-DevMonFact-RB
 MBL-060RFC:RFS-FIM-201:AI10-DevMonIlck-RB
@@ -208,7 +202,6 @@ MBL-060RFC:RFS-FIM-201:AI10-Wave-Avg
 MBL-060RFC:RFS-FIM-201:AI10-Wave-High
 MBL-060RFC:RFS-FIM-201:AI10-Wave-Low
 MBL-060RFC:RFS-FIM-201:AI10-Wave-Med
-MBL-060RFC:RFS-FIM-201:AI10-Wave-PM
 MBL-060RFC:RFS-FIM-201:AI1-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-201:AI1-HVON-En-RB
 MBL-060RFC:RFS-FIM-201:AI1-HVON-Precond
@@ -277,7 +270,6 @@ MBL-060RFC:RFS-FIM-201:AI5-Wave-Avg
 MBL-060RFC:RFS-FIM-201:AI5-Wave-High
 MBL-060RFC:RFS-FIM-201:AI5-Wave-Low
 MBL-060RFC:RFS-FIM-201:AI5-Wave-Med
-MBL-060RFC:RFS-FIM-201:AI5-Wave-PM
 MBL-060RFC:RFS-FIM-201:AI6-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-201:AI6-HVON-En-RB
 MBL-060RFC:RFS-FIM-201:AI6-HVON-Precond
@@ -328,7 +320,6 @@ MBL-060RFC:RFS-FIM-201:AI7-Wave-Avg
 MBL-060RFC:RFS-FIM-201:AI7-Wave-High
 MBL-060RFC:RFS-FIM-201:AI7-Wave-Low
 MBL-060RFC:RFS-FIM-201:AI7-Wave-Med
-MBL-060RFC:RFS-FIM-201:AI7-Wave-PM
 MBL-060RFC:RFS-FIM-201:AI8-DevMonEval-RB
 MBL-060RFC:RFS-FIM-201:AI8-DevMonFact-RB
 MBL-060RFC:RFS-FIM-201:AI8-DevMonIlck-RB
@@ -373,7 +364,6 @@ MBL-060RFC:RFS-FIM-201:AI8-Wave-Avg
 MBL-060RFC:RFS-FIM-201:AI8-Wave-High
 MBL-060RFC:RFS-FIM-201:AI8-Wave-Low
 MBL-060RFC:RFS-FIM-201:AI8-Wave-Med
-MBL-060RFC:RFS-FIM-201:AI8-Wave-PM
 MBL-060RFC:RFS-FIM-201:AI9-DevMonEval-RB
 MBL-060RFC:RFS-FIM-201:AI9-DevMonFact-RB
 MBL-060RFC:RFS-FIM-201:AI9-DevMonIlck-RB
@@ -418,7 +408,6 @@ MBL-060RFC:RFS-FIM-201:AI9-Wave-Avg
 MBL-060RFC:RFS-FIM-201:AI9-Wave-High
 MBL-060RFC:RFS-FIM-201:AI9-Wave-Low
 MBL-060RFC:RFS-FIM-201:AI9-Wave-Med
-MBL-060RFC:RFS-FIM-201:AI9-Wave-PM
 MBL-060RFC:RFS-FIM-201:CD1-DevFactor-RB
 MBL-060RFC:RFS-FIM-201:CD1-DevPeriod-RB
 MBL-060RFC:RFS-FIM-201:CD1-FastRst-IlckCnt
@@ -440,7 +429,6 @@ MBL-060RFC:RFS-FIM-201:CD1-RFON-En-RB
 MBL-060RFC:RFS-FIM-201:CD1-RFON-Precond
 MBL-060RFC:RFS-FIM-201:CD1-TrigSel-RB
 MBL-060RFC:RFS-FIM-201:CD1-TrigThre-RB
-MBL-060RFC:RFS-FIM-201:CD1-Wave-IlckPM
 MBL-060RFC:RFS-FIM-201:CD2-DevFactor-RB
 MBL-060RFC:RFS-FIM-201:CD2-DevPeriod-RB
 MBL-060RFC:RFS-FIM-201:CD2-FastRst-IlckCnt
@@ -462,7 +450,6 @@ MBL-060RFC:RFS-FIM-201:CD2-RFON-En-RB
 MBL-060RFC:RFS-FIM-201:CD2-RFON-Precond
 MBL-060RFC:RFS-FIM-201:CD2-TrigSel-RB
 MBL-060RFC:RFS-FIM-201:CD2-TrigThre-RB
-MBL-060RFC:RFS-FIM-201:CD2-Wave-IlckPM
 MBL-060RFC:RFS-FIM-201:DI10-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-201:DI10-DIlckMode-RB
 MBL-060RFC:RFS-FIM-201:DI10-FastRst-IlckCnt
@@ -474,7 +461,6 @@ MBL-060RFC:RFS-FIM-201:DI10-Input-RB
 MBL-060RFC:RFS-FIM-201:DI10-isFirstIlck
 MBL-060RFC:RFS-FIM-201:DI10-RFON-En-RB
 MBL-060RFC:RFS-FIM-201:DI10-RFON-Precond
-MBL-060RFC:RFS-FIM-201:DI10-Wave-PM
 MBL-060RFC:RFS-FIM-201:DI11-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-201:DI11-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-201:DI11-HVON-En-RB
@@ -493,7 +479,6 @@ MBL-060RFC:RFS-FIM-201:DI12-Input-RB
 MBL-060RFC:RFS-FIM-201:DI12-isFirstIlck
 MBL-060RFC:RFS-FIM-201:DI12-RFON-En-RB
 MBL-060RFC:RFS-FIM-201:DI12-RFON-Precond
-MBL-060RFC:RFS-FIM-201:DI12-Wave-PM
 MBL-060RFC:RFS-FIM-201:DI13-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-201:DI13-DIlckMode-RB
 MBL-060RFC:RFS-FIM-201:DI13-FastRst-IlckCnt
@@ -505,7 +490,6 @@ MBL-060RFC:RFS-FIM-201:DI13-Input-RB
 MBL-060RFC:RFS-FIM-201:DI13-isFirstIlck
 MBL-060RFC:RFS-FIM-201:DI13-RFON-En-RB
 MBL-060RFC:RFS-FIM-201:DI13-RFON-Precond
-MBL-060RFC:RFS-FIM-201:DI13-Wave-PM
 MBL-060RFC:RFS-FIM-201:DI14-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-201:DI14-DIlckMode-RB
 MBL-060RFC:RFS-FIM-201:DI14-FastRst-IlckCnt
@@ -517,7 +501,6 @@ MBL-060RFC:RFS-FIM-201:DI14-Input-RB
 MBL-060RFC:RFS-FIM-201:DI14-isFirstIlck
 MBL-060RFC:RFS-FIM-201:DI14-RFON-En-RB
 MBL-060RFC:RFS-FIM-201:DI14-RFON-Precond
-MBL-060RFC:RFS-FIM-201:DI14-Wave-PM
 MBL-060RFC:RFS-FIM-201:DI15-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-201:DI15-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-201:DI15-HVON-En-RB
@@ -543,7 +526,6 @@ MBL-060RFC:RFS-FIM-201:DI17-Input-RB
 MBL-060RFC:RFS-FIM-201:DI17-isFirstIlck
 MBL-060RFC:RFS-FIM-201:DI17-RFON-En-RB
 MBL-060RFC:RFS-FIM-201:DI17-RFON-Precond
-MBL-060RFC:RFS-FIM-201:DI17-Wave-PM
 MBL-060RFC:RFS-FIM-201:DI18-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-201:DI18-DIlckMode-RB
 MBL-060RFC:RFS-FIM-201:DI18-FastRst-IlckCnt
@@ -555,7 +537,6 @@ MBL-060RFC:RFS-FIM-201:DI18-Input-RB
 MBL-060RFC:RFS-FIM-201:DI18-isFirstIlck
 MBL-060RFC:RFS-FIM-201:DI18-RFON-En-RB
 MBL-060RFC:RFS-FIM-201:DI18-RFON-Precond
-MBL-060RFC:RFS-FIM-201:DI18-Wave-PM
 MBL-060RFC:RFS-FIM-201:DI19-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-201:DI19-DIlckMode-RB
 MBL-060RFC:RFS-FIM-201:DI19-FastRst-IlckCnt
@@ -567,7 +548,6 @@ MBL-060RFC:RFS-FIM-201:DI19-Input-RB
 MBL-060RFC:RFS-FIM-201:DI19-isFirstIlck
 MBL-060RFC:RFS-FIM-201:DI19-RFON-En-RB
 MBL-060RFC:RFS-FIM-201:DI19-RFON-Precond
-MBL-060RFC:RFS-FIM-201:DI19-Wave-PM
 MBL-060RFC:RFS-FIM-201:DI1-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-201:DI1-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-201:DI1-HVON-En-RB
@@ -586,7 +566,6 @@ MBL-060RFC:RFS-FIM-201:DI20-Input-RB
 MBL-060RFC:RFS-FIM-201:DI20-isFirstIlck
 MBL-060RFC:RFS-FIM-201:DI20-RFON-En-RB
 MBL-060RFC:RFS-FIM-201:DI20-RFON-Precond
-MBL-060RFC:RFS-FIM-201:DI20-Wave-PM
 MBL-060RFC:RFS-FIM-201:DI21-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-201:DI21-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-201:DI21-HVON-En-RB
@@ -640,7 +619,6 @@ MBL-060RFC:RFS-FIM-201:DI7-Input-RB
 MBL-060RFC:RFS-FIM-201:DI7-isFirstIlck
 MBL-060RFC:RFS-FIM-201:DI7-RFON-En-RB
 MBL-060RFC:RFS-FIM-201:DI7-RFON-Precond
-MBL-060RFC:RFS-FIM-201:DI7-Wave-PM
 MBL-060RFC:RFS-FIM-201:DI8-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-201:DI8-DIlckMode-RB
 MBL-060RFC:RFS-FIM-201:DI8-FastRst-IlckCnt
@@ -652,7 +630,6 @@ MBL-060RFC:RFS-FIM-201:DI8-Input-RB
 MBL-060RFC:RFS-FIM-201:DI8-isFirstIlck
 MBL-060RFC:RFS-FIM-201:DI8-RFON-En-RB
 MBL-060RFC:RFS-FIM-201:DI8-RFON-Precond
-MBL-060RFC:RFS-FIM-201:DI8-Wave-PM
 MBL-060RFC:RFS-FIM-201:DI9-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-201:DI9-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-201:DI9-HVON-En-RB
@@ -710,7 +687,6 @@ MBL-060RFC:RFS-FIM-201:RF10-Wave-Avg
 MBL-060RFC:RFS-FIM-201:RF10-Wave-High
 MBL-060RFC:RFS-FIM-201:RF10-Wave-Low
 MBL-060RFC:RFS-FIM-201:RF10-Wave-Med
-MBL-060RFC:RFS-FIM-201:RF10-Wave-PM
 MBL-060RFC:RFS-FIM-201:RF1-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-201:RF1-HVON-En-RB
 MBL-060RFC:RFS-FIM-201:RF1-HVON-Precond
@@ -803,7 +779,6 @@ MBL-060RFC:RFS-FIM-201:RF9-Wave-Avg
 MBL-060RFC:RFS-FIM-201:RF9-Wave-High
 MBL-060RFC:RFS-FIM-201:RF9-Wave-Low
 MBL-060RFC:RFS-FIM-201:RF9-Wave-Med
-MBL-060RFC:RFS-FIM-201:RF9-Wave-PM
 MBL-060RFC:RFS-FIM-201:RFON-Precond
 MBL-060RFC:RFS-FIM-201:RP1-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-201:RP1-HVON-En-RB
@@ -824,7 +799,6 @@ MBL-060RFC:RFS-FIM-201:RP1-RFON-En-RB
 MBL-060RFC:RFS-FIM-201:RP1-RFON-Precond
 MBL-060RFC:RFS-FIM-201:RP1-TrigSel-RB
 MBL-060RFC:RFS-FIM-201:RP1-TrigThre-RB
-MBL-060RFC:RFS-FIM-201:RP1-Wave-IlckPM
 MBL-060RFC:RFS-FIM-201:RP2-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-201:RP2-HVON-En-RB
 MBL-060RFC:RFS-FIM-201:RP2-HVON-Precond
@@ -844,7 +818,6 @@ MBL-060RFC:RFS-FIM-201:RP2-RFON-En-RB
 MBL-060RFC:RFS-FIM-201:RP2-RFON-Precond
 MBL-060RFC:RFS-FIM-201:RP2-TrigSel-RB
 MBL-060RFC:RFS-FIM-201:RP2-TrigThre-RB
-MBL-060RFC:RFS-FIM-201:RP2-Wave-IlckPM
 MBL-060RFC:RFS-FIM-201:TriggerLine-RB
 MBL-060RFC:RFS-Kly-210:PwrFwd-DevMonEval-RB
 MBL-060RFC:RFS-Kly-210:PwrFwd-DevMonFact-RB
@@ -884,7 +857,6 @@ MBL-060RFC:RFS-Kly-210:PwrFwd-Wave-Avg
 MBL-060RFC:RFS-Kly-210:PwrFwd-Wave-High
 MBL-060RFC:RFS-Kly-210:PwrFwd-Wave-Low
 MBL-060RFC:RFS-Kly-210:PwrFwd-Wave-Med
-MBL-060RFC:RFS-Kly-210:PwrFwd-Wave-PM
 MBL-060RFC:RFS-Kly-210:PwrRfl-DevMonEval-RB
 MBL-060RFC:RFS-Kly-210:PwrRfl-DevMonFact-RB
 MBL-060RFC:RFS-Kly-210:PwrRfl-DevMonIlck-RB
@@ -923,12 +895,10 @@ MBL-060RFC:RFS-Kly-210:PwrRfl-Wave-Avg
 MBL-060RFC:RFS-Kly-210:PwrRfl-Wave-High
 MBL-060RFC:RFS-Kly-210:PwrRfl-Wave-Low
 MBL-060RFC:RFS-Kly-210:PwrRfl-Wave-Med
-MBL-060RFC:RFS-Kly-210:PwrRfl-Wave-PM
 MBL-060RFC:RFS-LLRF-201:Status-DIlckMode-RB
 MBL-060RFC:RFS-LLRF-201:Status-Ilck-RB
 MBL-060RFC:RFS-LLRF-201:Status-Input-RB
 MBL-060RFC:RFS-LLRF-201:Status-isFirstIlck
-MBL-060RFC:RFS-LLRF-201:Status-Wave-PM
 MBL-060RFC:RFS-Load-220:PwrFwd-DevMonEval-RB
 MBL-060RFC:RFS-Load-220:PwrFwd-DevMonFact-RB
 MBL-060RFC:RFS-Load-220:PwrFwd-DevMonIlck-RB
@@ -967,7 +937,6 @@ MBL-060RFC:RFS-Load-220:PwrFwd-Wave-Avg
 MBL-060RFC:RFS-Load-220:PwrFwd-Wave-High
 MBL-060RFC:RFS-Load-220:PwrFwd-Wave-Low
 MBL-060RFC:RFS-Load-220:PwrFwd-Wave-Med
-MBL-060RFC:RFS-Load-220:PwrFwd-Wave-PM
 MBL-060RFC:RFS-Load-220:PwrRfl-DevMonEval-RB
 MBL-060RFC:RFS-Load-220:PwrRfl-DevMonFact-RB
 MBL-060RFC:RFS-Load-220:PwrRfl-DevMonIlck-RB
@@ -1006,7 +975,6 @@ MBL-060RFC:RFS-Load-220:PwrRfl-Wave-Avg
 MBL-060RFC:RFS-Load-220:PwrRfl-Wave-High
 MBL-060RFC:RFS-Load-220:PwrRfl-Wave-Low
 MBL-060RFC:RFS-Load-220:PwrRfl-Wave-Med
-MBL-060RFC:RFS-Load-220:PwrRfl-Wave-PM
 MBL-060RFC:RFS-Mod-210:Cur-DevMonEval-RB
 MBL-060RFC:RFS-Mod-210:Cur-DevMonFact-RB
 MBL-060RFC:RFS-Mod-210:Cur-DevMonIlck-RB
@@ -1045,17 +1013,14 @@ MBL-060RFC:RFS-Mod-210:Cur-Wave-Avg
 MBL-060RFC:RFS-Mod-210:Cur-Wave-High
 MBL-060RFC:RFS-Mod-210:Cur-Wave-Low
 MBL-060RFC:RFS-Mod-210:Cur-Wave-Med
-MBL-060RFC:RFS-Mod-210:Cur-Wave-PM
 MBL-060RFC:RFS-Mod-210:PCcon-DIlckMode-RB
 MBL-060RFC:RFS-Mod-210:PCcon-Ilck-RB
 MBL-060RFC:RFS-Mod-210:PCcon-Input-RB
 MBL-060RFC:RFS-Mod-210:PCcon-isFirstIlck
-MBL-060RFC:RFS-Mod-210:PCcon-Wave-PM
 MBL-060RFC:RFS-Mod-210:Ready-DIlckMode-RB
 MBL-060RFC:RFS-Mod-210:Ready-Ilck-RB
 MBL-060RFC:RFS-Mod-210:Ready-Input-RB
 MBL-060RFC:RFS-Mod-210:Ready-isFirstIlck
-MBL-060RFC:RFS-Mod-210:Ready-Wave-PM
 MBL-060RFC:RFS-Mod-210:Vol-DevMonEval-RB
 MBL-060RFC:RFS-Mod-210:Vol-DevMonFact-RB
 MBL-060RFC:RFS-Mod-210:Vol-DevMonIlck-RB
@@ -1094,7 +1059,6 @@ MBL-060RFC:RFS-Mod-210:Vol-Wave-Avg
 MBL-060RFC:RFS-Mod-210:Vol-Wave-High
 MBL-060RFC:RFS-Mod-210:Vol-Wave-Low
 MBL-060RFC:RFS-Mod-210:Vol-Wave-Med
-MBL-060RFC:RFS-Mod-210:Vol-Wave-PM
 MBL-060RFC:RFS-PAmp-210:PwrFwd-DevMonEval-RB
 MBL-060RFC:RFS-PAmp-210:PwrFwd-DevMonFact-RB
 MBL-060RFC:RFS-PAmp-210:PwrFwd-DevMonIlck-RB
@@ -1133,17 +1097,14 @@ MBL-060RFC:RFS-PAmp-210:PwrFwd-Wave-Avg
 MBL-060RFC:RFS-PAmp-210:PwrFwd-Wave-High
 MBL-060RFC:RFS-PAmp-210:PwrFwd-Wave-Low
 MBL-060RFC:RFS-PAmp-210:PwrFwd-Wave-Med
-MBL-060RFC:RFS-PAmp-210:PwrFwd-Wave-PM
 MBL-060RFC:RFS-SIM-210:HvEna-DIlckMode-RB
 MBL-060RFC:RFS-SIM-210:HvEna-Ilck-RB
 MBL-060RFC:RFS-SIM-210:HvEna-Input-RB
 MBL-060RFC:RFS-SIM-210:HvEna-isFirstIlck
-MBL-060RFC:RFS-SIM-210:HvEna-Wave-PM
 MBL-060RFC:RFS-SIM-210:RfEna-DIlckMode-RB
 MBL-060RFC:RFS-SIM-210:RfEna-Ilck-RB
 MBL-060RFC:RFS-SIM-210:RfEna-Input-RB
 MBL-060RFC:RFS-SIM-210:RfEna-isFirstIlck
-MBL-060RFC:RFS-SIM-210:RfEna-Wave-PM
 MBL-060RFC:RFS-SolPS-210:Cur-DevMonEval-RB
 MBL-060RFC:RFS-SolPS-210:Cur-DevMonFact-RB
 MBL-060RFC:RFS-SolPS-210:Cur-DevMonIlck-RB
@@ -1182,7 +1143,6 @@ MBL-060RFC:RFS-SolPS-210:Cur-Wave-Avg
 MBL-060RFC:RFS-SolPS-210:Cur-Wave-High
 MBL-060RFC:RFS-SolPS-210:Cur-Wave-Low
 MBL-060RFC:RFS-SolPS-210:Cur-Wave-Med
-MBL-060RFC:RFS-SolPS-210:Cur-Wave-PM
 MBL-060RFC:RFS-SolPS-220:Cur-DevMonEval-RB
 MBL-060RFC:RFS-SolPS-220:Cur-DevMonFact-RB
 MBL-060RFC:RFS-SolPS-220:Cur-DevMonIlck-RB
@@ -1221,24 +1181,19 @@ MBL-060RFC:RFS-SolPS-220:Cur-Wave-Avg
 MBL-060RFC:RFS-SolPS-220:Cur-Wave-High
 MBL-060RFC:RFS-SolPS-220:Cur-Wave-Low
 MBL-060RFC:RFS-SolPS-220:Cur-Wave-Med
-MBL-060RFC:RFS-SolPS-220:Cur-Wave-PM
 MBL-060RFC:RFS-VacBody-210:Status-DIlckMode-RB
 MBL-060RFC:RFS-VacBody-210:Status-Ilck-RB
 MBL-060RFC:RFS-VacBody-210:Status-Input-RB
 MBL-060RFC:RFS-VacBody-210:Status-isFirstIlck
-MBL-060RFC:RFS-VacBody-210:Status-Wave-PM
 MBL-060RFC:RFS-VacCav-210:Status-DIlckMode-RB
 MBL-060RFC:RFS-VacCav-210:Status-Ilck-RB
 MBL-060RFC:RFS-VacCav-210:Status-Input-RB
 MBL-060RFC:RFS-VacCav-210:Status-isFirstIlck
-MBL-060RFC:RFS-VacCav-210:Status-Wave-PM
 MBL-060RFC:RFS-VacPS-210:I-SP-DIlckMode-RB
 MBL-060RFC:RFS-VacPS-210:I-SP-Ilck-RB
 MBL-060RFC:RFS-VacPS-210:I-SP-Input-RB
 MBL-060RFC:RFS-VacPS-210:I-SP-isFirstIlck
-MBL-060RFC:RFS-VacPS-210:I-SP-Wave-PM
 MBL-060RFC:RFS-VacPS-220:I-SP-DIlckMode-RB
 MBL-060RFC:RFS-VacPS-220:I-SP-Ilck-RB
 MBL-060RFC:RFS-VacPS-220:I-SP-Input-RB
 MBL-060RFC:RFS-VacPS-220:I-SP-isFirstIlck
-MBL-060RFC:RFS-VacPS-220:I-SP-Wave-PM
diff --git a/files/MBL-060RFC_SC-IOC-302.archive b/files/MBL-060RFC_SC-IOC-302.archive
index 79fbbf9..873b1e1 100644
--- a/files/MBL-060RFC_SC-IOC-302.archive
+++ b/files/MBL-060RFC_SC-IOC-302.archive
@@ -2,12 +2,10 @@ MBL-060RFC:RFS-ADG-310:IlckStatus-DIlckMode-RB
 MBL-060RFC:RFS-ADG-310:IlckStatus-Ilck-RB
 MBL-060RFC:RFS-ADG-310:IlckStatus-Input-RB
 MBL-060RFC:RFS-ADG-310:IlckStatus-isFirstIlck
-MBL-060RFC:RFS-ADG-310:IlckStatus-Wave-PM
 MBL-060RFC:RFS-ADG-310:PwrFail-DIlckMode-RB
 MBL-060RFC:RFS-ADG-310:PwrFail-Ilck-RB
 MBL-060RFC:RFS-ADG-310:PwrFail-Input-RB
 MBL-060RFC:RFS-ADG-310:PwrFail-isFirstIlck
-MBL-060RFC:RFS-ADG-310:PwrFail-Wave-PM
 MBL-060RFC:RFS-Cav-310:Fld-DevMonEval-RB
 MBL-060RFC:RFS-Cav-310:Fld-DevMonFact-RB
 MBL-060RFC:RFS-Cav-310:Fld-DevMonIlck-RB
@@ -46,7 +44,6 @@ MBL-060RFC:RFS-Cav-310:Fld-Wave-Avg
 MBL-060RFC:RFS-Cav-310:Fld-Wave-High
 MBL-060RFC:RFS-Cav-310:Fld-Wave-Low
 MBL-060RFC:RFS-Cav-310:Fld-Wave-Med
-MBL-060RFC:RFS-Cav-310:Fld-Wave-PM
 MBL-060RFC:RFS-Cav-310:PwrFwd-DevMonEval-RB
 MBL-060RFC:RFS-Cav-310:PwrFwd-DevMonFact-RB
 MBL-060RFC:RFS-Cav-310:PwrFwd-DevMonIlck-RB
@@ -85,7 +82,6 @@ MBL-060RFC:RFS-Cav-310:PwrFwd-Wave-Avg
 MBL-060RFC:RFS-Cav-310:PwrFwd-Wave-High
 MBL-060RFC:RFS-Cav-310:PwrFwd-Wave-Low
 MBL-060RFC:RFS-Cav-310:PwrFwd-Wave-Med
-MBL-060RFC:RFS-Cav-310:PwrFwd-Wave-PM
 MBL-060RFC:RFS-Cav-310:PwrRfl-DevMonEval-RB
 MBL-060RFC:RFS-Cav-310:PwrRfl-DevMonFact-RB
 MBL-060RFC:RFS-Cav-310:PwrRfl-DevMonIlck-RB
@@ -124,7 +120,6 @@ MBL-060RFC:RFS-Cav-310:PwrRfl-Wave-Avg
 MBL-060RFC:RFS-Cav-310:PwrRfl-Wave-High
 MBL-060RFC:RFS-Cav-310:PwrRfl-Wave-Low
 MBL-060RFC:RFS-Cav-310:PwrRfl-Wave-Med
-MBL-060RFC:RFS-Cav-310:PwrRfl-Wave-PM
 MBL-060RFC:RFS-EPR-310:Cur-DevMonEval-RB
 MBL-060RFC:RFS-EPR-310:Cur-DevMonFact-RB
 MBL-060RFC:RFS-EPR-310:Cur-DevMonIlck-RB
@@ -163,7 +158,6 @@ MBL-060RFC:RFS-EPR-310:Cur-Wave-Avg
 MBL-060RFC:RFS-EPR-310:Cur-Wave-High
 MBL-060RFC:RFS-EPR-310:Cur-Wave-Low
 MBL-060RFC:RFS-EPR-310:Cur-Wave-Med
-MBL-060RFC:RFS-EPR-310:Cur-Wave-PM
 MBL-060RFC:RFS-FIM-301:AI10-DevMonEval-RB
 MBL-060RFC:RFS-FIM-301:AI10-DevMonFact-RB
 MBL-060RFC:RFS-FIM-301:AI10-DevMonIlck-RB
@@ -208,7 +202,6 @@ MBL-060RFC:RFS-FIM-301:AI10-Wave-Avg
 MBL-060RFC:RFS-FIM-301:AI10-Wave-High
 MBL-060RFC:RFS-FIM-301:AI10-Wave-Low
 MBL-060RFC:RFS-FIM-301:AI10-Wave-Med
-MBL-060RFC:RFS-FIM-301:AI10-Wave-PM
 MBL-060RFC:RFS-FIM-301:AI1-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-301:AI1-HVON-En-RB
 MBL-060RFC:RFS-FIM-301:AI1-HVON-Precond
@@ -277,7 +270,6 @@ MBL-060RFC:RFS-FIM-301:AI5-Wave-Avg
 MBL-060RFC:RFS-FIM-301:AI5-Wave-High
 MBL-060RFC:RFS-FIM-301:AI5-Wave-Low
 MBL-060RFC:RFS-FIM-301:AI5-Wave-Med
-MBL-060RFC:RFS-FIM-301:AI5-Wave-PM
 MBL-060RFC:RFS-FIM-301:AI6-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-301:AI6-HVON-En-RB
 MBL-060RFC:RFS-FIM-301:AI6-HVON-Precond
@@ -328,7 +320,6 @@ MBL-060RFC:RFS-FIM-301:AI7-Wave-Avg
 MBL-060RFC:RFS-FIM-301:AI7-Wave-High
 MBL-060RFC:RFS-FIM-301:AI7-Wave-Low
 MBL-060RFC:RFS-FIM-301:AI7-Wave-Med
-MBL-060RFC:RFS-FIM-301:AI7-Wave-PM
 MBL-060RFC:RFS-FIM-301:AI8-DevMonEval-RB
 MBL-060RFC:RFS-FIM-301:AI8-DevMonFact-RB
 MBL-060RFC:RFS-FIM-301:AI8-DevMonIlck-RB
@@ -373,7 +364,6 @@ MBL-060RFC:RFS-FIM-301:AI8-Wave-Avg
 MBL-060RFC:RFS-FIM-301:AI8-Wave-High
 MBL-060RFC:RFS-FIM-301:AI8-Wave-Low
 MBL-060RFC:RFS-FIM-301:AI8-Wave-Med
-MBL-060RFC:RFS-FIM-301:AI8-Wave-PM
 MBL-060RFC:RFS-FIM-301:AI9-DevMonEval-RB
 MBL-060RFC:RFS-FIM-301:AI9-DevMonFact-RB
 MBL-060RFC:RFS-FIM-301:AI9-DevMonIlck-RB
@@ -418,7 +408,6 @@ MBL-060RFC:RFS-FIM-301:AI9-Wave-Avg
 MBL-060RFC:RFS-FIM-301:AI9-Wave-High
 MBL-060RFC:RFS-FIM-301:AI9-Wave-Low
 MBL-060RFC:RFS-FIM-301:AI9-Wave-Med
-MBL-060RFC:RFS-FIM-301:AI9-Wave-PM
 MBL-060RFC:RFS-FIM-301:CD1-DevFactor-RB
 MBL-060RFC:RFS-FIM-301:CD1-DevPeriod-RB
 MBL-060RFC:RFS-FIM-301:CD1-FastRst-IlckCnt
@@ -440,7 +429,6 @@ MBL-060RFC:RFS-FIM-301:CD1-RFON-En-RB
 MBL-060RFC:RFS-FIM-301:CD1-RFON-Precond
 MBL-060RFC:RFS-FIM-301:CD1-TrigSel-RB
 MBL-060RFC:RFS-FIM-301:CD1-TrigThre-RB
-MBL-060RFC:RFS-FIM-301:CD1-Wave-IlckPM
 MBL-060RFC:RFS-FIM-301:CD2-DevFactor-RB
 MBL-060RFC:RFS-FIM-301:CD2-DevPeriod-RB
 MBL-060RFC:RFS-FIM-301:CD2-FastRst-IlckCnt
@@ -462,7 +450,6 @@ MBL-060RFC:RFS-FIM-301:CD2-RFON-En-RB
 MBL-060RFC:RFS-FIM-301:CD2-RFON-Precond
 MBL-060RFC:RFS-FIM-301:CD2-TrigSel-RB
 MBL-060RFC:RFS-FIM-301:CD2-TrigThre-RB
-MBL-060RFC:RFS-FIM-301:CD2-Wave-IlckPM
 MBL-060RFC:RFS-FIM-301:DI10-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-301:DI10-DIlckMode-RB
 MBL-060RFC:RFS-FIM-301:DI10-FastRst-IlckCnt
@@ -474,7 +461,6 @@ MBL-060RFC:RFS-FIM-301:DI10-Input-RB
 MBL-060RFC:RFS-FIM-301:DI10-isFirstIlck
 MBL-060RFC:RFS-FIM-301:DI10-RFON-En-RB
 MBL-060RFC:RFS-FIM-301:DI10-RFON-Precond
-MBL-060RFC:RFS-FIM-301:DI10-Wave-PM
 MBL-060RFC:RFS-FIM-301:DI11-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-301:DI11-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-301:DI11-HVON-En-RB
@@ -493,7 +479,6 @@ MBL-060RFC:RFS-FIM-301:DI12-Input-RB
 MBL-060RFC:RFS-FIM-301:DI12-isFirstIlck
 MBL-060RFC:RFS-FIM-301:DI12-RFON-En-RB
 MBL-060RFC:RFS-FIM-301:DI12-RFON-Precond
-MBL-060RFC:RFS-FIM-301:DI12-Wave-PM
 MBL-060RFC:RFS-FIM-301:DI13-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-301:DI13-DIlckMode-RB
 MBL-060RFC:RFS-FIM-301:DI13-FastRst-IlckCnt
@@ -505,7 +490,6 @@ MBL-060RFC:RFS-FIM-301:DI13-Input-RB
 MBL-060RFC:RFS-FIM-301:DI13-isFirstIlck
 MBL-060RFC:RFS-FIM-301:DI13-RFON-En-RB
 MBL-060RFC:RFS-FIM-301:DI13-RFON-Precond
-MBL-060RFC:RFS-FIM-301:DI13-Wave-PM
 MBL-060RFC:RFS-FIM-301:DI14-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-301:DI14-DIlckMode-RB
 MBL-060RFC:RFS-FIM-301:DI14-FastRst-IlckCnt
@@ -517,7 +501,6 @@ MBL-060RFC:RFS-FIM-301:DI14-Input-RB
 MBL-060RFC:RFS-FIM-301:DI14-isFirstIlck
 MBL-060RFC:RFS-FIM-301:DI14-RFON-En-RB
 MBL-060RFC:RFS-FIM-301:DI14-RFON-Precond
-MBL-060RFC:RFS-FIM-301:DI14-Wave-PM
 MBL-060RFC:RFS-FIM-301:DI15-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-301:DI15-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-301:DI15-HVON-En-RB
@@ -543,7 +526,6 @@ MBL-060RFC:RFS-FIM-301:DI17-Input-RB
 MBL-060RFC:RFS-FIM-301:DI17-isFirstIlck
 MBL-060RFC:RFS-FIM-301:DI17-RFON-En-RB
 MBL-060RFC:RFS-FIM-301:DI17-RFON-Precond
-MBL-060RFC:RFS-FIM-301:DI17-Wave-PM
 MBL-060RFC:RFS-FIM-301:DI18-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-301:DI18-DIlckMode-RB
 MBL-060RFC:RFS-FIM-301:DI18-FastRst-IlckCnt
@@ -555,7 +537,6 @@ MBL-060RFC:RFS-FIM-301:DI18-Input-RB
 MBL-060RFC:RFS-FIM-301:DI18-isFirstIlck
 MBL-060RFC:RFS-FIM-301:DI18-RFON-En-RB
 MBL-060RFC:RFS-FIM-301:DI18-RFON-Precond
-MBL-060RFC:RFS-FIM-301:DI18-Wave-PM
 MBL-060RFC:RFS-FIM-301:DI19-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-301:DI19-DIlckMode-RB
 MBL-060RFC:RFS-FIM-301:DI19-FastRst-IlckCnt
@@ -567,7 +548,6 @@ MBL-060RFC:RFS-FIM-301:DI19-Input-RB
 MBL-060RFC:RFS-FIM-301:DI19-isFirstIlck
 MBL-060RFC:RFS-FIM-301:DI19-RFON-En-RB
 MBL-060RFC:RFS-FIM-301:DI19-RFON-Precond
-MBL-060RFC:RFS-FIM-301:DI19-Wave-PM
 MBL-060RFC:RFS-FIM-301:DI1-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-301:DI1-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-301:DI1-HVON-En-RB
@@ -586,7 +566,6 @@ MBL-060RFC:RFS-FIM-301:DI20-Input-RB
 MBL-060RFC:RFS-FIM-301:DI20-isFirstIlck
 MBL-060RFC:RFS-FIM-301:DI20-RFON-En-RB
 MBL-060RFC:RFS-FIM-301:DI20-RFON-Precond
-MBL-060RFC:RFS-FIM-301:DI20-Wave-PM
 MBL-060RFC:RFS-FIM-301:DI21-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-301:DI21-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-301:DI21-HVON-En-RB
@@ -640,7 +619,6 @@ MBL-060RFC:RFS-FIM-301:DI7-Input-RB
 MBL-060RFC:RFS-FIM-301:DI7-isFirstIlck
 MBL-060RFC:RFS-FIM-301:DI7-RFON-En-RB
 MBL-060RFC:RFS-FIM-301:DI7-RFON-Precond
-MBL-060RFC:RFS-FIM-301:DI7-Wave-PM
 MBL-060RFC:RFS-FIM-301:DI8-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-301:DI8-DIlckMode-RB
 MBL-060RFC:RFS-FIM-301:DI8-FastRst-IlckCnt
@@ -652,7 +630,6 @@ MBL-060RFC:RFS-FIM-301:DI8-Input-RB
 MBL-060RFC:RFS-FIM-301:DI8-isFirstIlck
 MBL-060RFC:RFS-FIM-301:DI8-RFON-En-RB
 MBL-060RFC:RFS-FIM-301:DI8-RFON-Precond
-MBL-060RFC:RFS-FIM-301:DI8-Wave-PM
 MBL-060RFC:RFS-FIM-301:DI9-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-301:DI9-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-301:DI9-HVON-En-RB
@@ -710,7 +687,6 @@ MBL-060RFC:RFS-FIM-301:RF10-Wave-Avg
 MBL-060RFC:RFS-FIM-301:RF10-Wave-High
 MBL-060RFC:RFS-FIM-301:RF10-Wave-Low
 MBL-060RFC:RFS-FIM-301:RF10-Wave-Med
-MBL-060RFC:RFS-FIM-301:RF10-Wave-PM
 MBL-060RFC:RFS-FIM-301:RF1-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-301:RF1-HVON-En-RB
 MBL-060RFC:RFS-FIM-301:RF1-HVON-Precond
@@ -803,7 +779,6 @@ MBL-060RFC:RFS-FIM-301:RF9-Wave-Avg
 MBL-060RFC:RFS-FIM-301:RF9-Wave-High
 MBL-060RFC:RFS-FIM-301:RF9-Wave-Low
 MBL-060RFC:RFS-FIM-301:RF9-Wave-Med
-MBL-060RFC:RFS-FIM-301:RF9-Wave-PM
 MBL-060RFC:RFS-FIM-301:RFON-Precond
 MBL-060RFC:RFS-FIM-301:RP1-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-301:RP1-HVON-En-RB
@@ -824,7 +799,6 @@ MBL-060RFC:RFS-FIM-301:RP1-RFON-En-RB
 MBL-060RFC:RFS-FIM-301:RP1-RFON-Precond
 MBL-060RFC:RFS-FIM-301:RP1-TrigSel-RB
 MBL-060RFC:RFS-FIM-301:RP1-TrigThre-RB
-MBL-060RFC:RFS-FIM-301:RP1-Wave-IlckPM
 MBL-060RFC:RFS-FIM-301:RP2-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-301:RP2-HVON-En-RB
 MBL-060RFC:RFS-FIM-301:RP2-HVON-Precond
@@ -844,7 +818,6 @@ MBL-060RFC:RFS-FIM-301:RP2-RFON-En-RB
 MBL-060RFC:RFS-FIM-301:RP2-RFON-Precond
 MBL-060RFC:RFS-FIM-301:RP2-TrigSel-RB
 MBL-060RFC:RFS-FIM-301:RP2-TrigThre-RB
-MBL-060RFC:RFS-FIM-301:RP2-Wave-IlckPM
 MBL-060RFC:RFS-FIM-301:TriggerLine-RB
 MBL-060RFC:RFS-Kly-310:PwrFwd-DevMonEval-RB
 MBL-060RFC:RFS-Kly-310:PwrFwd-DevMonFact-RB
@@ -884,7 +857,6 @@ MBL-060RFC:RFS-Kly-310:PwrFwd-Wave-Avg
 MBL-060RFC:RFS-Kly-310:PwrFwd-Wave-High
 MBL-060RFC:RFS-Kly-310:PwrFwd-Wave-Low
 MBL-060RFC:RFS-Kly-310:PwrFwd-Wave-Med
-MBL-060RFC:RFS-Kly-310:PwrFwd-Wave-PM
 MBL-060RFC:RFS-Kly-310:PwrRfl-DevMonEval-RB
 MBL-060RFC:RFS-Kly-310:PwrRfl-DevMonFact-RB
 MBL-060RFC:RFS-Kly-310:PwrRfl-DevMonIlck-RB
@@ -923,12 +895,10 @@ MBL-060RFC:RFS-Kly-310:PwrRfl-Wave-Avg
 MBL-060RFC:RFS-Kly-310:PwrRfl-Wave-High
 MBL-060RFC:RFS-Kly-310:PwrRfl-Wave-Low
 MBL-060RFC:RFS-Kly-310:PwrRfl-Wave-Med
-MBL-060RFC:RFS-Kly-310:PwrRfl-Wave-PM
 MBL-060RFC:RFS-LLRF-301:Status-DIlckMode-RB
 MBL-060RFC:RFS-LLRF-301:Status-Ilck-RB
 MBL-060RFC:RFS-LLRF-301:Status-Input-RB
 MBL-060RFC:RFS-LLRF-301:Status-isFirstIlck
-MBL-060RFC:RFS-LLRF-301:Status-Wave-PM
 MBL-060RFC:RFS-Load-320:PwrFwd-DevMonEval-RB
 MBL-060RFC:RFS-Load-320:PwrFwd-DevMonFact-RB
 MBL-060RFC:RFS-Load-320:PwrFwd-DevMonIlck-RB
@@ -967,7 +937,6 @@ MBL-060RFC:RFS-Load-320:PwrFwd-Wave-Avg
 MBL-060RFC:RFS-Load-320:PwrFwd-Wave-High
 MBL-060RFC:RFS-Load-320:PwrFwd-Wave-Low
 MBL-060RFC:RFS-Load-320:PwrFwd-Wave-Med
-MBL-060RFC:RFS-Load-320:PwrFwd-Wave-PM
 MBL-060RFC:RFS-Load-320:PwrRfl-DevMonEval-RB
 MBL-060RFC:RFS-Load-320:PwrRfl-DevMonFact-RB
 MBL-060RFC:RFS-Load-320:PwrRfl-DevMonIlck-RB
@@ -1006,7 +975,6 @@ MBL-060RFC:RFS-Load-320:PwrRfl-Wave-Avg
 MBL-060RFC:RFS-Load-320:PwrRfl-Wave-High
 MBL-060RFC:RFS-Load-320:PwrRfl-Wave-Low
 MBL-060RFC:RFS-Load-320:PwrRfl-Wave-Med
-MBL-060RFC:RFS-Load-320:PwrRfl-Wave-PM
 MBL-060RFC:RFS-Mod-310:Cur-DevMonEval-RB
 MBL-060RFC:RFS-Mod-310:Cur-DevMonFact-RB
 MBL-060RFC:RFS-Mod-310:Cur-DevMonIlck-RB
@@ -1045,17 +1013,14 @@ MBL-060RFC:RFS-Mod-310:Cur-Wave-Avg
 MBL-060RFC:RFS-Mod-310:Cur-Wave-High
 MBL-060RFC:RFS-Mod-310:Cur-Wave-Low
 MBL-060RFC:RFS-Mod-310:Cur-Wave-Med
-MBL-060RFC:RFS-Mod-310:Cur-Wave-PM
 MBL-060RFC:RFS-Mod-310:PCcon-DIlckMode-RB
 MBL-060RFC:RFS-Mod-310:PCcon-Ilck-RB
 MBL-060RFC:RFS-Mod-310:PCcon-Input-RB
 MBL-060RFC:RFS-Mod-310:PCcon-isFirstIlck
-MBL-060RFC:RFS-Mod-310:PCcon-Wave-PM
 MBL-060RFC:RFS-Mod-310:Ready-DIlckMode-RB
 MBL-060RFC:RFS-Mod-310:Ready-Ilck-RB
 MBL-060RFC:RFS-Mod-310:Ready-Input-RB
 MBL-060RFC:RFS-Mod-310:Ready-isFirstIlck
-MBL-060RFC:RFS-Mod-310:Ready-Wave-PM
 MBL-060RFC:RFS-Mod-310:Vol-DevMonEval-RB
 MBL-060RFC:RFS-Mod-310:Vol-DevMonFact-RB
 MBL-060RFC:RFS-Mod-310:Vol-DevMonIlck-RB
@@ -1094,7 +1059,6 @@ MBL-060RFC:RFS-Mod-310:Vol-Wave-Avg
 MBL-060RFC:RFS-Mod-310:Vol-Wave-High
 MBL-060RFC:RFS-Mod-310:Vol-Wave-Low
 MBL-060RFC:RFS-Mod-310:Vol-Wave-Med
-MBL-060RFC:RFS-Mod-310:Vol-Wave-PM
 MBL-060RFC:RFS-PAmp-310:PwrFwd-DevMonEval-RB
 MBL-060RFC:RFS-PAmp-310:PwrFwd-DevMonFact-RB
 MBL-060RFC:RFS-PAmp-310:PwrFwd-DevMonIlck-RB
@@ -1133,17 +1097,14 @@ MBL-060RFC:RFS-PAmp-310:PwrFwd-Wave-Avg
 MBL-060RFC:RFS-PAmp-310:PwrFwd-Wave-High
 MBL-060RFC:RFS-PAmp-310:PwrFwd-Wave-Low
 MBL-060RFC:RFS-PAmp-310:PwrFwd-Wave-Med
-MBL-060RFC:RFS-PAmp-310:PwrFwd-Wave-PM
 MBL-060RFC:RFS-SIM-310:HvEna-DIlckMode-RB
 MBL-060RFC:RFS-SIM-310:HvEna-Ilck-RB
 MBL-060RFC:RFS-SIM-310:HvEna-Input-RB
 MBL-060RFC:RFS-SIM-310:HvEna-isFirstIlck
-MBL-060RFC:RFS-SIM-310:HvEna-Wave-PM
 MBL-060RFC:RFS-SIM-310:RfEna-DIlckMode-RB
 MBL-060RFC:RFS-SIM-310:RfEna-Ilck-RB
 MBL-060RFC:RFS-SIM-310:RfEna-Input-RB
 MBL-060RFC:RFS-SIM-310:RfEna-isFirstIlck
-MBL-060RFC:RFS-SIM-310:RfEna-Wave-PM
 MBL-060RFC:RFS-SolPS-310:Cur-DevMonEval-RB
 MBL-060RFC:RFS-SolPS-310:Cur-DevMonFact-RB
 MBL-060RFC:RFS-SolPS-310:Cur-DevMonIlck-RB
@@ -1182,7 +1143,6 @@ MBL-060RFC:RFS-SolPS-310:Cur-Wave-Avg
 MBL-060RFC:RFS-SolPS-310:Cur-Wave-High
 MBL-060RFC:RFS-SolPS-310:Cur-Wave-Low
 MBL-060RFC:RFS-SolPS-310:Cur-Wave-Med
-MBL-060RFC:RFS-SolPS-310:Cur-Wave-PM
 MBL-060RFC:RFS-SolPS-320:Cur-DevMonEval-RB
 MBL-060RFC:RFS-SolPS-320:Cur-DevMonFact-RB
 MBL-060RFC:RFS-SolPS-320:Cur-DevMonIlck-RB
@@ -1221,24 +1181,19 @@ MBL-060RFC:RFS-SolPS-320:Cur-Wave-Avg
 MBL-060RFC:RFS-SolPS-320:Cur-Wave-High
 MBL-060RFC:RFS-SolPS-320:Cur-Wave-Low
 MBL-060RFC:RFS-SolPS-320:Cur-Wave-Med
-MBL-060RFC:RFS-SolPS-320:Cur-Wave-PM
 MBL-060RFC:RFS-VacBody-310:Status-DIlckMode-RB
 MBL-060RFC:RFS-VacBody-310:Status-Ilck-RB
 MBL-060RFC:RFS-VacBody-310:Status-Input-RB
 MBL-060RFC:RFS-VacBody-310:Status-isFirstIlck
-MBL-060RFC:RFS-VacBody-310:Status-Wave-PM
 MBL-060RFC:RFS-VacCav-310:Status-DIlckMode-RB
 MBL-060RFC:RFS-VacCav-310:Status-Ilck-RB
 MBL-060RFC:RFS-VacCav-310:Status-Input-RB
 MBL-060RFC:RFS-VacCav-310:Status-isFirstIlck
-MBL-060RFC:RFS-VacCav-310:Status-Wave-PM
 MBL-060RFC:RFS-VacPS-310:I-SP-DIlckMode-RB
 MBL-060RFC:RFS-VacPS-310:I-SP-Ilck-RB
 MBL-060RFC:RFS-VacPS-310:I-SP-Input-RB
 MBL-060RFC:RFS-VacPS-310:I-SP-isFirstIlck
-MBL-060RFC:RFS-VacPS-310:I-SP-Wave-PM
 MBL-060RFC:RFS-VacPS-320:I-SP-DIlckMode-RB
 MBL-060RFC:RFS-VacPS-320:I-SP-Ilck-RB
 MBL-060RFC:RFS-VacPS-320:I-SP-Input-RB
 MBL-060RFC:RFS-VacPS-320:I-SP-isFirstIlck
-MBL-060RFC:RFS-VacPS-320:I-SP-Wave-PM
diff --git a/files/MBL-060RFC_SC-IOC-402.archive b/files/MBL-060RFC_SC-IOC-402.archive
index 5863e33..8edb69b 100644
--- a/files/MBL-060RFC_SC-IOC-402.archive
+++ b/files/MBL-060RFC_SC-IOC-402.archive
@@ -2,12 +2,10 @@ MBL-060RFC:RFS-ADG-410:IlckStatus-DIlckMode-RB
 MBL-060RFC:RFS-ADG-410:IlckStatus-Ilck-RB
 MBL-060RFC:RFS-ADG-410:IlckStatus-Input-RB
 MBL-060RFC:RFS-ADG-410:IlckStatus-isFirstIlck
-MBL-060RFC:RFS-ADG-410:IlckStatus-Wave-PM
 MBL-060RFC:RFS-ADG-410:PwrFail-DIlckMode-RB
 MBL-060RFC:RFS-ADG-410:PwrFail-Ilck-RB
 MBL-060RFC:RFS-ADG-410:PwrFail-Input-RB
 MBL-060RFC:RFS-ADG-410:PwrFail-isFirstIlck
-MBL-060RFC:RFS-ADG-410:PwrFail-Wave-PM
 MBL-060RFC:RFS-Cav-410:Fld-DevMonEval-RB
 MBL-060RFC:RFS-Cav-410:Fld-DevMonFact-RB
 MBL-060RFC:RFS-Cav-410:Fld-DevMonIlck-RB
@@ -46,7 +44,6 @@ MBL-060RFC:RFS-Cav-410:Fld-Wave-Avg
 MBL-060RFC:RFS-Cav-410:Fld-Wave-High
 MBL-060RFC:RFS-Cav-410:Fld-Wave-Low
 MBL-060RFC:RFS-Cav-410:Fld-Wave-Med
-MBL-060RFC:RFS-Cav-410:Fld-Wave-PM
 MBL-060RFC:RFS-Cav-410:PwrFwd-DevMonEval-RB
 MBL-060RFC:RFS-Cav-410:PwrFwd-DevMonFact-RB
 MBL-060RFC:RFS-Cav-410:PwrFwd-DevMonIlck-RB
@@ -85,7 +82,6 @@ MBL-060RFC:RFS-Cav-410:PwrFwd-Wave-Avg
 MBL-060RFC:RFS-Cav-410:PwrFwd-Wave-High
 MBL-060RFC:RFS-Cav-410:PwrFwd-Wave-Low
 MBL-060RFC:RFS-Cav-410:PwrFwd-Wave-Med
-MBL-060RFC:RFS-Cav-410:PwrFwd-Wave-PM
 MBL-060RFC:RFS-Cav-410:PwrRfl-DevMonEval-RB
 MBL-060RFC:RFS-Cav-410:PwrRfl-DevMonFact-RB
 MBL-060RFC:RFS-Cav-410:PwrRfl-DevMonIlck-RB
@@ -124,7 +120,6 @@ MBL-060RFC:RFS-Cav-410:PwrRfl-Wave-Avg
 MBL-060RFC:RFS-Cav-410:PwrRfl-Wave-High
 MBL-060RFC:RFS-Cav-410:PwrRfl-Wave-Low
 MBL-060RFC:RFS-Cav-410:PwrRfl-Wave-Med
-MBL-060RFC:RFS-Cav-410:PwrRfl-Wave-PM
 MBL-060RFC:RFS-EPR-410:Cur-DevMonEval-RB
 MBL-060RFC:RFS-EPR-410:Cur-DevMonFact-RB
 MBL-060RFC:RFS-EPR-410:Cur-DevMonIlck-RB
@@ -163,7 +158,6 @@ MBL-060RFC:RFS-EPR-410:Cur-Wave-Avg
 MBL-060RFC:RFS-EPR-410:Cur-Wave-High
 MBL-060RFC:RFS-EPR-410:Cur-Wave-Low
 MBL-060RFC:RFS-EPR-410:Cur-Wave-Med
-MBL-060RFC:RFS-EPR-410:Cur-Wave-PM
 MBL-060RFC:RFS-FIM-401:AI10-DevMonEval-RB
 MBL-060RFC:RFS-FIM-401:AI10-DevMonFact-RB
 MBL-060RFC:RFS-FIM-401:AI10-DevMonIlck-RB
@@ -208,7 +202,6 @@ MBL-060RFC:RFS-FIM-401:AI10-Wave-Avg
 MBL-060RFC:RFS-FIM-401:AI10-Wave-High
 MBL-060RFC:RFS-FIM-401:AI10-Wave-Low
 MBL-060RFC:RFS-FIM-401:AI10-Wave-Med
-MBL-060RFC:RFS-FIM-401:AI10-Wave-PM
 MBL-060RFC:RFS-FIM-401:AI1-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-401:AI1-HVON-En-RB
 MBL-060RFC:RFS-FIM-401:AI1-HVON-Precond
@@ -277,7 +270,6 @@ MBL-060RFC:RFS-FIM-401:AI5-Wave-Avg
 MBL-060RFC:RFS-FIM-401:AI5-Wave-High
 MBL-060RFC:RFS-FIM-401:AI5-Wave-Low
 MBL-060RFC:RFS-FIM-401:AI5-Wave-Med
-MBL-060RFC:RFS-FIM-401:AI5-Wave-PM
 MBL-060RFC:RFS-FIM-401:AI6-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-401:AI6-HVON-En-RB
 MBL-060RFC:RFS-FIM-401:AI6-HVON-Precond
@@ -328,7 +320,6 @@ MBL-060RFC:RFS-FIM-401:AI7-Wave-Avg
 MBL-060RFC:RFS-FIM-401:AI7-Wave-High
 MBL-060RFC:RFS-FIM-401:AI7-Wave-Low
 MBL-060RFC:RFS-FIM-401:AI7-Wave-Med
-MBL-060RFC:RFS-FIM-401:AI7-Wave-PM
 MBL-060RFC:RFS-FIM-401:AI8-DevMonEval-RB
 MBL-060RFC:RFS-FIM-401:AI8-DevMonFact-RB
 MBL-060RFC:RFS-FIM-401:AI8-DevMonIlck-RB
@@ -373,7 +364,6 @@ MBL-060RFC:RFS-FIM-401:AI8-Wave-Avg
 MBL-060RFC:RFS-FIM-401:AI8-Wave-High
 MBL-060RFC:RFS-FIM-401:AI8-Wave-Low
 MBL-060RFC:RFS-FIM-401:AI8-Wave-Med
-MBL-060RFC:RFS-FIM-401:AI8-Wave-PM
 MBL-060RFC:RFS-FIM-401:AI9-DevMonEval-RB
 MBL-060RFC:RFS-FIM-401:AI9-DevMonFact-RB
 MBL-060RFC:RFS-FIM-401:AI9-DevMonIlck-RB
@@ -418,7 +408,6 @@ MBL-060RFC:RFS-FIM-401:AI9-Wave-Avg
 MBL-060RFC:RFS-FIM-401:AI9-Wave-High
 MBL-060RFC:RFS-FIM-401:AI9-Wave-Low
 MBL-060RFC:RFS-FIM-401:AI9-Wave-Med
-MBL-060RFC:RFS-FIM-401:AI9-Wave-PM
 MBL-060RFC:RFS-FIM-401:CD1-DevFactor-RB
 MBL-060RFC:RFS-FIM-401:CD1-DevPeriod-RB
 MBL-060RFC:RFS-FIM-401:CD1-FastRst-IlckCnt
@@ -440,7 +429,6 @@ MBL-060RFC:RFS-FIM-401:CD1-RFON-En-RB
 MBL-060RFC:RFS-FIM-401:CD1-RFON-Precond
 MBL-060RFC:RFS-FIM-401:CD1-TrigSel-RB
 MBL-060RFC:RFS-FIM-401:CD1-TrigThre-RB
-MBL-060RFC:RFS-FIM-401:CD1-Wave-IlckPM
 MBL-060RFC:RFS-FIM-401:CD2-DevFactor-RB
 MBL-060RFC:RFS-FIM-401:CD2-DevPeriod-RB
 MBL-060RFC:RFS-FIM-401:CD2-FastRst-IlckCnt
@@ -462,7 +450,6 @@ MBL-060RFC:RFS-FIM-401:CD2-RFON-En-RB
 MBL-060RFC:RFS-FIM-401:CD2-RFON-Precond
 MBL-060RFC:RFS-FIM-401:CD2-TrigSel-RB
 MBL-060RFC:RFS-FIM-401:CD2-TrigThre-RB
-MBL-060RFC:RFS-FIM-401:CD2-Wave-IlckPM
 MBL-060RFC:RFS-FIM-401:DI10-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-401:DI10-DIlckMode-RB
 MBL-060RFC:RFS-FIM-401:DI10-FastRst-IlckCnt
@@ -474,7 +461,6 @@ MBL-060RFC:RFS-FIM-401:DI10-Input-RB
 MBL-060RFC:RFS-FIM-401:DI10-isFirstIlck
 MBL-060RFC:RFS-FIM-401:DI10-RFON-En-RB
 MBL-060RFC:RFS-FIM-401:DI10-RFON-Precond
-MBL-060RFC:RFS-FIM-401:DI10-Wave-PM
 MBL-060RFC:RFS-FIM-401:DI11-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-401:DI11-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-401:DI11-HVON-En-RB
@@ -493,7 +479,6 @@ MBL-060RFC:RFS-FIM-401:DI12-Input-RB
 MBL-060RFC:RFS-FIM-401:DI12-isFirstIlck
 MBL-060RFC:RFS-FIM-401:DI12-RFON-En-RB
 MBL-060RFC:RFS-FIM-401:DI12-RFON-Precond
-MBL-060RFC:RFS-FIM-401:DI12-Wave-PM
 MBL-060RFC:RFS-FIM-401:DI13-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-401:DI13-DIlckMode-RB
 MBL-060RFC:RFS-FIM-401:DI13-FastRst-IlckCnt
@@ -505,7 +490,6 @@ MBL-060RFC:RFS-FIM-401:DI13-Input-RB
 MBL-060RFC:RFS-FIM-401:DI13-isFirstIlck
 MBL-060RFC:RFS-FIM-401:DI13-RFON-En-RB
 MBL-060RFC:RFS-FIM-401:DI13-RFON-Precond
-MBL-060RFC:RFS-FIM-401:DI13-Wave-PM
 MBL-060RFC:RFS-FIM-401:DI14-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-401:DI14-DIlckMode-RB
 MBL-060RFC:RFS-FIM-401:DI14-FastRst-IlckCnt
@@ -517,7 +501,6 @@ MBL-060RFC:RFS-FIM-401:DI14-Input-RB
 MBL-060RFC:RFS-FIM-401:DI14-isFirstIlck
 MBL-060RFC:RFS-FIM-401:DI14-RFON-En-RB
 MBL-060RFC:RFS-FIM-401:DI14-RFON-Precond
-MBL-060RFC:RFS-FIM-401:DI14-Wave-PM
 MBL-060RFC:RFS-FIM-401:DI15-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-401:DI15-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-401:DI15-HVON-En-RB
@@ -543,7 +526,6 @@ MBL-060RFC:RFS-FIM-401:DI17-Input-RB
 MBL-060RFC:RFS-FIM-401:DI17-isFirstIlck
 MBL-060RFC:RFS-FIM-401:DI17-RFON-En-RB
 MBL-060RFC:RFS-FIM-401:DI17-RFON-Precond
-MBL-060RFC:RFS-FIM-401:DI17-Wave-PM
 MBL-060RFC:RFS-FIM-401:DI18-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-401:DI18-DIlckMode-RB
 MBL-060RFC:RFS-FIM-401:DI18-FastRst-IlckCnt
@@ -555,7 +537,6 @@ MBL-060RFC:RFS-FIM-401:DI18-Input-RB
 MBL-060RFC:RFS-FIM-401:DI18-isFirstIlck
 MBL-060RFC:RFS-FIM-401:DI18-RFON-En-RB
 MBL-060RFC:RFS-FIM-401:DI18-RFON-Precond
-MBL-060RFC:RFS-FIM-401:DI18-Wave-PM
 MBL-060RFC:RFS-FIM-401:DI19-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-401:DI19-DIlckMode-RB
 MBL-060RFC:RFS-FIM-401:DI19-FastRst-IlckCnt
@@ -567,7 +548,6 @@ MBL-060RFC:RFS-FIM-401:DI19-Input-RB
 MBL-060RFC:RFS-FIM-401:DI19-isFirstIlck
 MBL-060RFC:RFS-FIM-401:DI19-RFON-En-RB
 MBL-060RFC:RFS-FIM-401:DI19-RFON-Precond
-MBL-060RFC:RFS-FIM-401:DI19-Wave-PM
 MBL-060RFC:RFS-FIM-401:DI1-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-401:DI1-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-401:DI1-HVON-En-RB
@@ -586,7 +566,6 @@ MBL-060RFC:RFS-FIM-401:DI20-Input-RB
 MBL-060RFC:RFS-FIM-401:DI20-isFirstIlck
 MBL-060RFC:RFS-FIM-401:DI20-RFON-En-RB
 MBL-060RFC:RFS-FIM-401:DI20-RFON-Precond
-MBL-060RFC:RFS-FIM-401:DI20-Wave-PM
 MBL-060RFC:RFS-FIM-401:DI21-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-401:DI21-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-401:DI21-HVON-En-RB
@@ -640,7 +619,6 @@ MBL-060RFC:RFS-FIM-401:DI7-Input-RB
 MBL-060RFC:RFS-FIM-401:DI7-isFirstIlck
 MBL-060RFC:RFS-FIM-401:DI7-RFON-En-RB
 MBL-060RFC:RFS-FIM-401:DI7-RFON-Precond
-MBL-060RFC:RFS-FIM-401:DI7-Wave-PM
 MBL-060RFC:RFS-FIM-401:DI8-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-401:DI8-DIlckMode-RB
 MBL-060RFC:RFS-FIM-401:DI8-FastRst-IlckCnt
@@ -652,7 +630,6 @@ MBL-060RFC:RFS-FIM-401:DI8-Input-RB
 MBL-060RFC:RFS-FIM-401:DI8-isFirstIlck
 MBL-060RFC:RFS-FIM-401:DI8-RFON-En-RB
 MBL-060RFC:RFS-FIM-401:DI8-RFON-Precond
-MBL-060RFC:RFS-FIM-401:DI8-Wave-PM
 MBL-060RFC:RFS-FIM-401:DI9-DIlckLatch-RB
 MBL-060RFC:RFS-FIM-401:DI9-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-401:DI9-HVON-En-RB
@@ -710,7 +687,6 @@ MBL-060RFC:RFS-FIM-401:RF10-Wave-Avg
 MBL-060RFC:RFS-FIM-401:RF10-Wave-High
 MBL-060RFC:RFS-FIM-401:RF10-Wave-Low
 MBL-060RFC:RFS-FIM-401:RF10-Wave-Med
-MBL-060RFC:RFS-FIM-401:RF10-Wave-PM
 MBL-060RFC:RFS-FIM-401:RF1-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-401:RF1-HVON-En-RB
 MBL-060RFC:RFS-FIM-401:RF1-HVON-Precond
@@ -803,7 +779,6 @@ MBL-060RFC:RFS-FIM-401:RF9-Wave-Avg
 MBL-060RFC:RFS-FIM-401:RF9-Wave-High
 MBL-060RFC:RFS-FIM-401:RF9-Wave-Low
 MBL-060RFC:RFS-FIM-401:RF9-Wave-Med
-MBL-060RFC:RFS-FIM-401:RF9-Wave-PM
 MBL-060RFC:RFS-FIM-401:RFON-Precond
 MBL-060RFC:RFS-FIM-401:RP1-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-401:RP1-HVON-En-RB
@@ -824,7 +799,6 @@ MBL-060RFC:RFS-FIM-401:RP1-RFON-En-RB
 MBL-060RFC:RFS-FIM-401:RP1-RFON-Precond
 MBL-060RFC:RFS-FIM-401:RP1-TrigSel-RB
 MBL-060RFC:RFS-FIM-401:RP1-TrigThre-RB
-MBL-060RFC:RFS-FIM-401:RP1-Wave-IlckPM
 MBL-060RFC:RFS-FIM-401:RP2-FastRst-IlckCnt
 MBL-060RFC:RFS-FIM-401:RP2-HVON-En-RB
 MBL-060RFC:RFS-FIM-401:RP2-HVON-Precond
@@ -844,7 +818,6 @@ MBL-060RFC:RFS-FIM-401:RP2-RFON-En-RB
 MBL-060RFC:RFS-FIM-401:RP2-RFON-Precond
 MBL-060RFC:RFS-FIM-401:RP2-TrigSel-RB
 MBL-060RFC:RFS-FIM-401:RP2-TrigThre-RB
-MBL-060RFC:RFS-FIM-401:RP2-Wave-IlckPM
 MBL-060RFC:RFS-FIM-401:TriggerLine-RB
 MBL-060RFC:RFS-Kly-410:PwrFwd-DevMonEval-RB
 MBL-060RFC:RFS-Kly-410:PwrFwd-DevMonFact-RB
@@ -884,7 +857,6 @@ MBL-060RFC:RFS-Kly-410:PwrFwd-Wave-Avg
 MBL-060RFC:RFS-Kly-410:PwrFwd-Wave-High
 MBL-060RFC:RFS-Kly-410:PwrFwd-Wave-Low
 MBL-060RFC:RFS-Kly-410:PwrFwd-Wave-Med
-MBL-060RFC:RFS-Kly-410:PwrFwd-Wave-PM
 MBL-060RFC:RFS-Kly-410:PwrRfl-DevMonEval-RB
 MBL-060RFC:RFS-Kly-410:PwrRfl-DevMonFact-RB
 MBL-060RFC:RFS-Kly-410:PwrRfl-DevMonIlck-RB
@@ -923,12 +895,10 @@ MBL-060RFC:RFS-Kly-410:PwrRfl-Wave-Avg
 MBL-060RFC:RFS-Kly-410:PwrRfl-Wave-High
 MBL-060RFC:RFS-Kly-410:PwrRfl-Wave-Low
 MBL-060RFC:RFS-Kly-410:PwrRfl-Wave-Med
-MBL-060RFC:RFS-Kly-410:PwrRfl-Wave-PM
 MBL-060RFC:RFS-LLRF-401:Status-DIlckMode-RB
 MBL-060RFC:RFS-LLRF-401:Status-Ilck-RB
 MBL-060RFC:RFS-LLRF-401:Status-Input-RB
 MBL-060RFC:RFS-LLRF-401:Status-isFirstIlck
-MBL-060RFC:RFS-LLRF-401:Status-Wave-PM
 MBL-060RFC:RFS-Load-420:PwrFwd-DevMonEval-RB
 MBL-060RFC:RFS-Load-420:PwrFwd-DevMonFact-RB
 MBL-060RFC:RFS-Load-420:PwrFwd-DevMonIlck-RB
@@ -967,7 +937,6 @@ MBL-060RFC:RFS-Load-420:PwrFwd-Wave-Avg
 MBL-060RFC:RFS-Load-420:PwrFwd-Wave-High
 MBL-060RFC:RFS-Load-420:PwrFwd-Wave-Low
 MBL-060RFC:RFS-Load-420:PwrFwd-Wave-Med
-MBL-060RFC:RFS-Load-420:PwrFwd-Wave-PM
 MBL-060RFC:RFS-Load-420:PwrRfl-DevMonEval-RB
 MBL-060RFC:RFS-Load-420:PwrRfl-DevMonFact-RB
 MBL-060RFC:RFS-Load-420:PwrRfl-DevMonIlck-RB
@@ -1006,7 +975,6 @@ MBL-060RFC:RFS-Load-420:PwrRfl-Wave-Avg
 MBL-060RFC:RFS-Load-420:PwrRfl-Wave-High
 MBL-060RFC:RFS-Load-420:PwrRfl-Wave-Low
 MBL-060RFC:RFS-Load-420:PwrRfl-Wave-Med
-MBL-060RFC:RFS-Load-420:PwrRfl-Wave-PM
 MBL-060RFC:RFS-Mod-410:Cur-DevMonEval-RB
 MBL-060RFC:RFS-Mod-410:Cur-DevMonFact-RB
 MBL-060RFC:RFS-Mod-410:Cur-DevMonIlck-RB
@@ -1045,17 +1013,14 @@ MBL-060RFC:RFS-Mod-410:Cur-Wave-Avg
 MBL-060RFC:RFS-Mod-410:Cur-Wave-High
 MBL-060RFC:RFS-Mod-410:Cur-Wave-Low
 MBL-060RFC:RFS-Mod-410:Cur-Wave-Med
-MBL-060RFC:RFS-Mod-410:Cur-Wave-PM
 MBL-060RFC:RFS-Mod-410:PCcon-DIlckMode-RB
 MBL-060RFC:RFS-Mod-410:PCcon-Ilck-RB
 MBL-060RFC:RFS-Mod-410:PCcon-Input-RB
 MBL-060RFC:RFS-Mod-410:PCcon-isFirstIlck
-MBL-060RFC:RFS-Mod-410:PCcon-Wave-PM
 MBL-060RFC:RFS-Mod-410:Ready-DIlckMode-RB
 MBL-060RFC:RFS-Mod-410:Ready-Ilck-RB
 MBL-060RFC:RFS-Mod-410:Ready-Input-RB
 MBL-060RFC:RFS-Mod-410:Ready-isFirstIlck
-MBL-060RFC:RFS-Mod-410:Ready-Wave-PM
 MBL-060RFC:RFS-Mod-410:Vol-DevMonEval-RB
 MBL-060RFC:RFS-Mod-410:Vol-DevMonFact-RB
 MBL-060RFC:RFS-Mod-410:Vol-DevMonIlck-RB
@@ -1094,7 +1059,6 @@ MBL-060RFC:RFS-Mod-410:Vol-Wave-Avg
 MBL-060RFC:RFS-Mod-410:Vol-Wave-High
 MBL-060RFC:RFS-Mod-410:Vol-Wave-Low
 MBL-060RFC:RFS-Mod-410:Vol-Wave-Med
-MBL-060RFC:RFS-Mod-410:Vol-Wave-PM
 MBL-060RFC:RFS-PAmp-410:PwrFwd-DevMonEval-RB
 MBL-060RFC:RFS-PAmp-410:PwrFwd-DevMonFact-RB
 MBL-060RFC:RFS-PAmp-410:PwrFwd-DevMonIlck-RB
@@ -1133,17 +1097,14 @@ MBL-060RFC:RFS-PAmp-410:PwrFwd-Wave-Avg
 MBL-060RFC:RFS-PAmp-410:PwrFwd-Wave-High
 MBL-060RFC:RFS-PAmp-410:PwrFwd-Wave-Low
 MBL-060RFC:RFS-PAmp-410:PwrFwd-Wave-Med
-MBL-060RFC:RFS-PAmp-410:PwrFwd-Wave-PM
 MBL-060RFC:RFS-SIM-410:HvEna-DIlckMode-RB
 MBL-060RFC:RFS-SIM-410:HvEna-Ilck-RB
 MBL-060RFC:RFS-SIM-410:HvEna-Input-RB
 MBL-060RFC:RFS-SIM-410:HvEna-isFirstIlck
-MBL-060RFC:RFS-SIM-410:HvEna-Wave-PM
 MBL-060RFC:RFS-SIM-410:RfEna-DIlckMode-RB
 MBL-060RFC:RFS-SIM-410:RfEna-Ilck-RB
 MBL-060RFC:RFS-SIM-410:RfEna-Input-RB
 MBL-060RFC:RFS-SIM-410:RfEna-isFirstIlck
-MBL-060RFC:RFS-SIM-410:RfEna-Wave-PM
 MBL-060RFC:RFS-SolPS-410:Cur-DevMonEval-RB
 MBL-060RFC:RFS-SolPS-410:Cur-DevMonFact-RB
 MBL-060RFC:RFS-SolPS-410:Cur-DevMonIlck-RB
@@ -1182,7 +1143,6 @@ MBL-060RFC:RFS-SolPS-410:Cur-Wave-Avg
 MBL-060RFC:RFS-SolPS-410:Cur-Wave-High
 MBL-060RFC:RFS-SolPS-410:Cur-Wave-Low
 MBL-060RFC:RFS-SolPS-410:Cur-Wave-Med
-MBL-060RFC:RFS-SolPS-410:Cur-Wave-PM
 MBL-060RFC:RFS-SolPS-420:Cur-DevMonEval-RB
 MBL-060RFC:RFS-SolPS-420:Cur-DevMonFact-RB
 MBL-060RFC:RFS-SolPS-420:Cur-DevMonIlck-RB
@@ -1221,24 +1181,19 @@ MBL-060RFC:RFS-SolPS-420:Cur-Wave-Avg
 MBL-060RFC:RFS-SolPS-420:Cur-Wave-High
 MBL-060RFC:RFS-SolPS-420:Cur-Wave-Low
 MBL-060RFC:RFS-SolPS-420:Cur-Wave-Med
-MBL-060RFC:RFS-SolPS-420:Cur-Wave-PM
 MBL-060RFC:RFS-VacBody-410:Status-DIlckMode-RB
 MBL-060RFC:RFS-VacBody-410:Status-Ilck-RB
 MBL-060RFC:RFS-VacBody-410:Status-Input-RB
 MBL-060RFC:RFS-VacBody-410:Status-isFirstIlck
-MBL-060RFC:RFS-VacBody-410:Status-Wave-PM
 MBL-060RFC:RFS-VacCav-410:Status-DIlckMode-RB
 MBL-060RFC:RFS-VacCav-410:Status-Ilck-RB
 MBL-060RFC:RFS-VacCav-410:Status-Input-RB
 MBL-060RFC:RFS-VacCav-410:Status-isFirstIlck
-MBL-060RFC:RFS-VacCav-410:Status-Wave-PM
 MBL-060RFC:RFS-VacPS-410:I-SP-DIlckMode-RB
 MBL-060RFC:RFS-VacPS-410:I-SP-Ilck-RB
 MBL-060RFC:RFS-VacPS-410:I-SP-Input-RB
 MBL-060RFC:RFS-VacPS-410:I-SP-isFirstIlck
-MBL-060RFC:RFS-VacPS-410:I-SP-Wave-PM
 MBL-060RFC:RFS-VacPS-420:I-SP-DIlckMode-RB
 MBL-060RFC:RFS-VacPS-420:I-SP-Ilck-RB
 MBL-060RFC:RFS-VacPS-420:I-SP-Input-RB
 MBL-060RFC:RFS-VacPS-420:I-SP-isFirstIlck
-MBL-060RFC:RFS-VacPS-420:I-SP-Wave-PM
diff --git a/files/MBL-070RFC_SC-IOC-102.archive b/files/MBL-070RFC_SC-IOC-102.archive
index a9782de..cef0e1e 100644
--- a/files/MBL-070RFC_SC-IOC-102.archive
+++ b/files/MBL-070RFC_SC-IOC-102.archive
@@ -2,12 +2,10 @@ MBL-070RFC:RFS-ADG-110:IlckStatus-DIlckMode-RB
 MBL-070RFC:RFS-ADG-110:IlckStatus-Ilck-RB
 MBL-070RFC:RFS-ADG-110:IlckStatus-Input-RB
 MBL-070RFC:RFS-ADG-110:IlckStatus-isFirstIlck
-MBL-070RFC:RFS-ADG-110:IlckStatus-Wave-PM
 MBL-070RFC:RFS-ADG-110:PwrFail-DIlckMode-RB
 MBL-070RFC:RFS-ADG-110:PwrFail-Ilck-RB
 MBL-070RFC:RFS-ADG-110:PwrFail-Input-RB
 MBL-070RFC:RFS-ADG-110:PwrFail-isFirstIlck
-MBL-070RFC:RFS-ADG-110:PwrFail-Wave-PM
 MBL-070RFC:RFS-Cav-110:Fld-DevMonEval-RB
 MBL-070RFC:RFS-Cav-110:Fld-DevMonFact-RB
 MBL-070RFC:RFS-Cav-110:Fld-DevMonIlck-RB
@@ -46,7 +44,6 @@ MBL-070RFC:RFS-Cav-110:Fld-Wave-Avg
 MBL-070RFC:RFS-Cav-110:Fld-Wave-High
 MBL-070RFC:RFS-Cav-110:Fld-Wave-Low
 MBL-070RFC:RFS-Cav-110:Fld-Wave-Med
-MBL-070RFC:RFS-Cav-110:Fld-Wave-PM
 MBL-070RFC:RFS-Cav-110:PwrFwd-DevMonEval-RB
 MBL-070RFC:RFS-Cav-110:PwrFwd-DevMonFact-RB
 MBL-070RFC:RFS-Cav-110:PwrFwd-DevMonIlck-RB
@@ -85,7 +82,6 @@ MBL-070RFC:RFS-Cav-110:PwrFwd-Wave-Avg
 MBL-070RFC:RFS-Cav-110:PwrFwd-Wave-High
 MBL-070RFC:RFS-Cav-110:PwrFwd-Wave-Low
 MBL-070RFC:RFS-Cav-110:PwrFwd-Wave-Med
-MBL-070RFC:RFS-Cav-110:PwrFwd-Wave-PM
 MBL-070RFC:RFS-Cav-110:PwrRfl-DevMonEval-RB
 MBL-070RFC:RFS-Cav-110:PwrRfl-DevMonFact-RB
 MBL-070RFC:RFS-Cav-110:PwrRfl-DevMonIlck-RB
@@ -124,7 +120,6 @@ MBL-070RFC:RFS-Cav-110:PwrRfl-Wave-Avg
 MBL-070RFC:RFS-Cav-110:PwrRfl-Wave-High
 MBL-070RFC:RFS-Cav-110:PwrRfl-Wave-Low
 MBL-070RFC:RFS-Cav-110:PwrRfl-Wave-Med
-MBL-070RFC:RFS-Cav-110:PwrRfl-Wave-PM
 MBL-070RFC:RFS-EPR-110:Cur-DevMonEval-RB
 MBL-070RFC:RFS-EPR-110:Cur-DevMonFact-RB
 MBL-070RFC:RFS-EPR-110:Cur-DevMonIlck-RB
@@ -163,7 +158,6 @@ MBL-070RFC:RFS-EPR-110:Cur-Wave-Avg
 MBL-070RFC:RFS-EPR-110:Cur-Wave-High
 MBL-070RFC:RFS-EPR-110:Cur-Wave-Low
 MBL-070RFC:RFS-EPR-110:Cur-Wave-Med
-MBL-070RFC:RFS-EPR-110:Cur-Wave-PM
 MBL-070RFC:RFS-FIM-101:AI10-DevMonEval-RB
 MBL-070RFC:RFS-FIM-101:AI10-DevMonFact-RB
 MBL-070RFC:RFS-FIM-101:AI10-DevMonIlck-RB
@@ -208,7 +202,6 @@ MBL-070RFC:RFS-FIM-101:AI10-Wave-Avg
 MBL-070RFC:RFS-FIM-101:AI10-Wave-High
 MBL-070RFC:RFS-FIM-101:AI10-Wave-Low
 MBL-070RFC:RFS-FIM-101:AI10-Wave-Med
-MBL-070RFC:RFS-FIM-101:AI10-Wave-PM
 MBL-070RFC:RFS-FIM-101:AI1-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-101:AI1-HVON-En-RB
 MBL-070RFC:RFS-FIM-101:AI1-HVON-Precond
@@ -277,7 +270,6 @@ MBL-070RFC:RFS-FIM-101:AI5-Wave-Avg
 MBL-070RFC:RFS-FIM-101:AI5-Wave-High
 MBL-070RFC:RFS-FIM-101:AI5-Wave-Low
 MBL-070RFC:RFS-FIM-101:AI5-Wave-Med
-MBL-070RFC:RFS-FIM-101:AI5-Wave-PM
 MBL-070RFC:RFS-FIM-101:AI6-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-101:AI6-HVON-En-RB
 MBL-070RFC:RFS-FIM-101:AI6-HVON-Precond
@@ -328,7 +320,6 @@ MBL-070RFC:RFS-FIM-101:AI7-Wave-Avg
 MBL-070RFC:RFS-FIM-101:AI7-Wave-High
 MBL-070RFC:RFS-FIM-101:AI7-Wave-Low
 MBL-070RFC:RFS-FIM-101:AI7-Wave-Med
-MBL-070RFC:RFS-FIM-101:AI7-Wave-PM
 MBL-070RFC:RFS-FIM-101:AI8-DevMonEval-RB
 MBL-070RFC:RFS-FIM-101:AI8-DevMonFact-RB
 MBL-070RFC:RFS-FIM-101:AI8-DevMonIlck-RB
@@ -373,7 +364,6 @@ MBL-070RFC:RFS-FIM-101:AI8-Wave-Avg
 MBL-070RFC:RFS-FIM-101:AI8-Wave-High
 MBL-070RFC:RFS-FIM-101:AI8-Wave-Low
 MBL-070RFC:RFS-FIM-101:AI8-Wave-Med
-MBL-070RFC:RFS-FIM-101:AI8-Wave-PM
 MBL-070RFC:RFS-FIM-101:AI9-DevMonEval-RB
 MBL-070RFC:RFS-FIM-101:AI9-DevMonFact-RB
 MBL-070RFC:RFS-FIM-101:AI9-DevMonIlck-RB
@@ -418,7 +408,6 @@ MBL-070RFC:RFS-FIM-101:AI9-Wave-Avg
 MBL-070RFC:RFS-FIM-101:AI9-Wave-High
 MBL-070RFC:RFS-FIM-101:AI9-Wave-Low
 MBL-070RFC:RFS-FIM-101:AI9-Wave-Med
-MBL-070RFC:RFS-FIM-101:AI9-Wave-PM
 MBL-070RFC:RFS-FIM-101:CD1-DevFactor-RB
 MBL-070RFC:RFS-FIM-101:CD1-DevPeriod-RB
 MBL-070RFC:RFS-FIM-101:CD1-FastRst-IlckCnt
@@ -440,7 +429,6 @@ MBL-070RFC:RFS-FIM-101:CD1-RFON-En-RB
 MBL-070RFC:RFS-FIM-101:CD1-RFON-Precond
 MBL-070RFC:RFS-FIM-101:CD1-TrigSel-RB
 MBL-070RFC:RFS-FIM-101:CD1-TrigThre-RB
-MBL-070RFC:RFS-FIM-101:CD1-Wave-IlckPM
 MBL-070RFC:RFS-FIM-101:CD2-DevFactor-RB
 MBL-070RFC:RFS-FIM-101:CD2-DevPeriod-RB
 MBL-070RFC:RFS-FIM-101:CD2-FastRst-IlckCnt
@@ -462,7 +450,6 @@ MBL-070RFC:RFS-FIM-101:CD2-RFON-En-RB
 MBL-070RFC:RFS-FIM-101:CD2-RFON-Precond
 MBL-070RFC:RFS-FIM-101:CD2-TrigSel-RB
 MBL-070RFC:RFS-FIM-101:CD2-TrigThre-RB
-MBL-070RFC:RFS-FIM-101:CD2-Wave-IlckPM
 MBL-070RFC:RFS-FIM-101:DI10-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-101:DI10-DIlckMode-RB
 MBL-070RFC:RFS-FIM-101:DI10-FastRst-IlckCnt
@@ -474,7 +461,6 @@ MBL-070RFC:RFS-FIM-101:DI10-Input-RB
 MBL-070RFC:RFS-FIM-101:DI10-isFirstIlck
 MBL-070RFC:RFS-FIM-101:DI10-RFON-En-RB
 MBL-070RFC:RFS-FIM-101:DI10-RFON-Precond
-MBL-070RFC:RFS-FIM-101:DI10-Wave-PM
 MBL-070RFC:RFS-FIM-101:DI11-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-101:DI11-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-101:DI11-HVON-En-RB
@@ -493,7 +479,6 @@ MBL-070RFC:RFS-FIM-101:DI12-Input-RB
 MBL-070RFC:RFS-FIM-101:DI12-isFirstIlck
 MBL-070RFC:RFS-FIM-101:DI12-RFON-En-RB
 MBL-070RFC:RFS-FIM-101:DI12-RFON-Precond
-MBL-070RFC:RFS-FIM-101:DI12-Wave-PM
 MBL-070RFC:RFS-FIM-101:DI13-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-101:DI13-DIlckMode-RB
 MBL-070RFC:RFS-FIM-101:DI13-FastRst-IlckCnt
@@ -505,7 +490,6 @@ MBL-070RFC:RFS-FIM-101:DI13-Input-RB
 MBL-070RFC:RFS-FIM-101:DI13-isFirstIlck
 MBL-070RFC:RFS-FIM-101:DI13-RFON-En-RB
 MBL-070RFC:RFS-FIM-101:DI13-RFON-Precond
-MBL-070RFC:RFS-FIM-101:DI13-Wave-PM
 MBL-070RFC:RFS-FIM-101:DI14-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-101:DI14-DIlckMode-RB
 MBL-070RFC:RFS-FIM-101:DI14-FastRst-IlckCnt
@@ -517,7 +501,6 @@ MBL-070RFC:RFS-FIM-101:DI14-Input-RB
 MBL-070RFC:RFS-FIM-101:DI14-isFirstIlck
 MBL-070RFC:RFS-FIM-101:DI14-RFON-En-RB
 MBL-070RFC:RFS-FIM-101:DI14-RFON-Precond
-MBL-070RFC:RFS-FIM-101:DI14-Wave-PM
 MBL-070RFC:RFS-FIM-101:DI15-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-101:DI15-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-101:DI15-HVON-En-RB
@@ -543,7 +526,6 @@ MBL-070RFC:RFS-FIM-101:DI17-Input-RB
 MBL-070RFC:RFS-FIM-101:DI17-isFirstIlck
 MBL-070RFC:RFS-FIM-101:DI17-RFON-En-RB
 MBL-070RFC:RFS-FIM-101:DI17-RFON-Precond
-MBL-070RFC:RFS-FIM-101:DI17-Wave-PM
 MBL-070RFC:RFS-FIM-101:DI18-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-101:DI18-DIlckMode-RB
 MBL-070RFC:RFS-FIM-101:DI18-FastRst-IlckCnt
@@ -555,7 +537,6 @@ MBL-070RFC:RFS-FIM-101:DI18-Input-RB
 MBL-070RFC:RFS-FIM-101:DI18-isFirstIlck
 MBL-070RFC:RFS-FIM-101:DI18-RFON-En-RB
 MBL-070RFC:RFS-FIM-101:DI18-RFON-Precond
-MBL-070RFC:RFS-FIM-101:DI18-Wave-PM
 MBL-070RFC:RFS-FIM-101:DI19-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-101:DI19-DIlckMode-RB
 MBL-070RFC:RFS-FIM-101:DI19-FastRst-IlckCnt
@@ -567,7 +548,6 @@ MBL-070RFC:RFS-FIM-101:DI19-Input-RB
 MBL-070RFC:RFS-FIM-101:DI19-isFirstIlck
 MBL-070RFC:RFS-FIM-101:DI19-RFON-En-RB
 MBL-070RFC:RFS-FIM-101:DI19-RFON-Precond
-MBL-070RFC:RFS-FIM-101:DI19-Wave-PM
 MBL-070RFC:RFS-FIM-101:DI1-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-101:DI1-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-101:DI1-HVON-En-RB
@@ -586,7 +566,6 @@ MBL-070RFC:RFS-FIM-101:DI20-Input-RB
 MBL-070RFC:RFS-FIM-101:DI20-isFirstIlck
 MBL-070RFC:RFS-FIM-101:DI20-RFON-En-RB
 MBL-070RFC:RFS-FIM-101:DI20-RFON-Precond
-MBL-070RFC:RFS-FIM-101:DI20-Wave-PM
 MBL-070RFC:RFS-FIM-101:DI21-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-101:DI21-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-101:DI21-HVON-En-RB
@@ -640,7 +619,6 @@ MBL-070RFC:RFS-FIM-101:DI7-Input-RB
 MBL-070RFC:RFS-FIM-101:DI7-isFirstIlck
 MBL-070RFC:RFS-FIM-101:DI7-RFON-En-RB
 MBL-070RFC:RFS-FIM-101:DI7-RFON-Precond
-MBL-070RFC:RFS-FIM-101:DI7-Wave-PM
 MBL-070RFC:RFS-FIM-101:DI8-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-101:DI8-DIlckMode-RB
 MBL-070RFC:RFS-FIM-101:DI8-FastRst-IlckCnt
@@ -652,7 +630,6 @@ MBL-070RFC:RFS-FIM-101:DI8-Input-RB
 MBL-070RFC:RFS-FIM-101:DI8-isFirstIlck
 MBL-070RFC:RFS-FIM-101:DI8-RFON-En-RB
 MBL-070RFC:RFS-FIM-101:DI8-RFON-Precond
-MBL-070RFC:RFS-FIM-101:DI8-Wave-PM
 MBL-070RFC:RFS-FIM-101:DI9-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-101:DI9-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-101:DI9-HVON-En-RB
@@ -710,7 +687,6 @@ MBL-070RFC:RFS-FIM-101:RF10-Wave-Avg
 MBL-070RFC:RFS-FIM-101:RF10-Wave-High
 MBL-070RFC:RFS-FIM-101:RF10-Wave-Low
 MBL-070RFC:RFS-FIM-101:RF10-Wave-Med
-MBL-070RFC:RFS-FIM-101:RF10-Wave-PM
 MBL-070RFC:RFS-FIM-101:RF1-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-101:RF1-HVON-En-RB
 MBL-070RFC:RFS-FIM-101:RF1-HVON-Precond
@@ -803,7 +779,6 @@ MBL-070RFC:RFS-FIM-101:RF9-Wave-Avg
 MBL-070RFC:RFS-FIM-101:RF9-Wave-High
 MBL-070RFC:RFS-FIM-101:RF9-Wave-Low
 MBL-070RFC:RFS-FIM-101:RF9-Wave-Med
-MBL-070RFC:RFS-FIM-101:RF9-Wave-PM
 MBL-070RFC:RFS-FIM-101:RFON-Precond
 MBL-070RFC:RFS-FIM-101:RP1-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-101:RP1-HVON-En-RB
@@ -824,7 +799,6 @@ MBL-070RFC:RFS-FIM-101:RP1-RFON-En-RB
 MBL-070RFC:RFS-FIM-101:RP1-RFON-Precond
 MBL-070RFC:RFS-FIM-101:RP1-TrigSel-RB
 MBL-070RFC:RFS-FIM-101:RP1-TrigThre-RB
-MBL-070RFC:RFS-FIM-101:RP1-Wave-IlckPM
 MBL-070RFC:RFS-FIM-101:RP2-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-101:RP2-HVON-En-RB
 MBL-070RFC:RFS-FIM-101:RP2-HVON-Precond
@@ -844,7 +818,6 @@ MBL-070RFC:RFS-FIM-101:RP2-RFON-En-RB
 MBL-070RFC:RFS-FIM-101:RP2-RFON-Precond
 MBL-070RFC:RFS-FIM-101:RP2-TrigSel-RB
 MBL-070RFC:RFS-FIM-101:RP2-TrigThre-RB
-MBL-070RFC:RFS-FIM-101:RP2-Wave-IlckPM
 MBL-070RFC:RFS-FIM-101:TriggerLine-RB
 MBL-070RFC:RFS-Kly-110:PwrFwd-DevMonEval-RB
 MBL-070RFC:RFS-Kly-110:PwrFwd-DevMonFact-RB
@@ -884,7 +857,6 @@ MBL-070RFC:RFS-Kly-110:PwrFwd-Wave-Avg
 MBL-070RFC:RFS-Kly-110:PwrFwd-Wave-High
 MBL-070RFC:RFS-Kly-110:PwrFwd-Wave-Low
 MBL-070RFC:RFS-Kly-110:PwrFwd-Wave-Med
-MBL-070RFC:RFS-Kly-110:PwrFwd-Wave-PM
 MBL-070RFC:RFS-Kly-110:PwrRfl-DevMonEval-RB
 MBL-070RFC:RFS-Kly-110:PwrRfl-DevMonFact-RB
 MBL-070RFC:RFS-Kly-110:PwrRfl-DevMonIlck-RB
@@ -923,12 +895,10 @@ MBL-070RFC:RFS-Kly-110:PwrRfl-Wave-Avg
 MBL-070RFC:RFS-Kly-110:PwrRfl-Wave-High
 MBL-070RFC:RFS-Kly-110:PwrRfl-Wave-Low
 MBL-070RFC:RFS-Kly-110:PwrRfl-Wave-Med
-MBL-070RFC:RFS-Kly-110:PwrRfl-Wave-PM
 MBL-070RFC:RFS-LLRF-101:Status-DIlckMode-RB
 MBL-070RFC:RFS-LLRF-101:Status-Ilck-RB
 MBL-070RFC:RFS-LLRF-101:Status-Input-RB
 MBL-070RFC:RFS-LLRF-101:Status-isFirstIlck
-MBL-070RFC:RFS-LLRF-101:Status-Wave-PM
 MBL-070RFC:RFS-Load-120:PwrFwd-DevMonEval-RB
 MBL-070RFC:RFS-Load-120:PwrFwd-DevMonFact-RB
 MBL-070RFC:RFS-Load-120:PwrFwd-DevMonIlck-RB
@@ -967,7 +937,6 @@ MBL-070RFC:RFS-Load-120:PwrFwd-Wave-Avg
 MBL-070RFC:RFS-Load-120:PwrFwd-Wave-High
 MBL-070RFC:RFS-Load-120:PwrFwd-Wave-Low
 MBL-070RFC:RFS-Load-120:PwrFwd-Wave-Med
-MBL-070RFC:RFS-Load-120:PwrFwd-Wave-PM
 MBL-070RFC:RFS-Load-120:PwrRfl-DevMonEval-RB
 MBL-070RFC:RFS-Load-120:PwrRfl-DevMonFact-RB
 MBL-070RFC:RFS-Load-120:PwrRfl-DevMonIlck-RB
@@ -1006,7 +975,6 @@ MBL-070RFC:RFS-Load-120:PwrRfl-Wave-Avg
 MBL-070RFC:RFS-Load-120:PwrRfl-Wave-High
 MBL-070RFC:RFS-Load-120:PwrRfl-Wave-Low
 MBL-070RFC:RFS-Load-120:PwrRfl-Wave-Med
-MBL-070RFC:RFS-Load-120:PwrRfl-Wave-PM
 MBL-070RFC:RFS-Mod-110:Cur-DevMonEval-RB
 MBL-070RFC:RFS-Mod-110:Cur-DevMonFact-RB
 MBL-070RFC:RFS-Mod-110:Cur-DevMonIlck-RB
@@ -1045,17 +1013,14 @@ MBL-070RFC:RFS-Mod-110:Cur-Wave-Avg
 MBL-070RFC:RFS-Mod-110:Cur-Wave-High
 MBL-070RFC:RFS-Mod-110:Cur-Wave-Low
 MBL-070RFC:RFS-Mod-110:Cur-Wave-Med
-MBL-070RFC:RFS-Mod-110:Cur-Wave-PM
 MBL-070RFC:RFS-Mod-110:PCcon-DIlckMode-RB
 MBL-070RFC:RFS-Mod-110:PCcon-Ilck-RB
 MBL-070RFC:RFS-Mod-110:PCcon-Input-RB
 MBL-070RFC:RFS-Mod-110:PCcon-isFirstIlck
-MBL-070RFC:RFS-Mod-110:PCcon-Wave-PM
 MBL-070RFC:RFS-Mod-110:Ready-DIlckMode-RB
 MBL-070RFC:RFS-Mod-110:Ready-Ilck-RB
 MBL-070RFC:RFS-Mod-110:Ready-Input-RB
 MBL-070RFC:RFS-Mod-110:Ready-isFirstIlck
-MBL-070RFC:RFS-Mod-110:Ready-Wave-PM
 MBL-070RFC:RFS-Mod-110:Vol-DevMonEval-RB
 MBL-070RFC:RFS-Mod-110:Vol-DevMonFact-RB
 MBL-070RFC:RFS-Mod-110:Vol-DevMonIlck-RB
@@ -1094,7 +1059,6 @@ MBL-070RFC:RFS-Mod-110:Vol-Wave-Avg
 MBL-070RFC:RFS-Mod-110:Vol-Wave-High
 MBL-070RFC:RFS-Mod-110:Vol-Wave-Low
 MBL-070RFC:RFS-Mod-110:Vol-Wave-Med
-MBL-070RFC:RFS-Mod-110:Vol-Wave-PM
 MBL-070RFC:RFS-PAmp-110:PwrFwd-DevMonEval-RB
 MBL-070RFC:RFS-PAmp-110:PwrFwd-DevMonFact-RB
 MBL-070RFC:RFS-PAmp-110:PwrFwd-DevMonIlck-RB
@@ -1133,17 +1097,14 @@ MBL-070RFC:RFS-PAmp-110:PwrFwd-Wave-Avg
 MBL-070RFC:RFS-PAmp-110:PwrFwd-Wave-High
 MBL-070RFC:RFS-PAmp-110:PwrFwd-Wave-Low
 MBL-070RFC:RFS-PAmp-110:PwrFwd-Wave-Med
-MBL-070RFC:RFS-PAmp-110:PwrFwd-Wave-PM
 MBL-070RFC:RFS-SIM-110:HvEna-DIlckMode-RB
 MBL-070RFC:RFS-SIM-110:HvEna-Ilck-RB
 MBL-070RFC:RFS-SIM-110:HvEna-Input-RB
 MBL-070RFC:RFS-SIM-110:HvEna-isFirstIlck
-MBL-070RFC:RFS-SIM-110:HvEna-Wave-PM
 MBL-070RFC:RFS-SIM-110:RfEna-DIlckMode-RB
 MBL-070RFC:RFS-SIM-110:RfEna-Ilck-RB
 MBL-070RFC:RFS-SIM-110:RfEna-Input-RB
 MBL-070RFC:RFS-SIM-110:RfEna-isFirstIlck
-MBL-070RFC:RFS-SIM-110:RfEna-Wave-PM
 MBL-070RFC:RFS-SolPS-110:Cur-DevMonEval-RB
 MBL-070RFC:RFS-SolPS-110:Cur-DevMonFact-RB
 MBL-070RFC:RFS-SolPS-110:Cur-DevMonIlck-RB
@@ -1182,7 +1143,6 @@ MBL-070RFC:RFS-SolPS-110:Cur-Wave-Avg
 MBL-070RFC:RFS-SolPS-110:Cur-Wave-High
 MBL-070RFC:RFS-SolPS-110:Cur-Wave-Low
 MBL-070RFC:RFS-SolPS-110:Cur-Wave-Med
-MBL-070RFC:RFS-SolPS-110:Cur-Wave-PM
 MBL-070RFC:RFS-SolPS-120:Cur-DevMonEval-RB
 MBL-070RFC:RFS-SolPS-120:Cur-DevMonFact-RB
 MBL-070RFC:RFS-SolPS-120:Cur-DevMonIlck-RB
@@ -1221,24 +1181,19 @@ MBL-070RFC:RFS-SolPS-120:Cur-Wave-Avg
 MBL-070RFC:RFS-SolPS-120:Cur-Wave-High
 MBL-070RFC:RFS-SolPS-120:Cur-Wave-Low
 MBL-070RFC:RFS-SolPS-120:Cur-Wave-Med
-MBL-070RFC:RFS-SolPS-120:Cur-Wave-PM
 MBL-070RFC:RFS-VacBody-110:Status-DIlckMode-RB
 MBL-070RFC:RFS-VacBody-110:Status-Ilck-RB
 MBL-070RFC:RFS-VacBody-110:Status-Input-RB
 MBL-070RFC:RFS-VacBody-110:Status-isFirstIlck
-MBL-070RFC:RFS-VacBody-110:Status-Wave-PM
 MBL-070RFC:RFS-VacCav-110:Status-DIlckMode-RB
 MBL-070RFC:RFS-VacCav-110:Status-Ilck-RB
 MBL-070RFC:RFS-VacCav-110:Status-Input-RB
 MBL-070RFC:RFS-VacCav-110:Status-isFirstIlck
-MBL-070RFC:RFS-VacCav-110:Status-Wave-PM
 MBL-070RFC:RFS-VacPS-110:I-SP-DIlckMode-RB
 MBL-070RFC:RFS-VacPS-110:I-SP-Ilck-RB
 MBL-070RFC:RFS-VacPS-110:I-SP-Input-RB
 MBL-070RFC:RFS-VacPS-110:I-SP-isFirstIlck
-MBL-070RFC:RFS-VacPS-110:I-SP-Wave-PM
 MBL-070RFC:RFS-VacPS-120:I-SP-DIlckMode-RB
 MBL-070RFC:RFS-VacPS-120:I-SP-Ilck-RB
 MBL-070RFC:RFS-VacPS-120:I-SP-Input-RB
 MBL-070RFC:RFS-VacPS-120:I-SP-isFirstIlck
-MBL-070RFC:RFS-VacPS-120:I-SP-Wave-PM
diff --git a/files/MBL-070RFC_SC-IOC-202.archive b/files/MBL-070RFC_SC-IOC-202.archive
index 0d7e051..bfb463a 100644
--- a/files/MBL-070RFC_SC-IOC-202.archive
+++ b/files/MBL-070RFC_SC-IOC-202.archive
@@ -2,12 +2,10 @@ MBL-070RFC:RFS-ADG-210:IlckStatus-DIlckMode-RB
 MBL-070RFC:RFS-ADG-210:IlckStatus-Ilck-RB
 MBL-070RFC:RFS-ADG-210:IlckStatus-Input-RB
 MBL-070RFC:RFS-ADG-210:IlckStatus-isFirstIlck
-MBL-070RFC:RFS-ADG-210:IlckStatus-Wave-PM
 MBL-070RFC:RFS-ADG-210:PwrFail-DIlckMode-RB
 MBL-070RFC:RFS-ADG-210:PwrFail-Ilck-RB
 MBL-070RFC:RFS-ADG-210:PwrFail-Input-RB
 MBL-070RFC:RFS-ADG-210:PwrFail-isFirstIlck
-MBL-070RFC:RFS-ADG-210:PwrFail-Wave-PM
 MBL-070RFC:RFS-Cav-210:Fld-DevMonEval-RB
 MBL-070RFC:RFS-Cav-210:Fld-DevMonFact-RB
 MBL-070RFC:RFS-Cav-210:Fld-DevMonIlck-RB
@@ -46,7 +44,6 @@ MBL-070RFC:RFS-Cav-210:Fld-Wave-Avg
 MBL-070RFC:RFS-Cav-210:Fld-Wave-High
 MBL-070RFC:RFS-Cav-210:Fld-Wave-Low
 MBL-070RFC:RFS-Cav-210:Fld-Wave-Med
-MBL-070RFC:RFS-Cav-210:Fld-Wave-PM
 MBL-070RFC:RFS-Cav-210:PwrFwd-DevMonEval-RB
 MBL-070RFC:RFS-Cav-210:PwrFwd-DevMonFact-RB
 MBL-070RFC:RFS-Cav-210:PwrFwd-DevMonIlck-RB
@@ -85,7 +82,6 @@ MBL-070RFC:RFS-Cav-210:PwrFwd-Wave-Avg
 MBL-070RFC:RFS-Cav-210:PwrFwd-Wave-High
 MBL-070RFC:RFS-Cav-210:PwrFwd-Wave-Low
 MBL-070RFC:RFS-Cav-210:PwrFwd-Wave-Med
-MBL-070RFC:RFS-Cav-210:PwrFwd-Wave-PM
 MBL-070RFC:RFS-Cav-210:PwrRfl-DevMonEval-RB
 MBL-070RFC:RFS-Cav-210:PwrRfl-DevMonFact-RB
 MBL-070RFC:RFS-Cav-210:PwrRfl-DevMonIlck-RB
@@ -124,7 +120,6 @@ MBL-070RFC:RFS-Cav-210:PwrRfl-Wave-Avg
 MBL-070RFC:RFS-Cav-210:PwrRfl-Wave-High
 MBL-070RFC:RFS-Cav-210:PwrRfl-Wave-Low
 MBL-070RFC:RFS-Cav-210:PwrRfl-Wave-Med
-MBL-070RFC:RFS-Cav-210:PwrRfl-Wave-PM
 MBL-070RFC:RFS-EPR-210:Cur-DevMonEval-RB
 MBL-070RFC:RFS-EPR-210:Cur-DevMonFact-RB
 MBL-070RFC:RFS-EPR-210:Cur-DevMonIlck-RB
@@ -163,7 +158,6 @@ MBL-070RFC:RFS-EPR-210:Cur-Wave-Avg
 MBL-070RFC:RFS-EPR-210:Cur-Wave-High
 MBL-070RFC:RFS-EPR-210:Cur-Wave-Low
 MBL-070RFC:RFS-EPR-210:Cur-Wave-Med
-MBL-070RFC:RFS-EPR-210:Cur-Wave-PM
 MBL-070RFC:RFS-FIM-201:AI10-DevMonEval-RB
 MBL-070RFC:RFS-FIM-201:AI10-DevMonFact-RB
 MBL-070RFC:RFS-FIM-201:AI10-DevMonIlck-RB
@@ -208,7 +202,6 @@ MBL-070RFC:RFS-FIM-201:AI10-Wave-Avg
 MBL-070RFC:RFS-FIM-201:AI10-Wave-High
 MBL-070RFC:RFS-FIM-201:AI10-Wave-Low
 MBL-070RFC:RFS-FIM-201:AI10-Wave-Med
-MBL-070RFC:RFS-FIM-201:AI10-Wave-PM
 MBL-070RFC:RFS-FIM-201:AI1-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-201:AI1-HVON-En-RB
 MBL-070RFC:RFS-FIM-201:AI1-HVON-Precond
@@ -277,7 +270,6 @@ MBL-070RFC:RFS-FIM-201:AI5-Wave-Avg
 MBL-070RFC:RFS-FIM-201:AI5-Wave-High
 MBL-070RFC:RFS-FIM-201:AI5-Wave-Low
 MBL-070RFC:RFS-FIM-201:AI5-Wave-Med
-MBL-070RFC:RFS-FIM-201:AI5-Wave-PM
 MBL-070RFC:RFS-FIM-201:AI6-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-201:AI6-HVON-En-RB
 MBL-070RFC:RFS-FIM-201:AI6-HVON-Precond
@@ -328,7 +320,6 @@ MBL-070RFC:RFS-FIM-201:AI7-Wave-Avg
 MBL-070RFC:RFS-FIM-201:AI7-Wave-High
 MBL-070RFC:RFS-FIM-201:AI7-Wave-Low
 MBL-070RFC:RFS-FIM-201:AI7-Wave-Med
-MBL-070RFC:RFS-FIM-201:AI7-Wave-PM
 MBL-070RFC:RFS-FIM-201:AI8-DevMonEval-RB
 MBL-070RFC:RFS-FIM-201:AI8-DevMonFact-RB
 MBL-070RFC:RFS-FIM-201:AI8-DevMonIlck-RB
@@ -373,7 +364,6 @@ MBL-070RFC:RFS-FIM-201:AI8-Wave-Avg
 MBL-070RFC:RFS-FIM-201:AI8-Wave-High
 MBL-070RFC:RFS-FIM-201:AI8-Wave-Low
 MBL-070RFC:RFS-FIM-201:AI8-Wave-Med
-MBL-070RFC:RFS-FIM-201:AI8-Wave-PM
 MBL-070RFC:RFS-FIM-201:AI9-DevMonEval-RB
 MBL-070RFC:RFS-FIM-201:AI9-DevMonFact-RB
 MBL-070RFC:RFS-FIM-201:AI9-DevMonIlck-RB
@@ -418,7 +408,6 @@ MBL-070RFC:RFS-FIM-201:AI9-Wave-Avg
 MBL-070RFC:RFS-FIM-201:AI9-Wave-High
 MBL-070RFC:RFS-FIM-201:AI9-Wave-Low
 MBL-070RFC:RFS-FIM-201:AI9-Wave-Med
-MBL-070RFC:RFS-FIM-201:AI9-Wave-PM
 MBL-070RFC:RFS-FIM-201:CD1-DevFactor-RB
 MBL-070RFC:RFS-FIM-201:CD1-DevPeriod-RB
 MBL-070RFC:RFS-FIM-201:CD1-FastRst-IlckCnt
@@ -440,7 +429,6 @@ MBL-070RFC:RFS-FIM-201:CD1-RFON-En-RB
 MBL-070RFC:RFS-FIM-201:CD1-RFON-Precond
 MBL-070RFC:RFS-FIM-201:CD1-TrigSel-RB
 MBL-070RFC:RFS-FIM-201:CD1-TrigThre-RB
-MBL-070RFC:RFS-FIM-201:CD1-Wave-IlckPM
 MBL-070RFC:RFS-FIM-201:CD2-DevFactor-RB
 MBL-070RFC:RFS-FIM-201:CD2-DevPeriod-RB
 MBL-070RFC:RFS-FIM-201:CD2-FastRst-IlckCnt
@@ -462,7 +450,6 @@ MBL-070RFC:RFS-FIM-201:CD2-RFON-En-RB
 MBL-070RFC:RFS-FIM-201:CD2-RFON-Precond
 MBL-070RFC:RFS-FIM-201:CD2-TrigSel-RB
 MBL-070RFC:RFS-FIM-201:CD2-TrigThre-RB
-MBL-070RFC:RFS-FIM-201:CD2-Wave-IlckPM
 MBL-070RFC:RFS-FIM-201:DI10-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-201:DI10-DIlckMode-RB
 MBL-070RFC:RFS-FIM-201:DI10-FastRst-IlckCnt
@@ -474,7 +461,6 @@ MBL-070RFC:RFS-FIM-201:DI10-Input-RB
 MBL-070RFC:RFS-FIM-201:DI10-isFirstIlck
 MBL-070RFC:RFS-FIM-201:DI10-RFON-En-RB
 MBL-070RFC:RFS-FIM-201:DI10-RFON-Precond
-MBL-070RFC:RFS-FIM-201:DI10-Wave-PM
 MBL-070RFC:RFS-FIM-201:DI11-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-201:DI11-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-201:DI11-HVON-En-RB
@@ -493,7 +479,6 @@ MBL-070RFC:RFS-FIM-201:DI12-Input-RB
 MBL-070RFC:RFS-FIM-201:DI12-isFirstIlck
 MBL-070RFC:RFS-FIM-201:DI12-RFON-En-RB
 MBL-070RFC:RFS-FIM-201:DI12-RFON-Precond
-MBL-070RFC:RFS-FIM-201:DI12-Wave-PM
 MBL-070RFC:RFS-FIM-201:DI13-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-201:DI13-DIlckMode-RB
 MBL-070RFC:RFS-FIM-201:DI13-FastRst-IlckCnt
@@ -505,7 +490,6 @@ MBL-070RFC:RFS-FIM-201:DI13-Input-RB
 MBL-070RFC:RFS-FIM-201:DI13-isFirstIlck
 MBL-070RFC:RFS-FIM-201:DI13-RFON-En-RB
 MBL-070RFC:RFS-FIM-201:DI13-RFON-Precond
-MBL-070RFC:RFS-FIM-201:DI13-Wave-PM
 MBL-070RFC:RFS-FIM-201:DI14-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-201:DI14-DIlckMode-RB
 MBL-070RFC:RFS-FIM-201:DI14-FastRst-IlckCnt
@@ -517,7 +501,6 @@ MBL-070RFC:RFS-FIM-201:DI14-Input-RB
 MBL-070RFC:RFS-FIM-201:DI14-isFirstIlck
 MBL-070RFC:RFS-FIM-201:DI14-RFON-En-RB
 MBL-070RFC:RFS-FIM-201:DI14-RFON-Precond
-MBL-070RFC:RFS-FIM-201:DI14-Wave-PM
 MBL-070RFC:RFS-FIM-201:DI15-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-201:DI15-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-201:DI15-HVON-En-RB
@@ -543,7 +526,6 @@ MBL-070RFC:RFS-FIM-201:DI17-Input-RB
 MBL-070RFC:RFS-FIM-201:DI17-isFirstIlck
 MBL-070RFC:RFS-FIM-201:DI17-RFON-En-RB
 MBL-070RFC:RFS-FIM-201:DI17-RFON-Precond
-MBL-070RFC:RFS-FIM-201:DI17-Wave-PM
 MBL-070RFC:RFS-FIM-201:DI18-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-201:DI18-DIlckMode-RB
 MBL-070RFC:RFS-FIM-201:DI18-FastRst-IlckCnt
@@ -555,7 +537,6 @@ MBL-070RFC:RFS-FIM-201:DI18-Input-RB
 MBL-070RFC:RFS-FIM-201:DI18-isFirstIlck
 MBL-070RFC:RFS-FIM-201:DI18-RFON-En-RB
 MBL-070RFC:RFS-FIM-201:DI18-RFON-Precond
-MBL-070RFC:RFS-FIM-201:DI18-Wave-PM
 MBL-070RFC:RFS-FIM-201:DI19-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-201:DI19-DIlckMode-RB
 MBL-070RFC:RFS-FIM-201:DI19-FastRst-IlckCnt
@@ -567,7 +548,6 @@ MBL-070RFC:RFS-FIM-201:DI19-Input-RB
 MBL-070RFC:RFS-FIM-201:DI19-isFirstIlck
 MBL-070RFC:RFS-FIM-201:DI19-RFON-En-RB
 MBL-070RFC:RFS-FIM-201:DI19-RFON-Precond
-MBL-070RFC:RFS-FIM-201:DI19-Wave-PM
 MBL-070RFC:RFS-FIM-201:DI1-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-201:DI1-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-201:DI1-HVON-En-RB
@@ -586,7 +566,6 @@ MBL-070RFC:RFS-FIM-201:DI20-Input-RB
 MBL-070RFC:RFS-FIM-201:DI20-isFirstIlck
 MBL-070RFC:RFS-FIM-201:DI20-RFON-En-RB
 MBL-070RFC:RFS-FIM-201:DI20-RFON-Precond
-MBL-070RFC:RFS-FIM-201:DI20-Wave-PM
 MBL-070RFC:RFS-FIM-201:DI21-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-201:DI21-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-201:DI21-HVON-En-RB
@@ -640,7 +619,6 @@ MBL-070RFC:RFS-FIM-201:DI7-Input-RB
 MBL-070RFC:RFS-FIM-201:DI7-isFirstIlck
 MBL-070RFC:RFS-FIM-201:DI7-RFON-En-RB
 MBL-070RFC:RFS-FIM-201:DI7-RFON-Precond
-MBL-070RFC:RFS-FIM-201:DI7-Wave-PM
 MBL-070RFC:RFS-FIM-201:DI8-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-201:DI8-DIlckMode-RB
 MBL-070RFC:RFS-FIM-201:DI8-FastRst-IlckCnt
@@ -652,7 +630,6 @@ MBL-070RFC:RFS-FIM-201:DI8-Input-RB
 MBL-070RFC:RFS-FIM-201:DI8-isFirstIlck
 MBL-070RFC:RFS-FIM-201:DI8-RFON-En-RB
 MBL-070RFC:RFS-FIM-201:DI8-RFON-Precond
-MBL-070RFC:RFS-FIM-201:DI8-Wave-PM
 MBL-070RFC:RFS-FIM-201:DI9-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-201:DI9-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-201:DI9-HVON-En-RB
@@ -710,7 +687,6 @@ MBL-070RFC:RFS-FIM-201:RF10-Wave-Avg
 MBL-070RFC:RFS-FIM-201:RF10-Wave-High
 MBL-070RFC:RFS-FIM-201:RF10-Wave-Low
 MBL-070RFC:RFS-FIM-201:RF10-Wave-Med
-MBL-070RFC:RFS-FIM-201:RF10-Wave-PM
 MBL-070RFC:RFS-FIM-201:RF1-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-201:RF1-HVON-En-RB
 MBL-070RFC:RFS-FIM-201:RF1-HVON-Precond
@@ -803,7 +779,6 @@ MBL-070RFC:RFS-FIM-201:RF9-Wave-Avg
 MBL-070RFC:RFS-FIM-201:RF9-Wave-High
 MBL-070RFC:RFS-FIM-201:RF9-Wave-Low
 MBL-070RFC:RFS-FIM-201:RF9-Wave-Med
-MBL-070RFC:RFS-FIM-201:RF9-Wave-PM
 MBL-070RFC:RFS-FIM-201:RFON-Precond
 MBL-070RFC:RFS-FIM-201:RP1-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-201:RP1-HVON-En-RB
@@ -824,7 +799,6 @@ MBL-070RFC:RFS-FIM-201:RP1-RFON-En-RB
 MBL-070RFC:RFS-FIM-201:RP1-RFON-Precond
 MBL-070RFC:RFS-FIM-201:RP1-TrigSel-RB
 MBL-070RFC:RFS-FIM-201:RP1-TrigThre-RB
-MBL-070RFC:RFS-FIM-201:RP1-Wave-IlckPM
 MBL-070RFC:RFS-FIM-201:RP2-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-201:RP2-HVON-En-RB
 MBL-070RFC:RFS-FIM-201:RP2-HVON-Precond
@@ -844,7 +818,6 @@ MBL-070RFC:RFS-FIM-201:RP2-RFON-En-RB
 MBL-070RFC:RFS-FIM-201:RP2-RFON-Precond
 MBL-070RFC:RFS-FIM-201:RP2-TrigSel-RB
 MBL-070RFC:RFS-FIM-201:RP2-TrigThre-RB
-MBL-070RFC:RFS-FIM-201:RP2-Wave-IlckPM
 MBL-070RFC:RFS-FIM-201:TriggerLine-RB
 MBL-070RFC:RFS-Kly-210:PwrFwd-DevMonEval-RB
 MBL-070RFC:RFS-Kly-210:PwrFwd-DevMonFact-RB
@@ -884,7 +857,6 @@ MBL-070RFC:RFS-Kly-210:PwrFwd-Wave-Avg
 MBL-070RFC:RFS-Kly-210:PwrFwd-Wave-High
 MBL-070RFC:RFS-Kly-210:PwrFwd-Wave-Low
 MBL-070RFC:RFS-Kly-210:PwrFwd-Wave-Med
-MBL-070RFC:RFS-Kly-210:PwrFwd-Wave-PM
 MBL-070RFC:RFS-Kly-210:PwrRfl-DevMonEval-RB
 MBL-070RFC:RFS-Kly-210:PwrRfl-DevMonFact-RB
 MBL-070RFC:RFS-Kly-210:PwrRfl-DevMonIlck-RB
@@ -923,12 +895,10 @@ MBL-070RFC:RFS-Kly-210:PwrRfl-Wave-Avg
 MBL-070RFC:RFS-Kly-210:PwrRfl-Wave-High
 MBL-070RFC:RFS-Kly-210:PwrRfl-Wave-Low
 MBL-070RFC:RFS-Kly-210:PwrRfl-Wave-Med
-MBL-070RFC:RFS-Kly-210:PwrRfl-Wave-PM
 MBL-070RFC:RFS-LLRF-201:Status-DIlckMode-RB
 MBL-070RFC:RFS-LLRF-201:Status-Ilck-RB
 MBL-070RFC:RFS-LLRF-201:Status-Input-RB
 MBL-070RFC:RFS-LLRF-201:Status-isFirstIlck
-MBL-070RFC:RFS-LLRF-201:Status-Wave-PM
 MBL-070RFC:RFS-Load-220:PwrFwd-DevMonEval-RB
 MBL-070RFC:RFS-Load-220:PwrFwd-DevMonFact-RB
 MBL-070RFC:RFS-Load-220:PwrFwd-DevMonIlck-RB
@@ -967,7 +937,6 @@ MBL-070RFC:RFS-Load-220:PwrFwd-Wave-Avg
 MBL-070RFC:RFS-Load-220:PwrFwd-Wave-High
 MBL-070RFC:RFS-Load-220:PwrFwd-Wave-Low
 MBL-070RFC:RFS-Load-220:PwrFwd-Wave-Med
-MBL-070RFC:RFS-Load-220:PwrFwd-Wave-PM
 MBL-070RFC:RFS-Load-220:PwrRfl-DevMonEval-RB
 MBL-070RFC:RFS-Load-220:PwrRfl-DevMonFact-RB
 MBL-070RFC:RFS-Load-220:PwrRfl-DevMonIlck-RB
@@ -1006,7 +975,6 @@ MBL-070RFC:RFS-Load-220:PwrRfl-Wave-Avg
 MBL-070RFC:RFS-Load-220:PwrRfl-Wave-High
 MBL-070RFC:RFS-Load-220:PwrRfl-Wave-Low
 MBL-070RFC:RFS-Load-220:PwrRfl-Wave-Med
-MBL-070RFC:RFS-Load-220:PwrRfl-Wave-PM
 MBL-070RFC:RFS-Mod-210:Cur-DevMonEval-RB
 MBL-070RFC:RFS-Mod-210:Cur-DevMonFact-RB
 MBL-070RFC:RFS-Mod-210:Cur-DevMonIlck-RB
@@ -1045,17 +1013,14 @@ MBL-070RFC:RFS-Mod-210:Cur-Wave-Avg
 MBL-070RFC:RFS-Mod-210:Cur-Wave-High
 MBL-070RFC:RFS-Mod-210:Cur-Wave-Low
 MBL-070RFC:RFS-Mod-210:Cur-Wave-Med
-MBL-070RFC:RFS-Mod-210:Cur-Wave-PM
 MBL-070RFC:RFS-Mod-210:PCcon-DIlckMode-RB
 MBL-070RFC:RFS-Mod-210:PCcon-Ilck-RB
 MBL-070RFC:RFS-Mod-210:PCcon-Input-RB
 MBL-070RFC:RFS-Mod-210:PCcon-isFirstIlck
-MBL-070RFC:RFS-Mod-210:PCcon-Wave-PM
 MBL-070RFC:RFS-Mod-210:Ready-DIlckMode-RB
 MBL-070RFC:RFS-Mod-210:Ready-Ilck-RB
 MBL-070RFC:RFS-Mod-210:Ready-Input-RB
 MBL-070RFC:RFS-Mod-210:Ready-isFirstIlck
-MBL-070RFC:RFS-Mod-210:Ready-Wave-PM
 MBL-070RFC:RFS-Mod-210:Vol-DevMonEval-RB
 MBL-070RFC:RFS-Mod-210:Vol-DevMonFact-RB
 MBL-070RFC:RFS-Mod-210:Vol-DevMonIlck-RB
@@ -1094,7 +1059,6 @@ MBL-070RFC:RFS-Mod-210:Vol-Wave-Avg
 MBL-070RFC:RFS-Mod-210:Vol-Wave-High
 MBL-070RFC:RFS-Mod-210:Vol-Wave-Low
 MBL-070RFC:RFS-Mod-210:Vol-Wave-Med
-MBL-070RFC:RFS-Mod-210:Vol-Wave-PM
 MBL-070RFC:RFS-PAmp-210:PwrFwd-DevMonEval-RB
 MBL-070RFC:RFS-PAmp-210:PwrFwd-DevMonFact-RB
 MBL-070RFC:RFS-PAmp-210:PwrFwd-DevMonIlck-RB
@@ -1133,17 +1097,14 @@ MBL-070RFC:RFS-PAmp-210:PwrFwd-Wave-Avg
 MBL-070RFC:RFS-PAmp-210:PwrFwd-Wave-High
 MBL-070RFC:RFS-PAmp-210:PwrFwd-Wave-Low
 MBL-070RFC:RFS-PAmp-210:PwrFwd-Wave-Med
-MBL-070RFC:RFS-PAmp-210:PwrFwd-Wave-PM
 MBL-070RFC:RFS-SIM-210:HvEna-DIlckMode-RB
 MBL-070RFC:RFS-SIM-210:HvEna-Ilck-RB
 MBL-070RFC:RFS-SIM-210:HvEna-Input-RB
 MBL-070RFC:RFS-SIM-210:HvEna-isFirstIlck
-MBL-070RFC:RFS-SIM-210:HvEna-Wave-PM
 MBL-070RFC:RFS-SIM-210:RfEna-DIlckMode-RB
 MBL-070RFC:RFS-SIM-210:RfEna-Ilck-RB
 MBL-070RFC:RFS-SIM-210:RfEna-Input-RB
 MBL-070RFC:RFS-SIM-210:RfEna-isFirstIlck
-MBL-070RFC:RFS-SIM-210:RfEna-Wave-PM
 MBL-070RFC:RFS-SolPS-210:Cur-DevMonEval-RB
 MBL-070RFC:RFS-SolPS-210:Cur-DevMonFact-RB
 MBL-070RFC:RFS-SolPS-210:Cur-DevMonIlck-RB
@@ -1182,7 +1143,6 @@ MBL-070RFC:RFS-SolPS-210:Cur-Wave-Avg
 MBL-070RFC:RFS-SolPS-210:Cur-Wave-High
 MBL-070RFC:RFS-SolPS-210:Cur-Wave-Low
 MBL-070RFC:RFS-SolPS-210:Cur-Wave-Med
-MBL-070RFC:RFS-SolPS-210:Cur-Wave-PM
 MBL-070RFC:RFS-SolPS-220:Cur-DevMonEval-RB
 MBL-070RFC:RFS-SolPS-220:Cur-DevMonFact-RB
 MBL-070RFC:RFS-SolPS-220:Cur-DevMonIlck-RB
@@ -1221,24 +1181,19 @@ MBL-070RFC:RFS-SolPS-220:Cur-Wave-Avg
 MBL-070RFC:RFS-SolPS-220:Cur-Wave-High
 MBL-070RFC:RFS-SolPS-220:Cur-Wave-Low
 MBL-070RFC:RFS-SolPS-220:Cur-Wave-Med
-MBL-070RFC:RFS-SolPS-220:Cur-Wave-PM
 MBL-070RFC:RFS-VacBody-210:Status-DIlckMode-RB
 MBL-070RFC:RFS-VacBody-210:Status-Ilck-RB
 MBL-070RFC:RFS-VacBody-210:Status-Input-RB
 MBL-070RFC:RFS-VacBody-210:Status-isFirstIlck
-MBL-070RFC:RFS-VacBody-210:Status-Wave-PM
 MBL-070RFC:RFS-VacCav-210:Status-DIlckMode-RB
 MBL-070RFC:RFS-VacCav-210:Status-Ilck-RB
 MBL-070RFC:RFS-VacCav-210:Status-Input-RB
 MBL-070RFC:RFS-VacCav-210:Status-isFirstIlck
-MBL-070RFC:RFS-VacCav-210:Status-Wave-PM
 MBL-070RFC:RFS-VacPS-210:I-SP-DIlckMode-RB
 MBL-070RFC:RFS-VacPS-210:I-SP-Ilck-RB
 MBL-070RFC:RFS-VacPS-210:I-SP-Input-RB
 MBL-070RFC:RFS-VacPS-210:I-SP-isFirstIlck
-MBL-070RFC:RFS-VacPS-210:I-SP-Wave-PM
 MBL-070RFC:RFS-VacPS-220:I-SP-DIlckMode-RB
 MBL-070RFC:RFS-VacPS-220:I-SP-Ilck-RB
 MBL-070RFC:RFS-VacPS-220:I-SP-Input-RB
 MBL-070RFC:RFS-VacPS-220:I-SP-isFirstIlck
-MBL-070RFC:RFS-VacPS-220:I-SP-Wave-PM
diff --git a/files/MBL-070RFC_SC-IOC-302.archive b/files/MBL-070RFC_SC-IOC-302.archive
index f0cd505..eb9745b 100644
--- a/files/MBL-070RFC_SC-IOC-302.archive
+++ b/files/MBL-070RFC_SC-IOC-302.archive
@@ -2,12 +2,10 @@ MBL-070RFC:RFS-ADG-310:IlckStatus-DIlckMode-RB
 MBL-070RFC:RFS-ADG-310:IlckStatus-Ilck-RB
 MBL-070RFC:RFS-ADG-310:IlckStatus-Input-RB
 MBL-070RFC:RFS-ADG-310:IlckStatus-isFirstIlck
-MBL-070RFC:RFS-ADG-310:IlckStatus-Wave-PM
 MBL-070RFC:RFS-ADG-310:PwrFail-DIlckMode-RB
 MBL-070RFC:RFS-ADG-310:PwrFail-Ilck-RB
 MBL-070RFC:RFS-ADG-310:PwrFail-Input-RB
 MBL-070RFC:RFS-ADG-310:PwrFail-isFirstIlck
-MBL-070RFC:RFS-ADG-310:PwrFail-Wave-PM
 MBL-070RFC:RFS-Cav-310:Fld-DevMonEval-RB
 MBL-070RFC:RFS-Cav-310:Fld-DevMonFact-RB
 MBL-070RFC:RFS-Cav-310:Fld-DevMonIlck-RB
@@ -46,7 +44,6 @@ MBL-070RFC:RFS-Cav-310:Fld-Wave-Avg
 MBL-070RFC:RFS-Cav-310:Fld-Wave-High
 MBL-070RFC:RFS-Cav-310:Fld-Wave-Low
 MBL-070RFC:RFS-Cav-310:Fld-Wave-Med
-MBL-070RFC:RFS-Cav-310:Fld-Wave-PM
 MBL-070RFC:RFS-Cav-310:PwrFwd-DevMonEval-RB
 MBL-070RFC:RFS-Cav-310:PwrFwd-DevMonFact-RB
 MBL-070RFC:RFS-Cav-310:PwrFwd-DevMonIlck-RB
@@ -85,7 +82,6 @@ MBL-070RFC:RFS-Cav-310:PwrFwd-Wave-Avg
 MBL-070RFC:RFS-Cav-310:PwrFwd-Wave-High
 MBL-070RFC:RFS-Cav-310:PwrFwd-Wave-Low
 MBL-070RFC:RFS-Cav-310:PwrFwd-Wave-Med
-MBL-070RFC:RFS-Cav-310:PwrFwd-Wave-PM
 MBL-070RFC:RFS-Cav-310:PwrRfl-DevMonEval-RB
 MBL-070RFC:RFS-Cav-310:PwrRfl-DevMonFact-RB
 MBL-070RFC:RFS-Cav-310:PwrRfl-DevMonIlck-RB
@@ -124,7 +120,6 @@ MBL-070RFC:RFS-Cav-310:PwrRfl-Wave-Avg
 MBL-070RFC:RFS-Cav-310:PwrRfl-Wave-High
 MBL-070RFC:RFS-Cav-310:PwrRfl-Wave-Low
 MBL-070RFC:RFS-Cav-310:PwrRfl-Wave-Med
-MBL-070RFC:RFS-Cav-310:PwrRfl-Wave-PM
 MBL-070RFC:RFS-EPR-310:Cur-DevMonEval-RB
 MBL-070RFC:RFS-EPR-310:Cur-DevMonFact-RB
 MBL-070RFC:RFS-EPR-310:Cur-DevMonIlck-RB
@@ -163,7 +158,6 @@ MBL-070RFC:RFS-EPR-310:Cur-Wave-Avg
 MBL-070RFC:RFS-EPR-310:Cur-Wave-High
 MBL-070RFC:RFS-EPR-310:Cur-Wave-Low
 MBL-070RFC:RFS-EPR-310:Cur-Wave-Med
-MBL-070RFC:RFS-EPR-310:Cur-Wave-PM
 MBL-070RFC:RFS-FIM-301:AI10-DevMonEval-RB
 MBL-070RFC:RFS-FIM-301:AI10-DevMonFact-RB
 MBL-070RFC:RFS-FIM-301:AI10-DevMonIlck-RB
@@ -208,7 +202,6 @@ MBL-070RFC:RFS-FIM-301:AI10-Wave-Avg
 MBL-070RFC:RFS-FIM-301:AI10-Wave-High
 MBL-070RFC:RFS-FIM-301:AI10-Wave-Low
 MBL-070RFC:RFS-FIM-301:AI10-Wave-Med
-MBL-070RFC:RFS-FIM-301:AI10-Wave-PM
 MBL-070RFC:RFS-FIM-301:AI1-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-301:AI1-HVON-En-RB
 MBL-070RFC:RFS-FIM-301:AI1-HVON-Precond
@@ -277,7 +270,6 @@ MBL-070RFC:RFS-FIM-301:AI5-Wave-Avg
 MBL-070RFC:RFS-FIM-301:AI5-Wave-High
 MBL-070RFC:RFS-FIM-301:AI5-Wave-Low
 MBL-070RFC:RFS-FIM-301:AI5-Wave-Med
-MBL-070RFC:RFS-FIM-301:AI5-Wave-PM
 MBL-070RFC:RFS-FIM-301:AI6-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-301:AI6-HVON-En-RB
 MBL-070RFC:RFS-FIM-301:AI6-HVON-Precond
@@ -328,7 +320,6 @@ MBL-070RFC:RFS-FIM-301:AI7-Wave-Avg
 MBL-070RFC:RFS-FIM-301:AI7-Wave-High
 MBL-070RFC:RFS-FIM-301:AI7-Wave-Low
 MBL-070RFC:RFS-FIM-301:AI7-Wave-Med
-MBL-070RFC:RFS-FIM-301:AI7-Wave-PM
 MBL-070RFC:RFS-FIM-301:AI8-DevMonEval-RB
 MBL-070RFC:RFS-FIM-301:AI8-DevMonFact-RB
 MBL-070RFC:RFS-FIM-301:AI8-DevMonIlck-RB
@@ -373,7 +364,6 @@ MBL-070RFC:RFS-FIM-301:AI8-Wave-Avg
 MBL-070RFC:RFS-FIM-301:AI8-Wave-High
 MBL-070RFC:RFS-FIM-301:AI8-Wave-Low
 MBL-070RFC:RFS-FIM-301:AI8-Wave-Med
-MBL-070RFC:RFS-FIM-301:AI8-Wave-PM
 MBL-070RFC:RFS-FIM-301:AI9-DevMonEval-RB
 MBL-070RFC:RFS-FIM-301:AI9-DevMonFact-RB
 MBL-070RFC:RFS-FIM-301:AI9-DevMonIlck-RB
@@ -418,7 +408,6 @@ MBL-070RFC:RFS-FIM-301:AI9-Wave-Avg
 MBL-070RFC:RFS-FIM-301:AI9-Wave-High
 MBL-070RFC:RFS-FIM-301:AI9-Wave-Low
 MBL-070RFC:RFS-FIM-301:AI9-Wave-Med
-MBL-070RFC:RFS-FIM-301:AI9-Wave-PM
 MBL-070RFC:RFS-FIM-301:CD1-DevFactor-RB
 MBL-070RFC:RFS-FIM-301:CD1-DevPeriod-RB
 MBL-070RFC:RFS-FIM-301:CD1-FastRst-IlckCnt
@@ -440,7 +429,6 @@ MBL-070RFC:RFS-FIM-301:CD1-RFON-En-RB
 MBL-070RFC:RFS-FIM-301:CD1-RFON-Precond
 MBL-070RFC:RFS-FIM-301:CD1-TrigSel-RB
 MBL-070RFC:RFS-FIM-301:CD1-TrigThre-RB
-MBL-070RFC:RFS-FIM-301:CD1-Wave-IlckPM
 MBL-070RFC:RFS-FIM-301:CD2-DevFactor-RB
 MBL-070RFC:RFS-FIM-301:CD2-DevPeriod-RB
 MBL-070RFC:RFS-FIM-301:CD2-FastRst-IlckCnt
@@ -462,7 +450,6 @@ MBL-070RFC:RFS-FIM-301:CD2-RFON-En-RB
 MBL-070RFC:RFS-FIM-301:CD2-RFON-Precond
 MBL-070RFC:RFS-FIM-301:CD2-TrigSel-RB
 MBL-070RFC:RFS-FIM-301:CD2-TrigThre-RB
-MBL-070RFC:RFS-FIM-301:CD2-Wave-IlckPM
 MBL-070RFC:RFS-FIM-301:DI10-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-301:DI10-DIlckMode-RB
 MBL-070RFC:RFS-FIM-301:DI10-FastRst-IlckCnt
@@ -474,7 +461,6 @@ MBL-070RFC:RFS-FIM-301:DI10-Input-RB
 MBL-070RFC:RFS-FIM-301:DI10-isFirstIlck
 MBL-070RFC:RFS-FIM-301:DI10-RFON-En-RB
 MBL-070RFC:RFS-FIM-301:DI10-RFON-Precond
-MBL-070RFC:RFS-FIM-301:DI10-Wave-PM
 MBL-070RFC:RFS-FIM-301:DI11-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-301:DI11-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-301:DI11-HVON-En-RB
@@ -493,7 +479,6 @@ MBL-070RFC:RFS-FIM-301:DI12-Input-RB
 MBL-070RFC:RFS-FIM-301:DI12-isFirstIlck
 MBL-070RFC:RFS-FIM-301:DI12-RFON-En-RB
 MBL-070RFC:RFS-FIM-301:DI12-RFON-Precond
-MBL-070RFC:RFS-FIM-301:DI12-Wave-PM
 MBL-070RFC:RFS-FIM-301:DI13-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-301:DI13-DIlckMode-RB
 MBL-070RFC:RFS-FIM-301:DI13-FastRst-IlckCnt
@@ -505,7 +490,6 @@ MBL-070RFC:RFS-FIM-301:DI13-Input-RB
 MBL-070RFC:RFS-FIM-301:DI13-isFirstIlck
 MBL-070RFC:RFS-FIM-301:DI13-RFON-En-RB
 MBL-070RFC:RFS-FIM-301:DI13-RFON-Precond
-MBL-070RFC:RFS-FIM-301:DI13-Wave-PM
 MBL-070RFC:RFS-FIM-301:DI14-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-301:DI14-DIlckMode-RB
 MBL-070RFC:RFS-FIM-301:DI14-FastRst-IlckCnt
@@ -517,7 +501,6 @@ MBL-070RFC:RFS-FIM-301:DI14-Input-RB
 MBL-070RFC:RFS-FIM-301:DI14-isFirstIlck
 MBL-070RFC:RFS-FIM-301:DI14-RFON-En-RB
 MBL-070RFC:RFS-FIM-301:DI14-RFON-Precond
-MBL-070RFC:RFS-FIM-301:DI14-Wave-PM
 MBL-070RFC:RFS-FIM-301:DI15-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-301:DI15-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-301:DI15-HVON-En-RB
@@ -543,7 +526,6 @@ MBL-070RFC:RFS-FIM-301:DI17-Input-RB
 MBL-070RFC:RFS-FIM-301:DI17-isFirstIlck
 MBL-070RFC:RFS-FIM-301:DI17-RFON-En-RB
 MBL-070RFC:RFS-FIM-301:DI17-RFON-Precond
-MBL-070RFC:RFS-FIM-301:DI17-Wave-PM
 MBL-070RFC:RFS-FIM-301:DI18-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-301:DI18-DIlckMode-RB
 MBL-070RFC:RFS-FIM-301:DI18-FastRst-IlckCnt
@@ -555,7 +537,6 @@ MBL-070RFC:RFS-FIM-301:DI18-Input-RB
 MBL-070RFC:RFS-FIM-301:DI18-isFirstIlck
 MBL-070RFC:RFS-FIM-301:DI18-RFON-En-RB
 MBL-070RFC:RFS-FIM-301:DI18-RFON-Precond
-MBL-070RFC:RFS-FIM-301:DI18-Wave-PM
 MBL-070RFC:RFS-FIM-301:DI19-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-301:DI19-DIlckMode-RB
 MBL-070RFC:RFS-FIM-301:DI19-FastRst-IlckCnt
@@ -567,7 +548,6 @@ MBL-070RFC:RFS-FIM-301:DI19-Input-RB
 MBL-070RFC:RFS-FIM-301:DI19-isFirstIlck
 MBL-070RFC:RFS-FIM-301:DI19-RFON-En-RB
 MBL-070RFC:RFS-FIM-301:DI19-RFON-Precond
-MBL-070RFC:RFS-FIM-301:DI19-Wave-PM
 MBL-070RFC:RFS-FIM-301:DI1-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-301:DI1-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-301:DI1-HVON-En-RB
@@ -586,7 +566,6 @@ MBL-070RFC:RFS-FIM-301:DI20-Input-RB
 MBL-070RFC:RFS-FIM-301:DI20-isFirstIlck
 MBL-070RFC:RFS-FIM-301:DI20-RFON-En-RB
 MBL-070RFC:RFS-FIM-301:DI20-RFON-Precond
-MBL-070RFC:RFS-FIM-301:DI20-Wave-PM
 MBL-070RFC:RFS-FIM-301:DI21-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-301:DI21-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-301:DI21-HVON-En-RB
@@ -640,7 +619,6 @@ MBL-070RFC:RFS-FIM-301:DI7-Input-RB
 MBL-070RFC:RFS-FIM-301:DI7-isFirstIlck
 MBL-070RFC:RFS-FIM-301:DI7-RFON-En-RB
 MBL-070RFC:RFS-FIM-301:DI7-RFON-Precond
-MBL-070RFC:RFS-FIM-301:DI7-Wave-PM
 MBL-070RFC:RFS-FIM-301:DI8-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-301:DI8-DIlckMode-RB
 MBL-070RFC:RFS-FIM-301:DI8-FastRst-IlckCnt
@@ -652,7 +630,6 @@ MBL-070RFC:RFS-FIM-301:DI8-Input-RB
 MBL-070RFC:RFS-FIM-301:DI8-isFirstIlck
 MBL-070RFC:RFS-FIM-301:DI8-RFON-En-RB
 MBL-070RFC:RFS-FIM-301:DI8-RFON-Precond
-MBL-070RFC:RFS-FIM-301:DI8-Wave-PM
 MBL-070RFC:RFS-FIM-301:DI9-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-301:DI9-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-301:DI9-HVON-En-RB
@@ -710,7 +687,6 @@ MBL-070RFC:RFS-FIM-301:RF10-Wave-Avg
 MBL-070RFC:RFS-FIM-301:RF10-Wave-High
 MBL-070RFC:RFS-FIM-301:RF10-Wave-Low
 MBL-070RFC:RFS-FIM-301:RF10-Wave-Med
-MBL-070RFC:RFS-FIM-301:RF10-Wave-PM
 MBL-070RFC:RFS-FIM-301:RF1-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-301:RF1-HVON-En-RB
 MBL-070RFC:RFS-FIM-301:RF1-HVON-Precond
@@ -803,7 +779,6 @@ MBL-070RFC:RFS-FIM-301:RF9-Wave-Avg
 MBL-070RFC:RFS-FIM-301:RF9-Wave-High
 MBL-070RFC:RFS-FIM-301:RF9-Wave-Low
 MBL-070RFC:RFS-FIM-301:RF9-Wave-Med
-MBL-070RFC:RFS-FIM-301:RF9-Wave-PM
 MBL-070RFC:RFS-FIM-301:RFON-Precond
 MBL-070RFC:RFS-FIM-301:RP1-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-301:RP1-HVON-En-RB
@@ -824,7 +799,6 @@ MBL-070RFC:RFS-FIM-301:RP1-RFON-En-RB
 MBL-070RFC:RFS-FIM-301:RP1-RFON-Precond
 MBL-070RFC:RFS-FIM-301:RP1-TrigSel-RB
 MBL-070RFC:RFS-FIM-301:RP1-TrigThre-RB
-MBL-070RFC:RFS-FIM-301:RP1-Wave-IlckPM
 MBL-070RFC:RFS-FIM-301:RP2-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-301:RP2-HVON-En-RB
 MBL-070RFC:RFS-FIM-301:RP2-HVON-Precond
@@ -844,7 +818,6 @@ MBL-070RFC:RFS-FIM-301:RP2-RFON-En-RB
 MBL-070RFC:RFS-FIM-301:RP2-RFON-Precond
 MBL-070RFC:RFS-FIM-301:RP2-TrigSel-RB
 MBL-070RFC:RFS-FIM-301:RP2-TrigThre-RB
-MBL-070RFC:RFS-FIM-301:RP2-Wave-IlckPM
 MBL-070RFC:RFS-FIM-301:TriggerLine-RB
 MBL-070RFC:RFS-Kly-310:PwrFwd-DevMonEval-RB
 MBL-070RFC:RFS-Kly-310:PwrFwd-DevMonFact-RB
@@ -884,7 +857,6 @@ MBL-070RFC:RFS-Kly-310:PwrFwd-Wave-Avg
 MBL-070RFC:RFS-Kly-310:PwrFwd-Wave-High
 MBL-070RFC:RFS-Kly-310:PwrFwd-Wave-Low
 MBL-070RFC:RFS-Kly-310:PwrFwd-Wave-Med
-MBL-070RFC:RFS-Kly-310:PwrFwd-Wave-PM
 MBL-070RFC:RFS-Kly-310:PwrRfl-DevMonEval-RB
 MBL-070RFC:RFS-Kly-310:PwrRfl-DevMonFact-RB
 MBL-070RFC:RFS-Kly-310:PwrRfl-DevMonIlck-RB
@@ -923,12 +895,10 @@ MBL-070RFC:RFS-Kly-310:PwrRfl-Wave-Avg
 MBL-070RFC:RFS-Kly-310:PwrRfl-Wave-High
 MBL-070RFC:RFS-Kly-310:PwrRfl-Wave-Low
 MBL-070RFC:RFS-Kly-310:PwrRfl-Wave-Med
-MBL-070RFC:RFS-Kly-310:PwrRfl-Wave-PM
 MBL-070RFC:RFS-LLRF-301:Status-DIlckMode-RB
 MBL-070RFC:RFS-LLRF-301:Status-Ilck-RB
 MBL-070RFC:RFS-LLRF-301:Status-Input-RB
 MBL-070RFC:RFS-LLRF-301:Status-isFirstIlck
-MBL-070RFC:RFS-LLRF-301:Status-Wave-PM
 MBL-070RFC:RFS-Load-320:PwrFwd-DevMonEval-RB
 MBL-070RFC:RFS-Load-320:PwrFwd-DevMonFact-RB
 MBL-070RFC:RFS-Load-320:PwrFwd-DevMonIlck-RB
@@ -967,7 +937,6 @@ MBL-070RFC:RFS-Load-320:PwrFwd-Wave-Avg
 MBL-070RFC:RFS-Load-320:PwrFwd-Wave-High
 MBL-070RFC:RFS-Load-320:PwrFwd-Wave-Low
 MBL-070RFC:RFS-Load-320:PwrFwd-Wave-Med
-MBL-070RFC:RFS-Load-320:PwrFwd-Wave-PM
 MBL-070RFC:RFS-Load-320:PwrRfl-DevMonEval-RB
 MBL-070RFC:RFS-Load-320:PwrRfl-DevMonFact-RB
 MBL-070RFC:RFS-Load-320:PwrRfl-DevMonIlck-RB
@@ -1006,7 +975,6 @@ MBL-070RFC:RFS-Load-320:PwrRfl-Wave-Avg
 MBL-070RFC:RFS-Load-320:PwrRfl-Wave-High
 MBL-070RFC:RFS-Load-320:PwrRfl-Wave-Low
 MBL-070RFC:RFS-Load-320:PwrRfl-Wave-Med
-MBL-070RFC:RFS-Load-320:PwrRfl-Wave-PM
 MBL-070RFC:RFS-Mod-310:Cur-DevMonEval-RB
 MBL-070RFC:RFS-Mod-310:Cur-DevMonFact-RB
 MBL-070RFC:RFS-Mod-310:Cur-DevMonIlck-RB
@@ -1045,17 +1013,14 @@ MBL-070RFC:RFS-Mod-310:Cur-Wave-Avg
 MBL-070RFC:RFS-Mod-310:Cur-Wave-High
 MBL-070RFC:RFS-Mod-310:Cur-Wave-Low
 MBL-070RFC:RFS-Mod-310:Cur-Wave-Med
-MBL-070RFC:RFS-Mod-310:Cur-Wave-PM
 MBL-070RFC:RFS-Mod-310:PCcon-DIlckMode-RB
 MBL-070RFC:RFS-Mod-310:PCcon-Ilck-RB
 MBL-070RFC:RFS-Mod-310:PCcon-Input-RB
 MBL-070RFC:RFS-Mod-310:PCcon-isFirstIlck
-MBL-070RFC:RFS-Mod-310:PCcon-Wave-PM
 MBL-070RFC:RFS-Mod-310:Ready-DIlckMode-RB
 MBL-070RFC:RFS-Mod-310:Ready-Ilck-RB
 MBL-070RFC:RFS-Mod-310:Ready-Input-RB
 MBL-070RFC:RFS-Mod-310:Ready-isFirstIlck
-MBL-070RFC:RFS-Mod-310:Ready-Wave-PM
 MBL-070RFC:RFS-Mod-310:Vol-DevMonEval-RB
 MBL-070RFC:RFS-Mod-310:Vol-DevMonFact-RB
 MBL-070RFC:RFS-Mod-310:Vol-DevMonIlck-RB
@@ -1094,7 +1059,6 @@ MBL-070RFC:RFS-Mod-310:Vol-Wave-Avg
 MBL-070RFC:RFS-Mod-310:Vol-Wave-High
 MBL-070RFC:RFS-Mod-310:Vol-Wave-Low
 MBL-070RFC:RFS-Mod-310:Vol-Wave-Med
-MBL-070RFC:RFS-Mod-310:Vol-Wave-PM
 MBL-070RFC:RFS-PAmp-310:PwrFwd-DevMonEval-RB
 MBL-070RFC:RFS-PAmp-310:PwrFwd-DevMonFact-RB
 MBL-070RFC:RFS-PAmp-310:PwrFwd-DevMonIlck-RB
@@ -1133,17 +1097,14 @@ MBL-070RFC:RFS-PAmp-310:PwrFwd-Wave-Avg
 MBL-070RFC:RFS-PAmp-310:PwrFwd-Wave-High
 MBL-070RFC:RFS-PAmp-310:PwrFwd-Wave-Low
 MBL-070RFC:RFS-PAmp-310:PwrFwd-Wave-Med
-MBL-070RFC:RFS-PAmp-310:PwrFwd-Wave-PM
 MBL-070RFC:RFS-SIM-310:HvEna-DIlckMode-RB
 MBL-070RFC:RFS-SIM-310:HvEna-Ilck-RB
 MBL-070RFC:RFS-SIM-310:HvEna-Input-RB
 MBL-070RFC:RFS-SIM-310:HvEna-isFirstIlck
-MBL-070RFC:RFS-SIM-310:HvEna-Wave-PM
 MBL-070RFC:RFS-SIM-310:RfEna-DIlckMode-RB
 MBL-070RFC:RFS-SIM-310:RfEna-Ilck-RB
 MBL-070RFC:RFS-SIM-310:RfEna-Input-RB
 MBL-070RFC:RFS-SIM-310:RfEna-isFirstIlck
-MBL-070RFC:RFS-SIM-310:RfEna-Wave-PM
 MBL-070RFC:RFS-SolPS-310:Cur-DevMonEval-RB
 MBL-070RFC:RFS-SolPS-310:Cur-DevMonFact-RB
 MBL-070RFC:RFS-SolPS-310:Cur-DevMonIlck-RB
@@ -1182,7 +1143,6 @@ MBL-070RFC:RFS-SolPS-310:Cur-Wave-Avg
 MBL-070RFC:RFS-SolPS-310:Cur-Wave-High
 MBL-070RFC:RFS-SolPS-310:Cur-Wave-Low
 MBL-070RFC:RFS-SolPS-310:Cur-Wave-Med
-MBL-070RFC:RFS-SolPS-310:Cur-Wave-PM
 MBL-070RFC:RFS-SolPS-320:Cur-DevMonEval-RB
 MBL-070RFC:RFS-SolPS-320:Cur-DevMonFact-RB
 MBL-070RFC:RFS-SolPS-320:Cur-DevMonIlck-RB
@@ -1221,24 +1181,19 @@ MBL-070RFC:RFS-SolPS-320:Cur-Wave-Avg
 MBL-070RFC:RFS-SolPS-320:Cur-Wave-High
 MBL-070RFC:RFS-SolPS-320:Cur-Wave-Low
 MBL-070RFC:RFS-SolPS-320:Cur-Wave-Med
-MBL-070RFC:RFS-SolPS-320:Cur-Wave-PM
 MBL-070RFC:RFS-VacBody-310:Status-DIlckMode-RB
 MBL-070RFC:RFS-VacBody-310:Status-Ilck-RB
 MBL-070RFC:RFS-VacBody-310:Status-Input-RB
 MBL-070RFC:RFS-VacBody-310:Status-isFirstIlck
-MBL-070RFC:RFS-VacBody-310:Status-Wave-PM
 MBL-070RFC:RFS-VacCav-310:Status-DIlckMode-RB
 MBL-070RFC:RFS-VacCav-310:Status-Ilck-RB
 MBL-070RFC:RFS-VacCav-310:Status-Input-RB
 MBL-070RFC:RFS-VacCav-310:Status-isFirstIlck
-MBL-070RFC:RFS-VacCav-310:Status-Wave-PM
 MBL-070RFC:RFS-VacPS-310:I-SP-DIlckMode-RB
 MBL-070RFC:RFS-VacPS-310:I-SP-Ilck-RB
 MBL-070RFC:RFS-VacPS-310:I-SP-Input-RB
 MBL-070RFC:RFS-VacPS-310:I-SP-isFirstIlck
-MBL-070RFC:RFS-VacPS-310:I-SP-Wave-PM
 MBL-070RFC:RFS-VacPS-320:I-SP-DIlckMode-RB
 MBL-070RFC:RFS-VacPS-320:I-SP-Ilck-RB
 MBL-070RFC:RFS-VacPS-320:I-SP-Input-RB
 MBL-070RFC:RFS-VacPS-320:I-SP-isFirstIlck
-MBL-070RFC:RFS-VacPS-320:I-SP-Wave-PM
diff --git a/files/MBL-070RFC_SC-IOC-402.archive b/files/MBL-070RFC_SC-IOC-402.archive
index 4af5658..2c784d7 100644
--- a/files/MBL-070RFC_SC-IOC-402.archive
+++ b/files/MBL-070RFC_SC-IOC-402.archive
@@ -2,12 +2,10 @@ MBL-070RFC:RFS-ADG-410:IlckStatus-DIlckMode-RB
 MBL-070RFC:RFS-ADG-410:IlckStatus-Ilck-RB
 MBL-070RFC:RFS-ADG-410:IlckStatus-Input-RB
 MBL-070RFC:RFS-ADG-410:IlckStatus-isFirstIlck
-MBL-070RFC:RFS-ADG-410:IlckStatus-Wave-PM
 MBL-070RFC:RFS-ADG-410:PwrFail-DIlckMode-RB
 MBL-070RFC:RFS-ADG-410:PwrFail-Ilck-RB
 MBL-070RFC:RFS-ADG-410:PwrFail-Input-RB
 MBL-070RFC:RFS-ADG-410:PwrFail-isFirstIlck
-MBL-070RFC:RFS-ADG-410:PwrFail-Wave-PM
 MBL-070RFC:RFS-Cav-410:Fld-DevMonEval-RB
 MBL-070RFC:RFS-Cav-410:Fld-DevMonFact-RB
 MBL-070RFC:RFS-Cav-410:Fld-DevMonIlck-RB
@@ -46,7 +44,6 @@ MBL-070RFC:RFS-Cav-410:Fld-Wave-Avg
 MBL-070RFC:RFS-Cav-410:Fld-Wave-High
 MBL-070RFC:RFS-Cav-410:Fld-Wave-Low
 MBL-070RFC:RFS-Cav-410:Fld-Wave-Med
-MBL-070RFC:RFS-Cav-410:Fld-Wave-PM
 MBL-070RFC:RFS-Cav-410:PwrFwd-DevMonEval-RB
 MBL-070RFC:RFS-Cav-410:PwrFwd-DevMonFact-RB
 MBL-070RFC:RFS-Cav-410:PwrFwd-DevMonIlck-RB
@@ -85,7 +82,6 @@ MBL-070RFC:RFS-Cav-410:PwrFwd-Wave-Avg
 MBL-070RFC:RFS-Cav-410:PwrFwd-Wave-High
 MBL-070RFC:RFS-Cav-410:PwrFwd-Wave-Low
 MBL-070RFC:RFS-Cav-410:PwrFwd-Wave-Med
-MBL-070RFC:RFS-Cav-410:PwrFwd-Wave-PM
 MBL-070RFC:RFS-Cav-410:PwrRfl-DevMonEval-RB
 MBL-070RFC:RFS-Cav-410:PwrRfl-DevMonFact-RB
 MBL-070RFC:RFS-Cav-410:PwrRfl-DevMonIlck-RB
@@ -124,7 +120,6 @@ MBL-070RFC:RFS-Cav-410:PwrRfl-Wave-Avg
 MBL-070RFC:RFS-Cav-410:PwrRfl-Wave-High
 MBL-070RFC:RFS-Cav-410:PwrRfl-Wave-Low
 MBL-070RFC:RFS-Cav-410:PwrRfl-Wave-Med
-MBL-070RFC:RFS-Cav-410:PwrRfl-Wave-PM
 MBL-070RFC:RFS-EPR-410:Cur-DevMonEval-RB
 MBL-070RFC:RFS-EPR-410:Cur-DevMonFact-RB
 MBL-070RFC:RFS-EPR-410:Cur-DevMonIlck-RB
@@ -163,7 +158,6 @@ MBL-070RFC:RFS-EPR-410:Cur-Wave-Avg
 MBL-070RFC:RFS-EPR-410:Cur-Wave-High
 MBL-070RFC:RFS-EPR-410:Cur-Wave-Low
 MBL-070RFC:RFS-EPR-410:Cur-Wave-Med
-MBL-070RFC:RFS-EPR-410:Cur-Wave-PM
 MBL-070RFC:RFS-FIM-401:AI10-DevMonEval-RB
 MBL-070RFC:RFS-FIM-401:AI10-DevMonFact-RB
 MBL-070RFC:RFS-FIM-401:AI10-DevMonIlck-RB
@@ -208,7 +202,6 @@ MBL-070RFC:RFS-FIM-401:AI10-Wave-Avg
 MBL-070RFC:RFS-FIM-401:AI10-Wave-High
 MBL-070RFC:RFS-FIM-401:AI10-Wave-Low
 MBL-070RFC:RFS-FIM-401:AI10-Wave-Med
-MBL-070RFC:RFS-FIM-401:AI10-Wave-PM
 MBL-070RFC:RFS-FIM-401:AI1-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-401:AI1-HVON-En-RB
 MBL-070RFC:RFS-FIM-401:AI1-HVON-Precond
@@ -277,7 +270,6 @@ MBL-070RFC:RFS-FIM-401:AI5-Wave-Avg
 MBL-070RFC:RFS-FIM-401:AI5-Wave-High
 MBL-070RFC:RFS-FIM-401:AI5-Wave-Low
 MBL-070RFC:RFS-FIM-401:AI5-Wave-Med
-MBL-070RFC:RFS-FIM-401:AI5-Wave-PM
 MBL-070RFC:RFS-FIM-401:AI6-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-401:AI6-HVON-En-RB
 MBL-070RFC:RFS-FIM-401:AI6-HVON-Precond
@@ -328,7 +320,6 @@ MBL-070RFC:RFS-FIM-401:AI7-Wave-Avg
 MBL-070RFC:RFS-FIM-401:AI7-Wave-High
 MBL-070RFC:RFS-FIM-401:AI7-Wave-Low
 MBL-070RFC:RFS-FIM-401:AI7-Wave-Med
-MBL-070RFC:RFS-FIM-401:AI7-Wave-PM
 MBL-070RFC:RFS-FIM-401:AI8-DevMonEval-RB
 MBL-070RFC:RFS-FIM-401:AI8-DevMonFact-RB
 MBL-070RFC:RFS-FIM-401:AI8-DevMonIlck-RB
@@ -373,7 +364,6 @@ MBL-070RFC:RFS-FIM-401:AI8-Wave-Avg
 MBL-070RFC:RFS-FIM-401:AI8-Wave-High
 MBL-070RFC:RFS-FIM-401:AI8-Wave-Low
 MBL-070RFC:RFS-FIM-401:AI8-Wave-Med
-MBL-070RFC:RFS-FIM-401:AI8-Wave-PM
 MBL-070RFC:RFS-FIM-401:AI9-DevMonEval-RB
 MBL-070RFC:RFS-FIM-401:AI9-DevMonFact-RB
 MBL-070RFC:RFS-FIM-401:AI9-DevMonIlck-RB
@@ -418,7 +408,6 @@ MBL-070RFC:RFS-FIM-401:AI9-Wave-Avg
 MBL-070RFC:RFS-FIM-401:AI9-Wave-High
 MBL-070RFC:RFS-FIM-401:AI9-Wave-Low
 MBL-070RFC:RFS-FIM-401:AI9-Wave-Med
-MBL-070RFC:RFS-FIM-401:AI9-Wave-PM
 MBL-070RFC:RFS-FIM-401:CD1-DevFactor-RB
 MBL-070RFC:RFS-FIM-401:CD1-DevPeriod-RB
 MBL-070RFC:RFS-FIM-401:CD1-FastRst-IlckCnt
@@ -440,7 +429,6 @@ MBL-070RFC:RFS-FIM-401:CD1-RFON-En-RB
 MBL-070RFC:RFS-FIM-401:CD1-RFON-Precond
 MBL-070RFC:RFS-FIM-401:CD1-TrigSel-RB
 MBL-070RFC:RFS-FIM-401:CD1-TrigThre-RB
-MBL-070RFC:RFS-FIM-401:CD1-Wave-IlckPM
 MBL-070RFC:RFS-FIM-401:CD2-DevFactor-RB
 MBL-070RFC:RFS-FIM-401:CD2-DevPeriod-RB
 MBL-070RFC:RFS-FIM-401:CD2-FastRst-IlckCnt
@@ -462,7 +450,6 @@ MBL-070RFC:RFS-FIM-401:CD2-RFON-En-RB
 MBL-070RFC:RFS-FIM-401:CD2-RFON-Precond
 MBL-070RFC:RFS-FIM-401:CD2-TrigSel-RB
 MBL-070RFC:RFS-FIM-401:CD2-TrigThre-RB
-MBL-070RFC:RFS-FIM-401:CD2-Wave-IlckPM
 MBL-070RFC:RFS-FIM-401:DI10-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-401:DI10-DIlckMode-RB
 MBL-070RFC:RFS-FIM-401:DI10-FastRst-IlckCnt
@@ -474,7 +461,6 @@ MBL-070RFC:RFS-FIM-401:DI10-Input-RB
 MBL-070RFC:RFS-FIM-401:DI10-isFirstIlck
 MBL-070RFC:RFS-FIM-401:DI10-RFON-En-RB
 MBL-070RFC:RFS-FIM-401:DI10-RFON-Precond
-MBL-070RFC:RFS-FIM-401:DI10-Wave-PM
 MBL-070RFC:RFS-FIM-401:DI11-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-401:DI11-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-401:DI11-HVON-En-RB
@@ -493,7 +479,6 @@ MBL-070RFC:RFS-FIM-401:DI12-Input-RB
 MBL-070RFC:RFS-FIM-401:DI12-isFirstIlck
 MBL-070RFC:RFS-FIM-401:DI12-RFON-En-RB
 MBL-070RFC:RFS-FIM-401:DI12-RFON-Precond
-MBL-070RFC:RFS-FIM-401:DI12-Wave-PM
 MBL-070RFC:RFS-FIM-401:DI13-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-401:DI13-DIlckMode-RB
 MBL-070RFC:RFS-FIM-401:DI13-FastRst-IlckCnt
@@ -505,7 +490,6 @@ MBL-070RFC:RFS-FIM-401:DI13-Input-RB
 MBL-070RFC:RFS-FIM-401:DI13-isFirstIlck
 MBL-070RFC:RFS-FIM-401:DI13-RFON-En-RB
 MBL-070RFC:RFS-FIM-401:DI13-RFON-Precond
-MBL-070RFC:RFS-FIM-401:DI13-Wave-PM
 MBL-070RFC:RFS-FIM-401:DI14-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-401:DI14-DIlckMode-RB
 MBL-070RFC:RFS-FIM-401:DI14-FastRst-IlckCnt
@@ -517,7 +501,6 @@ MBL-070RFC:RFS-FIM-401:DI14-Input-RB
 MBL-070RFC:RFS-FIM-401:DI14-isFirstIlck
 MBL-070RFC:RFS-FIM-401:DI14-RFON-En-RB
 MBL-070RFC:RFS-FIM-401:DI14-RFON-Precond
-MBL-070RFC:RFS-FIM-401:DI14-Wave-PM
 MBL-070RFC:RFS-FIM-401:DI15-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-401:DI15-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-401:DI15-HVON-En-RB
@@ -543,7 +526,6 @@ MBL-070RFC:RFS-FIM-401:DI17-Input-RB
 MBL-070RFC:RFS-FIM-401:DI17-isFirstIlck
 MBL-070RFC:RFS-FIM-401:DI17-RFON-En-RB
 MBL-070RFC:RFS-FIM-401:DI17-RFON-Precond
-MBL-070RFC:RFS-FIM-401:DI17-Wave-PM
 MBL-070RFC:RFS-FIM-401:DI18-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-401:DI18-DIlckMode-RB
 MBL-070RFC:RFS-FIM-401:DI18-FastRst-IlckCnt
@@ -555,7 +537,6 @@ MBL-070RFC:RFS-FIM-401:DI18-Input-RB
 MBL-070RFC:RFS-FIM-401:DI18-isFirstIlck
 MBL-070RFC:RFS-FIM-401:DI18-RFON-En-RB
 MBL-070RFC:RFS-FIM-401:DI18-RFON-Precond
-MBL-070RFC:RFS-FIM-401:DI18-Wave-PM
 MBL-070RFC:RFS-FIM-401:DI19-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-401:DI19-DIlckMode-RB
 MBL-070RFC:RFS-FIM-401:DI19-FastRst-IlckCnt
@@ -567,7 +548,6 @@ MBL-070RFC:RFS-FIM-401:DI19-Input-RB
 MBL-070RFC:RFS-FIM-401:DI19-isFirstIlck
 MBL-070RFC:RFS-FIM-401:DI19-RFON-En-RB
 MBL-070RFC:RFS-FIM-401:DI19-RFON-Precond
-MBL-070RFC:RFS-FIM-401:DI19-Wave-PM
 MBL-070RFC:RFS-FIM-401:DI1-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-401:DI1-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-401:DI1-HVON-En-RB
@@ -586,7 +566,6 @@ MBL-070RFC:RFS-FIM-401:DI20-Input-RB
 MBL-070RFC:RFS-FIM-401:DI20-isFirstIlck
 MBL-070RFC:RFS-FIM-401:DI20-RFON-En-RB
 MBL-070RFC:RFS-FIM-401:DI20-RFON-Precond
-MBL-070RFC:RFS-FIM-401:DI20-Wave-PM
 MBL-070RFC:RFS-FIM-401:DI21-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-401:DI21-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-401:DI21-HVON-En-RB
@@ -640,7 +619,6 @@ MBL-070RFC:RFS-FIM-401:DI7-Input-RB
 MBL-070RFC:RFS-FIM-401:DI7-isFirstIlck
 MBL-070RFC:RFS-FIM-401:DI7-RFON-En-RB
 MBL-070RFC:RFS-FIM-401:DI7-RFON-Precond
-MBL-070RFC:RFS-FIM-401:DI7-Wave-PM
 MBL-070RFC:RFS-FIM-401:DI8-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-401:DI8-DIlckMode-RB
 MBL-070RFC:RFS-FIM-401:DI8-FastRst-IlckCnt
@@ -652,7 +630,6 @@ MBL-070RFC:RFS-FIM-401:DI8-Input-RB
 MBL-070RFC:RFS-FIM-401:DI8-isFirstIlck
 MBL-070RFC:RFS-FIM-401:DI8-RFON-En-RB
 MBL-070RFC:RFS-FIM-401:DI8-RFON-Precond
-MBL-070RFC:RFS-FIM-401:DI8-Wave-PM
 MBL-070RFC:RFS-FIM-401:DI9-DIlckLatch-RB
 MBL-070RFC:RFS-FIM-401:DI9-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-401:DI9-HVON-En-RB
@@ -710,7 +687,6 @@ MBL-070RFC:RFS-FIM-401:RF10-Wave-Avg
 MBL-070RFC:RFS-FIM-401:RF10-Wave-High
 MBL-070RFC:RFS-FIM-401:RF10-Wave-Low
 MBL-070RFC:RFS-FIM-401:RF10-Wave-Med
-MBL-070RFC:RFS-FIM-401:RF10-Wave-PM
 MBL-070RFC:RFS-FIM-401:RF1-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-401:RF1-HVON-En-RB
 MBL-070RFC:RFS-FIM-401:RF1-HVON-Precond
@@ -803,7 +779,6 @@ MBL-070RFC:RFS-FIM-401:RF9-Wave-Avg
 MBL-070RFC:RFS-FIM-401:RF9-Wave-High
 MBL-070RFC:RFS-FIM-401:RF9-Wave-Low
 MBL-070RFC:RFS-FIM-401:RF9-Wave-Med
-MBL-070RFC:RFS-FIM-401:RF9-Wave-PM
 MBL-070RFC:RFS-FIM-401:RFON-Precond
 MBL-070RFC:RFS-FIM-401:RP1-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-401:RP1-HVON-En-RB
@@ -824,7 +799,6 @@ MBL-070RFC:RFS-FIM-401:RP1-RFON-En-RB
 MBL-070RFC:RFS-FIM-401:RP1-RFON-Precond
 MBL-070RFC:RFS-FIM-401:RP1-TrigSel-RB
 MBL-070RFC:RFS-FIM-401:RP1-TrigThre-RB
-MBL-070RFC:RFS-FIM-401:RP1-Wave-IlckPM
 MBL-070RFC:RFS-FIM-401:RP2-FastRst-IlckCnt
 MBL-070RFC:RFS-FIM-401:RP2-HVON-En-RB
 MBL-070RFC:RFS-FIM-401:RP2-HVON-Precond
@@ -844,7 +818,6 @@ MBL-070RFC:RFS-FIM-401:RP2-RFON-En-RB
 MBL-070RFC:RFS-FIM-401:RP2-RFON-Precond
 MBL-070RFC:RFS-FIM-401:RP2-TrigSel-RB
 MBL-070RFC:RFS-FIM-401:RP2-TrigThre-RB
-MBL-070RFC:RFS-FIM-401:RP2-Wave-IlckPM
 MBL-070RFC:RFS-FIM-401:TriggerLine-RB
 MBL-070RFC:RFS-Kly-410:PwrFwd-DevMonEval-RB
 MBL-070RFC:RFS-Kly-410:PwrFwd-DevMonFact-RB
@@ -884,7 +857,6 @@ MBL-070RFC:RFS-Kly-410:PwrFwd-Wave-Avg
 MBL-070RFC:RFS-Kly-410:PwrFwd-Wave-High
 MBL-070RFC:RFS-Kly-410:PwrFwd-Wave-Low
 MBL-070RFC:RFS-Kly-410:PwrFwd-Wave-Med
-MBL-070RFC:RFS-Kly-410:PwrFwd-Wave-PM
 MBL-070RFC:RFS-Kly-410:PwrRfl-DevMonEval-RB
 MBL-070RFC:RFS-Kly-410:PwrRfl-DevMonFact-RB
 MBL-070RFC:RFS-Kly-410:PwrRfl-DevMonIlck-RB
@@ -923,12 +895,10 @@ MBL-070RFC:RFS-Kly-410:PwrRfl-Wave-Avg
 MBL-070RFC:RFS-Kly-410:PwrRfl-Wave-High
 MBL-070RFC:RFS-Kly-410:PwrRfl-Wave-Low
 MBL-070RFC:RFS-Kly-410:PwrRfl-Wave-Med
-MBL-070RFC:RFS-Kly-410:PwrRfl-Wave-PM
 MBL-070RFC:RFS-LLRF-401:Status-DIlckMode-RB
 MBL-070RFC:RFS-LLRF-401:Status-Ilck-RB
 MBL-070RFC:RFS-LLRF-401:Status-Input-RB
 MBL-070RFC:RFS-LLRF-401:Status-isFirstIlck
-MBL-070RFC:RFS-LLRF-401:Status-Wave-PM
 MBL-070RFC:RFS-Load-420:PwrFwd-DevMonEval-RB
 MBL-070RFC:RFS-Load-420:PwrFwd-DevMonFact-RB
 MBL-070RFC:RFS-Load-420:PwrFwd-DevMonIlck-RB
@@ -967,7 +937,6 @@ MBL-070RFC:RFS-Load-420:PwrFwd-Wave-Avg
 MBL-070RFC:RFS-Load-420:PwrFwd-Wave-High
 MBL-070RFC:RFS-Load-420:PwrFwd-Wave-Low
 MBL-070RFC:RFS-Load-420:PwrFwd-Wave-Med
-MBL-070RFC:RFS-Load-420:PwrFwd-Wave-PM
 MBL-070RFC:RFS-Load-420:PwrRfl-DevMonEval-RB
 MBL-070RFC:RFS-Load-420:PwrRfl-DevMonFact-RB
 MBL-070RFC:RFS-Load-420:PwrRfl-DevMonIlck-RB
@@ -1006,7 +975,6 @@ MBL-070RFC:RFS-Load-420:PwrRfl-Wave-Avg
 MBL-070RFC:RFS-Load-420:PwrRfl-Wave-High
 MBL-070RFC:RFS-Load-420:PwrRfl-Wave-Low
 MBL-070RFC:RFS-Load-420:PwrRfl-Wave-Med
-MBL-070RFC:RFS-Load-420:PwrRfl-Wave-PM
 MBL-070RFC:RFS-Mod-410:Cur-DevMonEval-RB
 MBL-070RFC:RFS-Mod-410:Cur-DevMonFact-RB
 MBL-070RFC:RFS-Mod-410:Cur-DevMonIlck-RB
@@ -1045,17 +1013,14 @@ MBL-070RFC:RFS-Mod-410:Cur-Wave-Avg
 MBL-070RFC:RFS-Mod-410:Cur-Wave-High
 MBL-070RFC:RFS-Mod-410:Cur-Wave-Low
 MBL-070RFC:RFS-Mod-410:Cur-Wave-Med
-MBL-070RFC:RFS-Mod-410:Cur-Wave-PM
 MBL-070RFC:RFS-Mod-410:PCcon-DIlckMode-RB
 MBL-070RFC:RFS-Mod-410:PCcon-Ilck-RB
 MBL-070RFC:RFS-Mod-410:PCcon-Input-RB
 MBL-070RFC:RFS-Mod-410:PCcon-isFirstIlck
-MBL-070RFC:RFS-Mod-410:PCcon-Wave-PM
 MBL-070RFC:RFS-Mod-410:Ready-DIlckMode-RB
 MBL-070RFC:RFS-Mod-410:Ready-Ilck-RB
 MBL-070RFC:RFS-Mod-410:Ready-Input-RB
 MBL-070RFC:RFS-Mod-410:Ready-isFirstIlck
-MBL-070RFC:RFS-Mod-410:Ready-Wave-PM
 MBL-070RFC:RFS-Mod-410:Vol-DevMonEval-RB
 MBL-070RFC:RFS-Mod-410:Vol-DevMonFact-RB
 MBL-070RFC:RFS-Mod-410:Vol-DevMonIlck-RB
@@ -1094,7 +1059,6 @@ MBL-070RFC:RFS-Mod-410:Vol-Wave-Avg
 MBL-070RFC:RFS-Mod-410:Vol-Wave-High
 MBL-070RFC:RFS-Mod-410:Vol-Wave-Low
 MBL-070RFC:RFS-Mod-410:Vol-Wave-Med
-MBL-070RFC:RFS-Mod-410:Vol-Wave-PM
 MBL-070RFC:RFS-PAmp-410:PwrFwd-DevMonEval-RB
 MBL-070RFC:RFS-PAmp-410:PwrFwd-DevMonFact-RB
 MBL-070RFC:RFS-PAmp-410:PwrFwd-DevMonIlck-RB
@@ -1133,17 +1097,14 @@ MBL-070RFC:RFS-PAmp-410:PwrFwd-Wave-Avg
 MBL-070RFC:RFS-PAmp-410:PwrFwd-Wave-High
 MBL-070RFC:RFS-PAmp-410:PwrFwd-Wave-Low
 MBL-070RFC:RFS-PAmp-410:PwrFwd-Wave-Med
-MBL-070RFC:RFS-PAmp-410:PwrFwd-Wave-PM
 MBL-070RFC:RFS-SIM-410:HvEna-DIlckMode-RB
 MBL-070RFC:RFS-SIM-410:HvEna-Ilck-RB
 MBL-070RFC:RFS-SIM-410:HvEna-Input-RB
 MBL-070RFC:RFS-SIM-410:HvEna-isFirstIlck
-MBL-070RFC:RFS-SIM-410:HvEna-Wave-PM
 MBL-070RFC:RFS-SIM-410:RfEna-DIlckMode-RB
 MBL-070RFC:RFS-SIM-410:RfEna-Ilck-RB
 MBL-070RFC:RFS-SIM-410:RfEna-Input-RB
 MBL-070RFC:RFS-SIM-410:RfEna-isFirstIlck
-MBL-070RFC:RFS-SIM-410:RfEna-Wave-PM
 MBL-070RFC:RFS-SolPS-410:Cur-DevMonEval-RB
 MBL-070RFC:RFS-SolPS-410:Cur-DevMonFact-RB
 MBL-070RFC:RFS-SolPS-410:Cur-DevMonIlck-RB
@@ -1182,7 +1143,6 @@ MBL-070RFC:RFS-SolPS-410:Cur-Wave-Avg
 MBL-070RFC:RFS-SolPS-410:Cur-Wave-High
 MBL-070RFC:RFS-SolPS-410:Cur-Wave-Low
 MBL-070RFC:RFS-SolPS-410:Cur-Wave-Med
-MBL-070RFC:RFS-SolPS-410:Cur-Wave-PM
 MBL-070RFC:RFS-SolPS-420:Cur-DevMonEval-RB
 MBL-070RFC:RFS-SolPS-420:Cur-DevMonFact-RB
 MBL-070RFC:RFS-SolPS-420:Cur-DevMonIlck-RB
@@ -1221,24 +1181,19 @@ MBL-070RFC:RFS-SolPS-420:Cur-Wave-Avg
 MBL-070RFC:RFS-SolPS-420:Cur-Wave-High
 MBL-070RFC:RFS-SolPS-420:Cur-Wave-Low
 MBL-070RFC:RFS-SolPS-420:Cur-Wave-Med
-MBL-070RFC:RFS-SolPS-420:Cur-Wave-PM
 MBL-070RFC:RFS-VacBody-410:Status-DIlckMode-RB
 MBL-070RFC:RFS-VacBody-410:Status-Ilck-RB
 MBL-070RFC:RFS-VacBody-410:Status-Input-RB
 MBL-070RFC:RFS-VacBody-410:Status-isFirstIlck
-MBL-070RFC:RFS-VacBody-410:Status-Wave-PM
 MBL-070RFC:RFS-VacCav-410:Status-DIlckMode-RB
 MBL-070RFC:RFS-VacCav-410:Status-Ilck-RB
 MBL-070RFC:RFS-VacCav-410:Status-Input-RB
 MBL-070RFC:RFS-VacCav-410:Status-isFirstIlck
-MBL-070RFC:RFS-VacCav-410:Status-Wave-PM
 MBL-070RFC:RFS-VacPS-410:I-SP-DIlckMode-RB
 MBL-070RFC:RFS-VacPS-410:I-SP-Ilck-RB
 MBL-070RFC:RFS-VacPS-410:I-SP-Input-RB
 MBL-070RFC:RFS-VacPS-410:I-SP-isFirstIlck
-MBL-070RFC:RFS-VacPS-410:I-SP-Wave-PM
 MBL-070RFC:RFS-VacPS-420:I-SP-DIlckMode-RB
 MBL-070RFC:RFS-VacPS-420:I-SP-Ilck-RB
 MBL-070RFC:RFS-VacPS-420:I-SP-Input-RB
 MBL-070RFC:RFS-VacPS-420:I-SP-isFirstIlck
-MBL-070RFC:RFS-VacPS-420:I-SP-Wave-PM
diff --git a/files/MBL-080RFC_SC-IOC-102.archive b/files/MBL-080RFC_SC-IOC-102.archive
index 930a6e6..a63e48e 100644
--- a/files/MBL-080RFC_SC-IOC-102.archive
+++ b/files/MBL-080RFC_SC-IOC-102.archive
@@ -2,12 +2,10 @@ MBL-080RFC:RFS-ADG-110:IlckStatus-DIlckMode-RB
 MBL-080RFC:RFS-ADG-110:IlckStatus-Ilck-RB
 MBL-080RFC:RFS-ADG-110:IlckStatus-Input-RB
 MBL-080RFC:RFS-ADG-110:IlckStatus-isFirstIlck
-MBL-080RFC:RFS-ADG-110:IlckStatus-Wave-PM
 MBL-080RFC:RFS-ADG-110:PwrFail-DIlckMode-RB
 MBL-080RFC:RFS-ADG-110:PwrFail-Ilck-RB
 MBL-080RFC:RFS-ADG-110:PwrFail-Input-RB
 MBL-080RFC:RFS-ADG-110:PwrFail-isFirstIlck
-MBL-080RFC:RFS-ADG-110:PwrFail-Wave-PM
 MBL-080RFC:RFS-Cav-110:Fld-DevMonEval-RB
 MBL-080RFC:RFS-Cav-110:Fld-DevMonFact-RB
 MBL-080RFC:RFS-Cav-110:Fld-DevMonIlck-RB
@@ -46,7 +44,6 @@ MBL-080RFC:RFS-Cav-110:Fld-Wave-Avg
 MBL-080RFC:RFS-Cav-110:Fld-Wave-High
 MBL-080RFC:RFS-Cav-110:Fld-Wave-Low
 MBL-080RFC:RFS-Cav-110:Fld-Wave-Med
-MBL-080RFC:RFS-Cav-110:Fld-Wave-PM
 MBL-080RFC:RFS-Cav-110:PwrFwd-DevMonEval-RB
 MBL-080RFC:RFS-Cav-110:PwrFwd-DevMonFact-RB
 MBL-080RFC:RFS-Cav-110:PwrFwd-DevMonIlck-RB
@@ -85,7 +82,6 @@ MBL-080RFC:RFS-Cav-110:PwrFwd-Wave-Avg
 MBL-080RFC:RFS-Cav-110:PwrFwd-Wave-High
 MBL-080RFC:RFS-Cav-110:PwrFwd-Wave-Low
 MBL-080RFC:RFS-Cav-110:PwrFwd-Wave-Med
-MBL-080RFC:RFS-Cav-110:PwrFwd-Wave-PM
 MBL-080RFC:RFS-Cav-110:PwrRfl-DevMonEval-RB
 MBL-080RFC:RFS-Cav-110:PwrRfl-DevMonFact-RB
 MBL-080RFC:RFS-Cav-110:PwrRfl-DevMonIlck-RB
@@ -124,7 +120,6 @@ MBL-080RFC:RFS-Cav-110:PwrRfl-Wave-Avg
 MBL-080RFC:RFS-Cav-110:PwrRfl-Wave-High
 MBL-080RFC:RFS-Cav-110:PwrRfl-Wave-Low
 MBL-080RFC:RFS-Cav-110:PwrRfl-Wave-Med
-MBL-080RFC:RFS-Cav-110:PwrRfl-Wave-PM
 MBL-080RFC:RFS-EPR-110:Cur-DevMonEval-RB
 MBL-080RFC:RFS-EPR-110:Cur-DevMonFact-RB
 MBL-080RFC:RFS-EPR-110:Cur-DevMonIlck-RB
@@ -163,7 +158,6 @@ MBL-080RFC:RFS-EPR-110:Cur-Wave-Avg
 MBL-080RFC:RFS-EPR-110:Cur-Wave-High
 MBL-080RFC:RFS-EPR-110:Cur-Wave-Low
 MBL-080RFC:RFS-EPR-110:Cur-Wave-Med
-MBL-080RFC:RFS-EPR-110:Cur-Wave-PM
 MBL-080RFC:RFS-FIM-101:AI10-DevMonEval-RB
 MBL-080RFC:RFS-FIM-101:AI10-DevMonFact-RB
 MBL-080RFC:RFS-FIM-101:AI10-DevMonIlck-RB
@@ -208,7 +202,6 @@ MBL-080RFC:RFS-FIM-101:AI10-Wave-Avg
 MBL-080RFC:RFS-FIM-101:AI10-Wave-High
 MBL-080RFC:RFS-FIM-101:AI10-Wave-Low
 MBL-080RFC:RFS-FIM-101:AI10-Wave-Med
-MBL-080RFC:RFS-FIM-101:AI10-Wave-PM
 MBL-080RFC:RFS-FIM-101:AI1-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-101:AI1-HVON-En-RB
 MBL-080RFC:RFS-FIM-101:AI1-HVON-Precond
@@ -277,7 +270,6 @@ MBL-080RFC:RFS-FIM-101:AI5-Wave-Avg
 MBL-080RFC:RFS-FIM-101:AI5-Wave-High
 MBL-080RFC:RFS-FIM-101:AI5-Wave-Low
 MBL-080RFC:RFS-FIM-101:AI5-Wave-Med
-MBL-080RFC:RFS-FIM-101:AI5-Wave-PM
 MBL-080RFC:RFS-FIM-101:AI6-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-101:AI6-HVON-En-RB
 MBL-080RFC:RFS-FIM-101:AI6-HVON-Precond
@@ -328,7 +320,6 @@ MBL-080RFC:RFS-FIM-101:AI7-Wave-Avg
 MBL-080RFC:RFS-FIM-101:AI7-Wave-High
 MBL-080RFC:RFS-FIM-101:AI7-Wave-Low
 MBL-080RFC:RFS-FIM-101:AI7-Wave-Med
-MBL-080RFC:RFS-FIM-101:AI7-Wave-PM
 MBL-080RFC:RFS-FIM-101:AI8-DevMonEval-RB
 MBL-080RFC:RFS-FIM-101:AI8-DevMonFact-RB
 MBL-080RFC:RFS-FIM-101:AI8-DevMonIlck-RB
@@ -373,7 +364,6 @@ MBL-080RFC:RFS-FIM-101:AI8-Wave-Avg
 MBL-080RFC:RFS-FIM-101:AI8-Wave-High
 MBL-080RFC:RFS-FIM-101:AI8-Wave-Low
 MBL-080RFC:RFS-FIM-101:AI8-Wave-Med
-MBL-080RFC:RFS-FIM-101:AI8-Wave-PM
 MBL-080RFC:RFS-FIM-101:AI9-DevMonEval-RB
 MBL-080RFC:RFS-FIM-101:AI9-DevMonFact-RB
 MBL-080RFC:RFS-FIM-101:AI9-DevMonIlck-RB
@@ -418,7 +408,6 @@ MBL-080RFC:RFS-FIM-101:AI9-Wave-Avg
 MBL-080RFC:RFS-FIM-101:AI9-Wave-High
 MBL-080RFC:RFS-FIM-101:AI9-Wave-Low
 MBL-080RFC:RFS-FIM-101:AI9-Wave-Med
-MBL-080RFC:RFS-FIM-101:AI9-Wave-PM
 MBL-080RFC:RFS-FIM-101:CD1-DevFactor-RB
 MBL-080RFC:RFS-FIM-101:CD1-DevPeriod-RB
 MBL-080RFC:RFS-FIM-101:CD1-FastRst-IlckCnt
@@ -440,7 +429,6 @@ MBL-080RFC:RFS-FIM-101:CD1-RFON-En-RB
 MBL-080RFC:RFS-FIM-101:CD1-RFON-Precond
 MBL-080RFC:RFS-FIM-101:CD1-TrigSel-RB
 MBL-080RFC:RFS-FIM-101:CD1-TrigThre-RB
-MBL-080RFC:RFS-FIM-101:CD1-Wave-IlckPM
 MBL-080RFC:RFS-FIM-101:CD2-DevFactor-RB
 MBL-080RFC:RFS-FIM-101:CD2-DevPeriod-RB
 MBL-080RFC:RFS-FIM-101:CD2-FastRst-IlckCnt
@@ -462,7 +450,6 @@ MBL-080RFC:RFS-FIM-101:CD2-RFON-En-RB
 MBL-080RFC:RFS-FIM-101:CD2-RFON-Precond
 MBL-080RFC:RFS-FIM-101:CD2-TrigSel-RB
 MBL-080RFC:RFS-FIM-101:CD2-TrigThre-RB
-MBL-080RFC:RFS-FIM-101:CD2-Wave-IlckPM
 MBL-080RFC:RFS-FIM-101:DI10-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-101:DI10-DIlckMode-RB
 MBL-080RFC:RFS-FIM-101:DI10-FastRst-IlckCnt
@@ -474,7 +461,6 @@ MBL-080RFC:RFS-FIM-101:DI10-Input-RB
 MBL-080RFC:RFS-FIM-101:DI10-isFirstIlck
 MBL-080RFC:RFS-FIM-101:DI10-RFON-En-RB
 MBL-080RFC:RFS-FIM-101:DI10-RFON-Precond
-MBL-080RFC:RFS-FIM-101:DI10-Wave-PM
 MBL-080RFC:RFS-FIM-101:DI11-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-101:DI11-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-101:DI11-HVON-En-RB
@@ -493,7 +479,6 @@ MBL-080RFC:RFS-FIM-101:DI12-Input-RB
 MBL-080RFC:RFS-FIM-101:DI12-isFirstIlck
 MBL-080RFC:RFS-FIM-101:DI12-RFON-En-RB
 MBL-080RFC:RFS-FIM-101:DI12-RFON-Precond
-MBL-080RFC:RFS-FIM-101:DI12-Wave-PM
 MBL-080RFC:RFS-FIM-101:DI13-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-101:DI13-DIlckMode-RB
 MBL-080RFC:RFS-FIM-101:DI13-FastRst-IlckCnt
@@ -505,7 +490,6 @@ MBL-080RFC:RFS-FIM-101:DI13-Input-RB
 MBL-080RFC:RFS-FIM-101:DI13-isFirstIlck
 MBL-080RFC:RFS-FIM-101:DI13-RFON-En-RB
 MBL-080RFC:RFS-FIM-101:DI13-RFON-Precond
-MBL-080RFC:RFS-FIM-101:DI13-Wave-PM
 MBL-080RFC:RFS-FIM-101:DI14-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-101:DI14-DIlckMode-RB
 MBL-080RFC:RFS-FIM-101:DI14-FastRst-IlckCnt
@@ -517,7 +501,6 @@ MBL-080RFC:RFS-FIM-101:DI14-Input-RB
 MBL-080RFC:RFS-FIM-101:DI14-isFirstIlck
 MBL-080RFC:RFS-FIM-101:DI14-RFON-En-RB
 MBL-080RFC:RFS-FIM-101:DI14-RFON-Precond
-MBL-080RFC:RFS-FIM-101:DI14-Wave-PM
 MBL-080RFC:RFS-FIM-101:DI15-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-101:DI15-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-101:DI15-HVON-En-RB
@@ -543,7 +526,6 @@ MBL-080RFC:RFS-FIM-101:DI17-Input-RB
 MBL-080RFC:RFS-FIM-101:DI17-isFirstIlck
 MBL-080RFC:RFS-FIM-101:DI17-RFON-En-RB
 MBL-080RFC:RFS-FIM-101:DI17-RFON-Precond
-MBL-080RFC:RFS-FIM-101:DI17-Wave-PM
 MBL-080RFC:RFS-FIM-101:DI18-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-101:DI18-DIlckMode-RB
 MBL-080RFC:RFS-FIM-101:DI18-FastRst-IlckCnt
@@ -555,7 +537,6 @@ MBL-080RFC:RFS-FIM-101:DI18-Input-RB
 MBL-080RFC:RFS-FIM-101:DI18-isFirstIlck
 MBL-080RFC:RFS-FIM-101:DI18-RFON-En-RB
 MBL-080RFC:RFS-FIM-101:DI18-RFON-Precond
-MBL-080RFC:RFS-FIM-101:DI18-Wave-PM
 MBL-080RFC:RFS-FIM-101:DI19-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-101:DI19-DIlckMode-RB
 MBL-080RFC:RFS-FIM-101:DI19-FastRst-IlckCnt
@@ -567,7 +548,6 @@ MBL-080RFC:RFS-FIM-101:DI19-Input-RB
 MBL-080RFC:RFS-FIM-101:DI19-isFirstIlck
 MBL-080RFC:RFS-FIM-101:DI19-RFON-En-RB
 MBL-080RFC:RFS-FIM-101:DI19-RFON-Precond
-MBL-080RFC:RFS-FIM-101:DI19-Wave-PM
 MBL-080RFC:RFS-FIM-101:DI1-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-101:DI1-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-101:DI1-HVON-En-RB
@@ -586,7 +566,6 @@ MBL-080RFC:RFS-FIM-101:DI20-Input-RB
 MBL-080RFC:RFS-FIM-101:DI20-isFirstIlck
 MBL-080RFC:RFS-FIM-101:DI20-RFON-En-RB
 MBL-080RFC:RFS-FIM-101:DI20-RFON-Precond
-MBL-080RFC:RFS-FIM-101:DI20-Wave-PM
 MBL-080RFC:RFS-FIM-101:DI21-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-101:DI21-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-101:DI21-HVON-En-RB
@@ -640,7 +619,6 @@ MBL-080RFC:RFS-FIM-101:DI7-Input-RB
 MBL-080RFC:RFS-FIM-101:DI7-isFirstIlck
 MBL-080RFC:RFS-FIM-101:DI7-RFON-En-RB
 MBL-080RFC:RFS-FIM-101:DI7-RFON-Precond
-MBL-080RFC:RFS-FIM-101:DI7-Wave-PM
 MBL-080RFC:RFS-FIM-101:DI8-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-101:DI8-DIlckMode-RB
 MBL-080RFC:RFS-FIM-101:DI8-FastRst-IlckCnt
@@ -652,7 +630,6 @@ MBL-080RFC:RFS-FIM-101:DI8-Input-RB
 MBL-080RFC:RFS-FIM-101:DI8-isFirstIlck
 MBL-080RFC:RFS-FIM-101:DI8-RFON-En-RB
 MBL-080RFC:RFS-FIM-101:DI8-RFON-Precond
-MBL-080RFC:RFS-FIM-101:DI8-Wave-PM
 MBL-080RFC:RFS-FIM-101:DI9-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-101:DI9-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-101:DI9-HVON-En-RB
@@ -710,7 +687,6 @@ MBL-080RFC:RFS-FIM-101:RF10-Wave-Avg
 MBL-080RFC:RFS-FIM-101:RF10-Wave-High
 MBL-080RFC:RFS-FIM-101:RF10-Wave-Low
 MBL-080RFC:RFS-FIM-101:RF10-Wave-Med
-MBL-080RFC:RFS-FIM-101:RF10-Wave-PM
 MBL-080RFC:RFS-FIM-101:RF1-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-101:RF1-HVON-En-RB
 MBL-080RFC:RFS-FIM-101:RF1-HVON-Precond
@@ -803,7 +779,6 @@ MBL-080RFC:RFS-FIM-101:RF9-Wave-Avg
 MBL-080RFC:RFS-FIM-101:RF9-Wave-High
 MBL-080RFC:RFS-FIM-101:RF9-Wave-Low
 MBL-080RFC:RFS-FIM-101:RF9-Wave-Med
-MBL-080RFC:RFS-FIM-101:RF9-Wave-PM
 MBL-080RFC:RFS-FIM-101:RFON-Precond
 MBL-080RFC:RFS-FIM-101:RP1-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-101:RP1-HVON-En-RB
@@ -824,7 +799,6 @@ MBL-080RFC:RFS-FIM-101:RP1-RFON-En-RB
 MBL-080RFC:RFS-FIM-101:RP1-RFON-Precond
 MBL-080RFC:RFS-FIM-101:RP1-TrigSel-RB
 MBL-080RFC:RFS-FIM-101:RP1-TrigThre-RB
-MBL-080RFC:RFS-FIM-101:RP1-Wave-IlckPM
 MBL-080RFC:RFS-FIM-101:RP2-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-101:RP2-HVON-En-RB
 MBL-080RFC:RFS-FIM-101:RP2-HVON-Precond
@@ -844,7 +818,6 @@ MBL-080RFC:RFS-FIM-101:RP2-RFON-En-RB
 MBL-080RFC:RFS-FIM-101:RP2-RFON-Precond
 MBL-080RFC:RFS-FIM-101:RP2-TrigSel-RB
 MBL-080RFC:RFS-FIM-101:RP2-TrigThre-RB
-MBL-080RFC:RFS-FIM-101:RP2-Wave-IlckPM
 MBL-080RFC:RFS-FIM-101:TriggerLine-RB
 MBL-080RFC:RFS-Kly-110:PwrFwd-DevMonEval-RB
 MBL-080RFC:RFS-Kly-110:PwrFwd-DevMonFact-RB
@@ -884,7 +857,6 @@ MBL-080RFC:RFS-Kly-110:PwrFwd-Wave-Avg
 MBL-080RFC:RFS-Kly-110:PwrFwd-Wave-High
 MBL-080RFC:RFS-Kly-110:PwrFwd-Wave-Low
 MBL-080RFC:RFS-Kly-110:PwrFwd-Wave-Med
-MBL-080RFC:RFS-Kly-110:PwrFwd-Wave-PM
 MBL-080RFC:RFS-Kly-110:PwrRfl-DevMonEval-RB
 MBL-080RFC:RFS-Kly-110:PwrRfl-DevMonFact-RB
 MBL-080RFC:RFS-Kly-110:PwrRfl-DevMonIlck-RB
@@ -923,12 +895,10 @@ MBL-080RFC:RFS-Kly-110:PwrRfl-Wave-Avg
 MBL-080RFC:RFS-Kly-110:PwrRfl-Wave-High
 MBL-080RFC:RFS-Kly-110:PwrRfl-Wave-Low
 MBL-080RFC:RFS-Kly-110:PwrRfl-Wave-Med
-MBL-080RFC:RFS-Kly-110:PwrRfl-Wave-PM
 MBL-080RFC:RFS-LLRF-101:Status-DIlckMode-RB
 MBL-080RFC:RFS-LLRF-101:Status-Ilck-RB
 MBL-080RFC:RFS-LLRF-101:Status-Input-RB
 MBL-080RFC:RFS-LLRF-101:Status-isFirstIlck
-MBL-080RFC:RFS-LLRF-101:Status-Wave-PM
 MBL-080RFC:RFS-Load-120:PwrFwd-DevMonEval-RB
 MBL-080RFC:RFS-Load-120:PwrFwd-DevMonFact-RB
 MBL-080RFC:RFS-Load-120:PwrFwd-DevMonIlck-RB
@@ -967,7 +937,6 @@ MBL-080RFC:RFS-Load-120:PwrFwd-Wave-Avg
 MBL-080RFC:RFS-Load-120:PwrFwd-Wave-High
 MBL-080RFC:RFS-Load-120:PwrFwd-Wave-Low
 MBL-080RFC:RFS-Load-120:PwrFwd-Wave-Med
-MBL-080RFC:RFS-Load-120:PwrFwd-Wave-PM
 MBL-080RFC:RFS-Load-120:PwrRfl-DevMonEval-RB
 MBL-080RFC:RFS-Load-120:PwrRfl-DevMonFact-RB
 MBL-080RFC:RFS-Load-120:PwrRfl-DevMonIlck-RB
@@ -1006,7 +975,6 @@ MBL-080RFC:RFS-Load-120:PwrRfl-Wave-Avg
 MBL-080RFC:RFS-Load-120:PwrRfl-Wave-High
 MBL-080RFC:RFS-Load-120:PwrRfl-Wave-Low
 MBL-080RFC:RFS-Load-120:PwrRfl-Wave-Med
-MBL-080RFC:RFS-Load-120:PwrRfl-Wave-PM
 MBL-080RFC:RFS-Mod-110:Cur-DevMonEval-RB
 MBL-080RFC:RFS-Mod-110:Cur-DevMonFact-RB
 MBL-080RFC:RFS-Mod-110:Cur-DevMonIlck-RB
@@ -1045,17 +1013,14 @@ MBL-080RFC:RFS-Mod-110:Cur-Wave-Avg
 MBL-080RFC:RFS-Mod-110:Cur-Wave-High
 MBL-080RFC:RFS-Mod-110:Cur-Wave-Low
 MBL-080RFC:RFS-Mod-110:Cur-Wave-Med
-MBL-080RFC:RFS-Mod-110:Cur-Wave-PM
 MBL-080RFC:RFS-Mod-110:PCcon-DIlckMode-RB
 MBL-080RFC:RFS-Mod-110:PCcon-Ilck-RB
 MBL-080RFC:RFS-Mod-110:PCcon-Input-RB
 MBL-080RFC:RFS-Mod-110:PCcon-isFirstIlck
-MBL-080RFC:RFS-Mod-110:PCcon-Wave-PM
 MBL-080RFC:RFS-Mod-110:Ready-DIlckMode-RB
 MBL-080RFC:RFS-Mod-110:Ready-Ilck-RB
 MBL-080RFC:RFS-Mod-110:Ready-Input-RB
 MBL-080RFC:RFS-Mod-110:Ready-isFirstIlck
-MBL-080RFC:RFS-Mod-110:Ready-Wave-PM
 MBL-080RFC:RFS-Mod-110:Vol-DevMonEval-RB
 MBL-080RFC:RFS-Mod-110:Vol-DevMonFact-RB
 MBL-080RFC:RFS-Mod-110:Vol-DevMonIlck-RB
@@ -1094,7 +1059,6 @@ MBL-080RFC:RFS-Mod-110:Vol-Wave-Avg
 MBL-080RFC:RFS-Mod-110:Vol-Wave-High
 MBL-080RFC:RFS-Mod-110:Vol-Wave-Low
 MBL-080RFC:RFS-Mod-110:Vol-Wave-Med
-MBL-080RFC:RFS-Mod-110:Vol-Wave-PM
 MBL-080RFC:RFS-PAmp-110:PwrFwd-DevMonEval-RB
 MBL-080RFC:RFS-PAmp-110:PwrFwd-DevMonFact-RB
 MBL-080RFC:RFS-PAmp-110:PwrFwd-DevMonIlck-RB
@@ -1133,17 +1097,14 @@ MBL-080RFC:RFS-PAmp-110:PwrFwd-Wave-Avg
 MBL-080RFC:RFS-PAmp-110:PwrFwd-Wave-High
 MBL-080RFC:RFS-PAmp-110:PwrFwd-Wave-Low
 MBL-080RFC:RFS-PAmp-110:PwrFwd-Wave-Med
-MBL-080RFC:RFS-PAmp-110:PwrFwd-Wave-PM
 MBL-080RFC:RFS-SIM-110:HvEna-DIlckMode-RB
 MBL-080RFC:RFS-SIM-110:HvEna-Ilck-RB
 MBL-080RFC:RFS-SIM-110:HvEna-Input-RB
 MBL-080RFC:RFS-SIM-110:HvEna-isFirstIlck
-MBL-080RFC:RFS-SIM-110:HvEna-Wave-PM
 MBL-080RFC:RFS-SIM-110:RfEna-DIlckMode-RB
 MBL-080RFC:RFS-SIM-110:RfEna-Ilck-RB
 MBL-080RFC:RFS-SIM-110:RfEna-Input-RB
 MBL-080RFC:RFS-SIM-110:RfEna-isFirstIlck
-MBL-080RFC:RFS-SIM-110:RfEna-Wave-PM
 MBL-080RFC:RFS-SolPS-110:Cur-DevMonEval-RB
 MBL-080RFC:RFS-SolPS-110:Cur-DevMonFact-RB
 MBL-080RFC:RFS-SolPS-110:Cur-DevMonIlck-RB
@@ -1182,7 +1143,6 @@ MBL-080RFC:RFS-SolPS-110:Cur-Wave-Avg
 MBL-080RFC:RFS-SolPS-110:Cur-Wave-High
 MBL-080RFC:RFS-SolPS-110:Cur-Wave-Low
 MBL-080RFC:RFS-SolPS-110:Cur-Wave-Med
-MBL-080RFC:RFS-SolPS-110:Cur-Wave-PM
 MBL-080RFC:RFS-SolPS-120:Cur-DevMonEval-RB
 MBL-080RFC:RFS-SolPS-120:Cur-DevMonFact-RB
 MBL-080RFC:RFS-SolPS-120:Cur-DevMonIlck-RB
@@ -1221,24 +1181,19 @@ MBL-080RFC:RFS-SolPS-120:Cur-Wave-Avg
 MBL-080RFC:RFS-SolPS-120:Cur-Wave-High
 MBL-080RFC:RFS-SolPS-120:Cur-Wave-Low
 MBL-080RFC:RFS-SolPS-120:Cur-Wave-Med
-MBL-080RFC:RFS-SolPS-120:Cur-Wave-PM
 MBL-080RFC:RFS-VacBody-110:Status-DIlckMode-RB
 MBL-080RFC:RFS-VacBody-110:Status-Ilck-RB
 MBL-080RFC:RFS-VacBody-110:Status-Input-RB
 MBL-080RFC:RFS-VacBody-110:Status-isFirstIlck
-MBL-080RFC:RFS-VacBody-110:Status-Wave-PM
 MBL-080RFC:RFS-VacCav-110:Status-DIlckMode-RB
 MBL-080RFC:RFS-VacCav-110:Status-Ilck-RB
 MBL-080RFC:RFS-VacCav-110:Status-Input-RB
 MBL-080RFC:RFS-VacCav-110:Status-isFirstIlck
-MBL-080RFC:RFS-VacCav-110:Status-Wave-PM
 MBL-080RFC:RFS-VacPS-110:I-SP-DIlckMode-RB
 MBL-080RFC:RFS-VacPS-110:I-SP-Ilck-RB
 MBL-080RFC:RFS-VacPS-110:I-SP-Input-RB
 MBL-080RFC:RFS-VacPS-110:I-SP-isFirstIlck
-MBL-080RFC:RFS-VacPS-110:I-SP-Wave-PM
 MBL-080RFC:RFS-VacPS-120:I-SP-DIlckMode-RB
 MBL-080RFC:RFS-VacPS-120:I-SP-Ilck-RB
 MBL-080RFC:RFS-VacPS-120:I-SP-Input-RB
 MBL-080RFC:RFS-VacPS-120:I-SP-isFirstIlck
-MBL-080RFC:RFS-VacPS-120:I-SP-Wave-PM
diff --git a/files/MBL-080RFC_SC-IOC-202.archive b/files/MBL-080RFC_SC-IOC-202.archive
index 0282115..cb4a3f3 100644
--- a/files/MBL-080RFC_SC-IOC-202.archive
+++ b/files/MBL-080RFC_SC-IOC-202.archive
@@ -2,12 +2,10 @@ MBL-080RFC:RFS-ADG-210:IlckStatus-DIlckMode-RB
 MBL-080RFC:RFS-ADG-210:IlckStatus-Ilck-RB
 MBL-080RFC:RFS-ADG-210:IlckStatus-Input-RB
 MBL-080RFC:RFS-ADG-210:IlckStatus-isFirstIlck
-MBL-080RFC:RFS-ADG-210:IlckStatus-Wave-PM
 MBL-080RFC:RFS-ADG-210:PwrFail-DIlckMode-RB
 MBL-080RFC:RFS-ADG-210:PwrFail-Ilck-RB
 MBL-080RFC:RFS-ADG-210:PwrFail-Input-RB
 MBL-080RFC:RFS-ADG-210:PwrFail-isFirstIlck
-MBL-080RFC:RFS-ADG-210:PwrFail-Wave-PM
 MBL-080RFC:RFS-Cav-210:Fld-DevMonEval-RB
 MBL-080RFC:RFS-Cav-210:Fld-DevMonFact-RB
 MBL-080RFC:RFS-Cav-210:Fld-DevMonIlck-RB
@@ -46,7 +44,6 @@ MBL-080RFC:RFS-Cav-210:Fld-Wave-Avg
 MBL-080RFC:RFS-Cav-210:Fld-Wave-High
 MBL-080RFC:RFS-Cav-210:Fld-Wave-Low
 MBL-080RFC:RFS-Cav-210:Fld-Wave-Med
-MBL-080RFC:RFS-Cav-210:Fld-Wave-PM
 MBL-080RFC:RFS-Cav-210:PwrFwd-DevMonEval-RB
 MBL-080RFC:RFS-Cav-210:PwrFwd-DevMonFact-RB
 MBL-080RFC:RFS-Cav-210:PwrFwd-DevMonIlck-RB
@@ -85,7 +82,6 @@ MBL-080RFC:RFS-Cav-210:PwrFwd-Wave-Avg
 MBL-080RFC:RFS-Cav-210:PwrFwd-Wave-High
 MBL-080RFC:RFS-Cav-210:PwrFwd-Wave-Low
 MBL-080RFC:RFS-Cav-210:PwrFwd-Wave-Med
-MBL-080RFC:RFS-Cav-210:PwrFwd-Wave-PM
 MBL-080RFC:RFS-Cav-210:PwrRfl-DevMonEval-RB
 MBL-080RFC:RFS-Cav-210:PwrRfl-DevMonFact-RB
 MBL-080RFC:RFS-Cav-210:PwrRfl-DevMonIlck-RB
@@ -124,7 +120,6 @@ MBL-080RFC:RFS-Cav-210:PwrRfl-Wave-Avg
 MBL-080RFC:RFS-Cav-210:PwrRfl-Wave-High
 MBL-080RFC:RFS-Cav-210:PwrRfl-Wave-Low
 MBL-080RFC:RFS-Cav-210:PwrRfl-Wave-Med
-MBL-080RFC:RFS-Cav-210:PwrRfl-Wave-PM
 MBL-080RFC:RFS-EPR-210:Cur-DevMonEval-RB
 MBL-080RFC:RFS-EPR-210:Cur-DevMonFact-RB
 MBL-080RFC:RFS-EPR-210:Cur-DevMonIlck-RB
@@ -163,7 +158,6 @@ MBL-080RFC:RFS-EPR-210:Cur-Wave-Avg
 MBL-080RFC:RFS-EPR-210:Cur-Wave-High
 MBL-080RFC:RFS-EPR-210:Cur-Wave-Low
 MBL-080RFC:RFS-EPR-210:Cur-Wave-Med
-MBL-080RFC:RFS-EPR-210:Cur-Wave-PM
 MBL-080RFC:RFS-FIM-201:AI10-DevMonEval-RB
 MBL-080RFC:RFS-FIM-201:AI10-DevMonFact-RB
 MBL-080RFC:RFS-FIM-201:AI10-DevMonIlck-RB
@@ -208,7 +202,6 @@ MBL-080RFC:RFS-FIM-201:AI10-Wave-Avg
 MBL-080RFC:RFS-FIM-201:AI10-Wave-High
 MBL-080RFC:RFS-FIM-201:AI10-Wave-Low
 MBL-080RFC:RFS-FIM-201:AI10-Wave-Med
-MBL-080RFC:RFS-FIM-201:AI10-Wave-PM
 MBL-080RFC:RFS-FIM-201:AI1-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-201:AI1-HVON-En-RB
 MBL-080RFC:RFS-FIM-201:AI1-HVON-Precond
@@ -277,7 +270,6 @@ MBL-080RFC:RFS-FIM-201:AI5-Wave-Avg
 MBL-080RFC:RFS-FIM-201:AI5-Wave-High
 MBL-080RFC:RFS-FIM-201:AI5-Wave-Low
 MBL-080RFC:RFS-FIM-201:AI5-Wave-Med
-MBL-080RFC:RFS-FIM-201:AI5-Wave-PM
 MBL-080RFC:RFS-FIM-201:AI6-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-201:AI6-HVON-En-RB
 MBL-080RFC:RFS-FIM-201:AI6-HVON-Precond
@@ -328,7 +320,6 @@ MBL-080RFC:RFS-FIM-201:AI7-Wave-Avg
 MBL-080RFC:RFS-FIM-201:AI7-Wave-High
 MBL-080RFC:RFS-FIM-201:AI7-Wave-Low
 MBL-080RFC:RFS-FIM-201:AI7-Wave-Med
-MBL-080RFC:RFS-FIM-201:AI7-Wave-PM
 MBL-080RFC:RFS-FIM-201:AI8-DevMonEval-RB
 MBL-080RFC:RFS-FIM-201:AI8-DevMonFact-RB
 MBL-080RFC:RFS-FIM-201:AI8-DevMonIlck-RB
@@ -373,7 +364,6 @@ MBL-080RFC:RFS-FIM-201:AI8-Wave-Avg
 MBL-080RFC:RFS-FIM-201:AI8-Wave-High
 MBL-080RFC:RFS-FIM-201:AI8-Wave-Low
 MBL-080RFC:RFS-FIM-201:AI8-Wave-Med
-MBL-080RFC:RFS-FIM-201:AI8-Wave-PM
 MBL-080RFC:RFS-FIM-201:AI9-DevMonEval-RB
 MBL-080RFC:RFS-FIM-201:AI9-DevMonFact-RB
 MBL-080RFC:RFS-FIM-201:AI9-DevMonIlck-RB
@@ -418,7 +408,6 @@ MBL-080RFC:RFS-FIM-201:AI9-Wave-Avg
 MBL-080RFC:RFS-FIM-201:AI9-Wave-High
 MBL-080RFC:RFS-FIM-201:AI9-Wave-Low
 MBL-080RFC:RFS-FIM-201:AI9-Wave-Med
-MBL-080RFC:RFS-FIM-201:AI9-Wave-PM
 MBL-080RFC:RFS-FIM-201:CD1-DevFactor-RB
 MBL-080RFC:RFS-FIM-201:CD1-DevPeriod-RB
 MBL-080RFC:RFS-FIM-201:CD1-FastRst-IlckCnt
@@ -440,7 +429,6 @@ MBL-080RFC:RFS-FIM-201:CD1-RFON-En-RB
 MBL-080RFC:RFS-FIM-201:CD1-RFON-Precond
 MBL-080RFC:RFS-FIM-201:CD1-TrigSel-RB
 MBL-080RFC:RFS-FIM-201:CD1-TrigThre-RB
-MBL-080RFC:RFS-FIM-201:CD1-Wave-IlckPM
 MBL-080RFC:RFS-FIM-201:CD2-DevFactor-RB
 MBL-080RFC:RFS-FIM-201:CD2-DevPeriod-RB
 MBL-080RFC:RFS-FIM-201:CD2-FastRst-IlckCnt
@@ -462,7 +450,6 @@ MBL-080RFC:RFS-FIM-201:CD2-RFON-En-RB
 MBL-080RFC:RFS-FIM-201:CD2-RFON-Precond
 MBL-080RFC:RFS-FIM-201:CD2-TrigSel-RB
 MBL-080RFC:RFS-FIM-201:CD2-TrigThre-RB
-MBL-080RFC:RFS-FIM-201:CD2-Wave-IlckPM
 MBL-080RFC:RFS-FIM-201:DI10-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-201:DI10-DIlckMode-RB
 MBL-080RFC:RFS-FIM-201:DI10-FastRst-IlckCnt
@@ -474,7 +461,6 @@ MBL-080RFC:RFS-FIM-201:DI10-Input-RB
 MBL-080RFC:RFS-FIM-201:DI10-isFirstIlck
 MBL-080RFC:RFS-FIM-201:DI10-RFON-En-RB
 MBL-080RFC:RFS-FIM-201:DI10-RFON-Precond
-MBL-080RFC:RFS-FIM-201:DI10-Wave-PM
 MBL-080RFC:RFS-FIM-201:DI11-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-201:DI11-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-201:DI11-HVON-En-RB
@@ -493,7 +479,6 @@ MBL-080RFC:RFS-FIM-201:DI12-Input-RB
 MBL-080RFC:RFS-FIM-201:DI12-isFirstIlck
 MBL-080RFC:RFS-FIM-201:DI12-RFON-En-RB
 MBL-080RFC:RFS-FIM-201:DI12-RFON-Precond
-MBL-080RFC:RFS-FIM-201:DI12-Wave-PM
 MBL-080RFC:RFS-FIM-201:DI13-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-201:DI13-DIlckMode-RB
 MBL-080RFC:RFS-FIM-201:DI13-FastRst-IlckCnt
@@ -505,7 +490,6 @@ MBL-080RFC:RFS-FIM-201:DI13-Input-RB
 MBL-080RFC:RFS-FIM-201:DI13-isFirstIlck
 MBL-080RFC:RFS-FIM-201:DI13-RFON-En-RB
 MBL-080RFC:RFS-FIM-201:DI13-RFON-Precond
-MBL-080RFC:RFS-FIM-201:DI13-Wave-PM
 MBL-080RFC:RFS-FIM-201:DI14-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-201:DI14-DIlckMode-RB
 MBL-080RFC:RFS-FIM-201:DI14-FastRst-IlckCnt
@@ -517,7 +501,6 @@ MBL-080RFC:RFS-FIM-201:DI14-Input-RB
 MBL-080RFC:RFS-FIM-201:DI14-isFirstIlck
 MBL-080RFC:RFS-FIM-201:DI14-RFON-En-RB
 MBL-080RFC:RFS-FIM-201:DI14-RFON-Precond
-MBL-080RFC:RFS-FIM-201:DI14-Wave-PM
 MBL-080RFC:RFS-FIM-201:DI15-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-201:DI15-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-201:DI15-HVON-En-RB
@@ -543,7 +526,6 @@ MBL-080RFC:RFS-FIM-201:DI17-Input-RB
 MBL-080RFC:RFS-FIM-201:DI17-isFirstIlck
 MBL-080RFC:RFS-FIM-201:DI17-RFON-En-RB
 MBL-080RFC:RFS-FIM-201:DI17-RFON-Precond
-MBL-080RFC:RFS-FIM-201:DI17-Wave-PM
 MBL-080RFC:RFS-FIM-201:DI18-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-201:DI18-DIlckMode-RB
 MBL-080RFC:RFS-FIM-201:DI18-FastRst-IlckCnt
@@ -555,7 +537,6 @@ MBL-080RFC:RFS-FIM-201:DI18-Input-RB
 MBL-080RFC:RFS-FIM-201:DI18-isFirstIlck
 MBL-080RFC:RFS-FIM-201:DI18-RFON-En-RB
 MBL-080RFC:RFS-FIM-201:DI18-RFON-Precond
-MBL-080RFC:RFS-FIM-201:DI18-Wave-PM
 MBL-080RFC:RFS-FIM-201:DI19-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-201:DI19-DIlckMode-RB
 MBL-080RFC:RFS-FIM-201:DI19-FastRst-IlckCnt
@@ -567,7 +548,6 @@ MBL-080RFC:RFS-FIM-201:DI19-Input-RB
 MBL-080RFC:RFS-FIM-201:DI19-isFirstIlck
 MBL-080RFC:RFS-FIM-201:DI19-RFON-En-RB
 MBL-080RFC:RFS-FIM-201:DI19-RFON-Precond
-MBL-080RFC:RFS-FIM-201:DI19-Wave-PM
 MBL-080RFC:RFS-FIM-201:DI1-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-201:DI1-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-201:DI1-HVON-En-RB
@@ -586,7 +566,6 @@ MBL-080RFC:RFS-FIM-201:DI20-Input-RB
 MBL-080RFC:RFS-FIM-201:DI20-isFirstIlck
 MBL-080RFC:RFS-FIM-201:DI20-RFON-En-RB
 MBL-080RFC:RFS-FIM-201:DI20-RFON-Precond
-MBL-080RFC:RFS-FIM-201:DI20-Wave-PM
 MBL-080RFC:RFS-FIM-201:DI21-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-201:DI21-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-201:DI21-HVON-En-RB
@@ -640,7 +619,6 @@ MBL-080RFC:RFS-FIM-201:DI7-Input-RB
 MBL-080RFC:RFS-FIM-201:DI7-isFirstIlck
 MBL-080RFC:RFS-FIM-201:DI7-RFON-En-RB
 MBL-080RFC:RFS-FIM-201:DI7-RFON-Precond
-MBL-080RFC:RFS-FIM-201:DI7-Wave-PM
 MBL-080RFC:RFS-FIM-201:DI8-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-201:DI8-DIlckMode-RB
 MBL-080RFC:RFS-FIM-201:DI8-FastRst-IlckCnt
@@ -652,7 +630,6 @@ MBL-080RFC:RFS-FIM-201:DI8-Input-RB
 MBL-080RFC:RFS-FIM-201:DI8-isFirstIlck
 MBL-080RFC:RFS-FIM-201:DI8-RFON-En-RB
 MBL-080RFC:RFS-FIM-201:DI8-RFON-Precond
-MBL-080RFC:RFS-FIM-201:DI8-Wave-PM
 MBL-080RFC:RFS-FIM-201:DI9-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-201:DI9-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-201:DI9-HVON-En-RB
@@ -710,7 +687,6 @@ MBL-080RFC:RFS-FIM-201:RF10-Wave-Avg
 MBL-080RFC:RFS-FIM-201:RF10-Wave-High
 MBL-080RFC:RFS-FIM-201:RF10-Wave-Low
 MBL-080RFC:RFS-FIM-201:RF10-Wave-Med
-MBL-080RFC:RFS-FIM-201:RF10-Wave-PM
 MBL-080RFC:RFS-FIM-201:RF1-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-201:RF1-HVON-En-RB
 MBL-080RFC:RFS-FIM-201:RF1-HVON-Precond
@@ -803,7 +779,6 @@ MBL-080RFC:RFS-FIM-201:RF9-Wave-Avg
 MBL-080RFC:RFS-FIM-201:RF9-Wave-High
 MBL-080RFC:RFS-FIM-201:RF9-Wave-Low
 MBL-080RFC:RFS-FIM-201:RF9-Wave-Med
-MBL-080RFC:RFS-FIM-201:RF9-Wave-PM
 MBL-080RFC:RFS-FIM-201:RFON-Precond
 MBL-080RFC:RFS-FIM-201:RP1-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-201:RP1-HVON-En-RB
@@ -824,7 +799,6 @@ MBL-080RFC:RFS-FIM-201:RP1-RFON-En-RB
 MBL-080RFC:RFS-FIM-201:RP1-RFON-Precond
 MBL-080RFC:RFS-FIM-201:RP1-TrigSel-RB
 MBL-080RFC:RFS-FIM-201:RP1-TrigThre-RB
-MBL-080RFC:RFS-FIM-201:RP1-Wave-IlckPM
 MBL-080RFC:RFS-FIM-201:RP2-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-201:RP2-HVON-En-RB
 MBL-080RFC:RFS-FIM-201:RP2-HVON-Precond
@@ -844,7 +818,6 @@ MBL-080RFC:RFS-FIM-201:RP2-RFON-En-RB
 MBL-080RFC:RFS-FIM-201:RP2-RFON-Precond
 MBL-080RFC:RFS-FIM-201:RP2-TrigSel-RB
 MBL-080RFC:RFS-FIM-201:RP2-TrigThre-RB
-MBL-080RFC:RFS-FIM-201:RP2-Wave-IlckPM
 MBL-080RFC:RFS-FIM-201:TriggerLine-RB
 MBL-080RFC:RFS-Kly-210:PwrFwd-DevMonEval-RB
 MBL-080RFC:RFS-Kly-210:PwrFwd-DevMonFact-RB
@@ -884,7 +857,6 @@ MBL-080RFC:RFS-Kly-210:PwrFwd-Wave-Avg
 MBL-080RFC:RFS-Kly-210:PwrFwd-Wave-High
 MBL-080RFC:RFS-Kly-210:PwrFwd-Wave-Low
 MBL-080RFC:RFS-Kly-210:PwrFwd-Wave-Med
-MBL-080RFC:RFS-Kly-210:PwrFwd-Wave-PM
 MBL-080RFC:RFS-Kly-210:PwrRfl-DevMonEval-RB
 MBL-080RFC:RFS-Kly-210:PwrRfl-DevMonFact-RB
 MBL-080RFC:RFS-Kly-210:PwrRfl-DevMonIlck-RB
@@ -923,12 +895,10 @@ MBL-080RFC:RFS-Kly-210:PwrRfl-Wave-Avg
 MBL-080RFC:RFS-Kly-210:PwrRfl-Wave-High
 MBL-080RFC:RFS-Kly-210:PwrRfl-Wave-Low
 MBL-080RFC:RFS-Kly-210:PwrRfl-Wave-Med
-MBL-080RFC:RFS-Kly-210:PwrRfl-Wave-PM
 MBL-080RFC:RFS-LLRF-201:Status-DIlckMode-RB
 MBL-080RFC:RFS-LLRF-201:Status-Ilck-RB
 MBL-080RFC:RFS-LLRF-201:Status-Input-RB
 MBL-080RFC:RFS-LLRF-201:Status-isFirstIlck
-MBL-080RFC:RFS-LLRF-201:Status-Wave-PM
 MBL-080RFC:RFS-Load-220:PwrFwd-DevMonEval-RB
 MBL-080RFC:RFS-Load-220:PwrFwd-DevMonFact-RB
 MBL-080RFC:RFS-Load-220:PwrFwd-DevMonIlck-RB
@@ -967,7 +937,6 @@ MBL-080RFC:RFS-Load-220:PwrFwd-Wave-Avg
 MBL-080RFC:RFS-Load-220:PwrFwd-Wave-High
 MBL-080RFC:RFS-Load-220:PwrFwd-Wave-Low
 MBL-080RFC:RFS-Load-220:PwrFwd-Wave-Med
-MBL-080RFC:RFS-Load-220:PwrFwd-Wave-PM
 MBL-080RFC:RFS-Load-220:PwrRfl-DevMonEval-RB
 MBL-080RFC:RFS-Load-220:PwrRfl-DevMonFact-RB
 MBL-080RFC:RFS-Load-220:PwrRfl-DevMonIlck-RB
@@ -1006,7 +975,6 @@ MBL-080RFC:RFS-Load-220:PwrRfl-Wave-Avg
 MBL-080RFC:RFS-Load-220:PwrRfl-Wave-High
 MBL-080RFC:RFS-Load-220:PwrRfl-Wave-Low
 MBL-080RFC:RFS-Load-220:PwrRfl-Wave-Med
-MBL-080RFC:RFS-Load-220:PwrRfl-Wave-PM
 MBL-080RFC:RFS-Mod-210:Cur-DevMonEval-RB
 MBL-080RFC:RFS-Mod-210:Cur-DevMonFact-RB
 MBL-080RFC:RFS-Mod-210:Cur-DevMonIlck-RB
@@ -1045,17 +1013,14 @@ MBL-080RFC:RFS-Mod-210:Cur-Wave-Avg
 MBL-080RFC:RFS-Mod-210:Cur-Wave-High
 MBL-080RFC:RFS-Mod-210:Cur-Wave-Low
 MBL-080RFC:RFS-Mod-210:Cur-Wave-Med
-MBL-080RFC:RFS-Mod-210:Cur-Wave-PM
 MBL-080RFC:RFS-Mod-210:PCcon-DIlckMode-RB
 MBL-080RFC:RFS-Mod-210:PCcon-Ilck-RB
 MBL-080RFC:RFS-Mod-210:PCcon-Input-RB
 MBL-080RFC:RFS-Mod-210:PCcon-isFirstIlck
-MBL-080RFC:RFS-Mod-210:PCcon-Wave-PM
 MBL-080RFC:RFS-Mod-210:Ready-DIlckMode-RB
 MBL-080RFC:RFS-Mod-210:Ready-Ilck-RB
 MBL-080RFC:RFS-Mod-210:Ready-Input-RB
 MBL-080RFC:RFS-Mod-210:Ready-isFirstIlck
-MBL-080RFC:RFS-Mod-210:Ready-Wave-PM
 MBL-080RFC:RFS-Mod-210:Vol-DevMonEval-RB
 MBL-080RFC:RFS-Mod-210:Vol-DevMonFact-RB
 MBL-080RFC:RFS-Mod-210:Vol-DevMonIlck-RB
@@ -1094,7 +1059,6 @@ MBL-080RFC:RFS-Mod-210:Vol-Wave-Avg
 MBL-080RFC:RFS-Mod-210:Vol-Wave-High
 MBL-080RFC:RFS-Mod-210:Vol-Wave-Low
 MBL-080RFC:RFS-Mod-210:Vol-Wave-Med
-MBL-080RFC:RFS-Mod-210:Vol-Wave-PM
 MBL-080RFC:RFS-PAmp-210:PwrFwd-DevMonEval-RB
 MBL-080RFC:RFS-PAmp-210:PwrFwd-DevMonFact-RB
 MBL-080RFC:RFS-PAmp-210:PwrFwd-DevMonIlck-RB
@@ -1133,17 +1097,14 @@ MBL-080RFC:RFS-PAmp-210:PwrFwd-Wave-Avg
 MBL-080RFC:RFS-PAmp-210:PwrFwd-Wave-High
 MBL-080RFC:RFS-PAmp-210:PwrFwd-Wave-Low
 MBL-080RFC:RFS-PAmp-210:PwrFwd-Wave-Med
-MBL-080RFC:RFS-PAmp-210:PwrFwd-Wave-PM
 MBL-080RFC:RFS-SIM-210:HvEna-DIlckMode-RB
 MBL-080RFC:RFS-SIM-210:HvEna-Ilck-RB
 MBL-080RFC:RFS-SIM-210:HvEna-Input-RB
 MBL-080RFC:RFS-SIM-210:HvEna-isFirstIlck
-MBL-080RFC:RFS-SIM-210:HvEna-Wave-PM
 MBL-080RFC:RFS-SIM-210:RfEna-DIlckMode-RB
 MBL-080RFC:RFS-SIM-210:RfEna-Ilck-RB
 MBL-080RFC:RFS-SIM-210:RfEna-Input-RB
 MBL-080RFC:RFS-SIM-210:RfEna-isFirstIlck
-MBL-080RFC:RFS-SIM-210:RfEna-Wave-PM
 MBL-080RFC:RFS-SolPS-210:Cur-DevMonEval-RB
 MBL-080RFC:RFS-SolPS-210:Cur-DevMonFact-RB
 MBL-080RFC:RFS-SolPS-210:Cur-DevMonIlck-RB
@@ -1182,7 +1143,6 @@ MBL-080RFC:RFS-SolPS-210:Cur-Wave-Avg
 MBL-080RFC:RFS-SolPS-210:Cur-Wave-High
 MBL-080RFC:RFS-SolPS-210:Cur-Wave-Low
 MBL-080RFC:RFS-SolPS-210:Cur-Wave-Med
-MBL-080RFC:RFS-SolPS-210:Cur-Wave-PM
 MBL-080RFC:RFS-SolPS-220:Cur-DevMonEval-RB
 MBL-080RFC:RFS-SolPS-220:Cur-DevMonFact-RB
 MBL-080RFC:RFS-SolPS-220:Cur-DevMonIlck-RB
@@ -1221,24 +1181,19 @@ MBL-080RFC:RFS-SolPS-220:Cur-Wave-Avg
 MBL-080RFC:RFS-SolPS-220:Cur-Wave-High
 MBL-080RFC:RFS-SolPS-220:Cur-Wave-Low
 MBL-080RFC:RFS-SolPS-220:Cur-Wave-Med
-MBL-080RFC:RFS-SolPS-220:Cur-Wave-PM
 MBL-080RFC:RFS-VacBody-210:Status-DIlckMode-RB
 MBL-080RFC:RFS-VacBody-210:Status-Ilck-RB
 MBL-080RFC:RFS-VacBody-210:Status-Input-RB
 MBL-080RFC:RFS-VacBody-210:Status-isFirstIlck
-MBL-080RFC:RFS-VacBody-210:Status-Wave-PM
 MBL-080RFC:RFS-VacCav-210:Status-DIlckMode-RB
 MBL-080RFC:RFS-VacCav-210:Status-Ilck-RB
 MBL-080RFC:RFS-VacCav-210:Status-Input-RB
 MBL-080RFC:RFS-VacCav-210:Status-isFirstIlck
-MBL-080RFC:RFS-VacCav-210:Status-Wave-PM
 MBL-080RFC:RFS-VacPS-210:I-SP-DIlckMode-RB
 MBL-080RFC:RFS-VacPS-210:I-SP-Ilck-RB
 MBL-080RFC:RFS-VacPS-210:I-SP-Input-RB
 MBL-080RFC:RFS-VacPS-210:I-SP-isFirstIlck
-MBL-080RFC:RFS-VacPS-210:I-SP-Wave-PM
 MBL-080RFC:RFS-VacPS-220:I-SP-DIlckMode-RB
 MBL-080RFC:RFS-VacPS-220:I-SP-Ilck-RB
 MBL-080RFC:RFS-VacPS-220:I-SP-Input-RB
 MBL-080RFC:RFS-VacPS-220:I-SP-isFirstIlck
-MBL-080RFC:RFS-VacPS-220:I-SP-Wave-PM
diff --git a/files/MBL-080RFC_SC-IOC-302.archive b/files/MBL-080RFC_SC-IOC-302.archive
index f46c000..cf6bd9b 100644
--- a/files/MBL-080RFC_SC-IOC-302.archive
+++ b/files/MBL-080RFC_SC-IOC-302.archive
@@ -2,12 +2,10 @@ MBL-080RFC:RFS-ADG-310:IlckStatus-DIlckMode-RB
 MBL-080RFC:RFS-ADG-310:IlckStatus-Ilck-RB
 MBL-080RFC:RFS-ADG-310:IlckStatus-Input-RB
 MBL-080RFC:RFS-ADG-310:IlckStatus-isFirstIlck
-MBL-080RFC:RFS-ADG-310:IlckStatus-Wave-PM
 MBL-080RFC:RFS-ADG-310:PwrFail-DIlckMode-RB
 MBL-080RFC:RFS-ADG-310:PwrFail-Ilck-RB
 MBL-080RFC:RFS-ADG-310:PwrFail-Input-RB
 MBL-080RFC:RFS-ADG-310:PwrFail-isFirstIlck
-MBL-080RFC:RFS-ADG-310:PwrFail-Wave-PM
 MBL-080RFC:RFS-Cav-310:Fld-DevMonEval-RB
 MBL-080RFC:RFS-Cav-310:Fld-DevMonFact-RB
 MBL-080RFC:RFS-Cav-310:Fld-DevMonIlck-RB
@@ -46,7 +44,6 @@ MBL-080RFC:RFS-Cav-310:Fld-Wave-Avg
 MBL-080RFC:RFS-Cav-310:Fld-Wave-High
 MBL-080RFC:RFS-Cav-310:Fld-Wave-Low
 MBL-080RFC:RFS-Cav-310:Fld-Wave-Med
-MBL-080RFC:RFS-Cav-310:Fld-Wave-PM
 MBL-080RFC:RFS-Cav-310:PwrFwd-DevMonEval-RB
 MBL-080RFC:RFS-Cav-310:PwrFwd-DevMonFact-RB
 MBL-080RFC:RFS-Cav-310:PwrFwd-DevMonIlck-RB
@@ -85,7 +82,6 @@ MBL-080RFC:RFS-Cav-310:PwrFwd-Wave-Avg
 MBL-080RFC:RFS-Cav-310:PwrFwd-Wave-High
 MBL-080RFC:RFS-Cav-310:PwrFwd-Wave-Low
 MBL-080RFC:RFS-Cav-310:PwrFwd-Wave-Med
-MBL-080RFC:RFS-Cav-310:PwrFwd-Wave-PM
 MBL-080RFC:RFS-Cav-310:PwrRfl-DevMonEval-RB
 MBL-080RFC:RFS-Cav-310:PwrRfl-DevMonFact-RB
 MBL-080RFC:RFS-Cav-310:PwrRfl-DevMonIlck-RB
@@ -124,7 +120,6 @@ MBL-080RFC:RFS-Cav-310:PwrRfl-Wave-Avg
 MBL-080RFC:RFS-Cav-310:PwrRfl-Wave-High
 MBL-080RFC:RFS-Cav-310:PwrRfl-Wave-Low
 MBL-080RFC:RFS-Cav-310:PwrRfl-Wave-Med
-MBL-080RFC:RFS-Cav-310:PwrRfl-Wave-PM
 MBL-080RFC:RFS-EPR-310:Cur-DevMonEval-RB
 MBL-080RFC:RFS-EPR-310:Cur-DevMonFact-RB
 MBL-080RFC:RFS-EPR-310:Cur-DevMonIlck-RB
@@ -163,7 +158,6 @@ MBL-080RFC:RFS-EPR-310:Cur-Wave-Avg
 MBL-080RFC:RFS-EPR-310:Cur-Wave-High
 MBL-080RFC:RFS-EPR-310:Cur-Wave-Low
 MBL-080RFC:RFS-EPR-310:Cur-Wave-Med
-MBL-080RFC:RFS-EPR-310:Cur-Wave-PM
 MBL-080RFC:RFS-FIM-301:AI10-DevMonEval-RB
 MBL-080RFC:RFS-FIM-301:AI10-DevMonFact-RB
 MBL-080RFC:RFS-FIM-301:AI10-DevMonIlck-RB
@@ -208,7 +202,6 @@ MBL-080RFC:RFS-FIM-301:AI10-Wave-Avg
 MBL-080RFC:RFS-FIM-301:AI10-Wave-High
 MBL-080RFC:RFS-FIM-301:AI10-Wave-Low
 MBL-080RFC:RFS-FIM-301:AI10-Wave-Med
-MBL-080RFC:RFS-FIM-301:AI10-Wave-PM
 MBL-080RFC:RFS-FIM-301:AI1-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-301:AI1-HVON-En-RB
 MBL-080RFC:RFS-FIM-301:AI1-HVON-Precond
@@ -277,7 +270,6 @@ MBL-080RFC:RFS-FIM-301:AI5-Wave-Avg
 MBL-080RFC:RFS-FIM-301:AI5-Wave-High
 MBL-080RFC:RFS-FIM-301:AI5-Wave-Low
 MBL-080RFC:RFS-FIM-301:AI5-Wave-Med
-MBL-080RFC:RFS-FIM-301:AI5-Wave-PM
 MBL-080RFC:RFS-FIM-301:AI6-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-301:AI6-HVON-En-RB
 MBL-080RFC:RFS-FIM-301:AI6-HVON-Precond
@@ -328,7 +320,6 @@ MBL-080RFC:RFS-FIM-301:AI7-Wave-Avg
 MBL-080RFC:RFS-FIM-301:AI7-Wave-High
 MBL-080RFC:RFS-FIM-301:AI7-Wave-Low
 MBL-080RFC:RFS-FIM-301:AI7-Wave-Med
-MBL-080RFC:RFS-FIM-301:AI7-Wave-PM
 MBL-080RFC:RFS-FIM-301:AI8-DevMonEval-RB
 MBL-080RFC:RFS-FIM-301:AI8-DevMonFact-RB
 MBL-080RFC:RFS-FIM-301:AI8-DevMonIlck-RB
@@ -373,7 +364,6 @@ MBL-080RFC:RFS-FIM-301:AI8-Wave-Avg
 MBL-080RFC:RFS-FIM-301:AI8-Wave-High
 MBL-080RFC:RFS-FIM-301:AI8-Wave-Low
 MBL-080RFC:RFS-FIM-301:AI8-Wave-Med
-MBL-080RFC:RFS-FIM-301:AI8-Wave-PM
 MBL-080RFC:RFS-FIM-301:AI9-DevMonEval-RB
 MBL-080RFC:RFS-FIM-301:AI9-DevMonFact-RB
 MBL-080RFC:RFS-FIM-301:AI9-DevMonIlck-RB
@@ -418,7 +408,6 @@ MBL-080RFC:RFS-FIM-301:AI9-Wave-Avg
 MBL-080RFC:RFS-FIM-301:AI9-Wave-High
 MBL-080RFC:RFS-FIM-301:AI9-Wave-Low
 MBL-080RFC:RFS-FIM-301:AI9-Wave-Med
-MBL-080RFC:RFS-FIM-301:AI9-Wave-PM
 MBL-080RFC:RFS-FIM-301:CD1-DevFactor-RB
 MBL-080RFC:RFS-FIM-301:CD1-DevPeriod-RB
 MBL-080RFC:RFS-FIM-301:CD1-FastRst-IlckCnt
@@ -440,7 +429,6 @@ MBL-080RFC:RFS-FIM-301:CD1-RFON-En-RB
 MBL-080RFC:RFS-FIM-301:CD1-RFON-Precond
 MBL-080RFC:RFS-FIM-301:CD1-TrigSel-RB
 MBL-080RFC:RFS-FIM-301:CD1-TrigThre-RB
-MBL-080RFC:RFS-FIM-301:CD1-Wave-IlckPM
 MBL-080RFC:RFS-FIM-301:CD2-DevFactor-RB
 MBL-080RFC:RFS-FIM-301:CD2-DevPeriod-RB
 MBL-080RFC:RFS-FIM-301:CD2-FastRst-IlckCnt
@@ -462,7 +450,6 @@ MBL-080RFC:RFS-FIM-301:CD2-RFON-En-RB
 MBL-080RFC:RFS-FIM-301:CD2-RFON-Precond
 MBL-080RFC:RFS-FIM-301:CD2-TrigSel-RB
 MBL-080RFC:RFS-FIM-301:CD2-TrigThre-RB
-MBL-080RFC:RFS-FIM-301:CD2-Wave-IlckPM
 MBL-080RFC:RFS-FIM-301:DI10-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-301:DI10-DIlckMode-RB
 MBL-080RFC:RFS-FIM-301:DI10-FastRst-IlckCnt
@@ -474,7 +461,6 @@ MBL-080RFC:RFS-FIM-301:DI10-Input-RB
 MBL-080RFC:RFS-FIM-301:DI10-isFirstIlck
 MBL-080RFC:RFS-FIM-301:DI10-RFON-En-RB
 MBL-080RFC:RFS-FIM-301:DI10-RFON-Precond
-MBL-080RFC:RFS-FIM-301:DI10-Wave-PM
 MBL-080RFC:RFS-FIM-301:DI11-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-301:DI11-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-301:DI11-HVON-En-RB
@@ -493,7 +479,6 @@ MBL-080RFC:RFS-FIM-301:DI12-Input-RB
 MBL-080RFC:RFS-FIM-301:DI12-isFirstIlck
 MBL-080RFC:RFS-FIM-301:DI12-RFON-En-RB
 MBL-080RFC:RFS-FIM-301:DI12-RFON-Precond
-MBL-080RFC:RFS-FIM-301:DI12-Wave-PM
 MBL-080RFC:RFS-FIM-301:DI13-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-301:DI13-DIlckMode-RB
 MBL-080RFC:RFS-FIM-301:DI13-FastRst-IlckCnt
@@ -505,7 +490,6 @@ MBL-080RFC:RFS-FIM-301:DI13-Input-RB
 MBL-080RFC:RFS-FIM-301:DI13-isFirstIlck
 MBL-080RFC:RFS-FIM-301:DI13-RFON-En-RB
 MBL-080RFC:RFS-FIM-301:DI13-RFON-Precond
-MBL-080RFC:RFS-FIM-301:DI13-Wave-PM
 MBL-080RFC:RFS-FIM-301:DI14-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-301:DI14-DIlckMode-RB
 MBL-080RFC:RFS-FIM-301:DI14-FastRst-IlckCnt
@@ -517,7 +501,6 @@ MBL-080RFC:RFS-FIM-301:DI14-Input-RB
 MBL-080RFC:RFS-FIM-301:DI14-isFirstIlck
 MBL-080RFC:RFS-FIM-301:DI14-RFON-En-RB
 MBL-080RFC:RFS-FIM-301:DI14-RFON-Precond
-MBL-080RFC:RFS-FIM-301:DI14-Wave-PM
 MBL-080RFC:RFS-FIM-301:DI15-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-301:DI15-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-301:DI15-HVON-En-RB
@@ -543,7 +526,6 @@ MBL-080RFC:RFS-FIM-301:DI17-Input-RB
 MBL-080RFC:RFS-FIM-301:DI17-isFirstIlck
 MBL-080RFC:RFS-FIM-301:DI17-RFON-En-RB
 MBL-080RFC:RFS-FIM-301:DI17-RFON-Precond
-MBL-080RFC:RFS-FIM-301:DI17-Wave-PM
 MBL-080RFC:RFS-FIM-301:DI18-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-301:DI18-DIlckMode-RB
 MBL-080RFC:RFS-FIM-301:DI18-FastRst-IlckCnt
@@ -555,7 +537,6 @@ MBL-080RFC:RFS-FIM-301:DI18-Input-RB
 MBL-080RFC:RFS-FIM-301:DI18-isFirstIlck
 MBL-080RFC:RFS-FIM-301:DI18-RFON-En-RB
 MBL-080RFC:RFS-FIM-301:DI18-RFON-Precond
-MBL-080RFC:RFS-FIM-301:DI18-Wave-PM
 MBL-080RFC:RFS-FIM-301:DI19-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-301:DI19-DIlckMode-RB
 MBL-080RFC:RFS-FIM-301:DI19-FastRst-IlckCnt
@@ -567,7 +548,6 @@ MBL-080RFC:RFS-FIM-301:DI19-Input-RB
 MBL-080RFC:RFS-FIM-301:DI19-isFirstIlck
 MBL-080RFC:RFS-FIM-301:DI19-RFON-En-RB
 MBL-080RFC:RFS-FIM-301:DI19-RFON-Precond
-MBL-080RFC:RFS-FIM-301:DI19-Wave-PM
 MBL-080RFC:RFS-FIM-301:DI1-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-301:DI1-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-301:DI1-HVON-En-RB
@@ -586,7 +566,6 @@ MBL-080RFC:RFS-FIM-301:DI20-Input-RB
 MBL-080RFC:RFS-FIM-301:DI20-isFirstIlck
 MBL-080RFC:RFS-FIM-301:DI20-RFON-En-RB
 MBL-080RFC:RFS-FIM-301:DI20-RFON-Precond
-MBL-080RFC:RFS-FIM-301:DI20-Wave-PM
 MBL-080RFC:RFS-FIM-301:DI21-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-301:DI21-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-301:DI21-HVON-En-RB
@@ -640,7 +619,6 @@ MBL-080RFC:RFS-FIM-301:DI7-Input-RB
 MBL-080RFC:RFS-FIM-301:DI7-isFirstIlck
 MBL-080RFC:RFS-FIM-301:DI7-RFON-En-RB
 MBL-080RFC:RFS-FIM-301:DI7-RFON-Precond
-MBL-080RFC:RFS-FIM-301:DI7-Wave-PM
 MBL-080RFC:RFS-FIM-301:DI8-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-301:DI8-DIlckMode-RB
 MBL-080RFC:RFS-FIM-301:DI8-FastRst-IlckCnt
@@ -652,7 +630,6 @@ MBL-080RFC:RFS-FIM-301:DI8-Input-RB
 MBL-080RFC:RFS-FIM-301:DI8-isFirstIlck
 MBL-080RFC:RFS-FIM-301:DI8-RFON-En-RB
 MBL-080RFC:RFS-FIM-301:DI8-RFON-Precond
-MBL-080RFC:RFS-FIM-301:DI8-Wave-PM
 MBL-080RFC:RFS-FIM-301:DI9-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-301:DI9-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-301:DI9-HVON-En-RB
@@ -710,7 +687,6 @@ MBL-080RFC:RFS-FIM-301:RF10-Wave-Avg
 MBL-080RFC:RFS-FIM-301:RF10-Wave-High
 MBL-080RFC:RFS-FIM-301:RF10-Wave-Low
 MBL-080RFC:RFS-FIM-301:RF10-Wave-Med
-MBL-080RFC:RFS-FIM-301:RF10-Wave-PM
 MBL-080RFC:RFS-FIM-301:RF1-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-301:RF1-HVON-En-RB
 MBL-080RFC:RFS-FIM-301:RF1-HVON-Precond
@@ -803,7 +779,6 @@ MBL-080RFC:RFS-FIM-301:RF9-Wave-Avg
 MBL-080RFC:RFS-FIM-301:RF9-Wave-High
 MBL-080RFC:RFS-FIM-301:RF9-Wave-Low
 MBL-080RFC:RFS-FIM-301:RF9-Wave-Med
-MBL-080RFC:RFS-FIM-301:RF9-Wave-PM
 MBL-080RFC:RFS-FIM-301:RFON-Precond
 MBL-080RFC:RFS-FIM-301:RP1-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-301:RP1-HVON-En-RB
@@ -824,7 +799,6 @@ MBL-080RFC:RFS-FIM-301:RP1-RFON-En-RB
 MBL-080RFC:RFS-FIM-301:RP1-RFON-Precond
 MBL-080RFC:RFS-FIM-301:RP1-TrigSel-RB
 MBL-080RFC:RFS-FIM-301:RP1-TrigThre-RB
-MBL-080RFC:RFS-FIM-301:RP1-Wave-IlckPM
 MBL-080RFC:RFS-FIM-301:RP2-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-301:RP2-HVON-En-RB
 MBL-080RFC:RFS-FIM-301:RP2-HVON-Precond
@@ -844,7 +818,6 @@ MBL-080RFC:RFS-FIM-301:RP2-RFON-En-RB
 MBL-080RFC:RFS-FIM-301:RP2-RFON-Precond
 MBL-080RFC:RFS-FIM-301:RP2-TrigSel-RB
 MBL-080RFC:RFS-FIM-301:RP2-TrigThre-RB
-MBL-080RFC:RFS-FIM-301:RP2-Wave-IlckPM
 MBL-080RFC:RFS-FIM-301:TriggerLine-RB
 MBL-080RFC:RFS-Kly-310:PwrFwd-DevMonEval-RB
 MBL-080RFC:RFS-Kly-310:PwrFwd-DevMonFact-RB
@@ -884,7 +857,6 @@ MBL-080RFC:RFS-Kly-310:PwrFwd-Wave-Avg
 MBL-080RFC:RFS-Kly-310:PwrFwd-Wave-High
 MBL-080RFC:RFS-Kly-310:PwrFwd-Wave-Low
 MBL-080RFC:RFS-Kly-310:PwrFwd-Wave-Med
-MBL-080RFC:RFS-Kly-310:PwrFwd-Wave-PM
 MBL-080RFC:RFS-Kly-310:PwrRfl-DevMonEval-RB
 MBL-080RFC:RFS-Kly-310:PwrRfl-DevMonFact-RB
 MBL-080RFC:RFS-Kly-310:PwrRfl-DevMonIlck-RB
@@ -923,12 +895,10 @@ MBL-080RFC:RFS-Kly-310:PwrRfl-Wave-Avg
 MBL-080RFC:RFS-Kly-310:PwrRfl-Wave-High
 MBL-080RFC:RFS-Kly-310:PwrRfl-Wave-Low
 MBL-080RFC:RFS-Kly-310:PwrRfl-Wave-Med
-MBL-080RFC:RFS-Kly-310:PwrRfl-Wave-PM
 MBL-080RFC:RFS-LLRF-301:Status-DIlckMode-RB
 MBL-080RFC:RFS-LLRF-301:Status-Ilck-RB
 MBL-080RFC:RFS-LLRF-301:Status-Input-RB
 MBL-080RFC:RFS-LLRF-301:Status-isFirstIlck
-MBL-080RFC:RFS-LLRF-301:Status-Wave-PM
 MBL-080RFC:RFS-Load-320:PwrFwd-DevMonEval-RB
 MBL-080RFC:RFS-Load-320:PwrFwd-DevMonFact-RB
 MBL-080RFC:RFS-Load-320:PwrFwd-DevMonIlck-RB
@@ -967,7 +937,6 @@ MBL-080RFC:RFS-Load-320:PwrFwd-Wave-Avg
 MBL-080RFC:RFS-Load-320:PwrFwd-Wave-High
 MBL-080RFC:RFS-Load-320:PwrFwd-Wave-Low
 MBL-080RFC:RFS-Load-320:PwrFwd-Wave-Med
-MBL-080RFC:RFS-Load-320:PwrFwd-Wave-PM
 MBL-080RFC:RFS-Load-320:PwrRfl-DevMonEval-RB
 MBL-080RFC:RFS-Load-320:PwrRfl-DevMonFact-RB
 MBL-080RFC:RFS-Load-320:PwrRfl-DevMonIlck-RB
@@ -1006,7 +975,6 @@ MBL-080RFC:RFS-Load-320:PwrRfl-Wave-Avg
 MBL-080RFC:RFS-Load-320:PwrRfl-Wave-High
 MBL-080RFC:RFS-Load-320:PwrRfl-Wave-Low
 MBL-080RFC:RFS-Load-320:PwrRfl-Wave-Med
-MBL-080RFC:RFS-Load-320:PwrRfl-Wave-PM
 MBL-080RFC:RFS-Mod-310:Cur-DevMonEval-RB
 MBL-080RFC:RFS-Mod-310:Cur-DevMonFact-RB
 MBL-080RFC:RFS-Mod-310:Cur-DevMonIlck-RB
@@ -1045,17 +1013,14 @@ MBL-080RFC:RFS-Mod-310:Cur-Wave-Avg
 MBL-080RFC:RFS-Mod-310:Cur-Wave-High
 MBL-080RFC:RFS-Mod-310:Cur-Wave-Low
 MBL-080RFC:RFS-Mod-310:Cur-Wave-Med
-MBL-080RFC:RFS-Mod-310:Cur-Wave-PM
 MBL-080RFC:RFS-Mod-310:PCcon-DIlckMode-RB
 MBL-080RFC:RFS-Mod-310:PCcon-Ilck-RB
 MBL-080RFC:RFS-Mod-310:PCcon-Input-RB
 MBL-080RFC:RFS-Mod-310:PCcon-isFirstIlck
-MBL-080RFC:RFS-Mod-310:PCcon-Wave-PM
 MBL-080RFC:RFS-Mod-310:Ready-DIlckMode-RB
 MBL-080RFC:RFS-Mod-310:Ready-Ilck-RB
 MBL-080RFC:RFS-Mod-310:Ready-Input-RB
 MBL-080RFC:RFS-Mod-310:Ready-isFirstIlck
-MBL-080RFC:RFS-Mod-310:Ready-Wave-PM
 MBL-080RFC:RFS-Mod-310:Vol-DevMonEval-RB
 MBL-080RFC:RFS-Mod-310:Vol-DevMonFact-RB
 MBL-080RFC:RFS-Mod-310:Vol-DevMonIlck-RB
@@ -1094,7 +1059,6 @@ MBL-080RFC:RFS-Mod-310:Vol-Wave-Avg
 MBL-080RFC:RFS-Mod-310:Vol-Wave-High
 MBL-080RFC:RFS-Mod-310:Vol-Wave-Low
 MBL-080RFC:RFS-Mod-310:Vol-Wave-Med
-MBL-080RFC:RFS-Mod-310:Vol-Wave-PM
 MBL-080RFC:RFS-PAmp-310:PwrFwd-DevMonEval-RB
 MBL-080RFC:RFS-PAmp-310:PwrFwd-DevMonFact-RB
 MBL-080RFC:RFS-PAmp-310:PwrFwd-DevMonIlck-RB
@@ -1133,17 +1097,14 @@ MBL-080RFC:RFS-PAmp-310:PwrFwd-Wave-Avg
 MBL-080RFC:RFS-PAmp-310:PwrFwd-Wave-High
 MBL-080RFC:RFS-PAmp-310:PwrFwd-Wave-Low
 MBL-080RFC:RFS-PAmp-310:PwrFwd-Wave-Med
-MBL-080RFC:RFS-PAmp-310:PwrFwd-Wave-PM
 MBL-080RFC:RFS-SIM-310:HvEna-DIlckMode-RB
 MBL-080RFC:RFS-SIM-310:HvEna-Ilck-RB
 MBL-080RFC:RFS-SIM-310:HvEna-Input-RB
 MBL-080RFC:RFS-SIM-310:HvEna-isFirstIlck
-MBL-080RFC:RFS-SIM-310:HvEna-Wave-PM
 MBL-080RFC:RFS-SIM-310:RfEna-DIlckMode-RB
 MBL-080RFC:RFS-SIM-310:RfEna-Ilck-RB
 MBL-080RFC:RFS-SIM-310:RfEna-Input-RB
 MBL-080RFC:RFS-SIM-310:RfEna-isFirstIlck
-MBL-080RFC:RFS-SIM-310:RfEna-Wave-PM
 MBL-080RFC:RFS-SolPS-310:Cur-DevMonEval-RB
 MBL-080RFC:RFS-SolPS-310:Cur-DevMonFact-RB
 MBL-080RFC:RFS-SolPS-310:Cur-DevMonIlck-RB
@@ -1182,7 +1143,6 @@ MBL-080RFC:RFS-SolPS-310:Cur-Wave-Avg
 MBL-080RFC:RFS-SolPS-310:Cur-Wave-High
 MBL-080RFC:RFS-SolPS-310:Cur-Wave-Low
 MBL-080RFC:RFS-SolPS-310:Cur-Wave-Med
-MBL-080RFC:RFS-SolPS-310:Cur-Wave-PM
 MBL-080RFC:RFS-SolPS-320:Cur-DevMonEval-RB
 MBL-080RFC:RFS-SolPS-320:Cur-DevMonFact-RB
 MBL-080RFC:RFS-SolPS-320:Cur-DevMonIlck-RB
@@ -1221,24 +1181,19 @@ MBL-080RFC:RFS-SolPS-320:Cur-Wave-Avg
 MBL-080RFC:RFS-SolPS-320:Cur-Wave-High
 MBL-080RFC:RFS-SolPS-320:Cur-Wave-Low
 MBL-080RFC:RFS-SolPS-320:Cur-Wave-Med
-MBL-080RFC:RFS-SolPS-320:Cur-Wave-PM
 MBL-080RFC:RFS-VacBody-310:Status-DIlckMode-RB
 MBL-080RFC:RFS-VacBody-310:Status-Ilck-RB
 MBL-080RFC:RFS-VacBody-310:Status-Input-RB
 MBL-080RFC:RFS-VacBody-310:Status-isFirstIlck
-MBL-080RFC:RFS-VacBody-310:Status-Wave-PM
 MBL-080RFC:RFS-VacCav-310:Status-DIlckMode-RB
 MBL-080RFC:RFS-VacCav-310:Status-Ilck-RB
 MBL-080RFC:RFS-VacCav-310:Status-Input-RB
 MBL-080RFC:RFS-VacCav-310:Status-isFirstIlck
-MBL-080RFC:RFS-VacCav-310:Status-Wave-PM
 MBL-080RFC:RFS-VacPS-310:I-SP-DIlckMode-RB
 MBL-080RFC:RFS-VacPS-310:I-SP-Ilck-RB
 MBL-080RFC:RFS-VacPS-310:I-SP-Input-RB
 MBL-080RFC:RFS-VacPS-310:I-SP-isFirstIlck
-MBL-080RFC:RFS-VacPS-310:I-SP-Wave-PM
 MBL-080RFC:RFS-VacPS-320:I-SP-DIlckMode-RB
 MBL-080RFC:RFS-VacPS-320:I-SP-Ilck-RB
 MBL-080RFC:RFS-VacPS-320:I-SP-Input-RB
 MBL-080RFC:RFS-VacPS-320:I-SP-isFirstIlck
-MBL-080RFC:RFS-VacPS-320:I-SP-Wave-PM
diff --git a/files/MBL-080RFC_SC-IOC-402.archive b/files/MBL-080RFC_SC-IOC-402.archive
index 93cddce..d3dc9eb 100644
--- a/files/MBL-080RFC_SC-IOC-402.archive
+++ b/files/MBL-080RFC_SC-IOC-402.archive
@@ -2,12 +2,10 @@ MBL-080RFC:RFS-ADG-410:IlckStatus-DIlckMode-RB
 MBL-080RFC:RFS-ADG-410:IlckStatus-Ilck-RB
 MBL-080RFC:RFS-ADG-410:IlckStatus-Input-RB
 MBL-080RFC:RFS-ADG-410:IlckStatus-isFirstIlck
-MBL-080RFC:RFS-ADG-410:IlckStatus-Wave-PM
 MBL-080RFC:RFS-ADG-410:PwrFail-DIlckMode-RB
 MBL-080RFC:RFS-ADG-410:PwrFail-Ilck-RB
 MBL-080RFC:RFS-ADG-410:PwrFail-Input-RB
 MBL-080RFC:RFS-ADG-410:PwrFail-isFirstIlck
-MBL-080RFC:RFS-ADG-410:PwrFail-Wave-PM
 MBL-080RFC:RFS-Cav-410:Fld-DevMonEval-RB
 MBL-080RFC:RFS-Cav-410:Fld-DevMonFact-RB
 MBL-080RFC:RFS-Cav-410:Fld-DevMonIlck-RB
@@ -46,7 +44,6 @@ MBL-080RFC:RFS-Cav-410:Fld-Wave-Avg
 MBL-080RFC:RFS-Cav-410:Fld-Wave-High
 MBL-080RFC:RFS-Cav-410:Fld-Wave-Low
 MBL-080RFC:RFS-Cav-410:Fld-Wave-Med
-MBL-080RFC:RFS-Cav-410:Fld-Wave-PM
 MBL-080RFC:RFS-Cav-410:PwrFwd-DevMonEval-RB
 MBL-080RFC:RFS-Cav-410:PwrFwd-DevMonFact-RB
 MBL-080RFC:RFS-Cav-410:PwrFwd-DevMonIlck-RB
@@ -85,7 +82,6 @@ MBL-080RFC:RFS-Cav-410:PwrFwd-Wave-Avg
 MBL-080RFC:RFS-Cav-410:PwrFwd-Wave-High
 MBL-080RFC:RFS-Cav-410:PwrFwd-Wave-Low
 MBL-080RFC:RFS-Cav-410:PwrFwd-Wave-Med
-MBL-080RFC:RFS-Cav-410:PwrFwd-Wave-PM
 MBL-080RFC:RFS-Cav-410:PwrRfl-DevMonEval-RB
 MBL-080RFC:RFS-Cav-410:PwrRfl-DevMonFact-RB
 MBL-080RFC:RFS-Cav-410:PwrRfl-DevMonIlck-RB
@@ -124,7 +120,6 @@ MBL-080RFC:RFS-Cav-410:PwrRfl-Wave-Avg
 MBL-080RFC:RFS-Cav-410:PwrRfl-Wave-High
 MBL-080RFC:RFS-Cav-410:PwrRfl-Wave-Low
 MBL-080RFC:RFS-Cav-410:PwrRfl-Wave-Med
-MBL-080RFC:RFS-Cav-410:PwrRfl-Wave-PM
 MBL-080RFC:RFS-EPR-410:Cur-DevMonEval-RB
 MBL-080RFC:RFS-EPR-410:Cur-DevMonFact-RB
 MBL-080RFC:RFS-EPR-410:Cur-DevMonIlck-RB
@@ -163,7 +158,6 @@ MBL-080RFC:RFS-EPR-410:Cur-Wave-Avg
 MBL-080RFC:RFS-EPR-410:Cur-Wave-High
 MBL-080RFC:RFS-EPR-410:Cur-Wave-Low
 MBL-080RFC:RFS-EPR-410:Cur-Wave-Med
-MBL-080RFC:RFS-EPR-410:Cur-Wave-PM
 MBL-080RFC:RFS-FIM-401:AI10-DevMonEval-RB
 MBL-080RFC:RFS-FIM-401:AI10-DevMonFact-RB
 MBL-080RFC:RFS-FIM-401:AI10-DevMonIlck-RB
@@ -208,7 +202,6 @@ MBL-080RFC:RFS-FIM-401:AI10-Wave-Avg
 MBL-080RFC:RFS-FIM-401:AI10-Wave-High
 MBL-080RFC:RFS-FIM-401:AI10-Wave-Low
 MBL-080RFC:RFS-FIM-401:AI10-Wave-Med
-MBL-080RFC:RFS-FIM-401:AI10-Wave-PM
 MBL-080RFC:RFS-FIM-401:AI1-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-401:AI1-HVON-En-RB
 MBL-080RFC:RFS-FIM-401:AI1-HVON-Precond
@@ -277,7 +270,6 @@ MBL-080RFC:RFS-FIM-401:AI5-Wave-Avg
 MBL-080RFC:RFS-FIM-401:AI5-Wave-High
 MBL-080RFC:RFS-FIM-401:AI5-Wave-Low
 MBL-080RFC:RFS-FIM-401:AI5-Wave-Med
-MBL-080RFC:RFS-FIM-401:AI5-Wave-PM
 MBL-080RFC:RFS-FIM-401:AI6-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-401:AI6-HVON-En-RB
 MBL-080RFC:RFS-FIM-401:AI6-HVON-Precond
@@ -328,7 +320,6 @@ MBL-080RFC:RFS-FIM-401:AI7-Wave-Avg
 MBL-080RFC:RFS-FIM-401:AI7-Wave-High
 MBL-080RFC:RFS-FIM-401:AI7-Wave-Low
 MBL-080RFC:RFS-FIM-401:AI7-Wave-Med
-MBL-080RFC:RFS-FIM-401:AI7-Wave-PM
 MBL-080RFC:RFS-FIM-401:AI8-DevMonEval-RB
 MBL-080RFC:RFS-FIM-401:AI8-DevMonFact-RB
 MBL-080RFC:RFS-FIM-401:AI8-DevMonIlck-RB
@@ -373,7 +364,6 @@ MBL-080RFC:RFS-FIM-401:AI8-Wave-Avg
 MBL-080RFC:RFS-FIM-401:AI8-Wave-High
 MBL-080RFC:RFS-FIM-401:AI8-Wave-Low
 MBL-080RFC:RFS-FIM-401:AI8-Wave-Med
-MBL-080RFC:RFS-FIM-401:AI8-Wave-PM
 MBL-080RFC:RFS-FIM-401:AI9-DevMonEval-RB
 MBL-080RFC:RFS-FIM-401:AI9-DevMonFact-RB
 MBL-080RFC:RFS-FIM-401:AI9-DevMonIlck-RB
@@ -418,7 +408,6 @@ MBL-080RFC:RFS-FIM-401:AI9-Wave-Avg
 MBL-080RFC:RFS-FIM-401:AI9-Wave-High
 MBL-080RFC:RFS-FIM-401:AI9-Wave-Low
 MBL-080RFC:RFS-FIM-401:AI9-Wave-Med
-MBL-080RFC:RFS-FIM-401:AI9-Wave-PM
 MBL-080RFC:RFS-FIM-401:CD1-DevFactor-RB
 MBL-080RFC:RFS-FIM-401:CD1-DevPeriod-RB
 MBL-080RFC:RFS-FIM-401:CD1-FastRst-IlckCnt
@@ -440,7 +429,6 @@ MBL-080RFC:RFS-FIM-401:CD1-RFON-En-RB
 MBL-080RFC:RFS-FIM-401:CD1-RFON-Precond
 MBL-080RFC:RFS-FIM-401:CD1-TrigSel-RB
 MBL-080RFC:RFS-FIM-401:CD1-TrigThre-RB
-MBL-080RFC:RFS-FIM-401:CD1-Wave-IlckPM
 MBL-080RFC:RFS-FIM-401:CD2-DevFactor-RB
 MBL-080RFC:RFS-FIM-401:CD2-DevPeriod-RB
 MBL-080RFC:RFS-FIM-401:CD2-FastRst-IlckCnt
@@ -462,7 +450,6 @@ MBL-080RFC:RFS-FIM-401:CD2-RFON-En-RB
 MBL-080RFC:RFS-FIM-401:CD2-RFON-Precond
 MBL-080RFC:RFS-FIM-401:CD2-TrigSel-RB
 MBL-080RFC:RFS-FIM-401:CD2-TrigThre-RB
-MBL-080RFC:RFS-FIM-401:CD2-Wave-IlckPM
 MBL-080RFC:RFS-FIM-401:DI10-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-401:DI10-DIlckMode-RB
 MBL-080RFC:RFS-FIM-401:DI10-FastRst-IlckCnt
@@ -474,7 +461,6 @@ MBL-080RFC:RFS-FIM-401:DI10-Input-RB
 MBL-080RFC:RFS-FIM-401:DI10-isFirstIlck
 MBL-080RFC:RFS-FIM-401:DI10-RFON-En-RB
 MBL-080RFC:RFS-FIM-401:DI10-RFON-Precond
-MBL-080RFC:RFS-FIM-401:DI10-Wave-PM
 MBL-080RFC:RFS-FIM-401:DI11-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-401:DI11-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-401:DI11-HVON-En-RB
@@ -493,7 +479,6 @@ MBL-080RFC:RFS-FIM-401:DI12-Input-RB
 MBL-080RFC:RFS-FIM-401:DI12-isFirstIlck
 MBL-080RFC:RFS-FIM-401:DI12-RFON-En-RB
 MBL-080RFC:RFS-FIM-401:DI12-RFON-Precond
-MBL-080RFC:RFS-FIM-401:DI12-Wave-PM
 MBL-080RFC:RFS-FIM-401:DI13-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-401:DI13-DIlckMode-RB
 MBL-080RFC:RFS-FIM-401:DI13-FastRst-IlckCnt
@@ -505,7 +490,6 @@ MBL-080RFC:RFS-FIM-401:DI13-Input-RB
 MBL-080RFC:RFS-FIM-401:DI13-isFirstIlck
 MBL-080RFC:RFS-FIM-401:DI13-RFON-En-RB
 MBL-080RFC:RFS-FIM-401:DI13-RFON-Precond
-MBL-080RFC:RFS-FIM-401:DI13-Wave-PM
 MBL-080RFC:RFS-FIM-401:DI14-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-401:DI14-DIlckMode-RB
 MBL-080RFC:RFS-FIM-401:DI14-FastRst-IlckCnt
@@ -517,7 +501,6 @@ MBL-080RFC:RFS-FIM-401:DI14-Input-RB
 MBL-080RFC:RFS-FIM-401:DI14-isFirstIlck
 MBL-080RFC:RFS-FIM-401:DI14-RFON-En-RB
 MBL-080RFC:RFS-FIM-401:DI14-RFON-Precond
-MBL-080RFC:RFS-FIM-401:DI14-Wave-PM
 MBL-080RFC:RFS-FIM-401:DI15-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-401:DI15-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-401:DI15-HVON-En-RB
@@ -543,7 +526,6 @@ MBL-080RFC:RFS-FIM-401:DI17-Input-RB
 MBL-080RFC:RFS-FIM-401:DI17-isFirstIlck
 MBL-080RFC:RFS-FIM-401:DI17-RFON-En-RB
 MBL-080RFC:RFS-FIM-401:DI17-RFON-Precond
-MBL-080RFC:RFS-FIM-401:DI17-Wave-PM
 MBL-080RFC:RFS-FIM-401:DI18-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-401:DI18-DIlckMode-RB
 MBL-080RFC:RFS-FIM-401:DI18-FastRst-IlckCnt
@@ -555,7 +537,6 @@ MBL-080RFC:RFS-FIM-401:DI18-Input-RB
 MBL-080RFC:RFS-FIM-401:DI18-isFirstIlck
 MBL-080RFC:RFS-FIM-401:DI18-RFON-En-RB
 MBL-080RFC:RFS-FIM-401:DI18-RFON-Precond
-MBL-080RFC:RFS-FIM-401:DI18-Wave-PM
 MBL-080RFC:RFS-FIM-401:DI19-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-401:DI19-DIlckMode-RB
 MBL-080RFC:RFS-FIM-401:DI19-FastRst-IlckCnt
@@ -567,7 +548,6 @@ MBL-080RFC:RFS-FIM-401:DI19-Input-RB
 MBL-080RFC:RFS-FIM-401:DI19-isFirstIlck
 MBL-080RFC:RFS-FIM-401:DI19-RFON-En-RB
 MBL-080RFC:RFS-FIM-401:DI19-RFON-Precond
-MBL-080RFC:RFS-FIM-401:DI19-Wave-PM
 MBL-080RFC:RFS-FIM-401:DI1-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-401:DI1-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-401:DI1-HVON-En-RB
@@ -586,7 +566,6 @@ MBL-080RFC:RFS-FIM-401:DI20-Input-RB
 MBL-080RFC:RFS-FIM-401:DI20-isFirstIlck
 MBL-080RFC:RFS-FIM-401:DI20-RFON-En-RB
 MBL-080RFC:RFS-FIM-401:DI20-RFON-Precond
-MBL-080RFC:RFS-FIM-401:DI20-Wave-PM
 MBL-080RFC:RFS-FIM-401:DI21-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-401:DI21-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-401:DI21-HVON-En-RB
@@ -640,7 +619,6 @@ MBL-080RFC:RFS-FIM-401:DI7-Input-RB
 MBL-080RFC:RFS-FIM-401:DI7-isFirstIlck
 MBL-080RFC:RFS-FIM-401:DI7-RFON-En-RB
 MBL-080RFC:RFS-FIM-401:DI7-RFON-Precond
-MBL-080RFC:RFS-FIM-401:DI7-Wave-PM
 MBL-080RFC:RFS-FIM-401:DI8-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-401:DI8-DIlckMode-RB
 MBL-080RFC:RFS-FIM-401:DI8-FastRst-IlckCnt
@@ -652,7 +630,6 @@ MBL-080RFC:RFS-FIM-401:DI8-Input-RB
 MBL-080RFC:RFS-FIM-401:DI8-isFirstIlck
 MBL-080RFC:RFS-FIM-401:DI8-RFON-En-RB
 MBL-080RFC:RFS-FIM-401:DI8-RFON-Precond
-MBL-080RFC:RFS-FIM-401:DI8-Wave-PM
 MBL-080RFC:RFS-FIM-401:DI9-DIlckLatch-RB
 MBL-080RFC:RFS-FIM-401:DI9-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-401:DI9-HVON-En-RB
@@ -710,7 +687,6 @@ MBL-080RFC:RFS-FIM-401:RF10-Wave-Avg
 MBL-080RFC:RFS-FIM-401:RF10-Wave-High
 MBL-080RFC:RFS-FIM-401:RF10-Wave-Low
 MBL-080RFC:RFS-FIM-401:RF10-Wave-Med
-MBL-080RFC:RFS-FIM-401:RF10-Wave-PM
 MBL-080RFC:RFS-FIM-401:RF1-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-401:RF1-HVON-En-RB
 MBL-080RFC:RFS-FIM-401:RF1-HVON-Precond
@@ -803,7 +779,6 @@ MBL-080RFC:RFS-FIM-401:RF9-Wave-Avg
 MBL-080RFC:RFS-FIM-401:RF9-Wave-High
 MBL-080RFC:RFS-FIM-401:RF9-Wave-Low
 MBL-080RFC:RFS-FIM-401:RF9-Wave-Med
-MBL-080RFC:RFS-FIM-401:RF9-Wave-PM
 MBL-080RFC:RFS-FIM-401:RFON-Precond
 MBL-080RFC:RFS-FIM-401:RP1-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-401:RP1-HVON-En-RB
@@ -824,7 +799,6 @@ MBL-080RFC:RFS-FIM-401:RP1-RFON-En-RB
 MBL-080RFC:RFS-FIM-401:RP1-RFON-Precond
 MBL-080RFC:RFS-FIM-401:RP1-TrigSel-RB
 MBL-080RFC:RFS-FIM-401:RP1-TrigThre-RB
-MBL-080RFC:RFS-FIM-401:RP1-Wave-IlckPM
 MBL-080RFC:RFS-FIM-401:RP2-FastRst-IlckCnt
 MBL-080RFC:RFS-FIM-401:RP2-HVON-En-RB
 MBL-080RFC:RFS-FIM-401:RP2-HVON-Precond
@@ -844,7 +818,6 @@ MBL-080RFC:RFS-FIM-401:RP2-RFON-En-RB
 MBL-080RFC:RFS-FIM-401:RP2-RFON-Precond
 MBL-080RFC:RFS-FIM-401:RP2-TrigSel-RB
 MBL-080RFC:RFS-FIM-401:RP2-TrigThre-RB
-MBL-080RFC:RFS-FIM-401:RP2-Wave-IlckPM
 MBL-080RFC:RFS-FIM-401:TriggerLine-RB
 MBL-080RFC:RFS-Kly-410:PwrFwd-DevMonEval-RB
 MBL-080RFC:RFS-Kly-410:PwrFwd-DevMonFact-RB
@@ -884,7 +857,6 @@ MBL-080RFC:RFS-Kly-410:PwrFwd-Wave-Avg
 MBL-080RFC:RFS-Kly-410:PwrFwd-Wave-High
 MBL-080RFC:RFS-Kly-410:PwrFwd-Wave-Low
 MBL-080RFC:RFS-Kly-410:PwrFwd-Wave-Med
-MBL-080RFC:RFS-Kly-410:PwrFwd-Wave-PM
 MBL-080RFC:RFS-Kly-410:PwrRfl-DevMonEval-RB
 MBL-080RFC:RFS-Kly-410:PwrRfl-DevMonFact-RB
 MBL-080RFC:RFS-Kly-410:PwrRfl-DevMonIlck-RB
@@ -923,12 +895,10 @@ MBL-080RFC:RFS-Kly-410:PwrRfl-Wave-Avg
 MBL-080RFC:RFS-Kly-410:PwrRfl-Wave-High
 MBL-080RFC:RFS-Kly-410:PwrRfl-Wave-Low
 MBL-080RFC:RFS-Kly-410:PwrRfl-Wave-Med
-MBL-080RFC:RFS-Kly-410:PwrRfl-Wave-PM
 MBL-080RFC:RFS-LLRF-401:Status-DIlckMode-RB
 MBL-080RFC:RFS-LLRF-401:Status-Ilck-RB
 MBL-080RFC:RFS-LLRF-401:Status-Input-RB
 MBL-080RFC:RFS-LLRF-401:Status-isFirstIlck
-MBL-080RFC:RFS-LLRF-401:Status-Wave-PM
 MBL-080RFC:RFS-Load-420:PwrFwd-DevMonEval-RB
 MBL-080RFC:RFS-Load-420:PwrFwd-DevMonFact-RB
 MBL-080RFC:RFS-Load-420:PwrFwd-DevMonIlck-RB
@@ -967,7 +937,6 @@ MBL-080RFC:RFS-Load-420:PwrFwd-Wave-Avg
 MBL-080RFC:RFS-Load-420:PwrFwd-Wave-High
 MBL-080RFC:RFS-Load-420:PwrFwd-Wave-Low
 MBL-080RFC:RFS-Load-420:PwrFwd-Wave-Med
-MBL-080RFC:RFS-Load-420:PwrFwd-Wave-PM
 MBL-080RFC:RFS-Load-420:PwrRfl-DevMonEval-RB
 MBL-080RFC:RFS-Load-420:PwrRfl-DevMonFact-RB
 MBL-080RFC:RFS-Load-420:PwrRfl-DevMonIlck-RB
@@ -1006,7 +975,6 @@ MBL-080RFC:RFS-Load-420:PwrRfl-Wave-Avg
 MBL-080RFC:RFS-Load-420:PwrRfl-Wave-High
 MBL-080RFC:RFS-Load-420:PwrRfl-Wave-Low
 MBL-080RFC:RFS-Load-420:PwrRfl-Wave-Med
-MBL-080RFC:RFS-Load-420:PwrRfl-Wave-PM
 MBL-080RFC:RFS-Mod-410:Cur-DevMonEval-RB
 MBL-080RFC:RFS-Mod-410:Cur-DevMonFact-RB
 MBL-080RFC:RFS-Mod-410:Cur-DevMonIlck-RB
@@ -1045,17 +1013,14 @@ MBL-080RFC:RFS-Mod-410:Cur-Wave-Avg
 MBL-080RFC:RFS-Mod-410:Cur-Wave-High
 MBL-080RFC:RFS-Mod-410:Cur-Wave-Low
 MBL-080RFC:RFS-Mod-410:Cur-Wave-Med
-MBL-080RFC:RFS-Mod-410:Cur-Wave-PM
 MBL-080RFC:RFS-Mod-410:PCcon-DIlckMode-RB
 MBL-080RFC:RFS-Mod-410:PCcon-Ilck-RB
 MBL-080RFC:RFS-Mod-410:PCcon-Input-RB
 MBL-080RFC:RFS-Mod-410:PCcon-isFirstIlck
-MBL-080RFC:RFS-Mod-410:PCcon-Wave-PM
 MBL-080RFC:RFS-Mod-410:Ready-DIlckMode-RB
 MBL-080RFC:RFS-Mod-410:Ready-Ilck-RB
 MBL-080RFC:RFS-Mod-410:Ready-Input-RB
 MBL-080RFC:RFS-Mod-410:Ready-isFirstIlck
-MBL-080RFC:RFS-Mod-410:Ready-Wave-PM
 MBL-080RFC:RFS-Mod-410:Vol-DevMonEval-RB
 MBL-080RFC:RFS-Mod-410:Vol-DevMonFact-RB
 MBL-080RFC:RFS-Mod-410:Vol-DevMonIlck-RB
@@ -1094,7 +1059,6 @@ MBL-080RFC:RFS-Mod-410:Vol-Wave-Avg
 MBL-080RFC:RFS-Mod-410:Vol-Wave-High
 MBL-080RFC:RFS-Mod-410:Vol-Wave-Low
 MBL-080RFC:RFS-Mod-410:Vol-Wave-Med
-MBL-080RFC:RFS-Mod-410:Vol-Wave-PM
 MBL-080RFC:RFS-PAmp-410:PwrFwd-DevMonEval-RB
 MBL-080RFC:RFS-PAmp-410:PwrFwd-DevMonFact-RB
 MBL-080RFC:RFS-PAmp-410:PwrFwd-DevMonIlck-RB
@@ -1133,17 +1097,14 @@ MBL-080RFC:RFS-PAmp-410:PwrFwd-Wave-Avg
 MBL-080RFC:RFS-PAmp-410:PwrFwd-Wave-High
 MBL-080RFC:RFS-PAmp-410:PwrFwd-Wave-Low
 MBL-080RFC:RFS-PAmp-410:PwrFwd-Wave-Med
-MBL-080RFC:RFS-PAmp-410:PwrFwd-Wave-PM
 MBL-080RFC:RFS-SIM-410:HvEna-DIlckMode-RB
 MBL-080RFC:RFS-SIM-410:HvEna-Ilck-RB
 MBL-080RFC:RFS-SIM-410:HvEna-Input-RB
 MBL-080RFC:RFS-SIM-410:HvEna-isFirstIlck
-MBL-080RFC:RFS-SIM-410:HvEna-Wave-PM
 MBL-080RFC:RFS-SIM-410:RfEna-DIlckMode-RB
 MBL-080RFC:RFS-SIM-410:RfEna-Ilck-RB
 MBL-080RFC:RFS-SIM-410:RfEna-Input-RB
 MBL-080RFC:RFS-SIM-410:RfEna-isFirstIlck
-MBL-080RFC:RFS-SIM-410:RfEna-Wave-PM
 MBL-080RFC:RFS-SolPS-410:Cur-DevMonEval-RB
 MBL-080RFC:RFS-SolPS-410:Cur-DevMonFact-RB
 MBL-080RFC:RFS-SolPS-410:Cur-DevMonIlck-RB
@@ -1182,7 +1143,6 @@ MBL-080RFC:RFS-SolPS-410:Cur-Wave-Avg
 MBL-080RFC:RFS-SolPS-410:Cur-Wave-High
 MBL-080RFC:RFS-SolPS-410:Cur-Wave-Low
 MBL-080RFC:RFS-SolPS-410:Cur-Wave-Med
-MBL-080RFC:RFS-SolPS-410:Cur-Wave-PM
 MBL-080RFC:RFS-SolPS-420:Cur-DevMonEval-RB
 MBL-080RFC:RFS-SolPS-420:Cur-DevMonFact-RB
 MBL-080RFC:RFS-SolPS-420:Cur-DevMonIlck-RB
@@ -1221,24 +1181,19 @@ MBL-080RFC:RFS-SolPS-420:Cur-Wave-Avg
 MBL-080RFC:RFS-SolPS-420:Cur-Wave-High
 MBL-080RFC:RFS-SolPS-420:Cur-Wave-Low
 MBL-080RFC:RFS-SolPS-420:Cur-Wave-Med
-MBL-080RFC:RFS-SolPS-420:Cur-Wave-PM
 MBL-080RFC:RFS-VacBody-410:Status-DIlckMode-RB
 MBL-080RFC:RFS-VacBody-410:Status-Ilck-RB
 MBL-080RFC:RFS-VacBody-410:Status-Input-RB
 MBL-080RFC:RFS-VacBody-410:Status-isFirstIlck
-MBL-080RFC:RFS-VacBody-410:Status-Wave-PM
 MBL-080RFC:RFS-VacCav-410:Status-DIlckMode-RB
 MBL-080RFC:RFS-VacCav-410:Status-Ilck-RB
 MBL-080RFC:RFS-VacCav-410:Status-Input-RB
 MBL-080RFC:RFS-VacCav-410:Status-isFirstIlck
-MBL-080RFC:RFS-VacCav-410:Status-Wave-PM
 MBL-080RFC:RFS-VacPS-410:I-SP-DIlckMode-RB
 MBL-080RFC:RFS-VacPS-410:I-SP-Ilck-RB
 MBL-080RFC:RFS-VacPS-410:I-SP-Input-RB
 MBL-080RFC:RFS-VacPS-410:I-SP-isFirstIlck
-MBL-080RFC:RFS-VacPS-410:I-SP-Wave-PM
 MBL-080RFC:RFS-VacPS-420:I-SP-DIlckMode-RB
 MBL-080RFC:RFS-VacPS-420:I-SP-Ilck-RB
 MBL-080RFC:RFS-VacPS-420:I-SP-Input-RB
 MBL-080RFC:RFS-VacPS-420:I-SP-isFirstIlck
-MBL-080RFC:RFS-VacPS-420:I-SP-Wave-PM
diff --git a/files/MEBT-010_SC-IOC-102.archive b/files/MEBT-010_SC-IOC-102.archive
index 2099ea5..6b337ad 100644
--- a/files/MEBT-010_SC-IOC-102.archive
+++ b/files/MEBT-010_SC-IOC-102.archive
@@ -261,51 +261,6 @@ MEBT-010:RFS-FIM-101:AI10-Wave-Avg
 MEBT-010:RFS-FIM-101:AI10-Wave-Low
 MEBT-010:RFS-FIM-101:AI10-Wave-High
 MEBT-010:RFS-FIM-101:AI10-Wave-Med
-MEBT-010:RFS-Cav-110:CavFld-Wave-PM
-MEBT-010:RFS-Cav-110:PwrFwd-Wave-PM
-MEBT-010:RFS-Cav-110:PwrRfl-Wave-PM
-MEBT-010:RFS-DA-110:PwrFwd-Wave-PM
-MEBT-010:RFS-DA-110:PwrRfl-Wave-PM
-MEBT-010:RFS-PAmp-110:PwrFwd-Wave-PM
-MEBT-010:RFS-FIM-101:RF7-Wave-PM
-MEBT-010:RFS-FIM-101:RF8-Wave-PM
-MEBT-010:RFS-FIM-101:RF9-Wave-PM
-MEBT-010:RFS-FIM-101:RF10-Wave-PM
-MEBT-010:RFS-FIM-101:AI1-Wave-PM
-MEBT-010:RFS-FIM-101:AI2-Wave-PM
-MEBT-010:RFS-FIM-101:AI3-Wave-PM
-MEBT-010:RFS-FIM-101:AI4-Wave-PM
-MEBT-010:RFS-FIM-101:AI5-Wave-PM
-MEBT-010:RFS-FIM-101:AI6-Wave-PM
-MEBT-010:RFS-FIM-101:AI7-Wave-PM
-MEBT-010:RFS-FIM-101:AI8-Wave-PM
-MEBT-010:RFS-FIM-101:AI9-Wave-PM
-MEBT-010:RFS-FIM-101:AI10-Wave-PM
-MEBT-010:RFS-SS-110:SS-D-Wave-PM
-MEBT-010:RFS-SS-110:SS-F-Wave-PM
-MEBT-010:RFS-SS-110:SS-A-Wave-PM
-MEBT-010:RFS-SS-110:SS-C-Wave-PM
-MEBT-010:RFS-DA-110:Da-Fault-Wave-PM
-MEBT-010:RFS-FIM-101:PSS-Ready-Wave-PM
-MEBT-010:RFS-Vac-110:Ilck-Wave-PM
-MEBT-010:RFS-DA-110:Da-Ready-Wave-PM
-MEBT-010:EMR-FS-001:Ilck-Wave-PM
-MEBT-010:RFS-FIM-101:DI10-Wave-PM
-MEBT-010:RFS-FIM-101:DI11-Wave-PM
-MEBT-010:RFS-FIM-101:DI12-Wave-PM
-MEBT-010:RFS-FIM-101:DI13-Wave-PM
-MEBT-010:RFS-FIM-101:DI14-Wave-PM
-MEBT-010:RFS-FIM-101:DI15-Wave-PM
-MEBT-010:RFS-FIM-101:DI16-Wave-PM
-MEBT-010:RFS-FIM-101:DI17-Wave-PM
-MEBT-010:RFS-FIM-101:DI18-Wave-PM
-MEBT-010:RFS-FIM-101:DI19-Wave-PM
-MEBT-010:RFS-FIM-101:DI20-Wave-PM
-MEBT-010:RFS-LLRF-101:Status-Wave-PM
-MEBT-010:RFS-FIM-101:RP1-Wave-IlckPM
-MEBT-010:RFS-FIM-101:RP2-Wave-IlckPM
-MEBT-010:RFS-FIM-101:CD1-Wave-IlckPM
-MEBT-010:RFS-FIM-101:CD2-Wave-IlckPM
 MEBT-010:RFS-FIM-101:FastReset-IlckCnt
 MEBT-010:RFS-FIM-101:RF1-FastRst-IlckCnt
 MEBT-010:RFS-FIM-101:RF2-FastRst-IlckCnt
diff --git a/files/MEBT-010_SC-IOC-202.archive b/files/MEBT-010_SC-IOC-202.archive
index 8ed39e5..cbd3d22 100644
--- a/files/MEBT-010_SC-IOC-202.archive
+++ b/files/MEBT-010_SC-IOC-202.archive
@@ -261,51 +261,6 @@ MEBT-010:RFS-FIM-201:AI10-Wave-Avg
 MEBT-010:RFS-FIM-201:AI10-Wave-Low
 MEBT-010:RFS-FIM-201:AI10-Wave-High
 MEBT-010:RFS-FIM-201:AI10-Wave-Med
-MEBT-010:RFS-Cav-210:CavFld-Wave-PM
-MEBT-010:RFS-Cav-210:PwrFwd-Wave-PM
-MEBT-010:RFS-Cav-210:PwrRfl-Wave-PM
-MEBT-010:RFS-DA-210:PwrFwd-Wave-PM
-MEBT-010:RFS-DA-210:PwrRfl-Wave-PM
-MEBT-010:RFS-PAmp-210:PwrFwd-Wave-PM
-MEBT-010:RFS-FIM-201:RF7-Wave-PM
-MEBT-010:RFS-FIM-201:RF8-Wave-PM
-MEBT-010:RFS-FIM-201:RF9-Wave-PM
-MEBT-010:RFS-FIM-201:RF10-Wave-PM
-MEBT-010:RFS-FIM-201:AI1-Wave-PM
-MEBT-010:RFS-FIM-201:AI2-Wave-PM
-MEBT-010:RFS-FIM-201:AI3-Wave-PM
-MEBT-010:RFS-FIM-201:AI4-Wave-PM
-MEBT-010:RFS-FIM-201:AI5-Wave-PM
-MEBT-010:RFS-FIM-201:AI6-Wave-PM
-MEBT-010:RFS-FIM-201:AI7-Wave-PM
-MEBT-010:RFS-FIM-201:AI8-Wave-PM
-MEBT-010:RFS-FIM-201:AI9-Wave-PM
-MEBT-010:RFS-FIM-201:AI10-Wave-PM
-MEBT-010:RFS-SS-210:SS-D-Wave-PM
-MEBT-010:RFS-SS-210:SS-F-Wave-PM
-MEBT-010:RFS-SS-210:SS-A-Wave-PM
-MEBT-010:RFS-SS-210:SS-C-Wave-PM
-MEBT-010:RFS-DA-210:Da-Fault-Wave-PM
-MEBT-010:RFS-FIM-201:PSS-Ready-Wave-PM
-MEBT-010:RFS-Vac-210:Ilck-Wave-PM
-MEBT-010:RFS-DA-210:Da-Ready-Wave-PM
-MEBT-010:EMR-FS-002:Ilck-Wave-PM
-MEBT-010:RFS-FIM-201:DI10-Wave-PM
-MEBT-010:RFS-FIM-201:DI11-Wave-PM
-MEBT-010:RFS-FIM-201:DI12-Wave-PM
-MEBT-010:RFS-FIM-201:DI13-Wave-PM
-MEBT-010:RFS-FIM-201:DI14-Wave-PM
-MEBT-010:RFS-FIM-201:DI15-Wave-PM
-MEBT-010:RFS-FIM-201:DI16-Wave-PM
-MEBT-010:RFS-FIM-201:DI17-Wave-PM
-MEBT-010:RFS-FIM-201:DI18-Wave-PM
-MEBT-010:RFS-FIM-201:DI19-Wave-PM
-MEBT-010:RFS-FIM-201:DI20-Wave-PM
-MEBT-010:RFS-LLRF-201:Status-Wave-PM
-MEBT-010:RFS-FIM-201:RP1-Wave-IlckPM
-MEBT-010:RFS-FIM-201:RP2-Wave-IlckPM
-MEBT-010:RFS-FIM-201:CD1-Wave-IlckPM
-MEBT-010:RFS-FIM-201:CD2-Wave-IlckPM
 MEBT-010:RFS-FIM-201:FastReset-IlckCnt
 MEBT-010:RFS-FIM-201:RF1-FastRst-IlckCnt
 MEBT-010:RFS-FIM-201:RF2-FastRst-IlckCnt
diff --git a/files/MEBT-010_SC-IOC-302.archive b/files/MEBT-010_SC-IOC-302.archive
index 10f42a5..cc0874d 100644
--- a/files/MEBT-010_SC-IOC-302.archive
+++ b/files/MEBT-010_SC-IOC-302.archive
@@ -261,51 +261,6 @@ MEBT-010:RFS-FIM-301:AI10-Wave-Avg
 MEBT-010:RFS-FIM-301:AI10-Wave-Low
 MEBT-010:RFS-FIM-301:AI10-Wave-High
 MEBT-010:RFS-FIM-301:AI10-Wave-Med
-MEBT-010:RFS-Cav-310:CavFld-Wave-PM
-MEBT-010:RFS-Cav-310:PwrFwd-Wave-PM
-MEBT-010:RFS-Cav-310:PwrRfl-Wave-PM
-MEBT-010:RFS-DA-310:PwrFwd-Wave-PM
-MEBT-010:RFS-DA-310:PwrRfl-Wave-PM
-MEBT-010:RFS-PAmp-310:PwrFwd-Wave-PM
-MEBT-010:RFS-FIM-301:RF7-Wave-PM
-MEBT-010:RFS-FIM-301:RF8-Wave-PM
-MEBT-010:RFS-FIM-301:RF9-Wave-PM
-MEBT-010:RFS-FIM-301:RF10-Wave-PM
-MEBT-010:RFS-FIM-301:AI1-Wave-PM
-MEBT-010:RFS-FIM-301:AI2-Wave-PM
-MEBT-010:RFS-FIM-301:AI3-Wave-PM
-MEBT-010:RFS-FIM-301:AI4-Wave-PM
-MEBT-010:RFS-FIM-301:AI5-Wave-PM
-MEBT-010:RFS-FIM-301:AI6-Wave-PM
-MEBT-010:RFS-FIM-301:AI7-Wave-PM
-MEBT-010:RFS-FIM-301:AI8-Wave-PM
-MEBT-010:RFS-FIM-301:AI9-Wave-PM
-MEBT-010:RFS-FIM-301:AI10-Wave-PM
-MEBT-010:RFS-SS-310:SS-D-Wave-PM
-MEBT-010:RFS-SS-310:SS-F-Wave-PM
-MEBT-010:RFS-SS-310:SS-A-Wave-PM
-MEBT-010:RFS-SS-310:SS-C-Wave-PM
-MEBT-010:RFS-DA-310:Da-Fault-Wave-PM
-MEBT-010:RFS-FIM-301:PSS-Ready-Wave-PM
-MEBT-010:RFS-Vac-310:Ilck-Wave-PM
-MEBT-010:RFS-DA-310:Da-Ready-Wave-PM
-MEBT-010:EMR-FS-003:Ilck-Wave-PM
-MEBT-010:RFS-FIM-301:DI10-Wave-PM
-MEBT-010:RFS-FIM-301:DI11-Wave-PM
-MEBT-010:RFS-FIM-301:DI12-Wave-PM
-MEBT-010:RFS-FIM-301:DI13-Wave-PM
-MEBT-010:RFS-FIM-301:DI14-Wave-PM
-MEBT-010:RFS-FIM-301:DI15-Wave-PM
-MEBT-010:RFS-FIM-301:DI16-Wave-PM
-MEBT-010:RFS-FIM-301:DI17-Wave-PM
-MEBT-010:RFS-FIM-301:DI18-Wave-PM
-MEBT-010:RFS-FIM-301:DI19-Wave-PM
-MEBT-010:RFS-FIM-301:DI20-Wave-PM
-MEBT-010:RFS-LLRF-301:Status-Wave-PM
-MEBT-010:RFS-FIM-301:RP1-Wave-IlckPM
-MEBT-010:RFS-FIM-301:RP2-Wave-IlckPM
-MEBT-010:RFS-FIM-301:CD1-Wave-IlckPM
-MEBT-010:RFS-FIM-301:CD2-Wave-IlckPM
 MEBT-010:RFS-FIM-301:FastReset-IlckCnt
 MEBT-010:RFS-FIM-301:RF1-FastRst-IlckCnt
 MEBT-010:RFS-FIM-301:RF2-FastRst-IlckCnt
diff --git a/files/RFQ-010_SC-IOC-002.archive b/files/RFQ-010_SC-IOC-002.archive
index 2ea8307..8f4c32c 100644
--- a/files/RFQ-010_SC-IOC-002.archive
+++ b/files/RFQ-010_SC-IOC-002.archive
@@ -2,22 +2,18 @@ RFQ-010:RFS-ADCav-110:IlckStatus-DIlckMode-RB
 RFQ-010:RFS-ADCav-110:IlckStatus-Ilck-RB
 RFQ-010:RFS-ADCav-110:IlckStatus-Input-RB
 RFQ-010:RFS-ADCav-110:IlckStatus-isFirstIlck
-RFQ-010:RFS-ADCav-110:IlckStatus-Wave-PM
 RFQ-010:RFS-ADCav-120:IlckStatus-DIlckMode-RB
 RFQ-010:RFS-ADCav-120:IlckStatus-Ilck-RB
 RFQ-010:RFS-ADCav-120:IlckStatus-Input-RB
 RFQ-010:RFS-ADCav-120:IlckStatus-isFirstIlck
-RFQ-010:RFS-ADCav-120:IlckStatus-Wave-PM
 RFQ-010:RFS-ADG-110:IlckStatus-DIlckMode-RB
 RFQ-010:RFS-ADG-110:IlckStatus-Ilck-RB
 RFQ-010:RFS-ADG-110:IlckStatus-Input-RB
 RFQ-010:RFS-ADG-110:IlckStatus-isFirstIlck
-RFQ-010:RFS-ADG-110:IlckStatus-Wave-PM
 RFQ-010:RFS-ADG-110:PwrFail-DIlckMode-RB
 RFQ-010:RFS-ADG-110:PwrFail-Ilck-RB
 RFQ-010:RFS-ADG-110:PwrFail-Input-RB
 RFQ-010:RFS-ADG-110:PwrFail-isFirstIlck
-RFQ-010:RFS-ADG-110:PwrFail-Wave-PM
 RFQ-010:RFS-Cav-110:Fld-DevMonEval-RB
 RFQ-010:RFS-Cav-110:Fld-DevMonFact-RB
 RFQ-010:RFS-Cav-110:Fld-DevMonIlck-RB
@@ -56,7 +52,6 @@ RFQ-010:RFS-Cav-110:Fld-Wave-Avg
 RFQ-010:RFS-Cav-110:Fld-Wave-High
 RFQ-010:RFS-Cav-110:Fld-Wave-Low
 RFQ-010:RFS-Cav-110:Fld-Wave-Med
-RFQ-010:RFS-Cav-110:Fld-Wave-PM
 RFQ-010:RFS-Cav-110:PwrFwd-DevMonEval-RB
 RFQ-010:RFS-Cav-110:PwrFwd-DevMonFact-RB
 RFQ-010:RFS-Cav-110:PwrFwd-DevMonIlck-RB
@@ -95,7 +90,6 @@ RFQ-010:RFS-Cav-110:PwrFwd-Wave-Avg
 RFQ-010:RFS-Cav-110:PwrFwd-Wave-High
 RFQ-010:RFS-Cav-110:PwrFwd-Wave-Low
 RFQ-010:RFS-Cav-110:PwrFwd-Wave-Med
-RFQ-010:RFS-Cav-110:PwrFwd-Wave-PM
 RFQ-010:RFS-Cav-110:PwrRfl-DevMonEval-RB
 RFQ-010:RFS-Cav-110:PwrRfl-DevMonFact-RB
 RFQ-010:RFS-Cav-110:PwrRfl-DevMonIlck-RB
@@ -134,7 +128,6 @@ RFQ-010:RFS-Cav-110:PwrRfl-Wave-Avg
 RFQ-010:RFS-Cav-110:PwrRfl-Wave-High
 RFQ-010:RFS-Cav-110:PwrRfl-Wave-Low
 RFQ-010:RFS-Cav-110:PwrRfl-Wave-Med
-RFQ-010:RFS-Cav-110:PwrRfl-Wave-PM
 RFQ-010:RFS-Cav-120:PwrFwd-DevMonEval-RB
 RFQ-010:RFS-Cav-120:PwrFwd-DevMonFact-RB
 RFQ-010:RFS-Cav-120:PwrFwd-DevMonIlck-RB
@@ -173,7 +166,6 @@ RFQ-010:RFS-Cav-120:PwrFwd-Wave-Avg
 RFQ-010:RFS-Cav-120:PwrFwd-Wave-High
 RFQ-010:RFS-Cav-120:PwrFwd-Wave-Low
 RFQ-010:RFS-Cav-120:PwrFwd-Wave-Med
-RFQ-010:RFS-Cav-120:PwrFwd-Wave-PM
 RFQ-010:RFS-Cav-120:PwrRfl-DevMonEval-RB
 RFQ-010:RFS-Cav-120:PwrRfl-DevMonFact-RB
 RFQ-010:RFS-Cav-120:PwrRfl-DevMonIlck-RB
@@ -212,7 +204,6 @@ RFQ-010:RFS-Cav-120:PwrRfl-Wave-Avg
 RFQ-010:RFS-Cav-120:PwrRfl-Wave-High
 RFQ-010:RFS-Cav-120:PwrRfl-Wave-Low
 RFQ-010:RFS-Cav-120:PwrRfl-Wave-Med
-RFQ-010:RFS-Cav-120:PwrRfl-Wave-PM
 RFQ-010:RFS-EPR-110:Cur-DevMonEval-RB
 RFQ-010:RFS-EPR-110:Cur-DevMonFact-RB
 RFQ-010:RFS-EPR-110:Cur-DevMonIlck-RB
@@ -251,7 +242,6 @@ RFQ-010:RFS-EPR-110:Cur-Wave-Avg
 RFQ-010:RFS-EPR-110:Cur-Wave-High
 RFQ-010:RFS-EPR-110:Cur-Wave-Low
 RFQ-010:RFS-EPR-110:Cur-Wave-Med
-RFQ-010:RFS-EPR-110:Cur-Wave-PM
 RFQ-010:RFS-EPR-120:Cur-DevMonEval-RB
 RFQ-010:RFS-EPR-120:Cur-DevMonFact-RB
 RFQ-010:RFS-EPR-120:Cur-DevMonIlck-RB
@@ -290,7 +280,6 @@ RFQ-010:RFS-EPR-120:Cur-Wave-Avg
 RFQ-010:RFS-EPR-120:Cur-Wave-High
 RFQ-010:RFS-EPR-120:Cur-Wave-Low
 RFQ-010:RFS-EPR-120:Cur-Wave-Med
-RFQ-010:RFS-EPR-120:Cur-Wave-PM
 RFQ-010:RFS-FIM-101:AI10-DevMonEval-RB
 RFQ-010:RFS-FIM-101:AI10-DevMonFact-RB
 RFQ-010:RFS-FIM-101:AI10-DevMonIlck-RB
@@ -335,7 +324,6 @@ RFQ-010:RFS-FIM-101:AI10-Wave-Avg
 RFQ-010:RFS-FIM-101:AI10-Wave-High
 RFQ-010:RFS-FIM-101:AI10-Wave-Low
 RFQ-010:RFS-FIM-101:AI10-Wave-Med
-RFQ-010:RFS-FIM-101:AI10-Wave-PM
 RFQ-010:RFS-FIM-101:AI1-FastRst-IlckCnt
 RFQ-010:RFS-FIM-101:AI1-HVON-En-RB
 RFQ-010:RFS-FIM-101:AI1-HVON-Precond
@@ -422,7 +410,6 @@ RFQ-010:RFS-FIM-101:AI8-Wave-Avg
 RFQ-010:RFS-FIM-101:AI8-Wave-High
 RFQ-010:RFS-FIM-101:AI8-Wave-Low
 RFQ-010:RFS-FIM-101:AI8-Wave-Med
-RFQ-010:RFS-FIM-101:AI8-Wave-PM
 RFQ-010:RFS-FIM-101:AI9-DevMonEval-RB
 RFQ-010:RFS-FIM-101:AI9-DevMonFact-RB
 RFQ-010:RFS-FIM-101:AI9-DevMonIlck-RB
@@ -467,7 +454,6 @@ RFQ-010:RFS-FIM-101:AI9-Wave-Avg
 RFQ-010:RFS-FIM-101:AI9-Wave-High
 RFQ-010:RFS-FIM-101:AI9-Wave-Low
 RFQ-010:RFS-FIM-101:AI9-Wave-Med
-RFQ-010:RFS-FIM-101:AI9-Wave-PM
 RFQ-010:RFS-FIM-101:CD1-DevFactor-RB
 RFQ-010:RFS-FIM-101:CD1-DevPeriod-RB
 RFQ-010:RFS-FIM-101:CD1-FastRst-IlckCnt
@@ -489,7 +475,6 @@ RFQ-010:RFS-FIM-101:CD1-RFON-En-RB
 RFQ-010:RFS-FIM-101:CD1-RFON-Precond
 RFQ-010:RFS-FIM-101:CD1-TrigSel-RB
 RFQ-010:RFS-FIM-101:CD1-TrigThre-RB
-RFQ-010:RFS-FIM-101:CD1-Wave-IlckPM
 RFQ-010:RFS-FIM-101:CD2-DevFactor-RB
 RFQ-010:RFS-FIM-101:CD2-DevPeriod-RB
 RFQ-010:RFS-FIM-101:CD2-FastRst-IlckCnt
@@ -511,7 +496,6 @@ RFQ-010:RFS-FIM-101:CD2-RFON-En-RB
 RFQ-010:RFS-FIM-101:CD2-RFON-Precond
 RFQ-010:RFS-FIM-101:CD2-TrigSel-RB
 RFQ-010:RFS-FIM-101:CD2-TrigThre-RB
-RFQ-010:RFS-FIM-101:CD2-Wave-IlckPM
 RFQ-010:RFS-FIM-101:DI10-DIlckLatch-RB
 RFQ-010:RFS-FIM-101:DI10-FastRst-IlckCnt
 RFQ-010:RFS-FIM-101:DI10-HVON-En-RB
@@ -572,7 +556,6 @@ RFQ-010:RFS-FIM-101:DI17-Input-RB
 RFQ-010:RFS-FIM-101:DI17-isFirstIlck
 RFQ-010:RFS-FIM-101:DI17-RFON-En-RB
 RFQ-010:RFS-FIM-101:DI17-RFON-Precond
-RFQ-010:RFS-FIM-101:DI17-Wave-PM
 RFQ-010:RFS-FIM-101:DI18-DIlckLatch-RB
 RFQ-010:RFS-FIM-101:DI18-DIlckMode-RB
 RFQ-010:RFS-FIM-101:DI18-FastRst-IlckCnt
@@ -584,7 +567,6 @@ RFQ-010:RFS-FIM-101:DI18-Input-RB
 RFQ-010:RFS-FIM-101:DI18-isFirstIlck
 RFQ-010:RFS-FIM-101:DI18-RFON-En-RB
 RFQ-010:RFS-FIM-101:DI18-RFON-Precond
-RFQ-010:RFS-FIM-101:DI18-Wave-PM
 RFQ-010:RFS-FIM-101:DI19-DIlckLatch-RB
 RFQ-010:RFS-FIM-101:DI19-DIlckMode-RB
 RFQ-010:RFS-FIM-101:DI19-FastRst-IlckCnt
@@ -596,7 +578,6 @@ RFQ-010:RFS-FIM-101:DI19-Input-RB
 RFQ-010:RFS-FIM-101:DI19-isFirstIlck
 RFQ-010:RFS-FIM-101:DI19-RFON-En-RB
 RFQ-010:RFS-FIM-101:DI19-RFON-Precond
-RFQ-010:RFS-FIM-101:DI19-Wave-PM
 RFQ-010:RFS-FIM-101:DI1-DIlckLatch-RB
 RFQ-010:RFS-FIM-101:DI1-FastRst-IlckCnt
 RFQ-010:RFS-FIM-101:DI1-HVON-En-RB
@@ -615,7 +596,6 @@ RFQ-010:RFS-FIM-101:DI20-Input-RB
 RFQ-010:RFS-FIM-101:DI20-isFirstIlck
 RFQ-010:RFS-FIM-101:DI20-RFON-En-RB
 RFQ-010:RFS-FIM-101:DI20-RFON-Precond
-RFQ-010:RFS-FIM-101:DI20-Wave-PM
 RFQ-010:RFS-FIM-101:DI21-DIlckLatch-RB
 RFQ-010:RFS-FIM-101:DI21-FastRst-IlckCnt
 RFQ-010:RFS-FIM-101:DI21-HVON-En-RB
@@ -669,7 +649,6 @@ RFQ-010:RFS-FIM-101:DI7-Input-RB
 RFQ-010:RFS-FIM-101:DI7-isFirstIlck
 RFQ-010:RFS-FIM-101:DI7-RFON-En-RB
 RFQ-010:RFS-FIM-101:DI7-RFON-Precond
-RFQ-010:RFS-FIM-101:DI7-Wave-PM
 RFQ-010:RFS-FIM-101:DI8-DIlckLatch-RB
 RFQ-010:RFS-FIM-101:DI8-DIlckMode-RB
 RFQ-010:RFS-FIM-101:DI8-FastRst-IlckCnt
@@ -681,7 +660,6 @@ RFQ-010:RFS-FIM-101:DI8-Input-RB
 RFQ-010:RFS-FIM-101:DI8-isFirstIlck
 RFQ-010:RFS-FIM-101:DI8-RFON-En-RB
 RFQ-010:RFS-FIM-101:DI8-RFON-Precond
-RFQ-010:RFS-FIM-101:DI8-Wave-PM
 RFQ-010:RFS-FIM-101:DI9-DIlckLatch-RB
 RFQ-010:RFS-FIM-101:DI9-FastRst-IlckCnt
 RFQ-010:RFS-FIM-101:DI9-HVON-En-RB
@@ -775,7 +753,6 @@ RFQ-010:RFS-FIM-101:RP1-RFON-En-RB
 RFQ-010:RFS-FIM-101:RP1-RFON-Precond
 RFQ-010:RFS-FIM-101:RP1-TrigSel-RB
 RFQ-010:RFS-FIM-101:RP1-TrigThre-RB
-RFQ-010:RFS-FIM-101:RP1-Wave-IlckPM
 RFQ-010:RFS-FIM-101:RP2-FastRst-IlckCnt
 RFQ-010:RFS-FIM-101:RP2-HVON-En-RB
 RFQ-010:RFS-FIM-101:RP2-HVON-Precond
@@ -795,7 +772,6 @@ RFQ-010:RFS-FIM-101:RP2-RFON-En-RB
 RFQ-010:RFS-FIM-101:RP2-RFON-Precond
 RFQ-010:RFS-FIM-101:RP2-TrigSel-RB
 RFQ-010:RFS-FIM-101:RP2-TrigThre-RB
-RFQ-010:RFS-FIM-101:RP2-Wave-IlckPM
 RFQ-010:RFS-FIM-101:SoftIlck-HVtoRF
 RFQ-010:RFS-FIM-101:SoftIlck-HVToRFPreCond
 RFQ-010:RFS-FIM-101:SoftIlck-IDLEtoHV
@@ -848,7 +824,6 @@ RFQ-010:RFS-Kly-110:PwrFwd-Wave-Avg
 RFQ-010:RFS-Kly-110:PwrFwd-Wave-High
 RFQ-010:RFS-Kly-110:PwrFwd-Wave-Low
 RFQ-010:RFS-Kly-110:PwrFwd-Wave-Med
-RFQ-010:RFS-Kly-110:PwrFwd-Wave-PM
 RFQ-010:RFS-Kly-110:PwrRfl-DevMonEval-RB
 RFQ-010:RFS-Kly-110:PwrRfl-DevMonFact-RB
 RFQ-010:RFS-Kly-110:PwrRfl-DevMonIlck-RB
@@ -887,12 +862,10 @@ RFQ-010:RFS-Kly-110:PwrRfl-Wave-Avg
 RFQ-010:RFS-Kly-110:PwrRfl-Wave-High
 RFQ-010:RFS-Kly-110:PwrRfl-Wave-Low
 RFQ-010:RFS-Kly-110:PwrRfl-Wave-Med
-RFQ-010:RFS-Kly-110:PwrRfl-Wave-PM
 RFQ-010:RFS-LLRF-101:Status-DIlckMode-RB
 RFQ-010:RFS-LLRF-101:Status-Ilck-RB
 RFQ-010:RFS-LLRF-101:Status-Input-RB
 RFQ-010:RFS-LLRF-101:Status-isFirstIlck
-RFQ-010:RFS-LLRF-101:Status-Wave-PM
 RFQ-010:RFS-Load-120:PwrFwd-DevMonEval-RB
 RFQ-010:RFS-Load-120:PwrFwd-DevMonFact-RB
 RFQ-010:RFS-Load-120:PwrFwd-DevMonIlck-RB
@@ -931,7 +904,6 @@ RFQ-010:RFS-Load-120:PwrFwd-Wave-Avg
 RFQ-010:RFS-Load-120:PwrFwd-Wave-High
 RFQ-010:RFS-Load-120:PwrFwd-Wave-Low
 RFQ-010:RFS-Load-120:PwrFwd-Wave-Med
-RFQ-010:RFS-Load-120:PwrFwd-Wave-PM
 RFQ-010:RFS-Load-130:PwrFwd-DevMonEval-RB
 RFQ-010:RFS-Load-130:PwrFwd-DevMonFact-RB
 RFQ-010:RFS-Load-130:PwrFwd-DevMonIlck-RB
@@ -970,7 +942,6 @@ RFQ-010:RFS-Load-130:PwrFwd-Wave-Avg
 RFQ-010:RFS-Load-130:PwrFwd-Wave-High
 RFQ-010:RFS-Load-130:PwrFwd-Wave-Low
 RFQ-010:RFS-Load-130:PwrFwd-Wave-Med
-RFQ-010:RFS-Load-130:PwrFwd-Wave-PM
 RFQ-010:RFS-Mod-110:Cur-DevMonEval-RB
 RFQ-010:RFS-Mod-110:Cur-DevMonFact-RB
 RFQ-010:RFS-Mod-110:Cur-DevMonIlck-RB
@@ -1009,17 +980,14 @@ RFQ-010:RFS-Mod-110:Cur-Wave-Avg
 RFQ-010:RFS-Mod-110:Cur-Wave-High
 RFQ-010:RFS-Mod-110:Cur-Wave-Low
 RFQ-010:RFS-Mod-110:Cur-Wave-Med
-RFQ-010:RFS-Mod-110:Cur-Wave-PM
 RFQ-010:RFS-Mod-110:PCcon-DIlckMode-RB
 RFQ-010:RFS-Mod-110:PCcon-Ilck-RB
 RFQ-010:RFS-Mod-110:PCcon-Input-RB
 RFQ-010:RFS-Mod-110:PCcon-isFirstIlck
-RFQ-010:RFS-Mod-110:PCcon-Wave-PM
 RFQ-010:RFS-Mod-110:Ready-DIlckMode-RB
 RFQ-010:RFS-Mod-110:Ready-Ilck-RB
 RFQ-010:RFS-Mod-110:Ready-Input-RB
 RFQ-010:RFS-Mod-110:Ready-isFirstIlck
-RFQ-010:RFS-Mod-110:Ready-Wave-PM
 RFQ-010:RFS-Mod-110:Vol-DevMonEval-RB
 RFQ-010:RFS-Mod-110:Vol-DevMonFact-RB
 RFQ-010:RFS-Mod-110:Vol-DevMonIlck-RB
@@ -1058,7 +1026,6 @@ RFQ-010:RFS-Mod-110:Vol-Wave-Avg
 RFQ-010:RFS-Mod-110:Vol-Wave-High
 RFQ-010:RFS-Mod-110:Vol-Wave-Low
 RFQ-010:RFS-Mod-110:Vol-Wave-Med
-RFQ-010:RFS-Mod-110:Vol-Wave-PM
 RFQ-010:RFS-PAmp-110:PwrFwd-DevMonEval-RB
 RFQ-010:RFS-PAmp-110:PwrFwd-DevMonFact-RB
 RFQ-010:RFS-PAmp-110:PwrFwd-DevMonIlck-RB
@@ -1097,17 +1064,14 @@ RFQ-010:RFS-PAmp-110:PwrFwd-Wave-Avg
 RFQ-010:RFS-PAmp-110:PwrFwd-Wave-High
 RFQ-010:RFS-PAmp-110:PwrFwd-Wave-Low
 RFQ-010:RFS-PAmp-110:PwrFwd-Wave-Med
-RFQ-010:RFS-PAmp-110:PwrFwd-Wave-PM
 RFQ-010:RFS-SIM-110:HvEna-DIlckMode-RB
 RFQ-010:RFS-SIM-110:HvEna-Ilck-RB
 RFQ-010:RFS-SIM-110:HvEna-Input-RB
 RFQ-010:RFS-SIM-110:HvEna-isFirstIlck
-RFQ-010:RFS-SIM-110:HvEna-Wave-PM
 RFQ-010:RFS-SIM-110:RfEna-DIlckMode-RB
 RFQ-010:RFS-SIM-110:RfEna-Ilck-RB
 RFQ-010:RFS-SIM-110:RfEna-Input-RB
 RFQ-010:RFS-SIM-110:RfEna-isFirstIlck
-RFQ-010:RFS-SIM-110:RfEna-Wave-PM
 RFQ-010:RFS-SolPS-110:Cur-DevMonEval-RB
 RFQ-010:RFS-SolPS-110:Cur-DevMonFact-RB
 RFQ-010:RFS-SolPS-110:Cur-DevMonIlck-RB
@@ -1146,7 +1110,6 @@ RFQ-010:RFS-SolPS-110:Cur-Wave-Avg
 RFQ-010:RFS-SolPS-110:Cur-Wave-High
 RFQ-010:RFS-SolPS-110:Cur-Wave-Low
 RFQ-010:RFS-SolPS-110:Cur-Wave-Med
-RFQ-010:RFS-SolPS-110:Cur-Wave-PM
 RFQ-010:RFS-SolPS-120:Cur-DevMonEval-RB
 RFQ-010:RFS-SolPS-120:Cur-DevMonFact-RB
 RFQ-010:RFS-SolPS-120:Cur-DevMonIlck-RB
@@ -1185,7 +1148,6 @@ RFQ-010:RFS-SolPS-120:Cur-Wave-Avg
 RFQ-010:RFS-SolPS-120:Cur-Wave-High
 RFQ-010:RFS-SolPS-120:Cur-Wave-Low
 RFQ-010:RFS-SolPS-120:Cur-Wave-Med
-RFQ-010:RFS-SolPS-120:Cur-Wave-PM
 RFQ-010:RFS-SolPS-130:Cur-DevMonEval-RB
 RFQ-010:RFS-SolPS-130:Cur-DevMonFact-RB
 RFQ-010:RFS-SolPS-130:Cur-DevMonIlck-RB
@@ -1224,34 +1186,27 @@ RFQ-010:RFS-SolPS-130:Cur-Wave-Avg
 RFQ-010:RFS-SolPS-130:Cur-Wave-High
 RFQ-010:RFS-SolPS-130:Cur-Wave-Low
 RFQ-010:RFS-SolPS-130:Cur-Wave-Med
-RFQ-010:RFS-SolPS-130:Cur-Wave-PM
 RFQ-010:RFS-VacMon-110:Status-DIlckMode-RB
 RFQ-010:RFS-VacMon-110:Status-Ilck-RB
 RFQ-010:RFS-VacMon-110:Status-Input-RB
 RFQ-010:RFS-VacMon-110:Status-isFirstIlck
-RFQ-010:RFS-VacMon-110:Status-Wave-PM
 RFQ-010:RFS-VacMon-120:Status-DIlckMode-RB
 RFQ-010:RFS-VacMon-120:Status-Ilck-RB
 RFQ-010:RFS-VacMon-120:Status-Input-RB
 RFQ-010:RFS-VacMon-120:Status-isFirstIlck
-RFQ-010:RFS-VacMon-120:Status-Wave-PM
 RFQ-010:RFS-VacMon-130:Status-DIlckMode-RB
 RFQ-010:RFS-VacMon-130:Status-Ilck-RB
 RFQ-010:RFS-VacMon-130:Status-Input-RB
 RFQ-010:RFS-VacMon-130:Status-isFirstIlck
-RFQ-010:RFS-VacMon-130:Status-Wave-PM
 RFQ-010:RFS-VacMon-140:Status-DIlckMode-RB
 RFQ-010:RFS-VacMon-140:Status-Ilck-RB
 RFQ-010:RFS-VacMon-140:Status-Input-RB
 RFQ-010:RFS-VacMon-140:Status-isFirstIlck
-RFQ-010:RFS-VacMon-140:Status-Wave-PM
 RFQ-010:RFS-VacPS-110:I-SP-DIlckMode-RB
 RFQ-010:RFS-VacPS-110:I-SP-Ilck-RB
 RFQ-010:RFS-VacPS-110:I-SP-Input-RB
 RFQ-010:RFS-VacPS-110:I-SP-isFirstIlck
-RFQ-010:RFS-VacPS-110:I-SP-Wave-PM
 RFQ-010:RFS-VacPS-120:I-SP-DIlckMode-RB
 RFQ-010:RFS-VacPS-120:I-SP-Ilck-RB
 RFQ-010:RFS-VacPS-120:I-SP-Input-RB
 RFQ-010:RFS-VacPS-120:I-SP-isFirstIlck
-RFQ-010:RFS-VacPS-120:I-SP-Wave-PM
diff --git a/files/RFQ-RFLPS.archive b/files/RFQ-RFLPS.archive
index fd171bc..172c0a4 100644
--- a/files/RFQ-RFLPS.archive
+++ b/files/RFQ-RFLPS.archive
@@ -6130,45 +6130,4 @@ RFQ-010:RFS-VacPS-120:I-SVAL-SEQ
 RFQ-010:RFS-VacPS-120:I-VAL-RB
 RFQ-010:RFS-VacPS-120:I-WRN-RB
 
-RFQ-010:RFS-PAmp-110:PwrFwd-Wave-PM
-RFQ-010:RFS-Kly-110:PwrFwd-Wave-PM
-RFQ-010:RFS-Load-130:PwrFwd-Wave-PM
-RFQ-010:RFS-Kly-110:PwrRfl-Wave-PM
-RFQ-010:RFS-Cav-110:PwrFwd-Wave-PM
-RFQ-010:RFS-Cav-120:PwrFwd-Wave-PM
-RFQ-010:RFS-Load-120:PwrFwd-Wave-PM
-RFQ-010:RFS-Cav-110:Fld-Wave-PM
-RFQ-010:RFS-Cav-110:PwrRfl-Wave-PM
-RFQ-010:RFS-Cav-120:PwrRfl-Wave-PM
-RFQ-010:RFS-Mod-110:Vol-Wave-PM
-RFQ-010:RFS-Mod-110:Cur-Wave-PM
-RFQ-010:RFS-SolPS-110:Cur-Wave-PM
-RFQ-010:RFS-SolPS-120:Cur-Wave-PM
-RFQ-010:RFS-SolPS-130:Cur-Wave-PM
-RFQ-010:RFS-EPR-110:Cur-Wave-PM
-RFQ-010:RFS-EPR-120:Cur-Wave-PM
-RFQ-010:RFS-FIM-101:AI8-Wave-PM
-RFQ-010:RFS-FIM-101:AI9-Wave-PM
-RFQ-010:RFS-FIM-101:AI10-Wave-PM
-RFQ-010:RFS-SIM-110:HvEna-Wave-PM
-RFQ-010:RFS-SIM-110:RfEna-Wave-PM
-RFQ-010:RFS-Mod-110:PCcon-Wave-PM
-RFQ-010:RFS-Mod-110:Ready-Wave-PM
-RFQ-010:RFS-VacPS-110:I-SP-Wave-PM
-RFQ-010:RFS-VacPS-120:I-SP-Wave-PM
-RFQ-010:RFS-FIM-101:DI7-Wave-PM
-RFQ-010:RFS-FIM-101:DI8-Wave-PM
-RFQ-010:RFS-VacMon-110:Status-Wave-PM
-RFQ-010:RFS-VacMon-120:Status-Wave-PM
-RFQ-010:RFS-VacMon-130:Status-Wave-PM
-RFQ-010:RFS-VacMon-140:Status-Wave-PM
-RFQ-010:RFS-ADCav-110:IlckStatus-Wave-PM
-RFQ-010:RFS-ADCav-120:IlckStatus-Wave-PM
-RFQ-010:RFS-ADG-110:IlckStatus-Wave-PM
-RFQ-010:RFS-ADG-110:PwrFail-Wave-PM
-RFQ-010:RFS-FIM-101:DI17-Wave-PM
-RFQ-010:RFS-FIM-101:DI18-Wave-PM
-RFQ-010:RFS-FIM-101:DI19-Wave-PM
-RFQ-010:RFS-FIM-101:DI20-Wave-PM
-RFQ-010:RFS-LLRF-101:Status-Wave-PM
 
diff --git a/files/Spk-030RFC_RFS-RFLPS-101.archive b/files/Spk-030RFC_RFS-RFLPS-101.archive
index 2073195..17239d9 100644
--- a/files/Spk-030RFC_RFS-RFLPS-101.archive
+++ b/files/Spk-030RFC_RFS-RFLPS-101.archive
@@ -4,22 +4,18 @@ Spk-030RFC:RFS-ADG-110:IlckCirc-DIlckMode-RB
 Spk-030RFC:RFS-ADG-110:IlckCirc-Ilck-RB
 Spk-030RFC:RFS-ADG-110:IlckCirc-Input-RB
 Spk-030RFC:RFS-ADG-110:IlckCirc-isFirstIlck
-Spk-030RFC:RFS-ADG-110:IlckCirc-Wave-PM
 Spk-030RFC:RFS-ADG-110:IlckStatus-DIlckMode-RB
 Spk-030RFC:RFS-ADG-110:IlckStatus-Ilck-RB
 Spk-030RFC:RFS-ADG-110:IlckStatus-Input-RB
 Spk-030RFC:RFS-ADG-110:IlckStatus-isFirstIlck
-Spk-030RFC:RFS-ADG-110:IlckStatus-Wave-PM
 Spk-030RFC:RFS-ADG-110:IlckWavg-DIlckMode-RB
 Spk-030RFC:RFS-ADG-110:IlckWavg-Ilck-RB
 Spk-030RFC:RFS-ADG-110:IlckWavg-Input-RB
 Spk-030RFC:RFS-ADG-110:IlckWavg-isFirstIlck
-Spk-030RFC:RFS-ADG-110:IlckWavg-Wave-PM
 Spk-030RFC:RFS-ADG-110:PwrFail-DIlckMode-RB
 Spk-030RFC:RFS-ADG-110:PwrFail-Ilck-RB
 Spk-030RFC:RFS-ADG-110:PwrFail-Input-RB
 Spk-030RFC:RFS-ADG-110:PwrFail-isFirstIlck
-Spk-030RFC:RFS-ADG-110:PwrFail-Wave-PM
 Spk-030RFC:RFS-Cav-110:Fld-DevMonEval-RB
 Spk-030RFC:RFS-Cav-110:Fld-DevMonFact-RB
 Spk-030RFC:RFS-Cav-110:Fld-DevMonIlck-RB
@@ -58,7 +54,6 @@ Spk-030RFC:RFS-Cav-110:Fld-Wave-Avg
 Spk-030RFC:RFS-Cav-110:Fld-Wave-High
 Spk-030RFC:RFS-Cav-110:Fld-Wave-Low
 Spk-030RFC:RFS-Cav-110:Fld-Wave-Med
-Spk-030RFC:RFS-Cav-110:Fld-Wave-PM
 Spk-030RFC:RFS-Cav-110:PwrFwd-DevMonEval-RB
 Spk-030RFC:RFS-Cav-110:PwrFwd-DevMonFact-RB
 Spk-030RFC:RFS-Cav-110:PwrFwd-DevMonIlck-RB
@@ -97,7 +92,6 @@ Spk-030RFC:RFS-Cav-110:PwrFwd-Wave-Avg
 Spk-030RFC:RFS-Cav-110:PwrFwd-Wave-High
 Spk-030RFC:RFS-Cav-110:PwrFwd-Wave-Low
 Spk-030RFC:RFS-Cav-110:PwrFwd-Wave-Med
-Spk-030RFC:RFS-Cav-110:PwrFwd-Wave-PM
 Spk-030RFC:RFS-Cav-110:PwrRfl-DevMonEval-RB
 Spk-030RFC:RFS-Cav-110:PwrRfl-DevMonFact-RB
 Spk-030RFC:RFS-Cav-110:PwrRfl-DevMonIlck-RB
@@ -136,7 +130,6 @@ Spk-030RFC:RFS-Cav-110:PwrRfl-Wave-Avg
 Spk-030RFC:RFS-Cav-110:PwrRfl-Wave-High
 Spk-030RFC:RFS-Cav-110:PwrRfl-Wave-Low
 Spk-030RFC:RFS-Cav-110:PwrRfl-Wave-Med
-Spk-030RFC:RFS-Cav-110:PwrRfl-Wave-PM
 Spk-030RFC:RFS-DirC-105:PwrFwd-DevMonEval-RB
 Spk-030RFC:RFS-DirC-105:PwrFwd-DevMonFact-RB
 Spk-030RFC:RFS-DirC-105:PwrFwd-DevMonIlck-RB
@@ -175,7 +168,6 @@ Spk-030RFC:RFS-DirC-105:PwrFwd-Wave-Avg
 Spk-030RFC:RFS-DirC-105:PwrFwd-Wave-High
 Spk-030RFC:RFS-DirC-105:PwrFwd-Wave-Low
 Spk-030RFC:RFS-DirC-105:PwrFwd-Wave-Med
-Spk-030RFC:RFS-DirC-105:PwrFwd-Wave-PM
 Spk-030RFC:RFS-EPR-110:Cur-DevMonEval-RB
 Spk-030RFC:RFS-EPR-110:Cur-DevMonFact-RB
 Spk-030RFC:RFS-EPR-110:Cur-DevMonIlck-RB
@@ -214,7 +206,6 @@ Spk-030RFC:RFS-EPR-110:Cur-Wave-Avg
 Spk-030RFC:RFS-EPR-110:Cur-Wave-High
 Spk-030RFC:RFS-EPR-110:Cur-Wave-Low
 Spk-030RFC:RFS-EPR-110:Cur-Wave-Med
-Spk-030RFC:RFS-EPR-110:Cur-Wave-PM
 Spk-030RFC:RFS-FIM-101:AI1-FastRst-IlckCnt
 Spk-030RFC:RFS-FIM-101:AI1-HVON-En-RB
 Spk-030RFC:RFS-FIM-101:AI1-HVON-Precond
@@ -265,7 +256,6 @@ Spk-030RFC:RFS-FIM-101:AI10-Wave-Avg
 Spk-030RFC:RFS-FIM-101:AI10-Wave-High
 Spk-030RFC:RFS-FIM-101:AI10-Wave-Low
 Spk-030RFC:RFS-FIM-101:AI10-Wave-Med
-Spk-030RFC:RFS-FIM-101:AI10-Wave-PM
 Spk-030RFC:RFS-FIM-101:AI2-FastRst-IlckCnt
 Spk-030RFC:RFS-FIM-101:AI2-HVON-En-RB
 Spk-030RFC:RFS-FIM-101:AI2-HVON-Precond
@@ -335,7 +325,6 @@ Spk-030RFC:RFS-FIM-101:CD1-RFON-En-RB
 Spk-030RFC:RFS-FIM-101:CD1-RFON-Precond
 Spk-030RFC:RFS-FIM-101:CD1-TrigSel-RB
 Spk-030RFC:RFS-FIM-101:CD1-TrigThre-RB
-Spk-030RFC:RFS-FIM-101:CD1-Wave-IlckPM
 Spk-030RFC:RFS-FIM-101:CD2-DevFactor-RB
 Spk-030RFC:RFS-FIM-101:CD2-DevPeriod-RB
 Spk-030RFC:RFS-FIM-101:CD2-FastRst-IlckCnt
@@ -357,7 +346,6 @@ Spk-030RFC:RFS-FIM-101:CD2-RFON-En-RB
 Spk-030RFC:RFS-FIM-101:CD2-RFON-Precond
 Spk-030RFC:RFS-FIM-101:CD2-TrigSel-RB
 Spk-030RFC:RFS-FIM-101:CD2-TrigThre-RB
-Spk-030RFC:RFS-FIM-101:CD2-Wave-IlckPM
 Spk-030RFC:RFS-FIM-101:DI1-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-101:DI1-FastRst-IlckCnt
 Spk-030RFC:RFS-FIM-101:DI1-HVON-En-RB
@@ -376,7 +364,6 @@ Spk-030RFC:RFS-FIM-101:DI10-Input-RB
 Spk-030RFC:RFS-FIM-101:DI10-isFirstIlck
 Spk-030RFC:RFS-FIM-101:DI10-RFON-En-RB
 Spk-030RFC:RFS-FIM-101:DI10-RFON-Precond
-Spk-030RFC:RFS-FIM-101:DI10-Wave-PM
 Spk-030RFC:RFS-FIM-101:DI11-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-101:DI11-DIlckMode-RB
 Spk-030RFC:RFS-FIM-101:DI11-FastRst-IlckCnt
@@ -388,7 +375,6 @@ Spk-030RFC:RFS-FIM-101:DI11-Input-RB
 Spk-030RFC:RFS-FIM-101:DI11-isFirstIlck
 Spk-030RFC:RFS-FIM-101:DI11-RFON-En-RB
 Spk-030RFC:RFS-FIM-101:DI11-RFON-Precond
-Spk-030RFC:RFS-FIM-101:DI11-Wave-PM
 Spk-030RFC:RFS-FIM-101:DI12-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-101:DI12-DIlckMode-RB
 Spk-030RFC:RFS-FIM-101:DI12-FastRst-IlckCnt
@@ -400,7 +386,6 @@ Spk-030RFC:RFS-FIM-101:DI12-Input-RB
 Spk-030RFC:RFS-FIM-101:DI12-isFirstIlck
 Spk-030RFC:RFS-FIM-101:DI12-RFON-En-RB
 Spk-030RFC:RFS-FIM-101:DI12-RFON-Precond
-Spk-030RFC:RFS-FIM-101:DI12-Wave-PM
 Spk-030RFC:RFS-FIM-101:DI13-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-101:DI13-DIlckMode-RB
 Spk-030RFC:RFS-FIM-101:DI13-FastRst-IlckCnt
@@ -412,7 +397,6 @@ Spk-030RFC:RFS-FIM-101:DI13-Input-RB
 Spk-030RFC:RFS-FIM-101:DI13-isFirstIlck
 Spk-030RFC:RFS-FIM-101:DI13-RFON-En-RB
 Spk-030RFC:RFS-FIM-101:DI13-RFON-Precond
-Spk-030RFC:RFS-FIM-101:DI13-Wave-PM
 Spk-030RFC:RFS-FIM-101:DI14-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-101:DI14-DIlckMode-RB
 Spk-030RFC:RFS-FIM-101:DI14-FastRst-IlckCnt
@@ -424,7 +408,6 @@ Spk-030RFC:RFS-FIM-101:DI14-Input-RB
 Spk-030RFC:RFS-FIM-101:DI14-isFirstIlck
 Spk-030RFC:RFS-FIM-101:DI14-RFON-En-RB
 Spk-030RFC:RFS-FIM-101:DI14-RFON-Precond
-Spk-030RFC:RFS-FIM-101:DI14-Wave-PM
 Spk-030RFC:RFS-FIM-101:DI15-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-101:DI15-FastRst-IlckCnt
 Spk-030RFC:RFS-FIM-101:DI15-HVON-En-RB
@@ -450,7 +433,6 @@ Spk-030RFC:RFS-FIM-101:DI17-Input-RB
 Spk-030RFC:RFS-FIM-101:DI17-isFirstIlck
 Spk-030RFC:RFS-FIM-101:DI17-RFON-En-RB
 Spk-030RFC:RFS-FIM-101:DI17-RFON-Precond
-Spk-030RFC:RFS-FIM-101:DI17-Wave-PM
 Spk-030RFC:RFS-FIM-101:DI18-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-101:DI18-DIlckMode-RB
 Spk-030RFC:RFS-FIM-101:DI18-FastRst-IlckCnt
@@ -462,7 +444,6 @@ Spk-030RFC:RFS-FIM-101:DI18-Input-RB
 Spk-030RFC:RFS-FIM-101:DI18-isFirstIlck
 Spk-030RFC:RFS-FIM-101:DI18-RFON-En-RB
 Spk-030RFC:RFS-FIM-101:DI18-RFON-Precond
-Spk-030RFC:RFS-FIM-101:DI18-Wave-PM
 Spk-030RFC:RFS-FIM-101:DI19-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-101:DI19-DIlckMode-RB
 Spk-030RFC:RFS-FIM-101:DI19-FastRst-IlckCnt
@@ -474,7 +455,6 @@ Spk-030RFC:RFS-FIM-101:DI19-Input-RB
 Spk-030RFC:RFS-FIM-101:DI19-isFirstIlck
 Spk-030RFC:RFS-FIM-101:DI19-RFON-En-RB
 Spk-030RFC:RFS-FIM-101:DI19-RFON-Precond
-Spk-030RFC:RFS-FIM-101:DI19-Wave-PM
 Spk-030RFC:RFS-FIM-101:DI2-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-101:DI2-FastRst-IlckCnt
 Spk-030RFC:RFS-FIM-101:DI2-HVON-En-RB
@@ -493,7 +473,6 @@ Spk-030RFC:RFS-FIM-101:DI20-Input-RB
 Spk-030RFC:RFS-FIM-101:DI20-isFirstIlck
 Spk-030RFC:RFS-FIM-101:DI20-RFON-En-RB
 Spk-030RFC:RFS-FIM-101:DI20-RFON-Precond
-Spk-030RFC:RFS-FIM-101:DI20-Wave-PM
 Spk-030RFC:RFS-FIM-101:DI21-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-101:DI21-FastRst-IlckCnt
 Spk-030RFC:RFS-FIM-101:DI21-HVON-En-RB
@@ -526,7 +505,6 @@ Spk-030RFC:RFS-FIM-101:DI5-Input-RB
 Spk-030RFC:RFS-FIM-101:DI5-isFirstIlck
 Spk-030RFC:RFS-FIM-101:DI5-RFON-En-RB
 Spk-030RFC:RFS-FIM-101:DI5-RFON-Precond
-Spk-030RFC:RFS-FIM-101:DI5-Wave-PM
 Spk-030RFC:RFS-FIM-101:DI6-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-101:DI6-DIlckMode-RB
 Spk-030RFC:RFS-FIM-101:DI6-FastRst-IlckCnt
@@ -538,7 +516,6 @@ Spk-030RFC:RFS-FIM-101:DI6-Input-RB
 Spk-030RFC:RFS-FIM-101:DI6-isFirstIlck
 Spk-030RFC:RFS-FIM-101:DI6-RFON-En-RB
 Spk-030RFC:RFS-FIM-101:DI6-RFON-Precond
-Spk-030RFC:RFS-FIM-101:DI6-Wave-PM
 Spk-030RFC:RFS-FIM-101:DI7-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-101:DI7-FastRst-IlckCnt
 Spk-030RFC:RFS-FIM-101:DI7-HVON-En-RB
@@ -616,7 +593,6 @@ Spk-030RFC:RFS-FIM-101:RF10-Wave-Avg
 Spk-030RFC:RFS-FIM-101:RF10-Wave-High
 Spk-030RFC:RFS-FIM-101:RF10-Wave-Low
 Spk-030RFC:RFS-FIM-101:RF10-Wave-Med
-Spk-030RFC:RFS-FIM-101:RF10-Wave-PM
 Spk-030RFC:RFS-FIM-101:RF2-FastRst-IlckCnt
 Spk-030RFC:RFS-FIM-101:RF2-HVON-En-RB
 Spk-030RFC:RFS-FIM-101:RF2-HVON-Precond
@@ -703,7 +679,6 @@ Spk-030RFC:RFS-FIM-101:RF9-Wave-Avg
 Spk-030RFC:RFS-FIM-101:RF9-Wave-High
 Spk-030RFC:RFS-FIM-101:RF9-Wave-Low
 Spk-030RFC:RFS-FIM-101:RF9-Wave-Med
-Spk-030RFC:RFS-FIM-101:RF9-Wave-PM
 Spk-030RFC:RFS-FIM-101:RFON-Precond
 Spk-030RFC:RFS-FIM-101:RP1-FastRst-IlckCnt
 Spk-030RFC:RFS-FIM-101:RP1-HVON-En-RB
@@ -724,7 +699,6 @@ Spk-030RFC:RFS-FIM-101:RP1-RFON-En-RB
 Spk-030RFC:RFS-FIM-101:RP1-RFON-Precond
 Spk-030RFC:RFS-FIM-101:RP1-TrigSel-RB
 Spk-030RFC:RFS-FIM-101:RP1-TrigThre-RB
-Spk-030RFC:RFS-FIM-101:RP1-Wave-IlckPM
 Spk-030RFC:RFS-FIM-101:RP2-FastRst-IlckCnt
 Spk-030RFC:RFS-FIM-101:RP2-HVON-En-RB
 Spk-030RFC:RFS-FIM-101:RP2-HVON-Precond
@@ -744,13 +718,11 @@ Spk-030RFC:RFS-FIM-101:RP2-RFON-En-RB
 Spk-030RFC:RFS-FIM-101:RP2-RFON-Precond
 Spk-030RFC:RFS-FIM-101:RP2-TrigSel-RB
 Spk-030RFC:RFS-FIM-101:RP2-TrigThre-RB
-Spk-030RFC:RFS-FIM-101:RP2-Wave-IlckPM
 Spk-030RFC:RFS-FIM-101:TriggerLine-RB
 Spk-030RFC:RFS-LLRF-101:Status-DIlckMode-RB
 Spk-030RFC:RFS-LLRF-101:Status-Ilck-RB
 Spk-030RFC:RFS-LLRF-101:Status-Input-RB
 Spk-030RFC:RFS-LLRF-101:Status-isFirstIlck
-Spk-030RFC:RFS-LLRF-101:Status-Wave-PM
 Spk-030RFC:RFS-Load-130:PwrFwd-DevMonEval-RB
 Spk-030RFC:RFS-Load-130:PwrFwd-DevMonFact-RB
 Spk-030RFC:RFS-Load-130:PwrFwd-DevMonIlck-RB
@@ -789,7 +761,6 @@ Spk-030RFC:RFS-Load-130:PwrFwd-Wave-Avg
 Spk-030RFC:RFS-Load-130:PwrFwd-Wave-High
 Spk-030RFC:RFS-Load-130:PwrFwd-Wave-Low
 Spk-030RFC:RFS-Load-130:PwrFwd-Wave-Med
-Spk-030RFC:RFS-Load-130:PwrFwd-Wave-PM
 Spk-030RFC:RFS-Load-130:PwrRfl-DevMonEval-RB
 Spk-030RFC:RFS-Load-130:PwrRfl-DevMonFact-RB
 Spk-030RFC:RFS-Load-130:PwrRfl-DevMonIlck-RB
@@ -828,7 +799,6 @@ Spk-030RFC:RFS-Load-130:PwrRfl-Wave-Avg
 Spk-030RFC:RFS-Load-130:PwrRfl-Wave-High
 Spk-030RFC:RFS-Load-130:PwrRfl-Wave-Low
 Spk-030RFC:RFS-Load-130:PwrRfl-Wave-Med
-Spk-030RFC:RFS-Load-130:PwrRfl-Wave-PM
 Spk-030RFC:RFS-RFPS-010:ACbOut-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-010:ACbOut-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-010:ACbOut-DevMonIlck-RB
@@ -867,7 +837,6 @@ Spk-030RFC:RFS-RFPS-010:ACbOut-Wave-Avg
 Spk-030RFC:RFS-RFPS-010:ACbOut-Wave-High
 Spk-030RFC:RFS-RFPS-010:ACbOut-Wave-Low
 Spk-030RFC:RFS-RFPS-010:ACbOut-Wave-Med
-Spk-030RFC:RFS-RFPS-010:ACbOut-Wave-PM
 Spk-030RFC:RFS-RFPS-010:AnVout-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-010:AnVout-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-010:AnVout-DevMonIlck-RB
@@ -906,17 +875,14 @@ Spk-030RFC:RFS-RFPS-010:AnVout-Wave-Avg
 Spk-030RFC:RFS-RFPS-010:AnVout-Wave-High
 Spk-030RFC:RFS-RFPS-010:AnVout-Wave-Low
 Spk-030RFC:RFS-RFPS-010:AnVout-Wave-Med
-Spk-030RFC:RFS-RFPS-010:AnVout-Wave-PM
 Spk-030RFC:RFS-RFPS-010:Conn-DIlckMode-RB
 Spk-030RFC:RFS-RFPS-010:Conn-Ilck-RB
 Spk-030RFC:RFS-RFPS-010:Conn-Input-RB
 Spk-030RFC:RFS-RFPS-010:Conn-isFirstIlck
-Spk-030RFC:RFS-RFPS-010:Conn-Wave-PM
 Spk-030RFC:RFS-RFPS-010:Fault-DIlckMode-RB
 Spk-030RFC:RFS-RFPS-010:Fault-Ilck-RB
 Spk-030RFC:RFS-RFPS-010:Fault-Input-RB
 Spk-030RFC:RFS-RFPS-010:Fault-isFirstIlck
-Spk-030RFC:RFS-RFPS-010:Fault-Wave-PM
 Spk-030RFC:RFS-RFPS-010:SSOut1-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-010:SSOut1-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-010:SSOut1-DevMonIlck-RB
@@ -955,7 +921,6 @@ Spk-030RFC:RFS-RFPS-010:SSOut1-Wave-Avg
 Spk-030RFC:RFS-RFPS-010:SSOut1-Wave-High
 Spk-030RFC:RFS-RFPS-010:SSOut1-Wave-Low
 Spk-030RFC:RFS-RFPS-010:SSOut1-Wave-Med
-Spk-030RFC:RFS-RFPS-010:SSOut1-Wave-PM
 Spk-030RFC:RFS-RFPS-010:SSOut2-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-010:SSOut2-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-010:SSOut2-DevMonIlck-RB
@@ -994,7 +959,6 @@ Spk-030RFC:RFS-RFPS-010:SSOut2-Wave-Avg
 Spk-030RFC:RFS-RFPS-010:SSOut2-Wave-High
 Spk-030RFC:RFS-RFPS-010:SSOut2-Wave-Low
 Spk-030RFC:RFS-RFPS-010:SSOut2-Wave-Med
-Spk-030RFC:RFS-RFPS-010:SSOut2-Wave-PM
 Spk-030RFC:RFS-RFPS-010:TAOut1-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-010:TAOut1-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-010:TAOut1-DevMonIlck-RB
@@ -1033,7 +997,6 @@ Spk-030RFC:RFS-RFPS-010:TAOut1-Wave-Avg
 Spk-030RFC:RFS-RFPS-010:TAOut1-Wave-High
 Spk-030RFC:RFS-RFPS-010:TAOut1-Wave-Low
 Spk-030RFC:RFS-RFPS-010:TAOut1-Wave-Med
-Spk-030RFC:RFS-RFPS-010:TAOut1-Wave-PM
 Spk-030RFC:RFS-RFPS-010:TAOut2-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-010:TAOut2-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-010:TAOut2-DevMonIlck-RB
@@ -1072,7 +1035,6 @@ Spk-030RFC:RFS-RFPS-010:TAOut2-Wave-Avg
 Spk-030RFC:RFS-RFPS-010:TAOut2-Wave-High
 Spk-030RFC:RFS-RFPS-010:TAOut2-Wave-Low
 Spk-030RFC:RFS-RFPS-010:TAOut2-Wave-Med
-Spk-030RFC:RFS-RFPS-010:TAOut2-Wave-PM
 Spk-030RFC:RFS-RFPS-010:Tetro1-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-010:Tetro1-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-010:Tetro1-DevMonIlck-RB
@@ -1111,7 +1073,6 @@ Spk-030RFC:RFS-RFPS-010:Tetro1-Wave-Avg
 Spk-030RFC:RFS-RFPS-010:Tetro1-Wave-High
 Spk-030RFC:RFS-RFPS-010:Tetro1-Wave-Low
 Spk-030RFC:RFS-RFPS-010:Tetro1-Wave-Med
-Spk-030RFC:RFS-RFPS-010:Tetro1-Wave-PM
 Spk-030RFC:RFS-RFPS-010:Tetro2-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-010:Tetro2-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-010:Tetro2-DevMonIlck-RB
@@ -1150,7 +1111,6 @@ Spk-030RFC:RFS-RFPS-010:Tetro2-Wave-Avg
 Spk-030RFC:RFS-RFPS-010:Tetro2-Wave-High
 Spk-030RFC:RFS-RFPS-010:Tetro2-Wave-Low
 Spk-030RFC:RFS-RFPS-010:Tetro2-Wave-Med
-Spk-030RFC:RFS-RFPS-010:Tetro2-Wave-PM
 Spk-030RFC:RFS-RFPS-110:PwrFwd-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-110:PwrFwd-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-110:PwrFwd-DevMonIlck-RB
@@ -1189,7 +1149,6 @@ Spk-030RFC:RFS-RFPS-110:PwrFwd-Wave-Avg
 Spk-030RFC:RFS-RFPS-110:PwrFwd-Wave-High
 Spk-030RFC:RFS-RFPS-110:PwrFwd-Wave-Low
 Spk-030RFC:RFS-RFPS-110:PwrFwd-Wave-Med
-Spk-030RFC:RFS-RFPS-110:PwrFwd-Wave-PM
 Spk-030RFC:RFS-RFPS-110:PwrRfl-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-110:PwrRfl-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-110:PwrRfl-DevMonIlck-RB
@@ -1228,22 +1187,18 @@ Spk-030RFC:RFS-RFPS-110:PwrRfl-Wave-Avg
 Spk-030RFC:RFS-RFPS-110:PwrRfl-Wave-High
 Spk-030RFC:RFS-RFPS-110:PwrRfl-Wave-Low
 Spk-030RFC:RFS-RFPS-110:PwrRfl-Wave-Med
-Spk-030RFC:RFS-RFPS-110:PwrRfl-Wave-PM
 Spk-030RFC:RFS-SIM-110:HvEna-DIlckMode-RB
 Spk-030RFC:RFS-SIM-110:HvEna-Ilck-RB
 Spk-030RFC:RFS-SIM-110:HvEna-Input-RB
 Spk-030RFC:RFS-SIM-110:HvEna-isFirstIlck
-Spk-030RFC:RFS-SIM-110:HvEna-Wave-PM
 Spk-030RFC:RFS-SIM-110:RfEna-DIlckMode-RB
 Spk-030RFC:RFS-SIM-110:RfEna-Ilck-RB
 Spk-030RFC:RFS-SIM-110:RfEna-Input-RB
 Spk-030RFC:RFS-SIM-110:RfEna-isFirstIlck
-Spk-030RFC:RFS-SIM-110:RfEna-Wave-PM
 Spk-030RFC:RFS-VacMon-110:Status-DIlckMode-RB
 Spk-030RFC:RFS-VacMon-110:Status-Ilck-RB
 Spk-030RFC:RFS-VacMon-110:Status-Input-RB
 Spk-030RFC:RFS-VacMon-110:Status-isFirstIlck
-Spk-030RFC:RFS-VacMon-110:Status-Wave-PM
 
 ## SIM
 
diff --git a/files/Spk-030RFC_RFS-RFLPS-201.archive b/files/Spk-030RFC_RFS-RFLPS-201.archive
index 4370510..55d64b2 100644
--- a/files/Spk-030RFC_RFS-RFLPS-201.archive
+++ b/files/Spk-030RFC_RFS-RFLPS-201.archive
@@ -4,22 +4,18 @@ Spk-030RFC:RFS-ADG-210:IlckCirc-DIlckMode-RB
 Spk-030RFC:RFS-ADG-210:IlckCirc-Ilck-RB
 Spk-030RFC:RFS-ADG-210:IlckCirc-Input-RB
 Spk-030RFC:RFS-ADG-210:IlckCirc-isFirstIlck
-Spk-030RFC:RFS-ADG-210:IlckCirc-Wave-PM
 Spk-030RFC:RFS-ADG-210:IlckStatus-DIlckMode-RB
 Spk-030RFC:RFS-ADG-210:IlckStatus-Ilck-RB
 Spk-030RFC:RFS-ADG-210:IlckStatus-Input-RB
 Spk-030RFC:RFS-ADG-210:IlckStatus-isFirstIlck
-Spk-030RFC:RFS-ADG-210:IlckStatus-Wave-PM
 Spk-030RFC:RFS-ADG-210:IlckWavg-DIlckMode-RB
 Spk-030RFC:RFS-ADG-210:IlckWavg-Ilck-RB
 Spk-030RFC:RFS-ADG-210:IlckWavg-Input-RB
 Spk-030RFC:RFS-ADG-210:IlckWavg-isFirstIlck
-Spk-030RFC:RFS-ADG-210:IlckWavg-Wave-PM
 Spk-030RFC:RFS-ADG-210:PwrFail-DIlckMode-RB
 Spk-030RFC:RFS-ADG-210:PwrFail-Ilck-RB
 Spk-030RFC:RFS-ADG-210:PwrFail-Input-RB
 Spk-030RFC:RFS-ADG-210:PwrFail-isFirstIlck
-Spk-030RFC:RFS-ADG-210:PwrFail-Wave-PM
 Spk-030RFC:RFS-Cav-210:Fld-DevMonEval-RB
 Spk-030RFC:RFS-Cav-210:Fld-DevMonFact-RB
 Spk-030RFC:RFS-Cav-210:Fld-DevMonIlck-RB
@@ -58,7 +54,6 @@ Spk-030RFC:RFS-Cav-210:Fld-Wave-Avg
 Spk-030RFC:RFS-Cav-210:Fld-Wave-High
 Spk-030RFC:RFS-Cav-210:Fld-Wave-Low
 Spk-030RFC:RFS-Cav-210:Fld-Wave-Med
-Spk-030RFC:RFS-Cav-210:Fld-Wave-PM
 Spk-030RFC:RFS-Cav-210:PwrFwd-DevMonEval-RB
 Spk-030RFC:RFS-Cav-210:PwrFwd-DevMonFact-RB
 Spk-030RFC:RFS-Cav-210:PwrFwd-DevMonIlck-RB
@@ -97,7 +92,6 @@ Spk-030RFC:RFS-Cav-210:PwrFwd-Wave-Avg
 Spk-030RFC:RFS-Cav-210:PwrFwd-Wave-High
 Spk-030RFC:RFS-Cav-210:PwrFwd-Wave-Low
 Spk-030RFC:RFS-Cav-210:PwrFwd-Wave-Med
-Spk-030RFC:RFS-Cav-210:PwrFwd-Wave-PM
 Spk-030RFC:RFS-Cav-210:PwrRfl-DevMonEval-RB
 Spk-030RFC:RFS-Cav-210:PwrRfl-DevMonFact-RB
 Spk-030RFC:RFS-Cav-210:PwrRfl-DevMonIlck-RB
@@ -136,7 +130,6 @@ Spk-030RFC:RFS-Cav-210:PwrRfl-Wave-Avg
 Spk-030RFC:RFS-Cav-210:PwrRfl-Wave-High
 Spk-030RFC:RFS-Cav-210:PwrRfl-Wave-Low
 Spk-030RFC:RFS-Cav-210:PwrRfl-Wave-Med
-Spk-030RFC:RFS-Cav-210:PwrRfl-Wave-PM
 Spk-030RFC:RFS-DirC-205:PwrFwd-DevMonEval-RB
 Spk-030RFC:RFS-DirC-205:PwrFwd-DevMonFact-RB
 Spk-030RFC:RFS-DirC-205:PwrFwd-DevMonIlck-RB
@@ -175,7 +168,6 @@ Spk-030RFC:RFS-DirC-205:PwrFwd-Wave-Avg
 Spk-030RFC:RFS-DirC-205:PwrFwd-Wave-High
 Spk-030RFC:RFS-DirC-205:PwrFwd-Wave-Low
 Spk-030RFC:RFS-DirC-205:PwrFwd-Wave-Med
-Spk-030RFC:RFS-DirC-205:PwrFwd-Wave-PM
 Spk-030RFC:RFS-EPR-210:Cur-DevMonEval-RB
 Spk-030RFC:RFS-EPR-210:Cur-DevMonFact-RB
 Spk-030RFC:RFS-EPR-210:Cur-DevMonIlck-RB
@@ -214,7 +206,6 @@ Spk-030RFC:RFS-EPR-210:Cur-Wave-Avg
 Spk-030RFC:RFS-EPR-210:Cur-Wave-High
 Spk-030RFC:RFS-EPR-210:Cur-Wave-Low
 Spk-030RFC:RFS-EPR-210:Cur-Wave-Med
-Spk-030RFC:RFS-EPR-210:Cur-Wave-PM
 Spk-030RFC:RFS-FIM-201:AI1-FastRst-IlckCnt
 Spk-030RFC:RFS-FIM-201:AI1-HVON-En-RB
 Spk-030RFC:RFS-FIM-201:AI1-HVON-Precond
@@ -265,7 +256,6 @@ Spk-030RFC:RFS-FIM-201:AI10-Wave-Avg
 Spk-030RFC:RFS-FIM-201:AI10-Wave-High
 Spk-030RFC:RFS-FIM-201:AI10-Wave-Low
 Spk-030RFC:RFS-FIM-201:AI10-Wave-Med
-Spk-030RFC:RFS-FIM-201:AI10-Wave-PM
 Spk-030RFC:RFS-FIM-201:AI2-FastRst-IlckCnt
 Spk-030RFC:RFS-FIM-201:AI2-HVON-En-RB
 Spk-030RFC:RFS-FIM-201:AI2-HVON-Precond
@@ -335,7 +325,6 @@ Spk-030RFC:RFS-FIM-201:CD1-RFON-En-RB
 Spk-030RFC:RFS-FIM-201:CD1-RFON-Precond
 Spk-030RFC:RFS-FIM-201:CD1-TrigSel-RB
 Spk-030RFC:RFS-FIM-201:CD1-TrigThre-RB
-Spk-030RFC:RFS-FIM-201:CD1-Wave-IlckPM
 Spk-030RFC:RFS-FIM-201:CD2-DevFactor-RB
 Spk-030RFC:RFS-FIM-201:CD2-DevPeriod-RB
 Spk-030RFC:RFS-FIM-201:CD2-FastRst-IlckCnt
@@ -357,7 +346,6 @@ Spk-030RFC:RFS-FIM-201:CD2-RFON-En-RB
 Spk-030RFC:RFS-FIM-201:CD2-RFON-Precond
 Spk-030RFC:RFS-FIM-201:CD2-TrigSel-RB
 Spk-030RFC:RFS-FIM-201:CD2-TrigThre-RB
-Spk-030RFC:RFS-FIM-201:CD2-Wave-IlckPM
 Spk-030RFC:RFS-FIM-201:DI1-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-201:DI1-FastRst-IlckCnt
 Spk-030RFC:RFS-FIM-201:DI1-HVON-En-RB
@@ -376,7 +364,6 @@ Spk-030RFC:RFS-FIM-201:DI10-Input-RB
 Spk-030RFC:RFS-FIM-201:DI10-isFirstIlck
 Spk-030RFC:RFS-FIM-201:DI10-RFON-En-RB
 Spk-030RFC:RFS-FIM-201:DI10-RFON-Precond
-Spk-030RFC:RFS-FIM-201:DI10-Wave-PM
 Spk-030RFC:RFS-FIM-201:DI11-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-201:DI11-DIlckMode-RB
 Spk-030RFC:RFS-FIM-201:DI11-FastRst-IlckCnt
@@ -388,7 +375,6 @@ Spk-030RFC:RFS-FIM-201:DI11-Input-RB
 Spk-030RFC:RFS-FIM-201:DI11-isFirstIlck
 Spk-030RFC:RFS-FIM-201:DI11-RFON-En-RB
 Spk-030RFC:RFS-FIM-201:DI11-RFON-Precond
-Spk-030RFC:RFS-FIM-201:DI11-Wave-PM
 Spk-030RFC:RFS-FIM-201:DI12-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-201:DI12-DIlckMode-RB
 Spk-030RFC:RFS-FIM-201:DI12-FastRst-IlckCnt
@@ -400,7 +386,6 @@ Spk-030RFC:RFS-FIM-201:DI12-Input-RB
 Spk-030RFC:RFS-FIM-201:DI12-isFirstIlck
 Spk-030RFC:RFS-FIM-201:DI12-RFON-En-RB
 Spk-030RFC:RFS-FIM-201:DI12-RFON-Precond
-Spk-030RFC:RFS-FIM-201:DI12-Wave-PM
 Spk-030RFC:RFS-FIM-201:DI13-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-201:DI13-DIlckMode-RB
 Spk-030RFC:RFS-FIM-201:DI13-FastRst-IlckCnt
@@ -412,7 +397,6 @@ Spk-030RFC:RFS-FIM-201:DI13-Input-RB
 Spk-030RFC:RFS-FIM-201:DI13-isFirstIlck
 Spk-030RFC:RFS-FIM-201:DI13-RFON-En-RB
 Spk-030RFC:RFS-FIM-201:DI13-RFON-Precond
-Spk-030RFC:RFS-FIM-201:DI13-Wave-PM
 Spk-030RFC:RFS-FIM-201:DI14-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-201:DI14-DIlckMode-RB
 Spk-030RFC:RFS-FIM-201:DI14-FastRst-IlckCnt
@@ -424,7 +408,6 @@ Spk-030RFC:RFS-FIM-201:DI14-Input-RB
 Spk-030RFC:RFS-FIM-201:DI14-isFirstIlck
 Spk-030RFC:RFS-FIM-201:DI14-RFON-En-RB
 Spk-030RFC:RFS-FIM-201:DI14-RFON-Precond
-Spk-030RFC:RFS-FIM-201:DI14-Wave-PM
 Spk-030RFC:RFS-FIM-201:DI15-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-201:DI15-FastRst-IlckCnt
 Spk-030RFC:RFS-FIM-201:DI15-HVON-En-RB
@@ -450,7 +433,6 @@ Spk-030RFC:RFS-FIM-201:DI17-Input-RB
 Spk-030RFC:RFS-FIM-201:DI17-isFirstIlck
 Spk-030RFC:RFS-FIM-201:DI17-RFON-En-RB
 Spk-030RFC:RFS-FIM-201:DI17-RFON-Precond
-Spk-030RFC:RFS-FIM-201:DI17-Wave-PM
 Spk-030RFC:RFS-FIM-201:DI18-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-201:DI18-DIlckMode-RB
 Spk-030RFC:RFS-FIM-201:DI18-FastRst-IlckCnt
@@ -462,7 +444,6 @@ Spk-030RFC:RFS-FIM-201:DI18-Input-RB
 Spk-030RFC:RFS-FIM-201:DI18-isFirstIlck
 Spk-030RFC:RFS-FIM-201:DI18-RFON-En-RB
 Spk-030RFC:RFS-FIM-201:DI18-RFON-Precond
-Spk-030RFC:RFS-FIM-201:DI18-Wave-PM
 Spk-030RFC:RFS-FIM-201:DI19-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-201:DI19-DIlckMode-RB
 Spk-030RFC:RFS-FIM-201:DI19-FastRst-IlckCnt
@@ -474,7 +455,6 @@ Spk-030RFC:RFS-FIM-201:DI19-Input-RB
 Spk-030RFC:RFS-FIM-201:DI19-isFirstIlck
 Spk-030RFC:RFS-FIM-201:DI19-RFON-En-RB
 Spk-030RFC:RFS-FIM-201:DI19-RFON-Precond
-Spk-030RFC:RFS-FIM-201:DI19-Wave-PM
 Spk-030RFC:RFS-FIM-201:DI2-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-201:DI2-FastRst-IlckCnt
 Spk-030RFC:RFS-FIM-201:DI2-HVON-En-RB
@@ -493,7 +473,6 @@ Spk-030RFC:RFS-FIM-201:DI20-Input-RB
 Spk-030RFC:RFS-FIM-201:DI20-isFirstIlck
 Spk-030RFC:RFS-FIM-201:DI20-RFON-En-RB
 Spk-030RFC:RFS-FIM-201:DI20-RFON-Precond
-Spk-030RFC:RFS-FIM-201:DI20-Wave-PM
 Spk-030RFC:RFS-FIM-201:DI21-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-201:DI21-FastRst-IlckCnt
 Spk-030RFC:RFS-FIM-201:DI21-HVON-En-RB
@@ -526,7 +505,6 @@ Spk-030RFC:RFS-FIM-201:DI5-Input-RB
 Spk-030RFC:RFS-FIM-201:DI5-isFirstIlck
 Spk-030RFC:RFS-FIM-201:DI5-RFON-En-RB
 Spk-030RFC:RFS-FIM-201:DI5-RFON-Precond
-Spk-030RFC:RFS-FIM-201:DI5-Wave-PM
 Spk-030RFC:RFS-FIM-201:DI6-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-201:DI6-DIlckMode-RB
 Spk-030RFC:RFS-FIM-201:DI6-FastRst-IlckCnt
@@ -538,7 +516,6 @@ Spk-030RFC:RFS-FIM-201:DI6-Input-RB
 Spk-030RFC:RFS-FIM-201:DI6-isFirstIlck
 Spk-030RFC:RFS-FIM-201:DI6-RFON-En-RB
 Spk-030RFC:RFS-FIM-201:DI6-RFON-Precond
-Spk-030RFC:RFS-FIM-201:DI6-Wave-PM
 Spk-030RFC:RFS-FIM-201:DI7-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-201:DI7-FastRst-IlckCnt
 Spk-030RFC:RFS-FIM-201:DI7-HVON-En-RB
@@ -616,7 +593,6 @@ Spk-030RFC:RFS-FIM-201:RF10-Wave-Avg
 Spk-030RFC:RFS-FIM-201:RF10-Wave-High
 Spk-030RFC:RFS-FIM-201:RF10-Wave-Low
 Spk-030RFC:RFS-FIM-201:RF10-Wave-Med
-Spk-030RFC:RFS-FIM-201:RF10-Wave-PM
 Spk-030RFC:RFS-FIM-201:RF2-FastRst-IlckCnt
 Spk-030RFC:RFS-FIM-201:RF2-HVON-En-RB
 Spk-030RFC:RFS-FIM-201:RF2-HVON-Precond
@@ -703,7 +679,6 @@ Spk-030RFC:RFS-FIM-201:RF9-Wave-Avg
 Spk-030RFC:RFS-FIM-201:RF9-Wave-High
 Spk-030RFC:RFS-FIM-201:RF9-Wave-Low
 Spk-030RFC:RFS-FIM-201:RF9-Wave-Med
-Spk-030RFC:RFS-FIM-201:RF9-Wave-PM
 Spk-030RFC:RFS-FIM-201:RFON-Precond
 Spk-030RFC:RFS-FIM-201:RP1-FastRst-IlckCnt
 Spk-030RFC:RFS-FIM-201:RP1-HVON-En-RB
@@ -724,7 +699,6 @@ Spk-030RFC:RFS-FIM-201:RP1-RFON-En-RB
 Spk-030RFC:RFS-FIM-201:RP1-RFON-Precond
 Spk-030RFC:RFS-FIM-201:RP1-TrigSel-RB
 Spk-030RFC:RFS-FIM-201:RP1-TrigThre-RB
-Spk-030RFC:RFS-FIM-201:RP1-Wave-IlckPM
 Spk-030RFC:RFS-FIM-201:RP2-FastRst-IlckCnt
 Spk-030RFC:RFS-FIM-201:RP2-HVON-En-RB
 Spk-030RFC:RFS-FIM-201:RP2-HVON-Precond
@@ -744,13 +718,11 @@ Spk-030RFC:RFS-FIM-201:RP2-RFON-En-RB
 Spk-030RFC:RFS-FIM-201:RP2-RFON-Precond
 Spk-030RFC:RFS-FIM-201:RP2-TrigSel-RB
 Spk-030RFC:RFS-FIM-201:RP2-TrigThre-RB
-Spk-030RFC:RFS-FIM-201:RP2-Wave-IlckPM
 Spk-030RFC:RFS-FIM-201:TriggerLine-RB
 Spk-030RFC:RFS-LLRF-201:Status-DIlckMode-RB
 Spk-030RFC:RFS-LLRF-201:Status-Ilck-RB
 Spk-030RFC:RFS-LLRF-201:Status-Input-RB
 Spk-030RFC:RFS-LLRF-201:Status-isFirstIlck
-Spk-030RFC:RFS-LLRF-201:Status-Wave-PM
 Spk-030RFC:RFS-Load-230:PwrFwd-DevMonEval-RB
 Spk-030RFC:RFS-Load-230:PwrFwd-DevMonFact-RB
 Spk-030RFC:RFS-Load-230:PwrFwd-DevMonIlck-RB
@@ -789,7 +761,6 @@ Spk-030RFC:RFS-Load-230:PwrFwd-Wave-Avg
 Spk-030RFC:RFS-Load-230:PwrFwd-Wave-High
 Spk-030RFC:RFS-Load-230:PwrFwd-Wave-Low
 Spk-030RFC:RFS-Load-230:PwrFwd-Wave-Med
-Spk-030RFC:RFS-Load-230:PwrFwd-Wave-PM
 Spk-030RFC:RFS-Load-230:PwrRfl-DevMonEval-RB
 Spk-030RFC:RFS-Load-230:PwrRfl-DevMonFact-RB
 Spk-030RFC:RFS-Load-230:PwrRfl-DevMonIlck-RB
@@ -828,7 +799,6 @@ Spk-030RFC:RFS-Load-230:PwrRfl-Wave-Avg
 Spk-030RFC:RFS-Load-230:PwrRfl-Wave-High
 Spk-030RFC:RFS-Load-230:PwrRfl-Wave-Low
 Spk-030RFC:RFS-Load-230:PwrRfl-Wave-Med
-Spk-030RFC:RFS-Load-230:PwrRfl-Wave-PM
 Spk-030RFC:RFS-RFPS-020:ACbOut-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-020:ACbOut-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-020:ACbOut-DevMonIlck-RB
@@ -867,7 +837,6 @@ Spk-030RFC:RFS-RFPS-020:ACbOut-Wave-Avg
 Spk-030RFC:RFS-RFPS-020:ACbOut-Wave-High
 Spk-030RFC:RFS-RFPS-020:ACbOut-Wave-Low
 Spk-030RFC:RFS-RFPS-020:ACbOut-Wave-Med
-Spk-030RFC:RFS-RFPS-020:ACbOut-Wave-PM
 Spk-030RFC:RFS-RFPS-020:AnVout-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-020:AnVout-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-020:AnVout-DevMonIlck-RB
@@ -906,17 +875,14 @@ Spk-030RFC:RFS-RFPS-020:AnVout-Wave-Avg
 Spk-030RFC:RFS-RFPS-020:AnVout-Wave-High
 Spk-030RFC:RFS-RFPS-020:AnVout-Wave-Low
 Spk-030RFC:RFS-RFPS-020:AnVout-Wave-Med
-Spk-030RFC:RFS-RFPS-020:AnVout-Wave-PM
 Spk-030RFC:RFS-RFPS-020:Conn-DIlckMode-RB
 Spk-030RFC:RFS-RFPS-020:Conn-Ilck-RB
 Spk-030RFC:RFS-RFPS-020:Conn-Input-RB
 Spk-030RFC:RFS-RFPS-020:Conn-isFirstIlck
-Spk-030RFC:RFS-RFPS-020:Conn-Wave-PM
 Spk-030RFC:RFS-RFPS-020:Fault-DIlckMode-RB
 Spk-030RFC:RFS-RFPS-020:Fault-Ilck-RB
 Spk-030RFC:RFS-RFPS-020:Fault-Input-RB
 Spk-030RFC:RFS-RFPS-020:Fault-isFirstIlck
-Spk-030RFC:RFS-RFPS-020:Fault-Wave-PM
 Spk-030RFC:RFS-RFPS-020:SSOut1-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-020:SSOut1-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-020:SSOut1-DevMonIlck-RB
@@ -955,7 +921,6 @@ Spk-030RFC:RFS-RFPS-020:SSOut1-Wave-Avg
 Spk-030RFC:RFS-RFPS-020:SSOut1-Wave-High
 Spk-030RFC:RFS-RFPS-020:SSOut1-Wave-Low
 Spk-030RFC:RFS-RFPS-020:SSOut1-Wave-Med
-Spk-030RFC:RFS-RFPS-020:SSOut1-Wave-PM
 Spk-030RFC:RFS-RFPS-020:SSOut2-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-020:SSOut2-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-020:SSOut2-DevMonIlck-RB
@@ -994,7 +959,6 @@ Spk-030RFC:RFS-RFPS-020:SSOut2-Wave-Avg
 Spk-030RFC:RFS-RFPS-020:SSOut2-Wave-High
 Spk-030RFC:RFS-RFPS-020:SSOut2-Wave-Low
 Spk-030RFC:RFS-RFPS-020:SSOut2-Wave-Med
-Spk-030RFC:RFS-RFPS-020:SSOut2-Wave-PM
 Spk-030RFC:RFS-RFPS-020:TAOut1-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-020:TAOut1-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-020:TAOut1-DevMonIlck-RB
@@ -1033,7 +997,6 @@ Spk-030RFC:RFS-RFPS-020:TAOut1-Wave-Avg
 Spk-030RFC:RFS-RFPS-020:TAOut1-Wave-High
 Spk-030RFC:RFS-RFPS-020:TAOut1-Wave-Low
 Spk-030RFC:RFS-RFPS-020:TAOut1-Wave-Med
-Spk-030RFC:RFS-RFPS-020:TAOut1-Wave-PM
 Spk-030RFC:RFS-RFPS-020:TAOut2-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-020:TAOut2-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-020:TAOut2-DevMonIlck-RB
@@ -1072,7 +1035,6 @@ Spk-030RFC:RFS-RFPS-020:TAOut2-Wave-Avg
 Spk-030RFC:RFS-RFPS-020:TAOut2-Wave-High
 Spk-030RFC:RFS-RFPS-020:TAOut2-Wave-Low
 Spk-030RFC:RFS-RFPS-020:TAOut2-Wave-Med
-Spk-030RFC:RFS-RFPS-020:TAOut2-Wave-PM
 Spk-030RFC:RFS-RFPS-020:Tetro1-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-020:Tetro1-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-020:Tetro1-DevMonIlck-RB
@@ -1111,7 +1073,6 @@ Spk-030RFC:RFS-RFPS-020:Tetro1-Wave-Avg
 Spk-030RFC:RFS-RFPS-020:Tetro1-Wave-High
 Spk-030RFC:RFS-RFPS-020:Tetro1-Wave-Low
 Spk-030RFC:RFS-RFPS-020:Tetro1-Wave-Med
-Spk-030RFC:RFS-RFPS-020:Tetro1-Wave-PM
 Spk-030RFC:RFS-RFPS-020:Tetro2-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-020:Tetro2-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-020:Tetro2-DevMonIlck-RB
@@ -1150,7 +1111,6 @@ Spk-030RFC:RFS-RFPS-020:Tetro2-Wave-Avg
 Spk-030RFC:RFS-RFPS-020:Tetro2-Wave-High
 Spk-030RFC:RFS-RFPS-020:Tetro2-Wave-Low
 Spk-030RFC:RFS-RFPS-020:Tetro2-Wave-Med
-Spk-030RFC:RFS-RFPS-020:Tetro2-Wave-PM
 Spk-030RFC:RFS-RFPS-210:PwrFwd-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-210:PwrFwd-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-210:PwrFwd-DevMonIlck-RB
@@ -1189,7 +1149,6 @@ Spk-030RFC:RFS-RFPS-210:PwrFwd-Wave-Avg
 Spk-030RFC:RFS-RFPS-210:PwrFwd-Wave-High
 Spk-030RFC:RFS-RFPS-210:PwrFwd-Wave-Low
 Spk-030RFC:RFS-RFPS-210:PwrFwd-Wave-Med
-Spk-030RFC:RFS-RFPS-210:PwrFwd-Wave-PM
 Spk-030RFC:RFS-RFPS-210:PwrRfl-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-210:PwrRfl-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-210:PwrRfl-DevMonIlck-RB
@@ -1228,22 +1187,18 @@ Spk-030RFC:RFS-RFPS-210:PwrRfl-Wave-Avg
 Spk-030RFC:RFS-RFPS-210:PwrRfl-Wave-High
 Spk-030RFC:RFS-RFPS-210:PwrRfl-Wave-Low
 Spk-030RFC:RFS-RFPS-210:PwrRfl-Wave-Med
-Spk-030RFC:RFS-RFPS-210:PwrRfl-Wave-PM
 Spk-030RFC:RFS-SIM-210:HvEna-DIlckMode-RB
 Spk-030RFC:RFS-SIM-210:HvEna-Ilck-RB
 Spk-030RFC:RFS-SIM-210:HvEna-Input-RB
 Spk-030RFC:RFS-SIM-210:HvEna-isFirstIlck
-Spk-030RFC:RFS-SIM-210:HvEna-Wave-PM
 Spk-030RFC:RFS-SIM-210:RfEna-DIlckMode-RB
 Spk-030RFC:RFS-SIM-210:RfEna-Ilck-RB
 Spk-030RFC:RFS-SIM-210:RfEna-Input-RB
 Spk-030RFC:RFS-SIM-210:RfEna-isFirstIlck
-Spk-030RFC:RFS-SIM-210:RfEna-Wave-PM
 Spk-030RFC:RFS-VacMon-210:Status-DIlckMode-RB
 Spk-030RFC:RFS-VacMon-210:Status-Ilck-RB
 Spk-030RFC:RFS-VacMon-210:Status-Input-RB
 Spk-030RFC:RFS-VacMon-210:Status-isFirstIlck
-Spk-030RFC:RFS-VacMon-210:Status-Wave-PM
 
 ## SIM
 
diff --git a/files/Spk-030RFC_SC-IOC-102.archive b/files/Spk-030RFC_SC-IOC-102.archive
index 0f4cda7..d274574 100644
--- a/files/Spk-030RFC_SC-IOC-102.archive
+++ b/files/Spk-030RFC_SC-IOC-102.archive
@@ -2,22 +2,18 @@ Spk-030RFC:RFS-ADG-110:IlckCirc-DIlckMode-RB
 Spk-030RFC:RFS-ADG-110:IlckCirc-Ilck-RB
 Spk-030RFC:RFS-ADG-110:IlckCirc-Input-RB
 Spk-030RFC:RFS-ADG-110:IlckCirc-isFirstIlck
-Spk-030RFC:RFS-ADG-110:IlckCirc-Wave-PM
 Spk-030RFC:RFS-ADG-110:IlckStatus-DIlckMode-RB
 Spk-030RFC:RFS-ADG-110:IlckStatus-Ilck-RB
 Spk-030RFC:RFS-ADG-110:IlckStatus-Input-RB
 Spk-030RFC:RFS-ADG-110:IlckStatus-isFirstIlck
-Spk-030RFC:RFS-ADG-110:IlckStatus-Wave-PM
 Spk-030RFC:RFS-ADG-110:IlckWavg-DIlckMode-RB
 Spk-030RFC:RFS-ADG-110:IlckWavg-Ilck-RB
 Spk-030RFC:RFS-ADG-110:IlckWavg-Input-RB
 Spk-030RFC:RFS-ADG-110:IlckWavg-isFirstIlck
-Spk-030RFC:RFS-ADG-110:IlckWavg-Wave-PM
 Spk-030RFC:RFS-ADG-110:PwrFail-DIlckMode-RB
 Spk-030RFC:RFS-ADG-110:PwrFail-Ilck-RB
 Spk-030RFC:RFS-ADG-110:PwrFail-Input-RB
 Spk-030RFC:RFS-ADG-110:PwrFail-isFirstIlck
-Spk-030RFC:RFS-ADG-110:PwrFail-Wave-PM
 Spk-030RFC:RFS-Cav-110:Fld-DevMonEval-RB
 Spk-030RFC:RFS-Cav-110:Fld-DevMonFact-RB
 Spk-030RFC:RFS-Cav-110:Fld-DevMonIlck-RB
@@ -56,7 +52,6 @@ Spk-030RFC:RFS-Cav-110:Fld-Wave-Avg
 Spk-030RFC:RFS-Cav-110:Fld-Wave-High
 Spk-030RFC:RFS-Cav-110:Fld-Wave-Low
 Spk-030RFC:RFS-Cav-110:Fld-Wave-Med
-Spk-030RFC:RFS-Cav-110:Fld-Wave-PM
 Spk-030RFC:RFS-Cav-110:PwrFwd-DevMonEval-RB
 Spk-030RFC:RFS-Cav-110:PwrFwd-DevMonFact-RB
 Spk-030RFC:RFS-Cav-110:PwrFwd-DevMonIlck-RB
@@ -95,7 +90,6 @@ Spk-030RFC:RFS-Cav-110:PwrFwd-Wave-Avg
 Spk-030RFC:RFS-Cav-110:PwrFwd-Wave-High
 Spk-030RFC:RFS-Cav-110:PwrFwd-Wave-Low
 Spk-030RFC:RFS-Cav-110:PwrFwd-Wave-Med
-Spk-030RFC:RFS-Cav-110:PwrFwd-Wave-PM
 Spk-030RFC:RFS-Cav-110:PwrRfl-DevMonEval-RB
 Spk-030RFC:RFS-Cav-110:PwrRfl-DevMonFact-RB
 Spk-030RFC:RFS-Cav-110:PwrRfl-DevMonIlck-RB
@@ -134,7 +128,6 @@ Spk-030RFC:RFS-Cav-110:PwrRfl-Wave-Avg
 Spk-030RFC:RFS-Cav-110:PwrRfl-Wave-High
 Spk-030RFC:RFS-Cav-110:PwrRfl-Wave-Low
 Spk-030RFC:RFS-Cav-110:PwrRfl-Wave-Med
-Spk-030RFC:RFS-Cav-110:PwrRfl-Wave-PM
 Spk-030RFC:RFS-DirC-105:PwrFwd-DevMonEval-RB
 Spk-030RFC:RFS-DirC-105:PwrFwd-DevMonFact-RB
 Spk-030RFC:RFS-DirC-105:PwrFwd-DevMonIlck-RB
@@ -173,7 +166,6 @@ Spk-030RFC:RFS-DirC-105:PwrFwd-Wave-Avg
 Spk-030RFC:RFS-DirC-105:PwrFwd-Wave-High
 Spk-030RFC:RFS-DirC-105:PwrFwd-Wave-Low
 Spk-030RFC:RFS-DirC-105:PwrFwd-Wave-Med
-Spk-030RFC:RFS-DirC-105:PwrFwd-Wave-PM
 Spk-030RFC:RFS-EPR-110:Cur-DevMonEval-RB
 Spk-030RFC:RFS-EPR-110:Cur-DevMonFact-RB
 Spk-030RFC:RFS-EPR-110:Cur-DevMonIlck-RB
@@ -212,7 +204,6 @@ Spk-030RFC:RFS-EPR-110:Cur-Wave-Avg
 Spk-030RFC:RFS-EPR-110:Cur-Wave-High
 Spk-030RFC:RFS-EPR-110:Cur-Wave-Low
 Spk-030RFC:RFS-EPR-110:Cur-Wave-Med
-Spk-030RFC:RFS-EPR-110:Cur-Wave-PM
 Spk-030RFC:RFS-FIM-101:AI10-DevMonEval-RB
 Spk-030RFC:RFS-FIM-101:AI10-DevMonFact-RB
 Spk-030RFC:RFS-FIM-101:AI10-DevMonIlck-RB
@@ -257,7 +248,6 @@ Spk-030RFC:RFS-FIM-101:AI10-Wave-Avg
 Spk-030RFC:RFS-FIM-101:AI10-Wave-High
 Spk-030RFC:RFS-FIM-101:AI10-Wave-Low
 Spk-030RFC:RFS-FIM-101:AI10-Wave-Med
-Spk-030RFC:RFS-FIM-101:AI10-Wave-PM
 Spk-030RFC:RFS-FIM-101:AI1-FastRst-IlckCnt
 Spk-030RFC:RFS-FIM-101:AI1-HVON-En-RB
 Spk-030RFC:RFS-FIM-101:AI1-HVON-Precond
@@ -333,7 +323,6 @@ Spk-030RFC:RFS-FIM-101:CD1-RFON-En-RB
 Spk-030RFC:RFS-FIM-101:CD1-RFON-Precond
 Spk-030RFC:RFS-FIM-101:CD1-TrigSel-RB
 Spk-030RFC:RFS-FIM-101:CD1-TrigThre-RB
-Spk-030RFC:RFS-FIM-101:CD1-Wave-IlckPM
 Spk-030RFC:RFS-FIM-101:CD2-DevFactor-RB
 Spk-030RFC:RFS-FIM-101:CD2-DevPeriod-RB
 Spk-030RFC:RFS-FIM-101:CD2-FastRst-IlckCnt
@@ -355,7 +344,6 @@ Spk-030RFC:RFS-FIM-101:CD2-RFON-En-RB
 Spk-030RFC:RFS-FIM-101:CD2-RFON-Precond
 Spk-030RFC:RFS-FIM-101:CD2-TrigSel-RB
 Spk-030RFC:RFS-FIM-101:CD2-TrigThre-RB
-Spk-030RFC:RFS-FIM-101:CD2-Wave-IlckPM
 Spk-030RFC:RFS-FIM-101:DI10-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-101:DI10-DIlckMode-RB
 Spk-030RFC:RFS-FIM-101:DI10-FastRst-IlckCnt
@@ -367,7 +355,6 @@ Spk-030RFC:RFS-FIM-101:DI10-Input-RB
 Spk-030RFC:RFS-FIM-101:DI10-isFirstIlck
 Spk-030RFC:RFS-FIM-101:DI10-RFON-En-RB
 Spk-030RFC:RFS-FIM-101:DI10-RFON-Precond
-Spk-030RFC:RFS-FIM-101:DI10-Wave-PM
 Spk-030RFC:RFS-FIM-101:DI11-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-101:DI11-DIlckMode-RB
 Spk-030RFC:RFS-FIM-101:DI11-FastRst-IlckCnt
@@ -379,7 +366,6 @@ Spk-030RFC:RFS-FIM-101:DI11-Input-RB
 Spk-030RFC:RFS-FIM-101:DI11-isFirstIlck
 Spk-030RFC:RFS-FIM-101:DI11-RFON-En-RB
 Spk-030RFC:RFS-FIM-101:DI11-RFON-Precond
-Spk-030RFC:RFS-FIM-101:DI11-Wave-PM
 Spk-030RFC:RFS-FIM-101:DI12-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-101:DI12-DIlckMode-RB
 Spk-030RFC:RFS-FIM-101:DI12-FastRst-IlckCnt
@@ -391,7 +377,6 @@ Spk-030RFC:RFS-FIM-101:DI12-Input-RB
 Spk-030RFC:RFS-FIM-101:DI12-isFirstIlck
 Spk-030RFC:RFS-FIM-101:DI12-RFON-En-RB
 Spk-030RFC:RFS-FIM-101:DI12-RFON-Precond
-Spk-030RFC:RFS-FIM-101:DI12-Wave-PM
 Spk-030RFC:RFS-FIM-101:DI13-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-101:DI13-DIlckMode-RB
 Spk-030RFC:RFS-FIM-101:DI13-FastRst-IlckCnt
@@ -403,7 +388,6 @@ Spk-030RFC:RFS-FIM-101:DI13-Input-RB
 Spk-030RFC:RFS-FIM-101:DI13-isFirstIlck
 Spk-030RFC:RFS-FIM-101:DI13-RFON-En-RB
 Spk-030RFC:RFS-FIM-101:DI13-RFON-Precond
-Spk-030RFC:RFS-FIM-101:DI13-Wave-PM
 Spk-030RFC:RFS-FIM-101:DI14-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-101:DI14-DIlckMode-RB
 Spk-030RFC:RFS-FIM-101:DI14-FastRst-IlckCnt
@@ -415,7 +399,6 @@ Spk-030RFC:RFS-FIM-101:DI14-Input-RB
 Spk-030RFC:RFS-FIM-101:DI14-isFirstIlck
 Spk-030RFC:RFS-FIM-101:DI14-RFON-En-RB
 Spk-030RFC:RFS-FIM-101:DI14-RFON-Precond
-Spk-030RFC:RFS-FIM-101:DI14-Wave-PM
 Spk-030RFC:RFS-FIM-101:DI15-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-101:DI15-FastRst-IlckCnt
 Spk-030RFC:RFS-FIM-101:DI15-HVON-En-RB
@@ -441,7 +424,6 @@ Spk-030RFC:RFS-FIM-101:DI17-Input-RB
 Spk-030RFC:RFS-FIM-101:DI17-isFirstIlck
 Spk-030RFC:RFS-FIM-101:DI17-RFON-En-RB
 Spk-030RFC:RFS-FIM-101:DI17-RFON-Precond
-Spk-030RFC:RFS-FIM-101:DI17-Wave-PM
 Spk-030RFC:RFS-FIM-101:DI18-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-101:DI18-DIlckMode-RB
 Spk-030RFC:RFS-FIM-101:DI18-FastRst-IlckCnt
@@ -453,7 +435,6 @@ Spk-030RFC:RFS-FIM-101:DI18-Input-RB
 Spk-030RFC:RFS-FIM-101:DI18-isFirstIlck
 Spk-030RFC:RFS-FIM-101:DI18-RFON-En-RB
 Spk-030RFC:RFS-FIM-101:DI18-RFON-Precond
-Spk-030RFC:RFS-FIM-101:DI18-Wave-PM
 Spk-030RFC:RFS-FIM-101:DI19-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-101:DI19-DIlckMode-RB
 Spk-030RFC:RFS-FIM-101:DI19-FastRst-IlckCnt
@@ -465,7 +446,6 @@ Spk-030RFC:RFS-FIM-101:DI19-Input-RB
 Spk-030RFC:RFS-FIM-101:DI19-isFirstIlck
 Spk-030RFC:RFS-FIM-101:DI19-RFON-En-RB
 Spk-030RFC:RFS-FIM-101:DI19-RFON-Precond
-Spk-030RFC:RFS-FIM-101:DI19-Wave-PM
 Spk-030RFC:RFS-FIM-101:DI1-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-101:DI1-FastRst-IlckCnt
 Spk-030RFC:RFS-FIM-101:DI1-HVON-En-RB
@@ -484,7 +464,6 @@ Spk-030RFC:RFS-FIM-101:DI20-Input-RB
 Spk-030RFC:RFS-FIM-101:DI20-isFirstIlck
 Spk-030RFC:RFS-FIM-101:DI20-RFON-En-RB
 Spk-030RFC:RFS-FIM-101:DI20-RFON-Precond
-Spk-030RFC:RFS-FIM-101:DI20-Wave-PM
 Spk-030RFC:RFS-FIM-101:DI21-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-101:DI21-FastRst-IlckCnt
 Spk-030RFC:RFS-FIM-101:DI21-HVON-En-RB
@@ -524,7 +503,6 @@ Spk-030RFC:RFS-FIM-101:DI5-Input-RB
 Spk-030RFC:RFS-FIM-101:DI5-isFirstIlck
 Spk-030RFC:RFS-FIM-101:DI5-RFON-En-RB
 Spk-030RFC:RFS-FIM-101:DI5-RFON-Precond
-Spk-030RFC:RFS-FIM-101:DI5-Wave-PM
 Spk-030RFC:RFS-FIM-101:DI6-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-101:DI6-DIlckMode-RB
 Spk-030RFC:RFS-FIM-101:DI6-FastRst-IlckCnt
@@ -536,7 +514,6 @@ Spk-030RFC:RFS-FIM-101:DI6-Input-RB
 Spk-030RFC:RFS-FIM-101:DI6-isFirstIlck
 Spk-030RFC:RFS-FIM-101:DI6-RFON-En-RB
 Spk-030RFC:RFS-FIM-101:DI6-RFON-Precond
-Spk-030RFC:RFS-FIM-101:DI6-Wave-PM
 Spk-030RFC:RFS-FIM-101:DI7-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-101:DI7-FastRst-IlckCnt
 Spk-030RFC:RFS-FIM-101:DI7-HVON-En-RB
@@ -608,7 +585,6 @@ Spk-030RFC:RFS-FIM-101:RF10-Wave-Avg
 Spk-030RFC:RFS-FIM-101:RF10-Wave-High
 Spk-030RFC:RFS-FIM-101:RF10-Wave-Low
 Spk-030RFC:RFS-FIM-101:RF10-Wave-Med
-Spk-030RFC:RFS-FIM-101:RF10-Wave-PM
 Spk-030RFC:RFS-FIM-101:RF1-FastRst-IlckCnt
 Spk-030RFC:RFS-FIM-101:RF1-HVON-En-RB
 Spk-030RFC:RFS-FIM-101:RF1-HVON-Precond
@@ -701,7 +677,6 @@ Spk-030RFC:RFS-FIM-101:RF9-Wave-Avg
 Spk-030RFC:RFS-FIM-101:RF9-Wave-High
 Spk-030RFC:RFS-FIM-101:RF9-Wave-Low
 Spk-030RFC:RFS-FIM-101:RF9-Wave-Med
-Spk-030RFC:RFS-FIM-101:RF9-Wave-PM
 Spk-030RFC:RFS-FIM-101:RFON-Precond
 Spk-030RFC:RFS-FIM-101:RP1-FastRst-IlckCnt
 Spk-030RFC:RFS-FIM-101:RP1-HVON-En-RB
@@ -722,7 +697,6 @@ Spk-030RFC:RFS-FIM-101:RP1-RFON-En-RB
 Spk-030RFC:RFS-FIM-101:RP1-RFON-Precond
 Spk-030RFC:RFS-FIM-101:RP1-TrigSel-RB
 Spk-030RFC:RFS-FIM-101:RP1-TrigThre-RB
-Spk-030RFC:RFS-FIM-101:RP1-Wave-IlckPM
 Spk-030RFC:RFS-FIM-101:RP2-FastRst-IlckCnt
 Spk-030RFC:RFS-FIM-101:RP2-HVON-En-RB
 Spk-030RFC:RFS-FIM-101:RP2-HVON-Precond
@@ -742,13 +716,11 @@ Spk-030RFC:RFS-FIM-101:RP2-RFON-En-RB
 Spk-030RFC:RFS-FIM-101:RP2-RFON-Precond
 Spk-030RFC:RFS-FIM-101:RP2-TrigSel-RB
 Spk-030RFC:RFS-FIM-101:RP2-TrigThre-RB
-Spk-030RFC:RFS-FIM-101:RP2-Wave-IlckPM
 Spk-030RFC:RFS-FIM-101:TriggerLine-RB
 Spk-030RFC:RFS-LLRF-101:Status-DIlckMode-RB
 Spk-030RFC:RFS-LLRF-101:Status-Ilck-RB
 Spk-030RFC:RFS-LLRF-101:Status-Input-RB
 Spk-030RFC:RFS-LLRF-101:Status-isFirstIlck
-Spk-030RFC:RFS-LLRF-101:Status-Wave-PM
 Spk-030RFC:RFS-Load-130:PwrFwd-DevMonEval-RB
 Spk-030RFC:RFS-Load-130:PwrFwd-DevMonFact-RB
 Spk-030RFC:RFS-Load-130:PwrFwd-DevMonIlck-RB
@@ -787,7 +759,6 @@ Spk-030RFC:RFS-Load-130:PwrFwd-Wave-Avg
 Spk-030RFC:RFS-Load-130:PwrFwd-Wave-High
 Spk-030RFC:RFS-Load-130:PwrFwd-Wave-Low
 Spk-030RFC:RFS-Load-130:PwrFwd-Wave-Med
-Spk-030RFC:RFS-Load-130:PwrFwd-Wave-PM
 Spk-030RFC:RFS-Load-130:PwrRfl-DevMonEval-RB
 Spk-030RFC:RFS-Load-130:PwrRfl-DevMonFact-RB
 Spk-030RFC:RFS-Load-130:PwrRfl-DevMonIlck-RB
@@ -826,7 +797,6 @@ Spk-030RFC:RFS-Load-130:PwrRfl-Wave-Avg
 Spk-030RFC:RFS-Load-130:PwrRfl-Wave-High
 Spk-030RFC:RFS-Load-130:PwrRfl-Wave-Low
 Spk-030RFC:RFS-Load-130:PwrRfl-Wave-Med
-Spk-030RFC:RFS-Load-130:PwrRfl-Wave-PM
 Spk-030RFC:RFS-RFPS-010:ACbOut-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-010:ACbOut-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-010:ACbOut-DevMonIlck-RB
@@ -865,7 +835,6 @@ Spk-030RFC:RFS-RFPS-010:ACbOut-Wave-Avg
 Spk-030RFC:RFS-RFPS-010:ACbOut-Wave-High
 Spk-030RFC:RFS-RFPS-010:ACbOut-Wave-Low
 Spk-030RFC:RFS-RFPS-010:ACbOut-Wave-Med
-Spk-030RFC:RFS-RFPS-010:ACbOut-Wave-PM
 Spk-030RFC:RFS-RFPS-010:AnVout-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-010:AnVout-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-010:AnVout-DevMonIlck-RB
@@ -904,17 +873,14 @@ Spk-030RFC:RFS-RFPS-010:AnVout-Wave-Avg
 Spk-030RFC:RFS-RFPS-010:AnVout-Wave-High
 Spk-030RFC:RFS-RFPS-010:AnVout-Wave-Low
 Spk-030RFC:RFS-RFPS-010:AnVout-Wave-Med
-Spk-030RFC:RFS-RFPS-010:AnVout-Wave-PM
 Spk-030RFC:RFS-RFPS-010:Conn-DIlckMode-RB
 Spk-030RFC:RFS-RFPS-010:Conn-Ilck-RB
 Spk-030RFC:RFS-RFPS-010:Conn-Input-RB
 Spk-030RFC:RFS-RFPS-010:Conn-isFirstIlck
-Spk-030RFC:RFS-RFPS-010:Conn-Wave-PM
 Spk-030RFC:RFS-RFPS-010:Fault-DIlckMode-RB
 Spk-030RFC:RFS-RFPS-010:Fault-Ilck-RB
 Spk-030RFC:RFS-RFPS-010:Fault-Input-RB
 Spk-030RFC:RFS-RFPS-010:Fault-isFirstIlck
-Spk-030RFC:RFS-RFPS-010:Fault-Wave-PM
 Spk-030RFC:RFS-RFPS-010:SSOut1-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-010:SSOut1-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-010:SSOut1-DevMonIlck-RB
@@ -953,7 +919,6 @@ Spk-030RFC:RFS-RFPS-010:SSOut1-Wave-Avg
 Spk-030RFC:RFS-RFPS-010:SSOut1-Wave-High
 Spk-030RFC:RFS-RFPS-010:SSOut1-Wave-Low
 Spk-030RFC:RFS-RFPS-010:SSOut1-Wave-Med
-Spk-030RFC:RFS-RFPS-010:SSOut1-Wave-PM
 Spk-030RFC:RFS-RFPS-010:SSOut2-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-010:SSOut2-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-010:SSOut2-DevMonIlck-RB
@@ -992,7 +957,6 @@ Spk-030RFC:RFS-RFPS-010:SSOut2-Wave-Avg
 Spk-030RFC:RFS-RFPS-010:SSOut2-Wave-High
 Spk-030RFC:RFS-RFPS-010:SSOut2-Wave-Low
 Spk-030RFC:RFS-RFPS-010:SSOut2-Wave-Med
-Spk-030RFC:RFS-RFPS-010:SSOut2-Wave-PM
 Spk-030RFC:RFS-RFPS-010:TAOut1-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-010:TAOut1-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-010:TAOut1-DevMonIlck-RB
@@ -1031,7 +995,6 @@ Spk-030RFC:RFS-RFPS-010:TAOut1-Wave-Avg
 Spk-030RFC:RFS-RFPS-010:TAOut1-Wave-High
 Spk-030RFC:RFS-RFPS-010:TAOut1-Wave-Low
 Spk-030RFC:RFS-RFPS-010:TAOut1-Wave-Med
-Spk-030RFC:RFS-RFPS-010:TAOut1-Wave-PM
 Spk-030RFC:RFS-RFPS-010:TAOut2-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-010:TAOut2-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-010:TAOut2-DevMonIlck-RB
@@ -1070,7 +1033,6 @@ Spk-030RFC:RFS-RFPS-010:TAOut2-Wave-Avg
 Spk-030RFC:RFS-RFPS-010:TAOut2-Wave-High
 Spk-030RFC:RFS-RFPS-010:TAOut2-Wave-Low
 Spk-030RFC:RFS-RFPS-010:TAOut2-Wave-Med
-Spk-030RFC:RFS-RFPS-010:TAOut2-Wave-PM
 Spk-030RFC:RFS-RFPS-010:Tetro1-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-010:Tetro1-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-010:Tetro1-DevMonIlck-RB
@@ -1109,7 +1071,6 @@ Spk-030RFC:RFS-RFPS-010:Tetro1-Wave-Avg
 Spk-030RFC:RFS-RFPS-010:Tetro1-Wave-High
 Spk-030RFC:RFS-RFPS-010:Tetro1-Wave-Low
 Spk-030RFC:RFS-RFPS-010:Tetro1-Wave-Med
-Spk-030RFC:RFS-RFPS-010:Tetro1-Wave-PM
 Spk-030RFC:RFS-RFPS-010:Tetro2-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-010:Tetro2-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-010:Tetro2-DevMonIlck-RB
@@ -1148,7 +1109,6 @@ Spk-030RFC:RFS-RFPS-010:Tetro2-Wave-Avg
 Spk-030RFC:RFS-RFPS-010:Tetro2-Wave-High
 Spk-030RFC:RFS-RFPS-010:Tetro2-Wave-Low
 Spk-030RFC:RFS-RFPS-010:Tetro2-Wave-Med
-Spk-030RFC:RFS-RFPS-010:Tetro2-Wave-PM
 Spk-030RFC:RFS-RFPS-110:PwrFwd-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-110:PwrFwd-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-110:PwrFwd-DevMonIlck-RB
@@ -1187,7 +1147,6 @@ Spk-030RFC:RFS-RFPS-110:PwrFwd-Wave-Avg
 Spk-030RFC:RFS-RFPS-110:PwrFwd-Wave-High
 Spk-030RFC:RFS-RFPS-110:PwrFwd-Wave-Low
 Spk-030RFC:RFS-RFPS-110:PwrFwd-Wave-Med
-Spk-030RFC:RFS-RFPS-110:PwrFwd-Wave-PM
 Spk-030RFC:RFS-RFPS-110:PwrRfl-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-110:PwrRfl-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-110:PwrRfl-DevMonIlck-RB
@@ -1226,19 +1185,15 @@ Spk-030RFC:RFS-RFPS-110:PwrRfl-Wave-Avg
 Spk-030RFC:RFS-RFPS-110:PwrRfl-Wave-High
 Spk-030RFC:RFS-RFPS-110:PwrRfl-Wave-Low
 Spk-030RFC:RFS-RFPS-110:PwrRfl-Wave-Med
-Spk-030RFC:RFS-RFPS-110:PwrRfl-Wave-PM
 Spk-030RFC:RFS-SIM-110:HvEna-DIlckMode-RB
 Spk-030RFC:RFS-SIM-110:HvEna-Ilck-RB
 Spk-030RFC:RFS-SIM-110:HvEna-Input-RB
 Spk-030RFC:RFS-SIM-110:HvEna-isFirstIlck
-Spk-030RFC:RFS-SIM-110:HvEna-Wave-PM
 Spk-030RFC:RFS-SIM-110:RfEna-DIlckMode-RB
 Spk-030RFC:RFS-SIM-110:RfEna-Ilck-RB
 Spk-030RFC:RFS-SIM-110:RfEna-Input-RB
 Spk-030RFC:RFS-SIM-110:RfEna-isFirstIlck
-Spk-030RFC:RFS-SIM-110:RfEna-Wave-PM
 Spk-030RFC:RFS-VacMon-110:Status-DIlckMode-RB
 Spk-030RFC:RFS-VacMon-110:Status-Ilck-RB
 Spk-030RFC:RFS-VacMon-110:Status-Input-RB
 Spk-030RFC:RFS-VacMon-110:Status-isFirstIlck
-Spk-030RFC:RFS-VacMon-110:Status-Wave-PM
diff --git a/files/Spk-030RFC_SC-IOC-202.archive b/files/Spk-030RFC_SC-IOC-202.archive
index 79b6b49..99c3ee6 100644
--- a/files/Spk-030RFC_SC-IOC-202.archive
+++ b/files/Spk-030RFC_SC-IOC-202.archive
@@ -2,22 +2,18 @@ Spk-030RFC:RFS-ADG-210:IlckCirc-DIlckMode-RB
 Spk-030RFC:RFS-ADG-210:IlckCirc-Ilck-RB
 Spk-030RFC:RFS-ADG-210:IlckCirc-Input-RB
 Spk-030RFC:RFS-ADG-210:IlckCirc-isFirstIlck
-Spk-030RFC:RFS-ADG-210:IlckCirc-Wave-PM
 Spk-030RFC:RFS-ADG-210:IlckStatus-DIlckMode-RB
 Spk-030RFC:RFS-ADG-210:IlckStatus-Ilck-RB
 Spk-030RFC:RFS-ADG-210:IlckStatus-Input-RB
 Spk-030RFC:RFS-ADG-210:IlckStatus-isFirstIlck
-Spk-030RFC:RFS-ADG-210:IlckStatus-Wave-PM
 Spk-030RFC:RFS-ADG-210:IlckWavg-DIlckMode-RB
 Spk-030RFC:RFS-ADG-210:IlckWavg-Ilck-RB
 Spk-030RFC:RFS-ADG-210:IlckWavg-Input-RB
 Spk-030RFC:RFS-ADG-210:IlckWavg-isFirstIlck
-Spk-030RFC:RFS-ADG-210:IlckWavg-Wave-PM
 Spk-030RFC:RFS-ADG-210:PwrFail-DIlckMode-RB
 Spk-030RFC:RFS-ADG-210:PwrFail-Ilck-RB
 Spk-030RFC:RFS-ADG-210:PwrFail-Input-RB
 Spk-030RFC:RFS-ADG-210:PwrFail-isFirstIlck
-Spk-030RFC:RFS-ADG-210:PwrFail-Wave-PM
 Spk-030RFC:RFS-Cav-210:Fld-DevMonEval-RB
 Spk-030RFC:RFS-Cav-210:Fld-DevMonFact-RB
 Spk-030RFC:RFS-Cav-210:Fld-DevMonIlck-RB
@@ -56,7 +52,6 @@ Spk-030RFC:RFS-Cav-210:Fld-Wave-Avg
 Spk-030RFC:RFS-Cav-210:Fld-Wave-High
 Spk-030RFC:RFS-Cav-210:Fld-Wave-Low
 Spk-030RFC:RFS-Cav-210:Fld-Wave-Med
-Spk-030RFC:RFS-Cav-210:Fld-Wave-PM
 Spk-030RFC:RFS-Cav-210:PwrFwd-DevMonEval-RB
 Spk-030RFC:RFS-Cav-210:PwrFwd-DevMonFact-RB
 Spk-030RFC:RFS-Cav-210:PwrFwd-DevMonIlck-RB
@@ -95,7 +90,6 @@ Spk-030RFC:RFS-Cav-210:PwrFwd-Wave-Avg
 Spk-030RFC:RFS-Cav-210:PwrFwd-Wave-High
 Spk-030RFC:RFS-Cav-210:PwrFwd-Wave-Low
 Spk-030RFC:RFS-Cav-210:PwrFwd-Wave-Med
-Spk-030RFC:RFS-Cav-210:PwrFwd-Wave-PM
 Spk-030RFC:RFS-Cav-210:PwrRfl-DevMonEval-RB
 Spk-030RFC:RFS-Cav-210:PwrRfl-DevMonFact-RB
 Spk-030RFC:RFS-Cav-210:PwrRfl-DevMonIlck-RB
@@ -134,7 +128,6 @@ Spk-030RFC:RFS-Cav-210:PwrRfl-Wave-Avg
 Spk-030RFC:RFS-Cav-210:PwrRfl-Wave-High
 Spk-030RFC:RFS-Cav-210:PwrRfl-Wave-Low
 Spk-030RFC:RFS-Cav-210:PwrRfl-Wave-Med
-Spk-030RFC:RFS-Cav-210:PwrRfl-Wave-PM
 Spk-030RFC:RFS-DirC-205:PwrFwd-DevMonEval-RB
 Spk-030RFC:RFS-DirC-205:PwrFwd-DevMonFact-RB
 Spk-030RFC:RFS-DirC-205:PwrFwd-DevMonIlck-RB
@@ -173,7 +166,6 @@ Spk-030RFC:RFS-DirC-205:PwrFwd-Wave-Avg
 Spk-030RFC:RFS-DirC-205:PwrFwd-Wave-High
 Spk-030RFC:RFS-DirC-205:PwrFwd-Wave-Low
 Spk-030RFC:RFS-DirC-205:PwrFwd-Wave-Med
-Spk-030RFC:RFS-DirC-205:PwrFwd-Wave-PM
 Spk-030RFC:RFS-EPR-210:Cur-DevMonEval-RB
 Spk-030RFC:RFS-EPR-210:Cur-DevMonFact-RB
 Spk-030RFC:RFS-EPR-210:Cur-DevMonIlck-RB
@@ -212,7 +204,6 @@ Spk-030RFC:RFS-EPR-210:Cur-Wave-Avg
 Spk-030RFC:RFS-EPR-210:Cur-Wave-High
 Spk-030RFC:RFS-EPR-210:Cur-Wave-Low
 Spk-030RFC:RFS-EPR-210:Cur-Wave-Med
-Spk-030RFC:RFS-EPR-210:Cur-Wave-PM
 Spk-030RFC:RFS-FIM-201:AI10-DevMonEval-RB
 Spk-030RFC:RFS-FIM-201:AI10-DevMonFact-RB
 Spk-030RFC:RFS-FIM-201:AI10-DevMonIlck-RB
@@ -257,7 +248,6 @@ Spk-030RFC:RFS-FIM-201:AI10-Wave-Avg
 Spk-030RFC:RFS-FIM-201:AI10-Wave-High
 Spk-030RFC:RFS-FIM-201:AI10-Wave-Low
 Spk-030RFC:RFS-FIM-201:AI10-Wave-Med
-Spk-030RFC:RFS-FIM-201:AI10-Wave-PM
 Spk-030RFC:RFS-FIM-201:AI1-FastRst-IlckCnt
 Spk-030RFC:RFS-FIM-201:AI1-HVON-En-RB
 Spk-030RFC:RFS-FIM-201:AI1-HVON-Precond
@@ -333,7 +323,6 @@ Spk-030RFC:RFS-FIM-201:CD1-RFON-En-RB
 Spk-030RFC:RFS-FIM-201:CD1-RFON-Precond
 Spk-030RFC:RFS-FIM-201:CD1-TrigSel-RB
 Spk-030RFC:RFS-FIM-201:CD1-TrigThre-RB
-Spk-030RFC:RFS-FIM-201:CD1-Wave-IlckPM
 Spk-030RFC:RFS-FIM-201:CD2-DevFactor-RB
 Spk-030RFC:RFS-FIM-201:CD2-DevPeriod-RB
 Spk-030RFC:RFS-FIM-201:CD2-FastRst-IlckCnt
@@ -355,7 +344,6 @@ Spk-030RFC:RFS-FIM-201:CD2-RFON-En-RB
 Spk-030RFC:RFS-FIM-201:CD2-RFON-Precond
 Spk-030RFC:RFS-FIM-201:CD2-TrigSel-RB
 Spk-030RFC:RFS-FIM-201:CD2-TrigThre-RB
-Spk-030RFC:RFS-FIM-201:CD2-Wave-IlckPM
 Spk-030RFC:RFS-FIM-201:DI10-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-201:DI10-DIlckMode-RB
 Spk-030RFC:RFS-FIM-201:DI10-FastRst-IlckCnt
@@ -367,7 +355,6 @@ Spk-030RFC:RFS-FIM-201:DI10-Input-RB
 Spk-030RFC:RFS-FIM-201:DI10-isFirstIlck
 Spk-030RFC:RFS-FIM-201:DI10-RFON-En-RB
 Spk-030RFC:RFS-FIM-201:DI10-RFON-Precond
-Spk-030RFC:RFS-FIM-201:DI10-Wave-PM
 Spk-030RFC:RFS-FIM-201:DI11-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-201:DI11-DIlckMode-RB
 Spk-030RFC:RFS-FIM-201:DI11-FastRst-IlckCnt
@@ -379,7 +366,6 @@ Spk-030RFC:RFS-FIM-201:DI11-Input-RB
 Spk-030RFC:RFS-FIM-201:DI11-isFirstIlck
 Spk-030RFC:RFS-FIM-201:DI11-RFON-En-RB
 Spk-030RFC:RFS-FIM-201:DI11-RFON-Precond
-Spk-030RFC:RFS-FIM-201:DI11-Wave-PM
 Spk-030RFC:RFS-FIM-201:DI12-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-201:DI12-DIlckMode-RB
 Spk-030RFC:RFS-FIM-201:DI12-FastRst-IlckCnt
@@ -391,7 +377,6 @@ Spk-030RFC:RFS-FIM-201:DI12-Input-RB
 Spk-030RFC:RFS-FIM-201:DI12-isFirstIlck
 Spk-030RFC:RFS-FIM-201:DI12-RFON-En-RB
 Spk-030RFC:RFS-FIM-201:DI12-RFON-Precond
-Spk-030RFC:RFS-FIM-201:DI12-Wave-PM
 Spk-030RFC:RFS-FIM-201:DI13-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-201:DI13-DIlckMode-RB
 Spk-030RFC:RFS-FIM-201:DI13-FastRst-IlckCnt
@@ -403,7 +388,6 @@ Spk-030RFC:RFS-FIM-201:DI13-Input-RB
 Spk-030RFC:RFS-FIM-201:DI13-isFirstIlck
 Spk-030RFC:RFS-FIM-201:DI13-RFON-En-RB
 Spk-030RFC:RFS-FIM-201:DI13-RFON-Precond
-Spk-030RFC:RFS-FIM-201:DI13-Wave-PM
 Spk-030RFC:RFS-FIM-201:DI14-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-201:DI14-DIlckMode-RB
 Spk-030RFC:RFS-FIM-201:DI14-FastRst-IlckCnt
@@ -415,7 +399,6 @@ Spk-030RFC:RFS-FIM-201:DI14-Input-RB
 Spk-030RFC:RFS-FIM-201:DI14-isFirstIlck
 Spk-030RFC:RFS-FIM-201:DI14-RFON-En-RB
 Spk-030RFC:RFS-FIM-201:DI14-RFON-Precond
-Spk-030RFC:RFS-FIM-201:DI14-Wave-PM
 Spk-030RFC:RFS-FIM-201:DI15-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-201:DI15-FastRst-IlckCnt
 Spk-030RFC:RFS-FIM-201:DI15-HVON-En-RB
@@ -441,7 +424,6 @@ Spk-030RFC:RFS-FIM-201:DI17-Input-RB
 Spk-030RFC:RFS-FIM-201:DI17-isFirstIlck
 Spk-030RFC:RFS-FIM-201:DI17-RFON-En-RB
 Spk-030RFC:RFS-FIM-201:DI17-RFON-Precond
-Spk-030RFC:RFS-FIM-201:DI17-Wave-PM
 Spk-030RFC:RFS-FIM-201:DI18-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-201:DI18-DIlckMode-RB
 Spk-030RFC:RFS-FIM-201:DI18-FastRst-IlckCnt
@@ -453,7 +435,6 @@ Spk-030RFC:RFS-FIM-201:DI18-Input-RB
 Spk-030RFC:RFS-FIM-201:DI18-isFirstIlck
 Spk-030RFC:RFS-FIM-201:DI18-RFON-En-RB
 Spk-030RFC:RFS-FIM-201:DI18-RFON-Precond
-Spk-030RFC:RFS-FIM-201:DI18-Wave-PM
 Spk-030RFC:RFS-FIM-201:DI19-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-201:DI19-DIlckMode-RB
 Spk-030RFC:RFS-FIM-201:DI19-FastRst-IlckCnt
@@ -465,7 +446,6 @@ Spk-030RFC:RFS-FIM-201:DI19-Input-RB
 Spk-030RFC:RFS-FIM-201:DI19-isFirstIlck
 Spk-030RFC:RFS-FIM-201:DI19-RFON-En-RB
 Spk-030RFC:RFS-FIM-201:DI19-RFON-Precond
-Spk-030RFC:RFS-FIM-201:DI19-Wave-PM
 Spk-030RFC:RFS-FIM-201:DI1-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-201:DI1-FastRst-IlckCnt
 Spk-030RFC:RFS-FIM-201:DI1-HVON-En-RB
@@ -484,7 +464,6 @@ Spk-030RFC:RFS-FIM-201:DI20-Input-RB
 Spk-030RFC:RFS-FIM-201:DI20-isFirstIlck
 Spk-030RFC:RFS-FIM-201:DI20-RFON-En-RB
 Spk-030RFC:RFS-FIM-201:DI20-RFON-Precond
-Spk-030RFC:RFS-FIM-201:DI20-Wave-PM
 Spk-030RFC:RFS-FIM-201:DI21-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-201:DI21-FastRst-IlckCnt
 Spk-030RFC:RFS-FIM-201:DI21-HVON-En-RB
@@ -524,7 +503,6 @@ Spk-030RFC:RFS-FIM-201:DI5-Input-RB
 Spk-030RFC:RFS-FIM-201:DI5-isFirstIlck
 Spk-030RFC:RFS-FIM-201:DI5-RFON-En-RB
 Spk-030RFC:RFS-FIM-201:DI5-RFON-Precond
-Spk-030RFC:RFS-FIM-201:DI5-Wave-PM
 Spk-030RFC:RFS-FIM-201:DI6-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-201:DI6-DIlckMode-RB
 Spk-030RFC:RFS-FIM-201:DI6-FastRst-IlckCnt
@@ -536,7 +514,6 @@ Spk-030RFC:RFS-FIM-201:DI6-Input-RB
 Spk-030RFC:RFS-FIM-201:DI6-isFirstIlck
 Spk-030RFC:RFS-FIM-201:DI6-RFON-En-RB
 Spk-030RFC:RFS-FIM-201:DI6-RFON-Precond
-Spk-030RFC:RFS-FIM-201:DI6-Wave-PM
 Spk-030RFC:RFS-FIM-201:DI7-DIlckLatch-RB
 Spk-030RFC:RFS-FIM-201:DI7-FastRst-IlckCnt
 Spk-030RFC:RFS-FIM-201:DI7-HVON-En-RB
@@ -608,7 +585,6 @@ Spk-030RFC:RFS-FIM-201:RF10-Wave-Avg
 Spk-030RFC:RFS-FIM-201:RF10-Wave-High
 Spk-030RFC:RFS-FIM-201:RF10-Wave-Low
 Spk-030RFC:RFS-FIM-201:RF10-Wave-Med
-Spk-030RFC:RFS-FIM-201:RF10-Wave-PM
 Spk-030RFC:RFS-FIM-201:RF1-FastRst-IlckCnt
 Spk-030RFC:RFS-FIM-201:RF1-HVON-En-RB
 Spk-030RFC:RFS-FIM-201:RF1-HVON-Precond
@@ -701,7 +677,6 @@ Spk-030RFC:RFS-FIM-201:RF9-Wave-Avg
 Spk-030RFC:RFS-FIM-201:RF9-Wave-High
 Spk-030RFC:RFS-FIM-201:RF9-Wave-Low
 Spk-030RFC:RFS-FIM-201:RF9-Wave-Med
-Spk-030RFC:RFS-FIM-201:RF9-Wave-PM
 Spk-030RFC:RFS-FIM-201:RFON-Precond
 Spk-030RFC:RFS-FIM-201:RP1-FastRst-IlckCnt
 Spk-030RFC:RFS-FIM-201:RP1-HVON-En-RB
@@ -722,7 +697,6 @@ Spk-030RFC:RFS-FIM-201:RP1-RFON-En-RB
 Spk-030RFC:RFS-FIM-201:RP1-RFON-Precond
 Spk-030RFC:RFS-FIM-201:RP1-TrigSel-RB
 Spk-030RFC:RFS-FIM-201:RP1-TrigThre-RB
-Spk-030RFC:RFS-FIM-201:RP1-Wave-IlckPM
 Spk-030RFC:RFS-FIM-201:RP2-FastRst-IlckCnt
 Spk-030RFC:RFS-FIM-201:RP2-HVON-En-RB
 Spk-030RFC:RFS-FIM-201:RP2-HVON-Precond
@@ -742,13 +716,11 @@ Spk-030RFC:RFS-FIM-201:RP2-RFON-En-RB
 Spk-030RFC:RFS-FIM-201:RP2-RFON-Precond
 Spk-030RFC:RFS-FIM-201:RP2-TrigSel-RB
 Spk-030RFC:RFS-FIM-201:RP2-TrigThre-RB
-Spk-030RFC:RFS-FIM-201:RP2-Wave-IlckPM
 Spk-030RFC:RFS-FIM-201:TriggerLine-RB
 Spk-030RFC:RFS-LLRF-201:Status-DIlckMode-RB
 Spk-030RFC:RFS-LLRF-201:Status-Ilck-RB
 Spk-030RFC:RFS-LLRF-201:Status-Input-RB
 Spk-030RFC:RFS-LLRF-201:Status-isFirstIlck
-Spk-030RFC:RFS-LLRF-201:Status-Wave-PM
 Spk-030RFC:RFS-Load-230:PwrFwd-DevMonEval-RB
 Spk-030RFC:RFS-Load-230:PwrFwd-DevMonFact-RB
 Spk-030RFC:RFS-Load-230:PwrFwd-DevMonIlck-RB
@@ -787,7 +759,6 @@ Spk-030RFC:RFS-Load-230:PwrFwd-Wave-Avg
 Spk-030RFC:RFS-Load-230:PwrFwd-Wave-High
 Spk-030RFC:RFS-Load-230:PwrFwd-Wave-Low
 Spk-030RFC:RFS-Load-230:PwrFwd-Wave-Med
-Spk-030RFC:RFS-Load-230:PwrFwd-Wave-PM
 Spk-030RFC:RFS-Load-230:PwrRfl-DevMonEval-RB
 Spk-030RFC:RFS-Load-230:PwrRfl-DevMonFact-RB
 Spk-030RFC:RFS-Load-230:PwrRfl-DevMonIlck-RB
@@ -826,7 +797,6 @@ Spk-030RFC:RFS-Load-230:PwrRfl-Wave-Avg
 Spk-030RFC:RFS-Load-230:PwrRfl-Wave-High
 Spk-030RFC:RFS-Load-230:PwrRfl-Wave-Low
 Spk-030RFC:RFS-Load-230:PwrRfl-Wave-Med
-Spk-030RFC:RFS-Load-230:PwrRfl-Wave-PM
 Spk-030RFC:RFS-RFPS-020:ACbOut-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-020:ACbOut-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-020:ACbOut-DevMonIlck-RB
@@ -865,7 +835,6 @@ Spk-030RFC:RFS-RFPS-020:ACbOut-Wave-Avg
 Spk-030RFC:RFS-RFPS-020:ACbOut-Wave-High
 Spk-030RFC:RFS-RFPS-020:ACbOut-Wave-Low
 Spk-030RFC:RFS-RFPS-020:ACbOut-Wave-Med
-Spk-030RFC:RFS-RFPS-020:ACbOut-Wave-PM
 Spk-030RFC:RFS-RFPS-020:AnVout-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-020:AnVout-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-020:AnVout-DevMonIlck-RB
@@ -904,17 +873,14 @@ Spk-030RFC:RFS-RFPS-020:AnVout-Wave-Avg
 Spk-030RFC:RFS-RFPS-020:AnVout-Wave-High
 Spk-030RFC:RFS-RFPS-020:AnVout-Wave-Low
 Spk-030RFC:RFS-RFPS-020:AnVout-Wave-Med
-Spk-030RFC:RFS-RFPS-020:AnVout-Wave-PM
 Spk-030RFC:RFS-RFPS-020:Conn-DIlckMode-RB
 Spk-030RFC:RFS-RFPS-020:Conn-Ilck-RB
 Spk-030RFC:RFS-RFPS-020:Conn-Input-RB
 Spk-030RFC:RFS-RFPS-020:Conn-isFirstIlck
-Spk-030RFC:RFS-RFPS-020:Conn-Wave-PM
 Spk-030RFC:RFS-RFPS-020:Fault-DIlckMode-RB
 Spk-030RFC:RFS-RFPS-020:Fault-Ilck-RB
 Spk-030RFC:RFS-RFPS-020:Fault-Input-RB
 Spk-030RFC:RFS-RFPS-020:Fault-isFirstIlck
-Spk-030RFC:RFS-RFPS-020:Fault-Wave-PM
 Spk-030RFC:RFS-RFPS-020:SSOut1-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-020:SSOut1-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-020:SSOut1-DevMonIlck-RB
@@ -953,7 +919,6 @@ Spk-030RFC:RFS-RFPS-020:SSOut1-Wave-Avg
 Spk-030RFC:RFS-RFPS-020:SSOut1-Wave-High
 Spk-030RFC:RFS-RFPS-020:SSOut1-Wave-Low
 Spk-030RFC:RFS-RFPS-020:SSOut1-Wave-Med
-Spk-030RFC:RFS-RFPS-020:SSOut1-Wave-PM
 Spk-030RFC:RFS-RFPS-020:SSOut2-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-020:SSOut2-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-020:SSOut2-DevMonIlck-RB
@@ -992,7 +957,6 @@ Spk-030RFC:RFS-RFPS-020:SSOut2-Wave-Avg
 Spk-030RFC:RFS-RFPS-020:SSOut2-Wave-High
 Spk-030RFC:RFS-RFPS-020:SSOut2-Wave-Low
 Spk-030RFC:RFS-RFPS-020:SSOut2-Wave-Med
-Spk-030RFC:RFS-RFPS-020:SSOut2-Wave-PM
 Spk-030RFC:RFS-RFPS-020:TAOut1-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-020:TAOut1-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-020:TAOut1-DevMonIlck-RB
@@ -1031,7 +995,6 @@ Spk-030RFC:RFS-RFPS-020:TAOut1-Wave-Avg
 Spk-030RFC:RFS-RFPS-020:TAOut1-Wave-High
 Spk-030RFC:RFS-RFPS-020:TAOut1-Wave-Low
 Spk-030RFC:RFS-RFPS-020:TAOut1-Wave-Med
-Spk-030RFC:RFS-RFPS-020:TAOut1-Wave-PM
 Spk-030RFC:RFS-RFPS-020:TAOut2-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-020:TAOut2-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-020:TAOut2-DevMonIlck-RB
@@ -1070,7 +1033,6 @@ Spk-030RFC:RFS-RFPS-020:TAOut2-Wave-Avg
 Spk-030RFC:RFS-RFPS-020:TAOut2-Wave-High
 Spk-030RFC:RFS-RFPS-020:TAOut2-Wave-Low
 Spk-030RFC:RFS-RFPS-020:TAOut2-Wave-Med
-Spk-030RFC:RFS-RFPS-020:TAOut2-Wave-PM
 Spk-030RFC:RFS-RFPS-020:Tetro1-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-020:Tetro1-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-020:Tetro1-DevMonIlck-RB
@@ -1109,7 +1071,6 @@ Spk-030RFC:RFS-RFPS-020:Tetro1-Wave-Avg
 Spk-030RFC:RFS-RFPS-020:Tetro1-Wave-High
 Spk-030RFC:RFS-RFPS-020:Tetro1-Wave-Low
 Spk-030RFC:RFS-RFPS-020:Tetro1-Wave-Med
-Spk-030RFC:RFS-RFPS-020:Tetro1-Wave-PM
 Spk-030RFC:RFS-RFPS-020:Tetro2-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-020:Tetro2-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-020:Tetro2-DevMonIlck-RB
@@ -1148,7 +1109,6 @@ Spk-030RFC:RFS-RFPS-020:Tetro2-Wave-Avg
 Spk-030RFC:RFS-RFPS-020:Tetro2-Wave-High
 Spk-030RFC:RFS-RFPS-020:Tetro2-Wave-Low
 Spk-030RFC:RFS-RFPS-020:Tetro2-Wave-Med
-Spk-030RFC:RFS-RFPS-020:Tetro2-Wave-PM
 Spk-030RFC:RFS-RFPS-210:PwrFwd-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-210:PwrFwd-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-210:PwrFwd-DevMonIlck-RB
@@ -1187,7 +1147,6 @@ Spk-030RFC:RFS-RFPS-210:PwrFwd-Wave-Avg
 Spk-030RFC:RFS-RFPS-210:PwrFwd-Wave-High
 Spk-030RFC:RFS-RFPS-210:PwrFwd-Wave-Low
 Spk-030RFC:RFS-RFPS-210:PwrFwd-Wave-Med
-Spk-030RFC:RFS-RFPS-210:PwrFwd-Wave-PM
 Spk-030RFC:RFS-RFPS-210:PwrRfl-DevMonEval-RB
 Spk-030RFC:RFS-RFPS-210:PwrRfl-DevMonFact-RB
 Spk-030RFC:RFS-RFPS-210:PwrRfl-DevMonIlck-RB
@@ -1226,19 +1185,15 @@ Spk-030RFC:RFS-RFPS-210:PwrRfl-Wave-Avg
 Spk-030RFC:RFS-RFPS-210:PwrRfl-Wave-High
 Spk-030RFC:RFS-RFPS-210:PwrRfl-Wave-Low
 Spk-030RFC:RFS-RFPS-210:PwrRfl-Wave-Med
-Spk-030RFC:RFS-RFPS-210:PwrRfl-Wave-PM
 Spk-030RFC:RFS-SIM-210:HvEna-DIlckMode-RB
 Spk-030RFC:RFS-SIM-210:HvEna-Ilck-RB
 Spk-030RFC:RFS-SIM-210:HvEna-Input-RB
 Spk-030RFC:RFS-SIM-210:HvEna-isFirstIlck
-Spk-030RFC:RFS-SIM-210:HvEna-Wave-PM
 Spk-030RFC:RFS-SIM-210:RfEna-DIlckMode-RB
 Spk-030RFC:RFS-SIM-210:RfEna-Ilck-RB
 Spk-030RFC:RFS-SIM-210:RfEna-Input-RB
 Spk-030RFC:RFS-SIM-210:RfEna-isFirstIlck
-Spk-030RFC:RFS-SIM-210:RfEna-Wave-PM
 Spk-030RFC:RFS-VacMon-210:Status-DIlckMode-RB
 Spk-030RFC:RFS-VacMon-210:Status-Ilck-RB
 Spk-030RFC:RFS-VacMon-210:Status-Input-RB
 Spk-030RFC:RFS-VacMon-210:Status-isFirstIlck
-Spk-030RFC:RFS-VacMon-210:Status-Wave-PM
diff --git a/files/Spk-040RFC_SC-IOC-102.archive b/files/Spk-040RFC_SC-IOC-102.archive
index 4f33fe6..c551b5e 100644
--- a/files/Spk-040RFC_SC-IOC-102.archive
+++ b/files/Spk-040RFC_SC-IOC-102.archive
@@ -2,22 +2,18 @@ Spk-040RFC:RFS-ADG-110:IlckCirc-DIlckMode-RB
 Spk-040RFC:RFS-ADG-110:IlckCirc-Ilck-RB
 Spk-040RFC:RFS-ADG-110:IlckCirc-Input-RB
 Spk-040RFC:RFS-ADG-110:IlckCirc-isFirstIlck
-Spk-040RFC:RFS-ADG-110:IlckCirc-Wave-PM
 Spk-040RFC:RFS-ADG-110:IlckStatus-DIlckMode-RB
 Spk-040RFC:RFS-ADG-110:IlckStatus-Ilck-RB
 Spk-040RFC:RFS-ADG-110:IlckStatus-Input-RB
 Spk-040RFC:RFS-ADG-110:IlckStatus-isFirstIlck
-Spk-040RFC:RFS-ADG-110:IlckStatus-Wave-PM
 Spk-040RFC:RFS-ADG-110:IlckWavg-DIlckMode-RB
 Spk-040RFC:RFS-ADG-110:IlckWavg-Ilck-RB
 Spk-040RFC:RFS-ADG-110:IlckWavg-Input-RB
 Spk-040RFC:RFS-ADG-110:IlckWavg-isFirstIlck
-Spk-040RFC:RFS-ADG-110:IlckWavg-Wave-PM
 Spk-040RFC:RFS-ADG-110:PwrFail-DIlckMode-RB
 Spk-040RFC:RFS-ADG-110:PwrFail-Ilck-RB
 Spk-040RFC:RFS-ADG-110:PwrFail-Input-RB
 Spk-040RFC:RFS-ADG-110:PwrFail-isFirstIlck
-Spk-040RFC:RFS-ADG-110:PwrFail-Wave-PM
 Spk-040RFC:RFS-Cav-110:Fld-DevMonEval-RB
 Spk-040RFC:RFS-Cav-110:Fld-DevMonFact-RB
 Spk-040RFC:RFS-Cav-110:Fld-DevMonIlck-RB
@@ -56,7 +52,6 @@ Spk-040RFC:RFS-Cav-110:Fld-Wave-Avg
 Spk-040RFC:RFS-Cav-110:Fld-Wave-High
 Spk-040RFC:RFS-Cav-110:Fld-Wave-Low
 Spk-040RFC:RFS-Cav-110:Fld-Wave-Med
-Spk-040RFC:RFS-Cav-110:Fld-Wave-PM
 Spk-040RFC:RFS-Cav-110:PwrFwd-DevMonEval-RB
 Spk-040RFC:RFS-Cav-110:PwrFwd-DevMonFact-RB
 Spk-040RFC:RFS-Cav-110:PwrFwd-DevMonIlck-RB
@@ -95,7 +90,6 @@ Spk-040RFC:RFS-Cav-110:PwrFwd-Wave-Avg
 Spk-040RFC:RFS-Cav-110:PwrFwd-Wave-High
 Spk-040RFC:RFS-Cav-110:PwrFwd-Wave-Low
 Spk-040RFC:RFS-Cav-110:PwrFwd-Wave-Med
-Spk-040RFC:RFS-Cav-110:PwrFwd-Wave-PM
 Spk-040RFC:RFS-Cav-110:PwrRfl-DevMonEval-RB
 Spk-040RFC:RFS-Cav-110:PwrRfl-DevMonFact-RB
 Spk-040RFC:RFS-Cav-110:PwrRfl-DevMonIlck-RB
@@ -134,7 +128,6 @@ Spk-040RFC:RFS-Cav-110:PwrRfl-Wave-Avg
 Spk-040RFC:RFS-Cav-110:PwrRfl-Wave-High
 Spk-040RFC:RFS-Cav-110:PwrRfl-Wave-Low
 Spk-040RFC:RFS-Cav-110:PwrRfl-Wave-Med
-Spk-040RFC:RFS-Cav-110:PwrRfl-Wave-PM
 Spk-040RFC:RFS-DirC-105:PwrFwd-DevMonEval-RB
 Spk-040RFC:RFS-DirC-105:PwrFwd-DevMonFact-RB
 Spk-040RFC:RFS-DirC-105:PwrFwd-DevMonIlck-RB
@@ -173,7 +166,6 @@ Spk-040RFC:RFS-DirC-105:PwrFwd-Wave-Avg
 Spk-040RFC:RFS-DirC-105:PwrFwd-Wave-High
 Spk-040RFC:RFS-DirC-105:PwrFwd-Wave-Low
 Spk-040RFC:RFS-DirC-105:PwrFwd-Wave-Med
-Spk-040RFC:RFS-DirC-105:PwrFwd-Wave-PM
 Spk-040RFC:RFS-EPR-110:Cur-DevMonEval-RB
 Spk-040RFC:RFS-EPR-110:Cur-DevMonFact-RB
 Spk-040RFC:RFS-EPR-110:Cur-DevMonIlck-RB
@@ -212,7 +204,6 @@ Spk-040RFC:RFS-EPR-110:Cur-Wave-Avg
 Spk-040RFC:RFS-EPR-110:Cur-Wave-High
 Spk-040RFC:RFS-EPR-110:Cur-Wave-Low
 Spk-040RFC:RFS-EPR-110:Cur-Wave-Med
-Spk-040RFC:RFS-EPR-110:Cur-Wave-PM
 Spk-040RFC:RFS-FIM-101:AI10-DevMonEval-RB
 Spk-040RFC:RFS-FIM-101:AI10-DevMonFact-RB
 Spk-040RFC:RFS-FIM-101:AI10-DevMonIlck-RB
@@ -257,7 +248,6 @@ Spk-040RFC:RFS-FIM-101:AI10-Wave-Avg
 Spk-040RFC:RFS-FIM-101:AI10-Wave-High
 Spk-040RFC:RFS-FIM-101:AI10-Wave-Low
 Spk-040RFC:RFS-FIM-101:AI10-Wave-Med
-Spk-040RFC:RFS-FIM-101:AI10-Wave-PM
 Spk-040RFC:RFS-FIM-101:AI1-FastRst-IlckCnt
 Spk-040RFC:RFS-FIM-101:AI1-HVON-En-RB
 Spk-040RFC:RFS-FIM-101:AI1-HVON-Precond
@@ -333,7 +323,6 @@ Spk-040RFC:RFS-FIM-101:CD1-RFON-En-RB
 Spk-040RFC:RFS-FIM-101:CD1-RFON-Precond
 Spk-040RFC:RFS-FIM-101:CD1-TrigSel-RB
 Spk-040RFC:RFS-FIM-101:CD1-TrigThre-RB
-Spk-040RFC:RFS-FIM-101:CD1-Wave-IlckPM
 Spk-040RFC:RFS-FIM-101:CD2-DevFactor-RB
 Spk-040RFC:RFS-FIM-101:CD2-DevPeriod-RB
 Spk-040RFC:RFS-FIM-101:CD2-FastRst-IlckCnt
@@ -355,7 +344,6 @@ Spk-040RFC:RFS-FIM-101:CD2-RFON-En-RB
 Spk-040RFC:RFS-FIM-101:CD2-RFON-Precond
 Spk-040RFC:RFS-FIM-101:CD2-TrigSel-RB
 Spk-040RFC:RFS-FIM-101:CD2-TrigThre-RB
-Spk-040RFC:RFS-FIM-101:CD2-Wave-IlckPM
 Spk-040RFC:RFS-FIM-101:DI10-DIlckLatch-RB
 Spk-040RFC:RFS-FIM-101:DI10-DIlckMode-RB
 Spk-040RFC:RFS-FIM-101:DI10-FastRst-IlckCnt
@@ -367,7 +355,6 @@ Spk-040RFC:RFS-FIM-101:DI10-Input-RB
 Spk-040RFC:RFS-FIM-101:DI10-isFirstIlck
 Spk-040RFC:RFS-FIM-101:DI10-RFON-En-RB
 Spk-040RFC:RFS-FIM-101:DI10-RFON-Precond
-Spk-040RFC:RFS-FIM-101:DI10-Wave-PM
 Spk-040RFC:RFS-FIM-101:DI11-DIlckLatch-RB
 Spk-040RFC:RFS-FIM-101:DI11-DIlckMode-RB
 Spk-040RFC:RFS-FIM-101:DI11-FastRst-IlckCnt
@@ -379,7 +366,6 @@ Spk-040RFC:RFS-FIM-101:DI11-Input-RB
 Spk-040RFC:RFS-FIM-101:DI11-isFirstIlck
 Spk-040RFC:RFS-FIM-101:DI11-RFON-En-RB
 Spk-040RFC:RFS-FIM-101:DI11-RFON-Precond
-Spk-040RFC:RFS-FIM-101:DI11-Wave-PM
 Spk-040RFC:RFS-FIM-101:DI12-DIlckLatch-RB
 Spk-040RFC:RFS-FIM-101:DI12-DIlckMode-RB
 Spk-040RFC:RFS-FIM-101:DI12-FastRst-IlckCnt
@@ -391,7 +377,6 @@ Spk-040RFC:RFS-FIM-101:DI12-Input-RB
 Spk-040RFC:RFS-FIM-101:DI12-isFirstIlck
 Spk-040RFC:RFS-FIM-101:DI12-RFON-En-RB
 Spk-040RFC:RFS-FIM-101:DI12-RFON-Precond
-Spk-040RFC:RFS-FIM-101:DI12-Wave-PM
 Spk-040RFC:RFS-FIM-101:DI13-DIlckLatch-RB
 Spk-040RFC:RFS-FIM-101:DI13-DIlckMode-RB
 Spk-040RFC:RFS-FIM-101:DI13-FastRst-IlckCnt
@@ -403,7 +388,6 @@ Spk-040RFC:RFS-FIM-101:DI13-Input-RB
 Spk-040RFC:RFS-FIM-101:DI13-isFirstIlck
 Spk-040RFC:RFS-FIM-101:DI13-RFON-En-RB
 Spk-040RFC:RFS-FIM-101:DI13-RFON-Precond
-Spk-040RFC:RFS-FIM-101:DI13-Wave-PM
 Spk-040RFC:RFS-FIM-101:DI14-DIlckLatch-RB
 Spk-040RFC:RFS-FIM-101:DI14-DIlckMode-RB
 Spk-040RFC:RFS-FIM-101:DI14-FastRst-IlckCnt
@@ -415,7 +399,6 @@ Spk-040RFC:RFS-FIM-101:DI14-Input-RB
 Spk-040RFC:RFS-FIM-101:DI14-isFirstIlck
 Spk-040RFC:RFS-FIM-101:DI14-RFON-En-RB
 Spk-040RFC:RFS-FIM-101:DI14-RFON-Precond
-Spk-040RFC:RFS-FIM-101:DI14-Wave-PM
 Spk-040RFC:RFS-FIM-101:DI15-DIlckLatch-RB
 Spk-040RFC:RFS-FIM-101:DI15-FastRst-IlckCnt
 Spk-040RFC:RFS-FIM-101:DI15-HVON-En-RB
@@ -441,7 +424,6 @@ Spk-040RFC:RFS-FIM-101:DI17-Input-RB
 Spk-040RFC:RFS-FIM-101:DI17-isFirstIlck
 Spk-040RFC:RFS-FIM-101:DI17-RFON-En-RB
 Spk-040RFC:RFS-FIM-101:DI17-RFON-Precond
-Spk-040RFC:RFS-FIM-101:DI17-Wave-PM
 Spk-040RFC:RFS-FIM-101:DI18-DIlckLatch-RB
 Spk-040RFC:RFS-FIM-101:DI18-DIlckMode-RB
 Spk-040RFC:RFS-FIM-101:DI18-FastRst-IlckCnt
@@ -453,7 +435,6 @@ Spk-040RFC:RFS-FIM-101:DI18-Input-RB
 Spk-040RFC:RFS-FIM-101:DI18-isFirstIlck
 Spk-040RFC:RFS-FIM-101:DI18-RFON-En-RB
 Spk-040RFC:RFS-FIM-101:DI18-RFON-Precond
-Spk-040RFC:RFS-FIM-101:DI18-Wave-PM
 Spk-040RFC:RFS-FIM-101:DI19-DIlckLatch-RB
 Spk-040RFC:RFS-FIM-101:DI19-DIlckMode-RB
 Spk-040RFC:RFS-FIM-101:DI19-FastRst-IlckCnt
@@ -465,7 +446,6 @@ Spk-040RFC:RFS-FIM-101:DI19-Input-RB
 Spk-040RFC:RFS-FIM-101:DI19-isFirstIlck
 Spk-040RFC:RFS-FIM-101:DI19-RFON-En-RB
 Spk-040RFC:RFS-FIM-101:DI19-RFON-Precond
-Spk-040RFC:RFS-FIM-101:DI19-Wave-PM
 Spk-040RFC:RFS-FIM-101:DI1-DIlckLatch-RB
 Spk-040RFC:RFS-FIM-101:DI1-FastRst-IlckCnt
 Spk-040RFC:RFS-FIM-101:DI1-HVON-En-RB
@@ -484,7 +464,6 @@ Spk-040RFC:RFS-FIM-101:DI20-Input-RB
 Spk-040RFC:RFS-FIM-101:DI20-isFirstIlck
 Spk-040RFC:RFS-FIM-101:DI20-RFON-En-RB
 Spk-040RFC:RFS-FIM-101:DI20-RFON-Precond
-Spk-040RFC:RFS-FIM-101:DI20-Wave-PM
 Spk-040RFC:RFS-FIM-101:DI21-DIlckLatch-RB
 Spk-040RFC:RFS-FIM-101:DI21-FastRst-IlckCnt
 Spk-040RFC:RFS-FIM-101:DI21-HVON-En-RB
@@ -524,7 +503,6 @@ Spk-040RFC:RFS-FIM-101:DI5-Input-RB
 Spk-040RFC:RFS-FIM-101:DI5-isFirstIlck
 Spk-040RFC:RFS-FIM-101:DI5-RFON-En-RB
 Spk-040RFC:RFS-FIM-101:DI5-RFON-Precond
-Spk-040RFC:RFS-FIM-101:DI5-Wave-PM
 Spk-040RFC:RFS-FIM-101:DI6-DIlckLatch-RB
 Spk-040RFC:RFS-FIM-101:DI6-DIlckMode-RB
 Spk-040RFC:RFS-FIM-101:DI6-FastRst-IlckCnt
@@ -536,7 +514,6 @@ Spk-040RFC:RFS-FIM-101:DI6-Input-RB
 Spk-040RFC:RFS-FIM-101:DI6-isFirstIlck
 Spk-040RFC:RFS-FIM-101:DI6-RFON-En-RB
 Spk-040RFC:RFS-FIM-101:DI6-RFON-Precond
-Spk-040RFC:RFS-FIM-101:DI6-Wave-PM
 Spk-040RFC:RFS-FIM-101:DI7-DIlckLatch-RB
 Spk-040RFC:RFS-FIM-101:DI7-FastRst-IlckCnt
 Spk-040RFC:RFS-FIM-101:DI7-HVON-En-RB
@@ -608,7 +585,6 @@ Spk-040RFC:RFS-FIM-101:RF10-Wave-Avg
 Spk-040RFC:RFS-FIM-101:RF10-Wave-High
 Spk-040RFC:RFS-FIM-101:RF10-Wave-Low
 Spk-040RFC:RFS-FIM-101:RF10-Wave-Med
-Spk-040RFC:RFS-FIM-101:RF10-Wave-PM
 Spk-040RFC:RFS-FIM-101:RF1-FastRst-IlckCnt
 Spk-040RFC:RFS-FIM-101:RF1-HVON-En-RB
 Spk-040RFC:RFS-FIM-101:RF1-HVON-Precond
@@ -701,7 +677,6 @@ Spk-040RFC:RFS-FIM-101:RF9-Wave-Avg
 Spk-040RFC:RFS-FIM-101:RF9-Wave-High
 Spk-040RFC:RFS-FIM-101:RF9-Wave-Low
 Spk-040RFC:RFS-FIM-101:RF9-Wave-Med
-Spk-040RFC:RFS-FIM-101:RF9-Wave-PM
 Spk-040RFC:RFS-FIM-101:RFON-Precond
 Spk-040RFC:RFS-FIM-101:RP1-FastRst-IlckCnt
 Spk-040RFC:RFS-FIM-101:RP1-HVON-En-RB
@@ -722,7 +697,6 @@ Spk-040RFC:RFS-FIM-101:RP1-RFON-En-RB
 Spk-040RFC:RFS-FIM-101:RP1-RFON-Precond
 Spk-040RFC:RFS-FIM-101:RP1-TrigSel-RB
 Spk-040RFC:RFS-FIM-101:RP1-TrigThre-RB
-Spk-040RFC:RFS-FIM-101:RP1-Wave-IlckPM
 Spk-040RFC:RFS-FIM-101:RP2-FastRst-IlckCnt
 Spk-040RFC:RFS-FIM-101:RP2-HVON-En-RB
 Spk-040RFC:RFS-FIM-101:RP2-HVON-Precond
@@ -742,13 +716,11 @@ Spk-040RFC:RFS-FIM-101:RP2-RFON-En-RB
 Spk-040RFC:RFS-FIM-101:RP2-RFON-Precond
 Spk-040RFC:RFS-FIM-101:RP2-TrigSel-RB
 Spk-040RFC:RFS-FIM-101:RP2-TrigThre-RB
-Spk-040RFC:RFS-FIM-101:RP2-Wave-IlckPM
 Spk-040RFC:RFS-FIM-101:TriggerLine-RB
 Spk-040RFC:RFS-LLRF-101:Status-DIlckMode-RB
 Spk-040RFC:RFS-LLRF-101:Status-Ilck-RB
 Spk-040RFC:RFS-LLRF-101:Status-Input-RB
 Spk-040RFC:RFS-LLRF-101:Status-isFirstIlck
-Spk-040RFC:RFS-LLRF-101:Status-Wave-PM
 Spk-040RFC:RFS-Load-130:PwrFwd-DevMonEval-RB
 Spk-040RFC:RFS-Load-130:PwrFwd-DevMonFact-RB
 Spk-040RFC:RFS-Load-130:PwrFwd-DevMonIlck-RB
@@ -787,7 +759,6 @@ Spk-040RFC:RFS-Load-130:PwrFwd-Wave-Avg
 Spk-040RFC:RFS-Load-130:PwrFwd-Wave-High
 Spk-040RFC:RFS-Load-130:PwrFwd-Wave-Low
 Spk-040RFC:RFS-Load-130:PwrFwd-Wave-Med
-Spk-040RFC:RFS-Load-130:PwrFwd-Wave-PM
 Spk-040RFC:RFS-Load-130:PwrRfl-DevMonEval-RB
 Spk-040RFC:RFS-Load-130:PwrRfl-DevMonFact-RB
 Spk-040RFC:RFS-Load-130:PwrRfl-DevMonIlck-RB
@@ -826,7 +797,6 @@ Spk-040RFC:RFS-Load-130:PwrRfl-Wave-Avg
 Spk-040RFC:RFS-Load-130:PwrRfl-Wave-High
 Spk-040RFC:RFS-Load-130:PwrRfl-Wave-Low
 Spk-040RFC:RFS-Load-130:PwrRfl-Wave-Med
-Spk-040RFC:RFS-Load-130:PwrRfl-Wave-PM
 Spk-040RFC:RFS-RFPS-010:ACbOut-DevMonEval-RB
 Spk-040RFC:RFS-RFPS-010:ACbOut-DevMonFact-RB
 Spk-040RFC:RFS-RFPS-010:ACbOut-DevMonIlck-RB
@@ -865,7 +835,6 @@ Spk-040RFC:RFS-RFPS-010:ACbOut-Wave-Avg
 Spk-040RFC:RFS-RFPS-010:ACbOut-Wave-High
 Spk-040RFC:RFS-RFPS-010:ACbOut-Wave-Low
 Spk-040RFC:RFS-RFPS-010:ACbOut-Wave-Med
-Spk-040RFC:RFS-RFPS-010:ACbOut-Wave-PM
 Spk-040RFC:RFS-RFPS-010:AnVout-DevMonEval-RB
 Spk-040RFC:RFS-RFPS-010:AnVout-DevMonFact-RB
 Spk-040RFC:RFS-RFPS-010:AnVout-DevMonIlck-RB
@@ -904,17 +873,14 @@ Spk-040RFC:RFS-RFPS-010:AnVout-Wave-Avg
 Spk-040RFC:RFS-RFPS-010:AnVout-Wave-High
 Spk-040RFC:RFS-RFPS-010:AnVout-Wave-Low
 Spk-040RFC:RFS-RFPS-010:AnVout-Wave-Med
-Spk-040RFC:RFS-RFPS-010:AnVout-Wave-PM
 Spk-040RFC:RFS-RFPS-010:Conn-DIlckMode-RB
 Spk-040RFC:RFS-RFPS-010:Conn-Ilck-RB
 Spk-040RFC:RFS-RFPS-010:Conn-Input-RB
 Spk-040RFC:RFS-RFPS-010:Conn-isFirstIlck
-Spk-040RFC:RFS-RFPS-010:Conn-Wave-PM
 Spk-040RFC:RFS-RFPS-010:Fault-DIlckMode-RB
 Spk-040RFC:RFS-RFPS-010:Fault-Ilck-RB
 Spk-040RFC:RFS-RFPS-010:Fault-Input-RB
 Spk-040RFC:RFS-RFPS-010:Fault-isFirstIlck
-Spk-040RFC:RFS-RFPS-010:Fault-Wave-PM
 Spk-040RFC:RFS-RFPS-010:SSOut1-DevMonEval-RB
 Spk-040RFC:RFS-RFPS-010:SSOut1-DevMonFact-RB
 Spk-040RFC:RFS-RFPS-010:SSOut1-DevMonIlck-RB
@@ -953,7 +919,6 @@ Spk-040RFC:RFS-RFPS-010:SSOut1-Wave-Avg
 Spk-040RFC:RFS-RFPS-010:SSOut1-Wave-High
 Spk-040RFC:RFS-RFPS-010:SSOut1-Wave-Low
 Spk-040RFC:RFS-RFPS-010:SSOut1-Wave-Med
-Spk-040RFC:RFS-RFPS-010:SSOut1-Wave-PM
 Spk-040RFC:RFS-RFPS-010:SSOut2-DevMonEval-RB
 Spk-040RFC:RFS-RFPS-010:SSOut2-DevMonFact-RB
 Spk-040RFC:RFS-RFPS-010:SSOut2-DevMonIlck-RB
@@ -992,7 +957,6 @@ Spk-040RFC:RFS-RFPS-010:SSOut2-Wave-Avg
 Spk-040RFC:RFS-RFPS-010:SSOut2-Wave-High
 Spk-040RFC:RFS-RFPS-010:SSOut2-Wave-Low
 Spk-040RFC:RFS-RFPS-010:SSOut2-Wave-Med
-Spk-040RFC:RFS-RFPS-010:SSOut2-Wave-PM
 Spk-040RFC:RFS-RFPS-010:TAOut1-DevMonEval-RB
 Spk-040RFC:RFS-RFPS-010:TAOut1-DevMonFact-RB
 Spk-040RFC:RFS-RFPS-010:TAOut1-DevMonIlck-RB
@@ -1031,7 +995,6 @@ Spk-040RFC:RFS-RFPS-010:TAOut1-Wave-Avg
 Spk-040RFC:RFS-RFPS-010:TAOut1-Wave-High
 Spk-040RFC:RFS-RFPS-010:TAOut1-Wave-Low
 Spk-040RFC:RFS-RFPS-010:TAOut1-Wave-Med
-Spk-040RFC:RFS-RFPS-010:TAOut1-Wave-PM
 Spk-040RFC:RFS-RFPS-010:TAOut2-DevMonEval-RB
 Spk-040RFC:RFS-RFPS-010:TAOut2-DevMonFact-RB
 Spk-040RFC:RFS-RFPS-010:TAOut2-DevMonIlck-RB
@@ -1070,7 +1033,6 @@ Spk-040RFC:RFS-RFPS-010:TAOut2-Wave-Avg
 Spk-040RFC:RFS-RFPS-010:TAOut2-Wave-High
 Spk-040RFC:RFS-RFPS-010:TAOut2-Wave-Low
 Spk-040RFC:RFS-RFPS-010:TAOut2-Wave-Med
-Spk-040RFC:RFS-RFPS-010:TAOut2-Wave-PM
 Spk-040RFC:RFS-RFPS-010:Tetro1-DevMonEval-RB
 Spk-040RFC:RFS-RFPS-010:Tetro1-DevMonFact-RB
 Spk-040RFC:RFS-RFPS-010:Tetro1-DevMonIlck-RB
@@ -1109,7 +1071,6 @@ Spk-040RFC:RFS-RFPS-010:Tetro1-Wave-Avg
 Spk-040RFC:RFS-RFPS-010:Tetro1-Wave-High
 Spk-040RFC:RFS-RFPS-010:Tetro1-Wave-Low
 Spk-040RFC:RFS-RFPS-010:Tetro1-Wave-Med
-Spk-040RFC:RFS-RFPS-010:Tetro1-Wave-PM
 Spk-040RFC:RFS-RFPS-010:Tetro2-DevMonEval-RB
 Spk-040RFC:RFS-RFPS-010:Tetro2-DevMonFact-RB
 Spk-040RFC:RFS-RFPS-010:Tetro2-DevMonIlck-RB
@@ -1148,7 +1109,6 @@ Spk-040RFC:RFS-RFPS-010:Tetro2-Wave-Avg
 Spk-040RFC:RFS-RFPS-010:Tetro2-Wave-High
 Spk-040RFC:RFS-RFPS-010:Tetro2-Wave-Low
 Spk-040RFC:RFS-RFPS-010:Tetro2-Wave-Med
-Spk-040RFC:RFS-RFPS-010:Tetro2-Wave-PM
 Spk-040RFC:RFS-RFPS-110:PwrFwd-DevMonEval-RB
 Spk-040RFC:RFS-RFPS-110:PwrFwd-DevMonFact-RB
 Spk-040RFC:RFS-RFPS-110:PwrFwd-DevMonIlck-RB
@@ -1187,7 +1147,6 @@ Spk-040RFC:RFS-RFPS-110:PwrFwd-Wave-Avg
 Spk-040RFC:RFS-RFPS-110:PwrFwd-Wave-High
 Spk-040RFC:RFS-RFPS-110:PwrFwd-Wave-Low
 Spk-040RFC:RFS-RFPS-110:PwrFwd-Wave-Med
-Spk-040RFC:RFS-RFPS-110:PwrFwd-Wave-PM
 Spk-040RFC:RFS-RFPS-110:PwrRfl-DevMonEval-RB
 Spk-040RFC:RFS-RFPS-110:PwrRfl-DevMonFact-RB
 Spk-040RFC:RFS-RFPS-110:PwrRfl-DevMonIlck-RB
@@ -1226,19 +1185,15 @@ Spk-040RFC:RFS-RFPS-110:PwrRfl-Wave-Avg
 Spk-040RFC:RFS-RFPS-110:PwrRfl-Wave-High
 Spk-040RFC:RFS-RFPS-110:PwrRfl-Wave-Low
 Spk-040RFC:RFS-RFPS-110:PwrRfl-Wave-Med
-Spk-040RFC:RFS-RFPS-110:PwrRfl-Wave-PM
 Spk-040RFC:RFS-SIM-110:HvEna-DIlckMode-RB
 Spk-040RFC:RFS-SIM-110:HvEna-Ilck-RB
 Spk-040RFC:RFS-SIM-110:HvEna-Input-RB
 Spk-040RFC:RFS-SIM-110:HvEna-isFirstIlck
-Spk-040RFC:RFS-SIM-110:HvEna-Wave-PM
 Spk-040RFC:RFS-SIM-110:RfEna-DIlckMode-RB
 Spk-040RFC:RFS-SIM-110:RfEna-Ilck-RB
 Spk-040RFC:RFS-SIM-110:RfEna-Input-RB
 Spk-040RFC:RFS-SIM-110:RfEna-isFirstIlck
-Spk-040RFC:RFS-SIM-110:RfEna-Wave-PM
 Spk-040RFC:RFS-VacMon-110:Status-DIlckMode-RB
 Spk-040RFC:RFS-VacMon-110:Status-Ilck-RB
 Spk-040RFC:RFS-VacMon-110:Status-Input-RB
 Spk-040RFC:RFS-VacMon-110:Status-isFirstIlck
-Spk-040RFC:RFS-VacMon-110:Status-Wave-PM
diff --git a/files/Spk-040RFC_SC-IOC-202.archive b/files/Spk-040RFC_SC-IOC-202.archive
index 810cacc..ced19aa 100644
--- a/files/Spk-040RFC_SC-IOC-202.archive
+++ b/files/Spk-040RFC_SC-IOC-202.archive
@@ -2,22 +2,18 @@ Spk-040RFC:RFS-ADG-210:IlckCirc-DIlckMode-RB
 Spk-040RFC:RFS-ADG-210:IlckCirc-Ilck-RB
 Spk-040RFC:RFS-ADG-210:IlckCirc-Input-RB
 Spk-040RFC:RFS-ADG-210:IlckCirc-isFirstIlck
-Spk-040RFC:RFS-ADG-210:IlckCirc-Wave-PM
 Spk-040RFC:RFS-ADG-210:IlckStatus-DIlckMode-RB
 Spk-040RFC:RFS-ADG-210:IlckStatus-Ilck-RB
 Spk-040RFC:RFS-ADG-210:IlckStatus-Input-RB
 Spk-040RFC:RFS-ADG-210:IlckStatus-isFirstIlck
-Spk-040RFC:RFS-ADG-210:IlckStatus-Wave-PM
 Spk-040RFC:RFS-ADG-210:IlckWavg-DIlckMode-RB
 Spk-040RFC:RFS-ADG-210:IlckWavg-Ilck-RB
 Spk-040RFC:RFS-ADG-210:IlckWavg-Input-RB
 Spk-040RFC:RFS-ADG-210:IlckWavg-isFirstIlck
-Spk-040RFC:RFS-ADG-210:IlckWavg-Wave-PM
 Spk-040RFC:RFS-ADG-210:PwrFail-DIlckMode-RB
 Spk-040RFC:RFS-ADG-210:PwrFail-Ilck-RB
 Spk-040RFC:RFS-ADG-210:PwrFail-Input-RB
 Spk-040RFC:RFS-ADG-210:PwrFail-isFirstIlck
-Spk-040RFC:RFS-ADG-210:PwrFail-Wave-PM
 Spk-040RFC:RFS-Cav-210:Fld-DevMonEval-RB
 Spk-040RFC:RFS-Cav-210:Fld-DevMonFact-RB
 Spk-040RFC:RFS-Cav-210:Fld-DevMonIlck-RB
@@ -56,7 +52,6 @@ Spk-040RFC:RFS-Cav-210:Fld-Wave-Avg
 Spk-040RFC:RFS-Cav-210:Fld-Wave-High
 Spk-040RFC:RFS-Cav-210:Fld-Wave-Low
 Spk-040RFC:RFS-Cav-210:Fld-Wave-Med
-Spk-040RFC:RFS-Cav-210:Fld-Wave-PM
 Spk-040RFC:RFS-Cav-210:PwrFwd-DevMonEval-RB
 Spk-040RFC:RFS-Cav-210:PwrFwd-DevMonFact-RB
 Spk-040RFC:RFS-Cav-210:PwrFwd-DevMonIlck-RB
@@ -95,7 +90,6 @@ Spk-040RFC:RFS-Cav-210:PwrFwd-Wave-Avg
 Spk-040RFC:RFS-Cav-210:PwrFwd-Wave-High
 Spk-040RFC:RFS-Cav-210:PwrFwd-Wave-Low
 Spk-040RFC:RFS-Cav-210:PwrFwd-Wave-Med
-Spk-040RFC:RFS-Cav-210:PwrFwd-Wave-PM
 Spk-040RFC:RFS-Cav-210:PwrRfl-DevMonEval-RB
 Spk-040RFC:RFS-Cav-210:PwrRfl-DevMonFact-RB
 Spk-040RFC:RFS-Cav-210:PwrRfl-DevMonIlck-RB
@@ -134,7 +128,6 @@ Spk-040RFC:RFS-Cav-210:PwrRfl-Wave-Avg
 Spk-040RFC:RFS-Cav-210:PwrRfl-Wave-High
 Spk-040RFC:RFS-Cav-210:PwrRfl-Wave-Low
 Spk-040RFC:RFS-Cav-210:PwrRfl-Wave-Med
-Spk-040RFC:RFS-Cav-210:PwrRfl-Wave-PM
 Spk-040RFC:RFS-DirC-205:PwrFwd-DevMonEval-RB
 Spk-040RFC:RFS-DirC-205:PwrFwd-DevMonFact-RB
 Spk-040RFC:RFS-DirC-205:PwrFwd-DevMonIlck-RB
@@ -173,7 +166,6 @@ Spk-040RFC:RFS-DirC-205:PwrFwd-Wave-Avg
 Spk-040RFC:RFS-DirC-205:PwrFwd-Wave-High
 Spk-040RFC:RFS-DirC-205:PwrFwd-Wave-Low
 Spk-040RFC:RFS-DirC-205:PwrFwd-Wave-Med
-Spk-040RFC:RFS-DirC-205:PwrFwd-Wave-PM
 Spk-040RFC:RFS-EPR-210:Cur-DevMonEval-RB
 Spk-040RFC:RFS-EPR-210:Cur-DevMonFact-RB
 Spk-040RFC:RFS-EPR-210:Cur-DevMonIlck-RB
@@ -212,7 +204,6 @@ Spk-040RFC:RFS-EPR-210:Cur-Wave-Avg
 Spk-040RFC:RFS-EPR-210:Cur-Wave-High
 Spk-040RFC:RFS-EPR-210:Cur-Wave-Low
 Spk-040RFC:RFS-EPR-210:Cur-Wave-Med
-Spk-040RFC:RFS-EPR-210:Cur-Wave-PM
 Spk-040RFC:RFS-FIM-201:AI10-DevMonEval-RB
 Spk-040RFC:RFS-FIM-201:AI10-DevMonFact-RB
 Spk-040RFC:RFS-FIM-201:AI10-DevMonIlck-RB
@@ -257,7 +248,6 @@ Spk-040RFC:RFS-FIM-201:AI10-Wave-Avg
 Spk-040RFC:RFS-FIM-201:AI10-Wave-High
 Spk-040RFC:RFS-FIM-201:AI10-Wave-Low
 Spk-040RFC:RFS-FIM-201:AI10-Wave-Med
-Spk-040RFC:RFS-FIM-201:AI10-Wave-PM
 Spk-040RFC:RFS-FIM-201:AI1-FastRst-IlckCnt
 Spk-040RFC:RFS-FIM-201:AI1-HVON-En-RB
 Spk-040RFC:RFS-FIM-201:AI1-HVON-Precond
@@ -333,7 +323,6 @@ Spk-040RFC:RFS-FIM-201:CD1-RFON-En-RB
 Spk-040RFC:RFS-FIM-201:CD1-RFON-Precond
 Spk-040RFC:RFS-FIM-201:CD1-TrigSel-RB
 Spk-040RFC:RFS-FIM-201:CD1-TrigThre-RB
-Spk-040RFC:RFS-FIM-201:CD1-Wave-IlckPM
 Spk-040RFC:RFS-FIM-201:CD2-DevFactor-RB
 Spk-040RFC:RFS-FIM-201:CD2-DevPeriod-RB
 Spk-040RFC:RFS-FIM-201:CD2-FastRst-IlckCnt
@@ -355,7 +344,6 @@ Spk-040RFC:RFS-FIM-201:CD2-RFON-En-RB
 Spk-040RFC:RFS-FIM-201:CD2-RFON-Precond
 Spk-040RFC:RFS-FIM-201:CD2-TrigSel-RB
 Spk-040RFC:RFS-FIM-201:CD2-TrigThre-RB
-Spk-040RFC:RFS-FIM-201:CD2-Wave-IlckPM
 Spk-040RFC:RFS-FIM-201:DI10-DIlckLatch-RB
 Spk-040RFC:RFS-FIM-201:DI10-DIlckMode-RB
 Spk-040RFC:RFS-FIM-201:DI10-FastRst-IlckCnt
@@ -367,7 +355,6 @@ Spk-040RFC:RFS-FIM-201:DI10-Input-RB
 Spk-040RFC:RFS-FIM-201:DI10-isFirstIlck
 Spk-040RFC:RFS-FIM-201:DI10-RFON-En-RB
 Spk-040RFC:RFS-FIM-201:DI10-RFON-Precond
-Spk-040RFC:RFS-FIM-201:DI10-Wave-PM
 Spk-040RFC:RFS-FIM-201:DI11-DIlckLatch-RB
 Spk-040RFC:RFS-FIM-201:DI11-DIlckMode-RB
 Spk-040RFC:RFS-FIM-201:DI11-FastRst-IlckCnt
@@ -379,7 +366,6 @@ Spk-040RFC:RFS-FIM-201:DI11-Input-RB
 Spk-040RFC:RFS-FIM-201:DI11-isFirstIlck
 Spk-040RFC:RFS-FIM-201:DI11-RFON-En-RB
 Spk-040RFC:RFS-FIM-201:DI11-RFON-Precond
-Spk-040RFC:RFS-FIM-201:DI11-Wave-PM
 Spk-040RFC:RFS-FIM-201:DI12-DIlckLatch-RB
 Spk-040RFC:RFS-FIM-201:DI12-DIlckMode-RB
 Spk-040RFC:RFS-FIM-201:DI12-FastRst-IlckCnt
@@ -391,7 +377,6 @@ Spk-040RFC:RFS-FIM-201:DI12-Input-RB
 Spk-040RFC:RFS-FIM-201:DI12-isFirstIlck
 Spk-040RFC:RFS-FIM-201:DI12-RFON-En-RB
 Spk-040RFC:RFS-FIM-201:DI12-RFON-Precond
-Spk-040RFC:RFS-FIM-201:DI12-Wave-PM
 Spk-040RFC:RFS-FIM-201:DI13-DIlckLatch-RB
 Spk-040RFC:RFS-FIM-201:DI13-DIlckMode-RB
 Spk-040RFC:RFS-FIM-201:DI13-FastRst-IlckCnt
@@ -403,7 +388,6 @@ Spk-040RFC:RFS-FIM-201:DI13-Input-RB
 Spk-040RFC:RFS-FIM-201:DI13-isFirstIlck
 Spk-040RFC:RFS-FIM-201:DI13-RFON-En-RB
 Spk-040RFC:RFS-FIM-201:DI13-RFON-Precond
-Spk-040RFC:RFS-FIM-201:DI13-Wave-PM
 Spk-040RFC:RFS-FIM-201:DI14-DIlckLatch-RB
 Spk-040RFC:RFS-FIM-201:DI14-DIlckMode-RB
 Spk-040RFC:RFS-FIM-201:DI14-FastRst-IlckCnt
@@ -415,7 +399,6 @@ Spk-040RFC:RFS-FIM-201:DI14-Input-RB
 Spk-040RFC:RFS-FIM-201:DI14-isFirstIlck
 Spk-040RFC:RFS-FIM-201:DI14-RFON-En-RB
 Spk-040RFC:RFS-FIM-201:DI14-RFON-Precond
-Spk-040RFC:RFS-FIM-201:DI14-Wave-PM
 Spk-040RFC:RFS-FIM-201:DI15-DIlckLatch-RB
 Spk-040RFC:RFS-FIM-201:DI15-FastRst-IlckCnt
 Spk-040RFC:RFS-FIM-201:DI15-HVON-En-RB
@@ -441,7 +424,6 @@ Spk-040RFC:RFS-FIM-201:DI17-Input-RB
 Spk-040RFC:RFS-FIM-201:DI17-isFirstIlck
 Spk-040RFC:RFS-FIM-201:DI17-RFON-En-RB
 Spk-040RFC:RFS-FIM-201:DI17-RFON-Precond
-Spk-040RFC:RFS-FIM-201:DI17-Wave-PM
 Spk-040RFC:RFS-FIM-201:DI18-DIlckLatch-RB
 Spk-040RFC:RFS-FIM-201:DI18-DIlckMode-RB
 Spk-040RFC:RFS-FIM-201:DI18-FastRst-IlckCnt
@@ -453,7 +435,6 @@ Spk-040RFC:RFS-FIM-201:DI18-Input-RB
 Spk-040RFC:RFS-FIM-201:DI18-isFirstIlck
 Spk-040RFC:RFS-FIM-201:DI18-RFON-En-RB
 Spk-040RFC:RFS-FIM-201:DI18-RFON-Precond
-Spk-040RFC:RFS-FIM-201:DI18-Wave-PM
 Spk-040RFC:RFS-FIM-201:DI19-DIlckLatch-RB
 Spk-040RFC:RFS-FIM-201:DI19-DIlckMode-RB
 Spk-040RFC:RFS-FIM-201:DI19-FastRst-IlckCnt
@@ -465,7 +446,6 @@ Spk-040RFC:RFS-FIM-201:DI19-Input-RB
 Spk-040RFC:RFS-FIM-201:DI19-isFirstIlck
 Spk-040RFC:RFS-FIM-201:DI19-RFON-En-RB
 Spk-040RFC:RFS-FIM-201:DI19-RFON-Precond
-Spk-040RFC:RFS-FIM-201:DI19-Wave-PM
 Spk-040RFC:RFS-FIM-201:DI1-DIlckLatch-RB
 Spk-040RFC:RFS-FIM-201:DI1-FastRst-IlckCnt
 Spk-040RFC:RFS-FIM-201:DI1-HVON-En-RB
@@ -484,7 +464,6 @@ Spk-040RFC:RFS-FIM-201:DI20-Input-RB
 Spk-040RFC:RFS-FIM-201:DI20-isFirstIlck
 Spk-040RFC:RFS-FIM-201:DI20-RFON-En-RB
 Spk-040RFC:RFS-FIM-201:DI20-RFON-Precond
-Spk-040RFC:RFS-FIM-201:DI20-Wave-PM
 Spk-040RFC:RFS-FIM-201:DI21-DIlckLatch-RB
 Spk-040RFC:RFS-FIM-201:DI21-FastRst-IlckCnt
 Spk-040RFC:RFS-FIM-201:DI21-HVON-En-RB
@@ -524,7 +503,6 @@ Spk-040RFC:RFS-FIM-201:DI5-Input-RB
 Spk-040RFC:RFS-FIM-201:DI5-isFirstIlck
 Spk-040RFC:RFS-FIM-201:DI5-RFON-En-RB
 Spk-040RFC:RFS-FIM-201:DI5-RFON-Precond
-Spk-040RFC:RFS-FIM-201:DI5-Wave-PM
 Spk-040RFC:RFS-FIM-201:DI6-DIlckLatch-RB
 Spk-040RFC:RFS-FIM-201:DI6-DIlckMode-RB
 Spk-040RFC:RFS-FIM-201:DI6-FastRst-IlckCnt
@@ -536,7 +514,6 @@ Spk-040RFC:RFS-FIM-201:DI6-Input-RB
 Spk-040RFC:RFS-FIM-201:DI6-isFirstIlck
 Spk-040RFC:RFS-FIM-201:DI6-RFON-En-RB
 Spk-040RFC:RFS-FIM-201:DI6-RFON-Precond
-Spk-040RFC:RFS-FIM-201:DI6-Wave-PM
 Spk-040RFC:RFS-FIM-201:DI7-DIlckLatch-RB
 Spk-040RFC:RFS-FIM-201:DI7-FastRst-IlckCnt
 Spk-040RFC:RFS-FIM-201:DI7-HVON-En-RB
@@ -608,7 +585,6 @@ Spk-040RFC:RFS-FIM-201:RF10-Wave-Avg
 Spk-040RFC:RFS-FIM-201:RF10-Wave-High
 Spk-040RFC:RFS-FIM-201:RF10-Wave-Low
 Spk-040RFC:RFS-FIM-201:RF10-Wave-Med
-Spk-040RFC:RFS-FIM-201:RF10-Wave-PM
 Spk-040RFC:RFS-FIM-201:RF1-FastRst-IlckCnt
 Spk-040RFC:RFS-FIM-201:RF1-HVON-En-RB
 Spk-040RFC:RFS-FIM-201:RF1-HVON-Precond
@@ -701,7 +677,6 @@ Spk-040RFC:RFS-FIM-201:RF9-Wave-Avg
 Spk-040RFC:RFS-FIM-201:RF9-Wave-High
 Spk-040RFC:RFS-FIM-201:RF9-Wave-Low
 Spk-040RFC:RFS-FIM-201:RF9-Wave-Med
-Spk-040RFC:RFS-FIM-201:RF9-Wave-PM
 Spk-040RFC:RFS-FIM-201:RFON-Precond
 Spk-040RFC:RFS-FIM-201:RP1-FastRst-IlckCnt
 Spk-040RFC:RFS-FIM-201:RP1-HVON-En-RB
@@ -722,7 +697,6 @@ Spk-040RFC:RFS-FIM-201:RP1-RFON-En-RB
 Spk-040RFC:RFS-FIM-201:RP1-RFON-Precond
 Spk-040RFC:RFS-FIM-201:RP1-TrigSel-RB
 Spk-040RFC:RFS-FIM-201:RP1-TrigThre-RB
-Spk-040RFC:RFS-FIM-201:RP1-Wave-IlckPM
 Spk-040RFC:RFS-FIM-201:RP2-FastRst-IlckCnt
 Spk-040RFC:RFS-FIM-201:RP2-HVON-En-RB
 Spk-040RFC:RFS-FIM-201:RP2-HVON-Precond
@@ -742,13 +716,11 @@ Spk-040RFC:RFS-FIM-201:RP2-RFON-En-RB
 Spk-040RFC:RFS-FIM-201:RP2-RFON-Precond
 Spk-040RFC:RFS-FIM-201:RP2-TrigSel-RB
 Spk-040RFC:RFS-FIM-201:RP2-TrigThre-RB
-Spk-040RFC:RFS-FIM-201:RP2-Wave-IlckPM
 Spk-040RFC:RFS-FIM-201:TriggerLine-RB
 Spk-040RFC:RFS-LLRF-201:Status-DIlckMode-RB
 Spk-040RFC:RFS-LLRF-201:Status-Ilck-RB
 Spk-040RFC:RFS-LLRF-201:Status-Input-RB
 Spk-040RFC:RFS-LLRF-201:Status-isFirstIlck
-Spk-040RFC:RFS-LLRF-201:Status-Wave-PM
 Spk-040RFC:RFS-Load-230:PwrFwd-DevMonEval-RB
 Spk-040RFC:RFS-Load-230:PwrFwd-DevMonFact-RB
 Spk-040RFC:RFS-Load-230:PwrFwd-DevMonIlck-RB
@@ -787,7 +759,6 @@ Spk-040RFC:RFS-Load-230:PwrFwd-Wave-Avg
 Spk-040RFC:RFS-Load-230:PwrFwd-Wave-High
 Spk-040RFC:RFS-Load-230:PwrFwd-Wave-Low
 Spk-040RFC:RFS-Load-230:PwrFwd-Wave-Med
-Spk-040RFC:RFS-Load-230:PwrFwd-Wave-PM
 Spk-040RFC:RFS-Load-230:PwrRfl-DevMonEval-RB
 Spk-040RFC:RFS-Load-230:PwrRfl-DevMonFact-RB
 Spk-040RFC:RFS-Load-230:PwrRfl-DevMonIlck-RB
@@ -826,7 +797,6 @@ Spk-040RFC:RFS-Load-230:PwrRfl-Wave-Avg
 Spk-040RFC:RFS-Load-230:PwrRfl-Wave-High
 Spk-040RFC:RFS-Load-230:PwrRfl-Wave-Low
 Spk-040RFC:RFS-Load-230:PwrRfl-Wave-Med
-Spk-040RFC:RFS-Load-230:PwrRfl-Wave-PM
 Spk-040RFC:RFS-RFPS-020:ACbOut-DevMonEval-RB
 Spk-040RFC:RFS-RFPS-020:ACbOut-DevMonFact-RB
 Spk-040RFC:RFS-RFPS-020:ACbOut-DevMonIlck-RB
@@ -865,7 +835,6 @@ Spk-040RFC:RFS-RFPS-020:ACbOut-Wave-Avg
 Spk-040RFC:RFS-RFPS-020:ACbOut-Wave-High
 Spk-040RFC:RFS-RFPS-020:ACbOut-Wave-Low
 Spk-040RFC:RFS-RFPS-020:ACbOut-Wave-Med
-Spk-040RFC:RFS-RFPS-020:ACbOut-Wave-PM
 Spk-040RFC:RFS-RFPS-020:AnVout-DevMonEval-RB
 Spk-040RFC:RFS-RFPS-020:AnVout-DevMonFact-RB
 Spk-040RFC:RFS-RFPS-020:AnVout-DevMonIlck-RB
@@ -904,17 +873,14 @@ Spk-040RFC:RFS-RFPS-020:AnVout-Wave-Avg
 Spk-040RFC:RFS-RFPS-020:AnVout-Wave-High
 Spk-040RFC:RFS-RFPS-020:AnVout-Wave-Low
 Spk-040RFC:RFS-RFPS-020:AnVout-Wave-Med
-Spk-040RFC:RFS-RFPS-020:AnVout-Wave-PM
 Spk-040RFC:RFS-RFPS-020:Conn-DIlckMode-RB
 Spk-040RFC:RFS-RFPS-020:Conn-Ilck-RB
 Spk-040RFC:RFS-RFPS-020:Conn-Input-RB
 Spk-040RFC:RFS-RFPS-020:Conn-isFirstIlck
-Spk-040RFC:RFS-RFPS-020:Conn-Wave-PM
 Spk-040RFC:RFS-RFPS-020:Fault-DIlckMode-RB
 Spk-040RFC:RFS-RFPS-020:Fault-Ilck-RB
 Spk-040RFC:RFS-RFPS-020:Fault-Input-RB
 Spk-040RFC:RFS-RFPS-020:Fault-isFirstIlck
-Spk-040RFC:RFS-RFPS-020:Fault-Wave-PM
 Spk-040RFC:RFS-RFPS-020:SSOut1-DevMonEval-RB
 Spk-040RFC:RFS-RFPS-020:SSOut1-DevMonFact-RB
 Spk-040RFC:RFS-RFPS-020:SSOut1-DevMonIlck-RB
@@ -953,7 +919,6 @@ Spk-040RFC:RFS-RFPS-020:SSOut1-Wave-Avg
 Spk-040RFC:RFS-RFPS-020:SSOut1-Wave-High
 Spk-040RFC:RFS-RFPS-020:SSOut1-Wave-Low
 Spk-040RFC:RFS-RFPS-020:SSOut1-Wave-Med
-Spk-040RFC:RFS-RFPS-020:SSOut1-Wave-PM
 Spk-040RFC:RFS-RFPS-020:SSOut2-DevMonEval-RB
 Spk-040RFC:RFS-RFPS-020:SSOut2-DevMonFact-RB
 Spk-040RFC:RFS-RFPS-020:SSOut2-DevMonIlck-RB
@@ -992,7 +957,6 @@ Spk-040RFC:RFS-RFPS-020:SSOut2-Wave-Avg
 Spk-040RFC:RFS-RFPS-020:SSOut2-Wave-High
 Spk-040RFC:RFS-RFPS-020:SSOut2-Wave-Low
 Spk-040RFC:RFS-RFPS-020:SSOut2-Wave-Med
-Spk-040RFC:RFS-RFPS-020:SSOut2-Wave-PM
 Spk-040RFC:RFS-RFPS-020:TAOut1-DevMonEval-RB
 Spk-040RFC:RFS-RFPS-020:TAOut1-DevMonFact-RB
 Spk-040RFC:RFS-RFPS-020:TAOut1-DevMonIlck-RB
@@ -1031,7 +995,6 @@ Spk-040RFC:RFS-RFPS-020:TAOut1-Wave-Avg
 Spk-040RFC:RFS-RFPS-020:TAOut1-Wave-High
 Spk-040RFC:RFS-RFPS-020:TAOut1-Wave-Low
 Spk-040RFC:RFS-RFPS-020:TAOut1-Wave-Med
-Spk-040RFC:RFS-RFPS-020:TAOut1-Wave-PM
 Spk-040RFC:RFS-RFPS-020:TAOut2-DevMonEval-RB
 Spk-040RFC:RFS-RFPS-020:TAOut2-DevMonFact-RB
 Spk-040RFC:RFS-RFPS-020:TAOut2-DevMonIlck-RB
@@ -1070,7 +1033,6 @@ Spk-040RFC:RFS-RFPS-020:TAOut2-Wave-Avg
 Spk-040RFC:RFS-RFPS-020:TAOut2-Wave-High
 Spk-040RFC:RFS-RFPS-020:TAOut2-Wave-Low
 Spk-040RFC:RFS-RFPS-020:TAOut2-Wave-Med
-Spk-040RFC:RFS-RFPS-020:TAOut2-Wave-PM
 Spk-040RFC:RFS-RFPS-020:Tetro1-DevMonEval-RB
 Spk-040RFC:RFS-RFPS-020:Tetro1-DevMonFact-RB
 Spk-040RFC:RFS-RFPS-020:Tetro1-DevMonIlck-RB
@@ -1109,7 +1071,6 @@ Spk-040RFC:RFS-RFPS-020:Tetro1-Wave-Avg
 Spk-040RFC:RFS-RFPS-020:Tetro1-Wave-High
 Spk-040RFC:RFS-RFPS-020:Tetro1-Wave-Low
 Spk-040RFC:RFS-RFPS-020:Tetro1-Wave-Med
-Spk-040RFC:RFS-RFPS-020:Tetro1-Wave-PM
 Spk-040RFC:RFS-RFPS-020:Tetro2-DevMonEval-RB
 Spk-040RFC:RFS-RFPS-020:Tetro2-DevMonFact-RB
 Spk-040RFC:RFS-RFPS-020:Tetro2-DevMonIlck-RB
@@ -1148,7 +1109,6 @@ Spk-040RFC:RFS-RFPS-020:Tetro2-Wave-Avg
 Spk-040RFC:RFS-RFPS-020:Tetro2-Wave-High
 Spk-040RFC:RFS-RFPS-020:Tetro2-Wave-Low
 Spk-040RFC:RFS-RFPS-020:Tetro2-Wave-Med
-Spk-040RFC:RFS-RFPS-020:Tetro2-Wave-PM
 Spk-040RFC:RFS-RFPS-210:PwrFwd-DevMonEval-RB
 Spk-040RFC:RFS-RFPS-210:PwrFwd-DevMonFact-RB
 Spk-040RFC:RFS-RFPS-210:PwrFwd-DevMonIlck-RB
@@ -1187,7 +1147,6 @@ Spk-040RFC:RFS-RFPS-210:PwrFwd-Wave-Avg
 Spk-040RFC:RFS-RFPS-210:PwrFwd-Wave-High
 Spk-040RFC:RFS-RFPS-210:PwrFwd-Wave-Low
 Spk-040RFC:RFS-RFPS-210:PwrFwd-Wave-Med
-Spk-040RFC:RFS-RFPS-210:PwrFwd-Wave-PM
 Spk-040RFC:RFS-RFPS-210:PwrRfl-DevMonEval-RB
 Spk-040RFC:RFS-RFPS-210:PwrRfl-DevMonFact-RB
 Spk-040RFC:RFS-RFPS-210:PwrRfl-DevMonIlck-RB
@@ -1226,19 +1185,15 @@ Spk-040RFC:RFS-RFPS-210:PwrRfl-Wave-Avg
 Spk-040RFC:RFS-RFPS-210:PwrRfl-Wave-High
 Spk-040RFC:RFS-RFPS-210:PwrRfl-Wave-Low
 Spk-040RFC:RFS-RFPS-210:PwrRfl-Wave-Med
-Spk-040RFC:RFS-RFPS-210:PwrRfl-Wave-PM
 Spk-040RFC:RFS-SIM-210:HvEna-DIlckMode-RB
 Spk-040RFC:RFS-SIM-210:HvEna-Ilck-RB
 Spk-040RFC:RFS-SIM-210:HvEna-Input-RB
 Spk-040RFC:RFS-SIM-210:HvEna-isFirstIlck
-Spk-040RFC:RFS-SIM-210:HvEna-Wave-PM
 Spk-040RFC:RFS-SIM-210:RfEna-DIlckMode-RB
 Spk-040RFC:RFS-SIM-210:RfEna-Ilck-RB
 Spk-040RFC:RFS-SIM-210:RfEna-Input-RB
 Spk-040RFC:RFS-SIM-210:RfEna-isFirstIlck
-Spk-040RFC:RFS-SIM-210:RfEna-Wave-PM
 Spk-040RFC:RFS-VacMon-210:Status-DIlckMode-RB
 Spk-040RFC:RFS-VacMon-210:Status-Ilck-RB
 Spk-040RFC:RFS-VacMon-210:Status-Input-RB
 Spk-040RFC:RFS-VacMon-210:Status-isFirstIlck
-Spk-040RFC:RFS-VacMon-210:Status-Wave-PM
-- 
GitLab