diff --git a/include/evalhyd/detail/determinist/evaluator.hpp b/include/evalhyd/detail/determinist/evaluator.hpp
index 03ed47acba43f0fb7de6a4de55e078c819a34364..b5cdad23b6222c821a9919a2cdf6a59fb33628e7 100644
--- a/include/evalhyd/detail/determinist/evaluator.hpp
+++ b/include/evalhyd/detail/determinist/evaluator.hpp
@@ -63,7 +63,7 @@ namespace evalhyd
             {
                 if (!mean_prd.has_value())
                 {
-                    mean_prd = elements::calc_mean_prd<XD2>(
+                    mean_prd = elements::calc_mean_prd(
                             q_prd, t_msk, b_exp, n_srs, n_msk, n_exp
                     );
                 }
@@ -74,7 +74,7 @@ namespace evalhyd
             {
                 if (!quad_err.has_value())
                 {
-                    quad_err = elements::calc_quad_err<XD2>(
+                    quad_err = elements::calc_quad_err(
                             q_obs, q_prd
                     );
                 }
@@ -85,7 +85,7 @@ namespace evalhyd
             {
                 if (!quad_obs.has_value())
                 {
-                    quad_obs = elements::calc_quad_obs<XD2>(
+                    quad_obs = elements::calc_quad_obs(
                             q_obs, get_mean_obs(), t_msk,
                             n_srs, n_tim, n_msk, n_exp
                     );
@@ -97,7 +97,7 @@ namespace evalhyd
             {
                 if (!quad_prd.has_value())
                 {
-                    quad_prd = elements::calc_quad_prd<XD2>(
+                    quad_prd = elements::calc_quad_prd(
                             q_prd, get_mean_prd(), t_msk,
                             n_srs, n_tim, n_msk, n_exp
                     );
@@ -109,7 +109,7 @@ namespace evalhyd
             {
                 if (!r_pearson.has_value())
                 {
-                    r_pearson = elements::calc_r_pearson<XD2>(
+                    r_pearson = elements::calc_r_pearson(
                             q_obs, q_prd, get_mean_obs(), get_mean_prd(),
                             get_quad_obs(), get_quad_prd(), t_msk, b_exp,
                             n_srs, n_msk, n_exp
@@ -122,7 +122,7 @@ namespace evalhyd
             {
                 if (!alpha.has_value())
                 {
-                    alpha = elements::calc_alpha<XD2>(
+                    alpha = elements::calc_alpha(
                             q_obs, q_prd, get_mean_obs(), get_mean_prd(),
                             t_msk, b_exp, n_srs, n_msk, n_exp
                     );
@@ -134,7 +134,7 @@ namespace evalhyd
             {
                 if (!bias.has_value())
                 {
-                    bias = elements::calc_bias<XD2>(
+                    bias = elements::calc_bias(
                             q_obs, q_prd, t_msk, b_exp, n_srs, n_msk, n_exp
                     );
                 }
diff --git a/include/evalhyd/detail/probabilist/evaluator.hpp b/include/evalhyd/detail/probabilist/evaluator.hpp
index ba047af80b48919706189b1e36f7c85c4c39b2cc..9b1f7761327bcf11827e77c09bc09bafb81fcd5b 100644
--- a/include/evalhyd/detail/probabilist/evaluator.hpp
+++ b/include/evalhyd/detail/probabilist/evaluator.hpp
@@ -107,7 +107,7 @@ namespace evalhyd
             {
                 if (!o_k.has_value())
                 {
-                    o_k = elements::calc_o_k<view1d_xtensor2d_double_type>(
+                    o_k = elements::calc_o_k(
                             q_obs, q_thr
                     );
                 }
@@ -129,10 +129,9 @@ namespace evalhyd
             {
                 if (!sum_f_k.has_value())
                 {
-                    sum_f_k = elements::calc_sum_f_k<view2d_xtensor4d_double_type,
-                                                     view1d_xtensor2d_double_type>(
-                                    q_prd, q_thr
-                            );
+                    sum_f_k = elements::calc_sum_f_k(
+                            q_prd, q_thr
+                    );
                 }
                 return sum_f_k.value();
             };
@@ -152,7 +151,7 @@ namespace evalhyd
             {
                 if (!q_qnt.has_value())
                 {
-                    q_qnt = elements::calc_q_qnt<view2d_xtensor4d_double_type>(
+                    q_qnt = elements::calc_q_qnt(
                             q_prd
                     );
                 }
@@ -230,7 +229,7 @@ namespace evalhyd
             {
                 if (!qs.has_value())
                 {
-                    qs = intermediate::calc_qs<view1d_xtensor2d_double_type>(
+                    qs = intermediate::calc_qs(
                             q_obs, get_q_qnt(), n_mbr
                     );
                 }
@@ -337,7 +336,7 @@ namespace evalhyd
             {
                 if (!BS.has_value())
                 {
-                    BS = metrics::calc_BS<view1d_xtensor2d_double_type>(
+                    BS = metrics::calc_BS(
                             get_bs(), q_thr, t_msk, b_exp, n_thr, n_msk, n_exp
                     );
                 }
@@ -348,7 +347,7 @@ namespace evalhyd
             {
                 if (!BS_CRD.has_value())
                 {
-                    BS_CRD = metrics::calc_BS_CRD<view1d_xtensor2d_double_type>(
+                    BS_CRD = metrics::calc_BS_CRD(
                             q_thr, get_o_k(), get_y_k(), get_bar_o(), t_msk,
                             b_exp, n_thr, n_mbr, n_msk, n_exp
                     );
@@ -360,7 +359,7 @@ namespace evalhyd
             {
                 if (!BS_LBD.has_value())
                 {
-                    BS_LBD = metrics::calc_BS_LBD<view1d_xtensor2d_double_type>(
+                    BS_LBD = metrics::calc_BS_LBD(
                             q_thr, get_o_k(), get_y_k(), t_msk,
                             b_exp, n_thr, n_msk, n_exp
                     );
@@ -372,7 +371,7 @@ namespace evalhyd
             {
                 if (!BSS.has_value())
                 {
-                    BSS = metrics::calc_BSS<view1d_xtensor2d_double_type>(
+                    BSS = metrics::calc_BSS(
                             get_bs(), q_thr, get_o_k(), get_bar_o(), t_msk,
                             b_exp, n_thr, n_msk, n_exp
                     );