diff --git a/nnpdf_data/nnpdf_data/commondata/PHENIX-2009_SHP_200GEV/filter.py b/nnpdf_data/nnpdf_data/commondata/PHENIX-2009_SHP_200GEV/filter.py
index 252b136331..642445b7bc 100644
--- a/nnpdf_data/nnpdf_data/commondata/PHENIX-2009_SHP_200GEV/filter.py
+++ b/nnpdf_data/nnpdf_data/commondata/PHENIX-2009_SHP_200GEV/filter.py
@@ -51,7 +51,6 @@ def dump_data(df_table: pd.DataFrame) -> None:
                 "mid": float(df_table.loc[i, "pT"]),
                 "max": float(df_table.loc[i, "pT_high"]),
             },
-            "sqrts": {"min": None, "mid": 200.0, "max": None},
             "eta": {"min": -0.35, "mid": 0.0, "max": 0.35},
         }
         kinematics.append(kin_value)
diff --git a/nnpdf_data/nnpdf_data/commondata/PHENIX-2009_SHP_200GEV/kinematics.yaml b/nnpdf_data/nnpdf_data/commondata/PHENIX-2009_SHP_200GEV/kinematics.yaml
index f38fdfbbee..c3a6860af0 100644
--- a/nnpdf_data/nnpdf_data/commondata/PHENIX-2009_SHP_200GEV/kinematics.yaml
+++ b/nnpdf_data/nnpdf_data/commondata/PHENIX-2009_SHP_200GEV/kinematics.yaml
@@ -3,10 +3,6 @@ bins:
     min: 1.0
     mid: 1.3
     max: 1.5
-  sqrts:
-    min: null
-    mid: 200.0
-    max: null
   eta:
     min: -0.35
     mid: 0.0
@@ -15,10 +11,6 @@ bins:
     min: 1.5
     mid: 1.75
     max: 2.0
-  sqrts:
-    min: null
-    mid: 200.0
-    max: null
   eta:
     min: -0.35
     mid: 0.0
@@ -27,10 +19,6 @@ bins:
     min: 2.0
     mid: 2.23
     max: 2.5
-  sqrts:
-    min: null
-    mid: 200.0
-    max: null
   eta:
     min: -0.35
     mid: 0.0
@@ -39,10 +27,6 @@ bins:
     min: 2.5
     mid: 2.72
     max: 3.0
-  sqrts:
-    min: null
-    mid: 200.0
-    max: null
   eta:
     min: -0.35
     mid: 0.0
@@ -51,10 +35,6 @@ bins:
     min: 3.0
     mid: 3.22
     max: 3.5
-  sqrts:
-    min: null
-    mid: 200.0
-    max: null
   eta:
     min: -0.35
     mid: 0.0
@@ -63,10 +43,6 @@ bins:
     min: 3.5
     mid: 3.72
     max: 4.0
-  sqrts:
-    min: null
-    mid: 200.0
-    max: null
   eta:
     min: -0.35
     mid: 0.0
@@ -75,10 +51,6 @@ bins:
     min: 4.0
     mid: 4.39
     max: 5.0
-  sqrts:
-    min: null
-    mid: 200.0
-    max: null
   eta:
     min: -0.35
     mid: 0.0
@@ -87,10 +59,6 @@ bins:
     min: 5.0
     mid: 5.4
     max: 6.0
-  sqrts:
-    min: null
-    mid: 200.0
-    max: null
   eta:
     min: -0.35
     mid: 0.0
@@ -99,10 +67,6 @@ bins:
     min: 6.0
     mid: 6.41
     max: 7.0
-  sqrts:
-    min: null
-    mid: 200.0
-    max: null
   eta:
     min: -0.35
     mid: 0.0
@@ -111,10 +75,6 @@ bins:
     min: 7.0
     mid: 7.74
     max: 9.0
-  sqrts:
-    min: null
-    mid: 200.0
-    max: null
   eta:
     min: -0.35
     mid: 0.0
@@ -123,10 +83,6 @@ bins:
     min: 9.0
     mid: 10.0
     max: 12.0
-  sqrts:
-    min: null
-    mid: 200.0
-    max: null
   eta:
     min: -0.35
     mid: 0.0
@@ -135,10 +91,6 @@ bins:
     min: 12.0
     mid: 13.1
     max: 15.0
-  sqrts:
-    min: null
-    mid: 200.0
-    max: null
   eta:
     min: -0.35
     mid: 0.0
