diff --git a/regtests/ww3_tnc1/input/switch b/regtests/ww3_tnc1/input/switch
index eb7b9e985f..153b4f94af 100644
--- a/regtests/ww3_tnc1/input/switch
+++ b/regtests/ww3_tnc1/input/switch
@@ -1 +1 @@
-SHRD LRB4 NOPA PR0 FLX0 LN1 ST3 STAB0 NL1 BT1 IC0 REF0 DB1 TR0 BS0 WNT1 WNX1 CRT1 CRX1 RWND MOPART NOGRB IS0
+SHRD PR0 FLX0 LN1 ST3 STAB0 NL1 BT1 IC0 REF0 DB1 TR0 BS0 WNT1 WNX1 CRT1 CRX1 RWND NOGRB IS0
diff --git a/regtests/ww3_tp2.16/input/switch_MPI b/regtests/ww3_tp2.16/input/switch_MPI
index 98800931df..0bab0bf323 100644
--- a/regtests/ww3_tp2.16/input/switch_MPI
+++ b/regtests/ww3_tp2.16/input/switch_MPI
@@ -1 +1 @@
-DIST MPI NOGRB LRB4 SMC PR2 UNO ST0 NL0 BT0 DB0 TR0 BS0 WNT1 WNX1 CRT1 CRX1 FLX0 LN0 IC0 REF0 IS0 FLD0 
+DIST MPI NOGRB SMC PR2 UNO ST0 NL0 BT0 DB0 TR0 BS0 WNT1 WNX1 CRT1 CRX1 FLX0 LN0 IC0 REF0 IS0 FLD0 
diff --git a/regtests/ww3_tp2.16/input/switch_MPI_OMPH b/regtests/ww3_tp2.16/input/switch_MPI_OMPH
index babb992d8b..d67023a772 100644
--- a/regtests/ww3_tp2.16/input/switch_MPI_OMPH
+++ b/regtests/ww3_tp2.16/input/switch_MPI_OMPH
@@ -1 +1 @@
-DIST MPI OMPG OMPH B4B NOGRB LRB4 SMC PR2 UNO ST0 NL0 BT0 DB0 TR0 BS0 WNT1 WNX1 CRT1 CRX1 FLX0 LN0 IC0 REF0 IS0 FLD0 
+DIST MPI OMPG OMPH B4B NOGRB SMC PR2 UNO ST0 NL0 BT0 DB0 TR0 BS0 WNT1 WNX1 CRT1 CRX1 FLX0 LN0 IC0 REF0 IS0 FLD0 
diff --git a/regtests/ww3_ts4/input_rg_multi/switch_MPI b/regtests/ww3_ts4/input_rg_multi/switch_MPI
index e92d55cd33..3a65832b9b 100644
--- a/regtests/ww3_ts4/input_rg_multi/switch_MPI
+++ b/regtests/ww3_ts4/input_rg_multi/switch_MPI
@@ -1 +1 @@
-NOGRB NOPA TRKNC DIST MPI PR3 UQ FLX0 LN0 ST0 STAB0 NL0 BT0 DB0 MLIM TR0 BS0 IC2 IS2 REF1 IG1 WNT2 WNX1 RWND CRT1 CRX1 O0 O1 O2 O2a O2b O2c O3 O4 O5 O6 O7 UOST
+NOGRB TRKNC DIST MPI PR3 UQ FLX0 LN0 ST0 STAB0 NL0 BT0 DB0 MLIM TR0 BS0 IC2 IS2 REF1 IG1 WNT2 WNX1 RWND CRT1 CRX1 O0 O1 O2 O2a O2b O2c O3 O4 O5 O6 O7 UOST