diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/disabled.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/disabled.marte
deleted file mode 100644
index a96a42a..0000000
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/disabled.marte
+++ /dev/null
@@ -1,99 +0,0 @@
-#package jada_gyro.StateMachine
-
-+DISABLED = {
-  Class = ReferenceContainer
-  +GoWaitStandby = {
-    Class = StateMachineEvent
-    NextState = WAITSTANDBY
-    NextStateError = ERROR
-    +StopCurrentStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StopCurrentStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +PrepareNextStateMsg = {
-      Class = Message
-      Destination = RTApp
-      Mode = "ExpectsReply"
-      Function = "PrepareNextState"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        param1 = WaitStandby
-      }
-    }
-    +StartNextStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StartNextStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +SetState = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_STATE
-        SignalValue = @state_standby
-      }
-    }
-    +SetFault = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_FAULT
-        SignalValue = 0
-      }
-    }
-  }
-  +GoError = {
-    Class = StateMachineEvent
-    NextState = "ERROR"
-    NextStateError = "ERROR"
-    +StopCurrentStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StopCurrentStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +PrepareNextStateMsg = {
-      Class = Message
-      Destination = RTApp
-      Mode = "ExpectsReply"
-      Function = "PrepareNextState"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        param1 = Error
-      }
-    }
-    +StartNextStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StartNextStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +SetState = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_STATE
-        SignalValue = @state_error
-      }
-    }
-    +SetFault = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_FAULT
-        SignalValue = 1
-      }
-    }
-  }
-}
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/error.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/error.marte
deleted file mode 100644
index ebd5411..0000000
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/error.marte
+++ /dev/null
@@ -1,53 +0,0 @@
-#package jada_gyro.StateMachine
-
-//# Error State (Enter by HVPS errors)
-+ERROR = {
-  Class = ReferenceContainer
-  +GoWaitStandby = {
-    Class = StateMachineEvent
-    NextState = WAITSTANDBY
-    NextStateError = ERROR
-    +StopCurrentStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StopCurrentStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +PrepareNextStateMsg = {
-      Class = Message
-      Destination = RTApp
-      Mode = "ExpectsReply"
-      Function = "PrepareNextState"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        param1 = WaitStandby
-      }
-    }
-    +StartNextStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StartNextStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +SetState = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_STATE
-        SignalValue = @state_standby
-      }
-    }
-    +SetFault = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_FAULT
-        SignalValue = 0
-      }
-    }
-  }
-}
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/initial.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/initial.marte
deleted file mode 100644
index f1d10e2..0000000
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/initial.marte
+++ /dev/null
@@ -1,46 +0,0 @@
-#package jada_gyro.StateMachine
-
-+INITIAL = {
-  Class = ReferenceContainer
-  +Start = {
-    Class = StateMachineEvent
-    NextState = "WAITSTANDBY"
-    NextStateError = "ERROR"
-    +PrepareNextStateMsg = {
-      Class = Message
-      Destination = RTApp
-      Mode = "ExpectsReply"
-      Function = "PrepareNextState"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        param1 = WaitStandby
-      }
-    }
-    +StartNextStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StartNextStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +SetState = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_STATE
-        SignalValue = @state_standby
-      }
-    }
-    +SetFault = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_FAULT
-        SignalValue = 0
-      }
-    }
-  }
-}
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon.marte
deleted file mode 100644
index a3891c7..0000000
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon.marte
+++ /dev/null
@@ -1,146 +0,0 @@
-#package jada_gyro.StateMachine
-
-+WAITHVON = {
-  Class = ReferenceContainer
-  +GoWaitStandby = {
-    Class = StateMachineEvent
-    NextState = WAITSTANDBY
-    NextStateError = ERROR
-    +StopCurrentStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StopCurrentStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +PrepareNextStateMsg = {
-      Class = Message
-      Destination = RTApp
-      Mode = "ExpectsReply"
-      Function = "PrepareNextState"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        param1 = WaitStandby
-      }
-    }
-    +StartNextStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StartNextStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +SetState = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_STATE
-        SignalValue = @state_standby
-      }
-    }
-    +SetFault = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_FAULT
-        SignalValue = 0
-      }
-    }
-  }
-  +GoWaitPermit = {
-    Class = StateMachineEvent
-    NextState = WAITPERMIT
-    NextStateError = ERROR
-    +StopCurrentStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StopCurrentStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +PrepareNextStateMsg = {
-      Class = Message
-      Destination = RTApp
-      Mode = "ExpectsReply"
-      Function = "PrepareNextState"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        param1 = WaitPermit
-      }
-    }
-    +StartNextStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StartNextStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +SetState = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_STATE
-        SignalValue = @state_permit
-      }
-    }
-    +SetFault = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_FAULT
-        SignalValue = 0
-      }
-    }
-  }
-  +GoError = {
-    Class = StateMachineEvent
-    NextState = ERROR
-    NextStateError = ERROR
-    +StopCurrentStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StopCurrentStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +PrepareNextStateMsg = {
-      Class = Message
-      Destination = RTApp
-      Mode = "ExpectsReply"
-      Function = "PrepareNextState"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        param1 = Error
-      }
-    }
-    +StartNextStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StartNextStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +SetState = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_STATE
-        SignalValue = @state_error
-      }
-    }
-    +SetFault = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_FAULT
-        SignalValue = 1
-      }
-    }
-  }
-}
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon_prep.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon_prep.marte
deleted file mode 100644
index 635dfab..0000000
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon_prep.marte
+++ /dev/null
@@ -1,146 +0,0 @@
-#package jada_gyro.StateMachine
-
-+WAITHVON_PREP = {
-  Class = ReferenceContainer
-  +GoWaitStandby = {
-    Class = StateMachineEvent
-    NextState = WAITSTANDBY
-    NextStateError = ERROR
-    +StopCurrentStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StopCurrentStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +PrepareNextStateMsg = {
-      Class = Message
-      Destination = RTApp
-      Mode = "ExpectsReply"
-      Function = "PrepareNextState"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        param1 = WaitStandby
-      }
-    }
-    +StartNextStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StartNextStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +SetState = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_STATE
-        SignalValue = @state_standby
-      }
-    }
-    +SetFault = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_FAULT
-        SignalValue = 0
-      }
-    }
-  }
-  +GoWaitPermit = {
-    Class = StateMachineEvent
-    NextState = WAITPERMIT
-    NextStateError = ERROR
-    +StopCurrentStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StopCurrentStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +PrepareNextStateMsg = {
-      Class = Message
-      Destination = RTApp
-      Mode = "ExpectsReply"
-      Function = "PrepareNextState"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        param1 = WaitPermit
-      }
-    }
-    +StartNextStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StartNextStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +SetState = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_STATE
-        SignalValue = @state_permit
-      }
-    }
-    +SetFault = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_FAULT
-        SignalValue = 0
-      }
-    }
-  }
-  +GoError = {
-    Class = StateMachineEvent
-    NextState = ERROR
-    NextStateError = ERROR
-    +StopCurrentStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StopCurrentStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +PrepareNextStateMsg = {
-      Class = Message
-      Destination = RTApp
-      Mode = "ExpectsReply"
-      Function = "PrepareNextState"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        param1 = Error
-      }
-    }
-    +StartNextStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StartNextStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +SetState = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_STATE
-        SignalValue = @state_error
-      }
-    }
-    +SetFault = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_FAULT
-        SignalValue = 1
-      }
-    }
-  }
-}
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon_sdn.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon_sdn.marte
deleted file mode 100644
index 234c426..0000000
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon_sdn.marte
+++ /dev/null
@@ -1,146 +0,0 @@
-#package jada_gyro.StateMachine
-
-+WAITHVON_SDN = {
-  Class = ReferenceContainer
-  +GoWaitStandby = {
-    Class = StateMachineEvent
-    NextState = WAITSTANDBY
-    NextStateError = ERROR
-    +StopCurrentStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StopCurrentStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +PrepareNextStateMsg = {
-      Class = Message
-      Destination = RTApp
-      Mode = "ExpectsReply"
-      Function = "PrepareNextState"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        param1 = WaitStandby
-      }
-    }
-    +StartNextStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StartNextStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +SetState = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_STATE
-        SignalValue = @state_standby
-      }
-    }
-    +SetFault = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_FAULT
-        SignalValue = 0
-      }
-    }
-  }
-  +GoWaitPermit = {
-    Class = StateMachineEvent
-    NextState = WAITPERMIT
-    NextStateError = ERROR
-    +StopCurrentStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StopCurrentStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +PrepareNextStateMsg = {
-      Class = Message
-      Destination = RTApp
-      Mode = "ExpectsReply"
-      Function = "PrepareNextState"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        param1 = WaitPermit
-      }
-    }
-    +StartNextStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StartNextStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +SetState = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_STATE
-        SignalValue = @state_permit
-      }
-    }
-    +SetFault = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_FAULT
-        SignalValue = 0
-      }
-    }
-  }
-  +GoError = {
-    Class = StateMachineEvent
-    NextState = ERROR
-    NextStateError = ERROR
-    +StopCurrentStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StopCurrentStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +PrepareNextStateMsg = {
-      Class = Message
-      Destination = RTApp
-      Mode = "ExpectsReply"
-      Function = "PrepareNextState"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        param1 = Error
-      }
-    }
-    +StartNextStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StartNextStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +SetState = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_STATE
-        SignalValue = @state_error
-      }
-    }
-    +SetFault = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_FAULT
-        SignalValue = 1
-      }
-    }
-  }
-}
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon_sdn_prep.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon_sdn_prep.marte
deleted file mode 100644
index 289205b..0000000
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon_sdn_prep.marte
+++ /dev/null
@@ -1,146 +0,0 @@
-#package jada_gyro.StateMachine
-
-+WAITHVON_SDN_PREP = {
-  Class = ReferenceContainer
-  +GoWaitStandby = {
-    Class = StateMachineEvent
-    NextState = WAITSTANDBY
-    NextStateError = ERROR
-    +StopCurrentStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StopCurrentStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +PrepareNextStateMsg = {
-      Class = Message
-      Destination = RTApp
-      Mode = "ExpectsReply"
-      Function = "PrepareNextState"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        param1 = WaitStandby
-      }
-    }
-    +StartNextStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StartNextStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +SetState = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_STATE
-        SignalValue = @state_standby
-      }
-    }
-    +SetFault = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_FAULT
-        SignalValue = 0
-      }
-    }
-  }
-  +GoWaitPermit = {
-    Class = StateMachineEvent
-    NextState = WAITPERMIT
-    NextStateError = ERROR
-    +StopCurrentStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StopCurrentStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +PrepareNextStateMsg = {
-      Class = Message
-      Destination = RTApp
-      Mode = "ExpectsReply"
-      Function = "PrepareNextState"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        param1 = WaitPermit
-      }
-    }
-    +StartNextStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StartNextStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +SetState = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_STATE
-        SignalValue = @state_permit
-      }
-    }
-    +SetFault = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_FAULT
-        SignalValue = 0
-      }
-    }
-  }
-  +GoError = {
-    Class = StateMachineEvent
-    NextState = ERROR
-    NextStateError = ERROR
-    +StopCurrentStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StopCurrentStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +PrepareNextStateMsg = {
-      Class = Message
-      Destination = RTApp
-      Mode = "ExpectsReply"
-      Function = "PrepareNextState"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        param1 = Error
-      }
-    }
-    +StartNextStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StartNextStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +SetState = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_STATE
-        SignalValue = @state_error
-      }
-    }
-    +SetFault = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_FAULT
-        SignalValue = 1
-      }
-    }
-  }
-}
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waitpermit.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waitpermit.marte
deleted file mode 100644
index 0a3fb10..0000000
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waitpermit.marte
+++ /dev/null
@@ -1,287 +0,0 @@
-#package jada_gyro.StateMachine
-
-+WAITPERMIT = {
-  Class = ReferenceContainer
-  +GoWaitReady = {
-    Class = StateMachineEvent
-    NextState = WAITREADY
-    NextStateError = ERROR
-    +StopCurrentStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StopCurrentStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +PrepareNextStateMsg = {
-      Class = Message
-      Destination = RTApp
-      Mode = "ExpectsReply"
-      Function = "PrepareNextState"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        param1 = WaitReady
-      }
-    }
-    +StartNextStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StartNextStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +SetState = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_STATE
-        SignalValue = @state_ready
-      }
-    }
-    +SetFault = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_FAULT
-        SignalValue = 0
-      }
-    }
-  }
-  +GoWaitHVON = {
-    Class = StateMachineEvent
-    NextState = WAITHVON
-    NextStateError = ERROR
-    +StopCurrentStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StopCurrentStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +PrepareNextStateMsg = {
-      Class = Message
-      Destination = RTApp
-      Mode = "ExpectsReply"
-      Function = "PrepareNextState"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        param1 = WaitHVON
-      }
-    }
-    +StartNextStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StartNextStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +SetState = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_STATE
-        SignalValue = @state_hvon
-      }
-    }
-    +SetFault = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_FAULT
-        SignalValue = 0
-      }
-    }
-  }
-  +GoWaitHVON_SDN = {
-    Class = StateMachineEvent
-    NextState = WAITHVON_SDN
-    NextStateError = ERROR
-    +StopCurrentStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StopCurrentStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +PrepareNextStateMsg = {
-      Class = Message
-      Destination = RTApp
-      Mode = "ExpectsReply"
-      Function = "PrepareNextState"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        param1 = WaitHVON_SDN
-      }
-    }
-    +StartNextStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StartNextStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +SetState = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_STATE
-        SignalValue = @state_hvon_sdn
-      }
-    }
-    +SetFault = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_FAULT
-        SignalValue = 0
-      }
-    }
-  }
-  +GoWaitHVON_PREP = {
-    Class = StateMachineEvent
-    NextState = WAITHVON_PREP
-    NextStateError = ERROR
-    +StopCurrentStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StopCurrentStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +PrepareNextStateMsg = {
-      Class = Message
-      Destination = RTApp
-      Mode = "ExpectsReply"
-      Function = "PrepareNextState"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        param1 = WaitHVON_PREP
-      }
-    }
-    +StartNextStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StartNextStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +SetState = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_STATE
-        SignalValue = @state_hvon_prep
-      }
-    }
-    +SetFault = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_FAULT
-        SignalValue = 0
-      }
-    }
-  }
-  +GoWaitHVON_SDN_PREP = {
-    Class = StateMachineEvent
-    NextState = WAITHVON_SDN_PREP
-    NextStateError = ERROR
-    +StopCurrentStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StopCurrentStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +PrepareNextStateMsg = {
-      Class = Message
-      Destination = RTApp
-      Mode = "ExpectsReply"
-      Function = "PrepareNextState"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        param1 = WaitHVON_SDN_PREP
-      }
-    }
-    +StartNextStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StartNextStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +SetState = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_STATE
-        SignalValue = @state_hvon_sdn_prep
-      }
-    }
-    +SetFault = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_FAULT
-        SignalValue = 0
-      }
-    }
-  }
-  +GoError = {
-    Class = StateMachineEvent
-    NextState = ERROR
-    NextStateError = ERROR
-    +StopCurrentStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StopCurrentStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +PrepareNextStateMsg = {
-      Class = Message
-      Destination = RTApp
-      Mode = "ExpectsReply"
-      Function = "PrepareNextState"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        param1 = Error
-      }
-    }
-    +StartNextStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StartNextStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +SetState = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_STATE
-        SignalValue = @state_error
-      }
-    }
-    +SetFault = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_FAULT
-        SignalValue = 1
-      }
-    }
-  }
-}
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waitready.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waitready.marte
deleted file mode 100644
index cc4aaa3..0000000
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waitready.marte
+++ /dev/null
@@ -1,146 +0,0 @@
-#package jada_gyro.StateMachine
-
-+WAITREADY = {
-  Class = ReferenceContainer
-  +GoWaitStandby = {
-    Class = StateMachineEvent
-    NextState = WAITSTANDBY
-    NextStateError = ERROR
-    +StopCurrentStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StopCurrentStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +PrepareNextStateMsg = {
-      Class = Message
-      Destination = RTApp
-      Mode = "ExpectsReply"
-      Function = "PrepareNextState"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        param1 = WaitStandby
-      }
-    }
-    +StartNextStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StartNextStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +SetState = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_STATE
-        SignalValue = @state_standby
-      }
-    }
-    +SetFault = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_FAULT
-        SignalValue = 0
-      }
-    }
-  }
-  +GoWaitPermit = {
-    Class = StateMachineEvent
-    NextState = WAITPERMIT
-    NextStateError = ERROR
-    +StopCurrentStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StopCurrentStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +PrepareNextStateMsg = {
-      Class = Message
-      Destination = RTApp
-      Mode = "ExpectsReply"
-      Function = "PrepareNextState"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        param1 = WaitPermit
-      }
-    }
-    +StartNextStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StartNextStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +SetState = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_STATE
-        SignalValue = @state_permit
-      }
-    }
-    +SetFault = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_FAULT
-        SignalValue = 0
-      }
-    }
-  }
-  +GoError = {
-    Class = StateMachineEvent
-    NextState = ERROR
-    NextStateError = ERROR
-    +StopCurrentStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StopCurrentStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +PrepareNextStateMsg = {
-      Class = Message
-      Destination = RTApp
-      Mode = "ExpectsReply"
-      Function = "PrepareNextState"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        param1 = Error
-      }
-    }
-    +StartNextStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StartNextStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +SetState = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_STATE
-        SignalValue = @state_error
-      }
-    }
-    +SetFault = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_FAULT
-        SignalValue = 1
-      }
-    }
-  }
-}
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waitstandby.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waitstandby.marte
deleted file mode 100644
index 3e7c07e..0000000
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waitstandby.marte
+++ /dev/null
@@ -1,146 +0,0 @@
-#package jada_gyro.StateMachine
-
-+WAITSTANDBY = {
-  Class = ReferenceContainer
-  +GoWaitReady = {
-    Class = StateMachineEvent
-    NextState = WAITREADY
-    NextStateError = ERROR
-    +StopCurrentStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StopCurrentStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +PrepareNextStateMsg = {
-      Class = Message
-      Destination = RTApp
-      Mode = "ExpectsReply"
-      Function = "PrepareNextState"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        param1 = WaitReady
-      }
-    }
-    +StartNextStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StartNextStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +SetState = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_STATE
-        SignalValue = @state_ready
-      }
-    }
-    +SetFault = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_FAULT
-        SignalValue = 0
-      }
-    }
-  }
-  +GoDisabled = {
-    Class = StateMachineEvent
-    NextState = DISABLED
-    NextStateError = ERROR
-    +StopCurrentStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StopCurrentStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +PrepareNextStateMsg = {
-      Class = Message
-      Destination = RTApp
-      Mode = "ExpectsReply"
-      Function = "PrepareNextState"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        param1 = Disabled
-      }
-    }
-    +StartNextStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StartNextStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +SetState = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_STATE
-        SignalValue = @state_disabled
-      }
-    }
-    +SetFault = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_FAULT
-        SignalValue = 0
-      }
-    }
-  }
-  +GoError = {
-    Class = StateMachineEvent
-    NextState = ERROR
-    NextStateError = ERROR
-    +StopCurrentStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StopCurrentStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +PrepareNextStateMsg = {
-      Class = Message
-      Destination = RTApp
-      Mode = "ExpectsReply"
-      Function = "PrepareNextState"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        param1 = Error
-      }
-    }
-    +StartNextStateExecutionMsg = {
-      Class = Message
-      Destination = RTApp
-      Function = "StartNextStateExecution"
-      Mode = "ExpectsReply"
-    }
-    +SetState = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_STATE
-        SignalValue = @state_error
-      }
-    }
-    +SetFault = {
-      Class = Message
-      Destination = RTApp.Functions.StateGAM
-      Function = "SetOutput"
-      +Parameters = {
-        Class = ConfigurationDatabase
-        SignalName = PCF_FAULT
-        SignalValue = 1
-      }
-    }
-  }
-}