diff --git a/nnpdf_data/nnpdf_data/commondata/PHENIX-2009_SHP_200GEV/metadata.yaml b/nnpdf_data/nnpdf_data/commondata/PHENIX-2009_SHP_200GEV/metadata.yaml
index a34b61cf98..fe3c4ba1a0 100644
--- a/nnpdf_data/nnpdf_data/commondata/PHENIX-2009_SHP_200GEV/metadata.yaml
+++ b/nnpdf_data/nnpdf_data/commondata/PHENIX-2009_SHP_200GEV/metadata.yaml
@@ -32,12 +32,11 @@ implemented_observables:
       dataset_label: "PHENIX ALL"
       y_label: "$A_{LL}(p_T)$"
       plot_x: pT
-    kinematic_coverage: [pT, sqrts, eta]
+    kinematic_coverage: [pT, eta]
 
     kinematics:
       variables:
         pT: { description: "Transverse momentum", label: "$p_T$", units: "GeV" }
-        sqrts: { description: "Center-of-mass energy", label: r"$\sqrt(s)$", units: "GeV" }
         eta: { description: "pi^0 pseudorapidity", label: r"$\eta$", units: "" }
       file: kinematics.yaml
 
diff --git a/nnpdf_data/nnpdf_data/commondata/PHENIX-2013_SHP_510GEV/filter.py b/nnpdf_data/nnpdf_data/commondata/PHENIX-2013_SHP_510GEV/filter.py
index 565f774695..a92cb51d5d 100644
--- a/nnpdf_data/nnpdf_data/commondata/PHENIX-2013_SHP_510GEV/filter.py
+++ b/nnpdf_data/nnpdf_data/commondata/PHENIX-2013_SHP_510GEV/filter.py
@@ -46,7 +46,6 @@ def dump_data(df_table: pd.DataFrame) -> None:
                 "mid": float(df_table.loc[i, "pT"]),
                 "max": float(df_table.loc[i, "pT_high"]),
             },
-            "sqrts": {"min": None, "mid": 510.0, "max": None},
             "eta": {"min": -0.35, "mid": 0.0, "max": 0.35},
         }
         kinematics.append(kin_value)
diff --git a/nnpdf_data/nnpdf_data/commondata/PHENIX-2013_SHP_510GEV/kinematics.yaml b/nnpdf_data/nnpdf_data/commondata/PHENIX-2013_SHP_510GEV/kinematics.yaml
index 8a4f77a3b7..ac6893b670 100644
--- a/nnpdf_data/nnpdf_data/commondata/PHENIX-2013_SHP_510GEV/kinematics.yaml
+++ b/nnpdf_data/nnpdf_data/commondata/PHENIX-2013_SHP_510GEV/kinematics.yaml
@@ -3,10 +3,6 @@ bins:
     min: 2.0
     mid: 2.28
     max: 2.5
-  sqrts:
-    min: null
-    mid: 510.0
-    max: null
   eta:
     min: -0.35
     mid: 0.0
@@ -15,10 +11,6 @@ bins:
     min: 2.5
     mid: 2.76
     max: 3.0
-  sqrts:
-    min: null
-    mid: 510.0
-    max: null
   eta:
     min: -0.35
     mid: 0.0
@@ -27,10 +19,6 @@ bins:
     min: 3.0
     mid: 3.25
     max: 3.5
-  sqrts:
-    min: null
-    mid: 510.0
-    max: null
   eta:
     min: -0.35
     mid: 0.0
@@ -39,10 +27,6 @@ bins:
     min: 3.5
     mid: 3.74
     max: 4.0
-  sqrts:
-    min: null
-    mid: 510.0
-    max: null
   eta:
     min: -0.35
     mid: 0.0
@@ -51,10 +35,6 @@ bins:
     min: 4.0
     mid: 4.24
     max: 4.5
-  sqrts:
-    min: null
-    mid: 510.0
-    max: null
   eta:
     min: -0.35
     mid: 0.0
@@ -63,10 +43,6 @@ bins:
     min: 4.5
     mid: 4.74
     max: 5.0
-  sqrts:
-    min: null
-    mid: 510.0
-    max: null
   eta:
     min: -0.35
     mid: 0.0
@@ -75,10 +51,6 @@ bins:
     min: 5.0
     mid: 5.45
     max: 6.0
-  sqrts:
-    min: null
-    mid: 510.0
-    max: null
   eta:
     min: -0.35
     mid: 0.0
@@ -87,10 +59,6 @@ bins:
     min: 6.0
     mid: 6.45
     max: 7.0
-  sqrts:
-    min: null
-    mid: 510.0
-    max: null
   eta:
     min: -0.35
     mid: 0.0
