diff --git a/init/accelerator-operation-ess.json b/init/accelerator-operation-ess.json
index 289374a0dfd502f9908250df7b1459c4f0be5251..1588ea9c9c917e56f929ccefbeaafc00f10a10e2 100644
--- a/init/accelerator-operation-ess.json
+++ b/init/accelerator-operation-ess.json
@@ -3,91 +3,43 @@
   "AccOp": {
     "None": {
       "id": 0,
-      "events": [
-        "None"
-      ],
       "description": "No Beam"
     },
     "Shutdown": {
       "id": 10,
-      "events": [
-        "DATA"
-      ],
       "description": "Ion source (plasma and HV) and most of the components off, only non-hazardous systems could remain “on”. Tunnel access is possible."
     },
     "PlasmaConditioning": {
       "id": 20,
-      "events": [
-        "DATA"
-      ],
       "description": "Ion Source plasma on, HV off (no beam extraction), no other RF system allowed. Tunnel access is possible."
     },
     "RFConditioning": {
       "id": 30,
-      "events": [
-        "DATA"
-      ],
       "description": "Some or all of the RF systems (RF sources, waveguides, cavities) could be on, as well as plasma conditioning in the ISrc, but no proton production (HV extraction off). Tunnel to be searched and locked."
     },
     "StudiesDump": {
       "id": 40,
-      "events": [
-        "ION_ST",
-        "ION_END",
-        "DATA"
-      ],
       "description": "P-beam on, send to the Tuning dump; requires the Tunnel to be searched and locked. Access to the Line-of-Sight (LoS) instruments possible only if primary shutters are closed."
     },
     "StudiesTarget": {
       "id": 50,
-      "events": [
-        "ION_ST",
-        "ION_END",
-        "DATA"
-      ],
       "description": "P-beam on, to the Target. Target areas searched and Locked and Tunnel searched and locked;. No access to the LoS instruments."
     },
     "StartUpTargetTest": {
       "id": 60,
-      "events": [
-        "ION_ST",
-        "ION_END",
-        "DATA"
-      ],
       "description": "P-beam on, to the Target. Target areas searched and Locked and Tunnel searched and locked;. No access to the LoS instruments."
     },
     "StartUpLowPower": {
       "id": 70,
-      "events": [
-        "ION_ST",
-        "ION_END",
-        "DATA"
-      ],
       "description": "P-beam on, to the target; Target areas searched and Locked and Tunnel searched and locked; no access to the LoS instruments."
     },
     "StartUpRamping": {
       "id": 80,
-      "events": [
-        "ION_ST",
-        "ION_END",
-        "BPULSE_CM",
-        "BPULSE_ST",
-        "BPULSE_END",
-        "DATA"
-      ],
       "description": "P-beam on, to the target; Target areas searched and Locked and Tunnel searched and locked; no access to the LoS instruments."
     },
     "Production": {
       "id": 90,
-      "events": [
-        "ION_ST",
-        "ION_END",
-        "BPULSE_CM",
-        "BPULSE_ST",
-        "BPULSE_END",
-        "DATA"
-      ],
       "description": "P-beam on, to the target; Target areas searched and Locked tunnel searched and locked; no access to the LoS instruments. Neutron production for NSS experiments."
     }
   }
-}
\ No newline at end of file
+}
diff --git a/init/databuffer-ess.json b/init/databuffer-ess.json
index 89e77b6ba1cb44d15da00d0d1c28fb6471173508..29301434caf0c0e1fad64b52dd6c42d941054ddc 100644
--- a/init/databuffer-ess.json
+++ b/init/databuffer-ess.json
@@ -23,120 +23,54 @@
   "PBMod": {
     "None": {
       "id": 0,
-      "events": "None",
       "description": "No Beam"
     },
     "NoBeam": {
       "id": 1,
-      "events": "None",
       "description": "No Beam"
     },
     "Conditioning": {
       "id": 10,
-      "events": [
-        "ION_ST",
-        "ION_END",
-        "DATA"
-      ],
       "description": "Plasma production, magnetron allowed but no extraction HV."
     },
     "Probe": {
       "id": 20,
-      "events": [
-        "ION_ST",
-        "ION_END",
-        "DATA"
-      ],
       "description": "First beam through a particular section; non-damaging even in the case of total beam loss (even repeated); used to verify that machine configuration is not grossly incorrect."
     },
     "FastCommissioning": {
       "id": 30,
-      "events": [
-        "ION_ST",
-        "ION_END",
-        "DATA"
-      ],
       "description": "Limited beam loading; used for fast scans to rapidly determine/verify RF setpoints."
     },
     "RfTest": {
       "id": 40,
-      "events": [
-        "ION_ST",
-        "ION_END",
-        "DATA"
-      ],
       "description": "To perform an initial RF test with a longer pulse."
     },
     "StabilityTest": {
       "id": 50,
-      "events": [
-        "ION_ST",
-        "ION_END",
-        "DATA"
-      ],
       "description": "To be used mostly for beam stability test."
     },
     "SlowCommissioning": {
       "id": 60,
-      "events": [
-        "ION_ST",
-        "ION_END",
-        "DATA"
-      ],
       "description": "Very short pulse planned to be used used during Normal Conducting Linac commissioning. It would allow installation of the rest of the Linac in parallel to Beam Commissioning."
     },
     "FastTuning": {
       "id": 70,
-      "events": [
-        "ION_ST",
-        "ION_END",
-        "DATA"
-      ],
       "description": "Limited beam loading; used for fast scans to rapidly determine/verify RF setpoints and measure beam profiles with wire scanners."
     },
     "SlowTuning": {
       "id": 80,
-      "events": [
-        "ION_ST",
-        "ION_END",
-        "BPULSE_CM",
-        "BPULSE_ST",
-        "BPULSE_END",
-        "DATA"
-      ],
       "description": "Largest charge per pulse that allow operation of invasive proton beam instrumentation devices like wire scanners; long enough beam pulses to diagnose and monitor RF feedback and the onset of beam loading; used to perform more precise single-pulse measurements."
     },
     "LongPulseVerification": {
       "id": 90,
-      "events": [
-        "ION_ST",
-        "ION_END",
-        "DATA"
-      ],
       "description": "Only used when machine reasonably tuned to the tuning dump or the target; slowly-increasing pulse lengths are used to tune RF feedforward, verify beam loading and Lorentz force detuning compensation, and tune for low beam losses. Iintermediate short pulses at 1Hz could be supplied to monitor stability between long pulses."
     },
     "ShieldingVerification": {
       "id": 100,
-      "events": [
-        "ION_ST",
-        "ION_END",
-        "BPULSE_CM",
-        "BPULSE_ST",
-        "BPULSE_END",
-        "DATA"
-      ],
       "description": "To be defined better once the exact requirements for the shielding verification (power, pulse length) are known."
     },
     "Production": {
       "id": 110,
-      "events": [
-        "ION_ST",
-        "ION_END",
-        "BPULSE_CM",
-        "BPULSE_ST",
-        "BPULSE_END",
-        "DATA"
-      ],
       "description": "Normal mode for NSS experiments during operation."
     }
   },
@@ -190,4 +124,4 @@
       "limits": "5MW"
     }
   }
-}
\ No newline at end of file
+}