@@ -99,10 +67,6 @@ bins:
     min: 7.0
     mid: 7.45
     max: 8.0
-  sqrts:
-    min: null
-    mid: 510.0
-    max: null
   eta:
     min: -0.35
     mid: 0.0
@@ -111,10 +75,6 @@ bins:
     min: 8.0
     mid: 8.45
     max: 9.0
-  sqrts:
-    min: null
-    mid: 510.0
-    max: null
   eta:
     min: -0.35
     mid: 0.0
@@ -123,10 +83,6 @@ bins:
     min: 9.0
     mid: 9.45
     max: 10.0
-  sqrts:
-    min: null
-    mid: 510.0
-    max: null
   eta:
     min: -0.35
     mid: 0.0
@@ -135,10 +91,6 @@ bins:
     min: 10.0
     mid: 10.82
     max: 12.0
-  sqrts:
-    min: null
-    mid: 510.0
-    max: null
   eta:
     min: -0.35
     mid: 0.0
@@ -147,10 +99,6 @@ bins:
     min: 12.0
     mid: 13.14
     max: 14.0
-  sqrts:
-    min: null
-    mid: 510.0
-    max: null
   eta:
     min: -0.35
     mid: 0.0
@@ -159,10 +107,6 @@ bins:
     min: 14.0
     mid: 16.62
     max: 18.0
-  sqrts:
-    min: null
-    mid: 510.0
-    max: null
   eta:
     min: -0.35
     mid: 0.0
diff --git a/nnpdf_data/nnpdf_data/commondata/PHENIX-2013_SHP_510GEV/metadata.yaml b/nnpdf_data/nnpdf_data/commondata/PHENIX-2013_SHP_510GEV/metadata.yaml
index fb5b551134..e3d27dd4d5 100644
--- a/nnpdf_data/nnpdf_data/commondata/PHENIX-2013_SHP_510GEV/metadata.yaml
+++ b/nnpdf_data/nnpdf_data/commondata/PHENIX-2013_SHP_510GEV/metadata.yaml
@@ -30,11 +30,10 @@ implemented_observables:
       dataset_label: "PHENIX ALL"
       y_label: "$A_{LL}(p_T)$"
       plot_x: pT
-    kinematic_coverage: [pT, sqrts, eta]
+    kinematic_coverage: [pT, eta]
     kinematics:
       variables:
         pT: { description: "Transverse momentum", label: "$p_T$", units: "GeV" }
-        sqrts: { description: "Center-of-mass energy", label: r"$\sqrt(s)$", units: "GeV" }
         eta: { description: "π0 pseudorapidity", label: r"$\eta$", units: ""}
       file: kinematics.yaml
 
diff --git a/nnpdf_data/nnpdf_data/commondata/STAR-2006_SHP_200GEV/filter.py b/nnpdf_data/nnpdf_data/commondata/STAR-2006_SHP_200GEV/filter.py
index 7f872d34f7..fdd8c754fd 100644
--- a/nnpdf_data/nnpdf_data/commondata/STAR-2006_SHP_200GEV/filter.py
+++ b/nnpdf_data/nnpdf_data/commondata/STAR-2006_SHP_200GEV/filter.py
@@ -40,7 +40,6 @@ def dump_data(df_table: pd.DataFrame) -> None:
     for i in range(len(df_table["asym"])):
         kin_value = {
             "pT": {"min": None, "mid": float(df_table.loc[i, "pT"]), "max": None},
-            "sqrts": {"min": None, "mid": 200.0, "max": None},
             "eta": {"min": 0.8, "mid": 1.4, "max": 2.0},
         }
         kinematics.append(kin_value)
diff --git a/nnpdf_data/nnpdf_data/commondata/STAR-2006_SHP_200GEV/kinematics.yaml b/nnpdf_data/nnpdf_data/commondata/STAR-2006_SHP_200GEV/kinematics.yaml
index 8aedac3e15..87f13208a4 100644
--- a/nnpdf_data/nnpdf_data/commondata/STAR-2006_SHP_200GEV/kinematics.yaml
+++ b/nnpdf_data/nnpdf_data/commondata/STAR-2006_SHP_200GEV/kinematics.yaml
@@ -3,10 +3,6 @@ bins:
     min: null
     mid: 5.57692
     max: null
-  sqrts:
-    min: null
-    mid: 200.0
-    max: null
   eta:
     min: 0.8
     mid: 1.4
@@ -15,10 +11,6 @@ bins:
     min: null
     mid: 6.51397
     max: null
-  sqrts:
-    min: null
-    mid: 200.0
-    max: null
   eta:
     min: 0.8
     mid: 1.4
@@ -27,10 +19,6 @@ bins:
     min: null
     mid: 7.48737
     max: null
-  sqrts:
-    min: null
-    mid: 200.0
-    max: null
   eta:
     min: 0.8
     mid: 1.4
@@ -39,10 +27,6 @@ bins:
     min: null
     mid: 8.4765
     max: null
-  sqrts:
-    min: null
-    mid: 200.0
-    max: null
   eta:
     min: 0.8
     mid: 1.4
@@ -51,10 +35,6 @@ bins:
     min: null
     mid: 9.44489
     max: null
-  sqrts:
-    min: null
-    mid: 200.0
-    max: null
   eta:
     min: 0.8
     mid: 1.4
@@ -63,10 +43,6 @@ bins:
     min: null
     mid: 10.7949
     max: null
-  sqrts:
-    min: null
-    mid: 200.0
-    max: null
   eta:
     min: 0.8
     mid: 1.4
diff --git a/nnpdf_data/nnpdf_data/commondata/STAR-2006_SHP_200GEV/metadata.yaml b/nnpdf_data/nnpdf_data/commondata/STAR-2006_SHP_200GEV/metadata.yaml
index 08d79b5517..725ffffdb0 100644
--- a/nnpdf_data/nnpdf_data/commondata/STAR-2006_SHP_200GEV/metadata.yaml
+++ b/nnpdf_data/nnpdf_data/commondata/STAR-2006_SHP_200GEV/metadata.yaml
@@ -32,12 +32,11 @@ implemented_observables:
       dataset_label: "STAR ALL"
       y_label: "$A_{LL}(p_T)$"
       plot_x: pT
-    kinematic_coverage: [pT, sqrts, eta]
+    kinematic_coverage: [pT, eta]
 
     kinematics:
       variables:
         pT: { description: "Transverse momentum", label: "$p_T$", units: "GeV" }
-        sqrts: { description: "Center-of-mass energy", label: r"$\sqrt(s)$", units: "GeV" }
         eta: { description: "Pseudorapidity", label: r"$\eta$", units: "" }
       file: kinematics.yaml
 
diff --git a/nnpdf_data/nnpdf_data/commondata/STAR-2013_SHP_510GEV/filter.py b/nnpdf_data/nnpdf_data/commondata/STAR-2013_SHP_510GEV/filter.py
index e057a4ef72..1d1f8e6017 100644
--- a/nnpdf_data/nnpdf_data/commondata/STAR-2013_SHP_510GEV/filter.py
+++ b/nnpdf_data/nnpdf_data/commondata/STAR-2013_SHP_510GEV/filter.py
@@ -46,7 +46,6 @@ def dump_data(df_table: pd.DataFrame, tableid: int) -> None:
                 "mid": (float(df_table.loc[i, "pT_high"]) + float(df_table.loc[i, "pT_low"])) / 2,
                 "max": float(df_table.loc[i, "pT_high"]),
             },
-            "sqrts": {"min": None, "mid": 510.0, "max": None},
             "eta": {"min": 3.15, "mid": 3.525, "max": 3.90},
         }
         kinematics.append(kin_value)
diff --git a/nnpdf_data/nnpdf_data/commondata/STAR-2013_SHP_510GEV/kinematics_highrap.yaml b/nnpdf_data/nnpdf_data/commondata/STAR-2013_SHP_510GEV/kinematics_highrap.yaml
index 9504c897dc..0da835fd68 100644
--- a/nnpdf_data/nnpdf_data/commondata/STAR-2013_SHP_510GEV/kinematics_highrap.yaml
+++ b/nnpdf_data/nnpdf_data/commondata/STAR-2013_SHP_510GEV/kinematics_highrap.yaml
@@ -3,10 +3,6 @@ bins:
     min: 3.7
     mid: 3.91
     max: 4.12
-  sqrts:
-    min: null
-    mid: 510.0
-    max: null
   eta:
     min: 3.15
     mid: 3.525
@@ -15,10 +11,6 @@ bins:
     min: 4.48
     mid: 4.73
     max: 4.98
-  sqrts:
-    min: null
-    mid: 510.0
-    max: null
   eta:
     min: 3.15
     mid: 3.525
@@ -27,10 +19,6 @@ bins:
     min: 5.33
     mid: 5.62
     max: 5.91
-  sqrts:
-    min: null
-    mid: 510.0
-    max: null
   eta:
     min: 3.15
     mid: 3.525
@@ -39,10 +27,6 @@ bins:
     min: 6.71
     mid: 7.08
     max: 7.45
-  sqrts:
-    min: null
-    mid: 510.0
-    max: null
   eta:
     min: 3.15
     mid: 3.525
diff --git a/nnpdf_data/nnpdf_data/commondata/STAR-2013_SHP_510GEV/kinematics_lowrap.yaml b/nnpdf_data/nnpdf_data/commondata/STAR-2013_SHP_510GEV/kinematics_lowrap.yaml
index c45551187a..6bc318481f 100644
--- a/nnpdf_data/nnpdf_data/commondata/STAR-2013_SHP_510GEV/kinematics_lowrap.yaml
+++ b/nnpdf_data/nnpdf_data/commondata/STAR-2013_SHP_510GEV/kinematics_lowrap.yaml
@@ -3,10 +3,6 @@ bins:
     min: 2.37
     mid: 2.5
     max: 2.63
-  sqrts:
-    min: null
-    mid: 510.0
-    max: null
   eta:
     min: 3.15
     mid: 3.525
@@ -15,10 +11,6 @@ bins:
     min: 3.15
     mid: 3.33
     max: 3.51
-  sqrts:
-    min: null
-    mid: 510.0
-    max: null
   eta:
     min: 3.15
     mid: 3.525
@@ -27,10 +19,6 @@ bins:
     min: 3.89
     mid: 4.11
     max: 4.33
-  sqrts:
-    min: null
-    mid: 510.0
-    max: null
   eta:
     min: 3.15
     mid: 3.525
@@ -39,10 +27,6 @@ bins:
     min: 5.08
     mid: 5.37
     max: 5.66
-  sqrts:
-    min: null
-    mid: 510.0
-    max: null
   eta:
     min: 3.15
     mid: 3.525
diff --git a/nnpdf_data/nnpdf_data/commondata/STAR-2013_SHP_510GEV/metadata.yaml b/nnpdf_data/nnpdf_data/commondata/STAR-2013_SHP_510GEV/metadata.yaml
index 728421f4d0..cad695df1a 100644
--- a/nnpdf_data/nnpdf_data/commondata/STAR-2013_SHP_510GEV/metadata.yaml
+++ b/nnpdf_data/nnpdf_data/commondata/STAR-2013_SHP_510GEV/metadata.yaml
@@ -31,11 +31,10 @@ implemented_observables:
       dataset_label: "STAR ALL"
       y_label: "$A_{LL}(p_T)$"
       plot_x: pT
-    kinematic_coverage: [pT, sqrts, eta]
+    kinematic_coverage: [pT, eta]
     kinematics:
       variables:
         pT: { description: "Transverse momentum", label: "$p_T$", units: "GeV" }
-        sqrts: { description: "Center-of-mass energy", label: r"$\sqrt(s)$", units: "GeV" }
         eta: { description: "Pseudorapidity", label: r"$\eta$", units: "" }
       file: kinematics_lowrap.yaml
     data_central: data_lowrap.yaml
@@ -56,11 +55,10 @@ implemented_observables:
       dataset_label: "STAR ALL"
       y_label: "$A_{LL}(p_T)$"
       plot_x: pT
-    kinematic_coverage: [pT, sqrts, eta]
+    kinematic_coverage: [pT, eta]
     kinematics:
       variables:
         pT: { description: "Transverse momentum", label: "$p_T$", units: "GeV" }
-        sqrts: { description: "Center-of-mass energy", label: r"$\sqrt(s)$", units: "GeV" }
         eta: { description: "Pseudorapidity", label: r"$\eta$", units: "" }
       file: kinematics_highrap.yaml
     data_central: data_highrap.yaml
diff --git a/validphys2/src/validphys/process_options.py b/validphys2/src/validphys/process_options.py
index 60b4117fbd..ec3cd7da5c 100644
--- a/validphys2/src/validphys/process_options.py
+++ b/validphys2/src/validphys/process_options.py
@@ -154,7 +154,7 @@ def _shp_xq2map(kin_info):
     # Then compute x, Q2
     pT = kin_info[_Vars.pT]
     ratio = pT / kin_info[_Vars.sqrts]
-    rap = kin_info.get_one_of(_Vars.y, _Vars.eta, _Vars.abs_eta)
+    rap = kin_info[_Vars.eta]
     x1 = 2 * ratio * np.exp(rap)
     x2 = 2 * ratio * np.exp(-rap)
     q2 = pT * pT