diff --git a/src/algorithm/REDUCE_SUM-OMPTarget.cpp b/src/algorithm/REDUCE_SUM-OMPTarget.cpp
index 1c1be1ab7..4ba7ab7a0 100644
--- a/src/algorithm/REDUCE_SUM-OMPTarget.cpp
+++ b/src/algorithm/REDUCE_SUM-OMPTarget.cpp
@@ -56,47 +56,23 @@ void REDUCE_SUM::runOpenMPTargetVariant(VariantID vid, size_t tune_idx)
 
   } else if ( vid == RAJA_OpenMPTarget ) {
 
-    if (tune_idx == 0) {
-
-      startTimer();
-      for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
-
-        RAJA::ReduceSum<RAJA::omp_target_reduce, Real_type> sum(m_sum_init);
-
-        RAJA::forall<RAJA::omp_target_parallel_for_exec<threads_per_team>>(
-          RAJA::RangeSegment(ibegin, iend),
-          [=](Index_type i) {
-            REDUCE_SUM_BODY;
-        });
-
-        m_sum = sum.get();
-
-      }
-      stopTimer();
-
-    } else if (tune_idx == 1) {
-
-      startTimer();
-      for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
-
-        Real_type tsum = m_sum_init;
+    startTimer();
+    for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
 
-        RAJA::forall<RAJA::omp_target_parallel_for_exec<threads_per_team>>(
-          RAJA::RangeSegment(ibegin, iend),
-          RAJA::expt::Reduce<RAJA::operators::plus>(&tsum),
-          [=] (Index_type i, Real_type& sum) {
-            REDUCE_SUM_BODY;
-          }
-        );
+      Real_type tsum = m_sum_init;
 
-        m_sum = static_cast<Real_type>(tsum);
+      RAJA::forall<RAJA::omp_target_parallel_for_exec<threads_per_team>>(
+        RAJA::RangeSegment(ibegin, iend),
+        RAJA::expt::Reduce<RAJA::operators::plus>(&tsum),
+        [=] (Index_type i, Real_type& sum) {
+          REDUCE_SUM_BODY;
+        }
+      );
 
-      }
-      stopTimer();
+      m_sum = static_cast<Real_type>(tsum);
 
-    } else {
-      getCout() << "\n  REDUCE_SUM : Unknown OMP Target tuning index = " << tune_idx << std::endl;
     }
+    stopTimer();
 
   } else {
     getCout() << "\n  REDUCE_SUM : Unknown OMP Target variant id = " << vid << std::endl;
@@ -104,14 +80,6 @@ void REDUCE_SUM::runOpenMPTargetVariant(VariantID vid, size_t tune_idx)
 
 }
 
-void REDUCE_SUM::setOpenMPTargetTuningDefinitions(VariantID vid)
-{
-  addVariantTuningName(vid, "default");
-  if (vid == RAJA_OpenMPTarget) {
-    addVariantTuningName(vid, "new");
-  }
-}
-
 } // end namespace algorithm
 } // end namespace rajaperf
 
diff --git a/src/algorithm/REDUCE_SUM.hpp b/src/algorithm/REDUCE_SUM.hpp
index c9f1a3c74..4349eb32e 100644
--- a/src/algorithm/REDUCE_SUM.hpp
+++ b/src/algorithm/REDUCE_SUM.hpp
@@ -64,7 +64,6 @@ class REDUCE_SUM : public KernelBase
   void setOpenMPTuningDefinitions(VariantID vid);
   void setCudaTuningDefinitions(VariantID vid);
   void setHipTuningDefinitions(VariantID vid);
-  void setOpenMPTargetTuningDefinitions(VariantID vid);
   void setSyclTuningDefinitions(VariantID vid);
 
   void runCudaVariantCub(VariantID vid);
diff --git a/src/basic/PI_REDUCE-OMPTarget.cpp b/src/basic/PI_REDUCE-OMPTarget.cpp
index 351580471..19b432498 100644
--- a/src/basic/PI_REDUCE-OMPTarget.cpp
+++ b/src/basic/PI_REDUCE-OMPTarget.cpp
@@ -56,47 +56,23 @@ void PI_REDUCE::runOpenMPTargetVariant(VariantID vid, size_t tune_idx)
 
   } else if ( vid == RAJA_OpenMPTarget ) {
 
-    if (tune_idx == 0) {
-
-      startTimer();
-      for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
-
-        RAJA::ReduceSum<RAJA::omp_target_reduce, Real_type> pi(m_pi_init);
-
-        RAJA::forall<RAJA::omp_target_parallel_for_exec<threads_per_team>>(
-          RAJA::RangeSegment(ibegin, iend),
-          [=](Index_type i) {
-            PI_REDUCE_BODY;
-        });
-
-        m_pi = 4.0 * pi.get();
-
-      }
-      stopTimer();
-
-    } else if (tune_idx == 1) {
-
-      startTimer();
-      for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
-
-        Real_type tpi = m_pi_init;
+    startTimer();
+    for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
 
-        RAJA::forall<RAJA::omp_target_parallel_for_exec<threads_per_team>>(
-          RAJA::RangeSegment(ibegin, iend),
-          RAJA::expt::Reduce<RAJA::operators::plus>(&tpi),
-          [=] (Index_type i, Real_type& pi) {
-            PI_REDUCE_BODY;
-          }
-        );
+      Real_type tpi = m_pi_init;
 
-        m_pi = static_cast<Real_type>(tpi) * 4.0;
+      RAJA::forall<RAJA::omp_target_parallel_for_exec<threads_per_team>>(
+        RAJA::RangeSegment(ibegin, iend),
+        RAJA::expt::Reduce<RAJA::operators::plus>(&tpi),
+        [=] (Index_type i, Real_type& pi) {
+          PI_REDUCE_BODY;
+        }
+      );
 
-      }
-      stopTimer();
+      m_pi = static_cast<Real_type>(tpi) * 4.0;
 
-    } else {
-       getCout() << "\n  PI_REDUCE : Unknown OMP Target tuning index = " << tune_idx << std::endl;
     }
+    stopTimer();
 
   } else {
     getCout() << "\n  PI_REDUCE : Unknown OMP Target variant id = " << vid << std::endl;
@@ -104,14 +80,6 @@ void PI_REDUCE::runOpenMPTargetVariant(VariantID vid, size_t tune_idx)
 
 }
 
-void PI_REDUCE::setOpenMPTargetTuningDefinitions(VariantID vid)
-{
-  addVariantTuningName(vid, "default");
-  if (vid == RAJA_OpenMPTarget) {
-    addVariantTuningName(vid, "new");
-  }
-}
-
 } // end namespace basic
 } // end namespace rajaperf
 
diff --git a/src/basic/PI_REDUCE.hpp b/src/basic/PI_REDUCE.hpp
index ca6860350..1c9363c15 100644
--- a/src/basic/PI_REDUCE.hpp
+++ b/src/basic/PI_REDUCE.hpp
@@ -62,7 +62,6 @@ class PI_REDUCE : public KernelBase
   void setOpenMPTuningDefinitions(VariantID vid);
   void setCudaTuningDefinitions(VariantID vid);
   void setHipTuningDefinitions(VariantID vid);
-  void setOpenMPTargetTuningDefinitions(VariantID vid);
   void setSyclTuningDefinitions(VariantID vid);
 
   template < size_t block_size, typename MappingHelper >
diff --git a/src/basic/REDUCE3_INT-OMPTarget.cpp b/src/basic/REDUCE3_INT-OMPTarget.cpp
index d92d37667..dd195b73b 100644
--- a/src/basic/REDUCE3_INT-OMPTarget.cpp
+++ b/src/basic/REDUCE3_INT-OMPTarget.cpp
@@ -62,70 +62,35 @@ void REDUCE3_INT::runOpenMPTargetVariant(VariantID vid, size_t tune_idx)
 
   } else if ( vid == RAJA_OpenMPTarget ) {
 
-    if (tune_idx == 0) {
-
-      startTimer();
-      for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
-
-        RAJA::ReduceSum<RAJA::omp_target_reduce, Int_type> vsum(m_vsum_init);
-        RAJA::ReduceMin<RAJA::omp_target_reduce, Int_type> vmin(m_vmin_init);
-        RAJA::ReduceMax<RAJA::omp_target_reduce, Int_type> vmax(m_vmax_init);
-
-        RAJA::forall<RAJA::omp_target_parallel_for_exec<threads_per_team>>(
-          RAJA::RangeSegment(ibegin, iend), [=](Index_type i) {
-          REDUCE3_INT_BODY_RAJA;
-        });
-
-        m_vsum += static_cast<Int_type>(vsum.get());
-        m_vmin = RAJA_MIN(m_vmin, static_cast<Int_type>(vmin.get()));
-        m_vmax = RAJA_MAX(m_vmax, static_cast<Int_type>(vmax.get()));
-
-      }
-      stopTimer();
-
-    } else if (tune_idx == 1) {
-
-      startTimer();
-      for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
-
-        Int_type tvsum = m_vsum_init;
-        Int_type tvmin = m_vmin_init;
-        Int_type tvmax = m_vmax_init;
+    startTimer();
+    for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
 
-        RAJA::forall<RAJA::omp_target_parallel_for_exec<threads_per_team>>(
-          RAJA::RangeSegment(ibegin, iend),
-          RAJA::expt::Reduce<RAJA::operators::plus>(&tvsum),
-          RAJA::expt::Reduce<RAJA::operators::minimum>(&tvmin),
-          RAJA::expt::Reduce<RAJA::operators::maximum>(&tvmax),
-          [=](Index_type i, Int_type& vsum, Int_type& vmin, Int_type& vmax) {
-            REDUCE3_INT_BODY;
-          }
-        );
+      Int_type tvsum = m_vsum_init;
+      Int_type tvmin = m_vmin_init;
+      Int_type tvmax = m_vmax_init;
 
-        m_vsum += static_cast<Int_type>(tvsum);
-        m_vmin = RAJA_MIN(m_vmin, static_cast<Int_type>(tvmin));
-        m_vmax = RAJA_MAX(m_vmax, static_cast<Int_type>(tvmax));
+      RAJA::forall<RAJA::omp_target_parallel_for_exec<threads_per_team>>(
+        RAJA::RangeSegment(ibegin, iend),
+        RAJA::expt::Reduce<RAJA::operators::plus>(&tvsum),
+        RAJA::expt::Reduce<RAJA::operators::minimum>(&tvmin),
+        RAJA::expt::Reduce<RAJA::operators::maximum>(&tvmax),
+        [=](Index_type i, Int_type& vsum, Int_type& vmin, Int_type& vmax) {
+          REDUCE3_INT_BODY;
+        }
+      );
 
-      }
-      stopTimer();
+      m_vsum += static_cast<Int_type>(tvsum);
+      m_vmin = RAJA_MIN(m_vmin, static_cast<Int_type>(tvmin));
+      m_vmax = RAJA_MAX(m_vmax, static_cast<Int_type>(tvmax));
 
-    } else {
-      getCout() << "\n  REDUCE3_INT : Unknown OMP Target tuning index = " << tune_idx << std::endl;
     }
+    stopTimer();
 
   } else {
      getCout() << "\n  REDUCE3_INT : Unknown OMP Target variant id = " << vid << std::endl;
   }
 }
 
-void REDUCE3_INT::setOpenMPTargetTuningDefinitions(VariantID vid)
-{
-  addVariantTuningName(vid, "default");
-  if (vid == RAJA_OpenMPTarget) {
-    addVariantTuningName(vid, "new");
-  }
-}
-
 } // end namespace basic
 } // end namespace rajaperf
 
diff --git a/src/basic/REDUCE3_INT.hpp b/src/basic/REDUCE3_INT.hpp
index a3719a845..eb527766c 100644
--- a/src/basic/REDUCE3_INT.hpp
+++ b/src/basic/REDUCE3_INT.hpp
@@ -78,7 +78,6 @@ class REDUCE3_INT : public KernelBase
   void setOpenMPTuningDefinitions(VariantID vid);
   void setCudaTuningDefinitions(VariantID vid);
   void setHipTuningDefinitions(VariantID vid);
-  void setOpenMPTargetTuningDefinitions(VariantID vid); 
   void setSyclTuningDefinitions(VariantID vid);
 
   template < size_t block_size, typename MappingHelper >
diff --git a/src/basic/REDUCE_STRUCT-OMPTarget.cpp b/src/basic/REDUCE_STRUCT-OMPTarget.cpp
index 594c62ccb..b581d395e 100644
--- a/src/basic/REDUCE_STRUCT-OMPTarget.cpp
+++ b/src/basic/REDUCE_STRUCT-OMPTarget.cpp
@@ -83,76 +83,41 @@ void REDUCE_STRUCT::runOpenMPTargetVariant(VariantID vid, size_t tune_idx)
 
     case RAJA_OpenMPTarget : {
 
-      if (tune_idx == 0) {
-
-        startTimer();
-        for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
-
-          RAJA::ReduceSum<RAJA::omp_target_reduce, Real_type> xsum(m_init_sum);
-          RAJA::ReduceSum<RAJA::omp_target_reduce, Real_type> ysum(m_init_sum);
-          RAJA::ReduceMin<RAJA::omp_target_reduce, Real_type> xmin(m_init_min);
-          RAJA::ReduceMin<RAJA::omp_target_reduce, Real_type> ymin(m_init_min);
-          RAJA::ReduceMax<RAJA::omp_target_reduce, Real_type> xmax(m_init_max);
-          RAJA::ReduceMax<RAJA::omp_target_reduce, Real_type> ymax(m_init_max);
-
-          RAJA::forall<RAJA::omp_target_parallel_for_exec<threads_per_team>>(
-            RAJA::RangeSegment(ibegin, iend),
-            [=](Index_type i) {
-              REDUCE_STRUCT_BODY_RAJA;
-          });
-
-          points.SetCenter(xsum.get()/(points.N),
-                           ysum.get()/(points.N));
-          points.SetXMin(xmin.get());
-          points.SetXMax(xmax.get());
-          points.SetYMin(ymin.get());
-          points.SetYMax(ymax.get());
-          m_points = points;
-
-        }
-        stopTimer();
-
-      } else if (tune_idx == 1) {
-
-        startTimer();
-        for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
-
-          Real_type txsum = m_init_sum;
-          Real_type tysum = m_init_sum;
-          Real_type txmin = m_init_min;
-          Real_type tymin = m_init_min;
-          Real_type txmax = m_init_max;
-          Real_type tymax = m_init_max;
-
-          RAJA::forall<RAJA::omp_target_parallel_for_exec<threads_per_team>>(
-            RAJA::RangeSegment(ibegin, iend),
-            RAJA::expt::Reduce<RAJA::operators::plus>(&txsum),
-            RAJA::expt::Reduce<RAJA::operators::plus>(&tysum),
-            RAJA::expt::Reduce<RAJA::operators::minimum>(&txmin),
-            RAJA::expt::Reduce<RAJA::operators::minimum>(&tymin),
-            RAJA::expt::Reduce<RAJA::operators::maximum>(&txmax),
-            RAJA::expt::Reduce<RAJA::operators::maximum>(&tymax),
-            [=](Index_type i, Real_type& xsum, Real_type& ysum,
-                              Real_type& xmin, Real_type& ymin,
-                              Real_type& xmax, Real_type& ymax) {
-              REDUCE_STRUCT_BODY;
-            }
-          );
-
-          points.SetCenter(static_cast<Real_type>(txsum)/(points.N),
-                           static_cast<Real_type>(tysum)/(points.N));
-          points.SetXMin(static_cast<Real_type>(txmin));
-          points.SetXMax(static_cast<Real_type>(txmax));
-          points.SetYMin(static_cast<Real_type>(tymin));
-          points.SetYMax(static_cast<Real_type>(tymax));
-          m_points = points;
+      startTimer();
+      for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
 
-        }
-        stopTimer();
+        Real_type txsum = m_init_sum;
+        Real_type tysum = m_init_sum;
+        Real_type txmin = m_init_min;
+        Real_type tymin = m_init_min;
+        Real_type txmax = m_init_max;
+        Real_type tymax = m_init_max;
+
+        RAJA::forall<RAJA::omp_target_parallel_for_exec<threads_per_team>>(
+          RAJA::RangeSegment(ibegin, iend),
+          RAJA::expt::Reduce<RAJA::operators::plus>(&txsum),
+          RAJA::expt::Reduce<RAJA::operators::plus>(&tysum),
+          RAJA::expt::Reduce<RAJA::operators::minimum>(&txmin),
+          RAJA::expt::Reduce<RAJA::operators::minimum>(&tymin),
+          RAJA::expt::Reduce<RAJA::operators::maximum>(&txmax),
+          RAJA::expt::Reduce<RAJA::operators::maximum>(&tymax),
+          [=](Index_type i, Real_type& xsum, Real_type& ysum,
+                            Real_type& xmin, Real_type& ymin,
+                            Real_type& xmax, Real_type& ymax) {
+            REDUCE_STRUCT_BODY;
+          }
+        );
+
+        points.SetCenter(static_cast<Real_type>(txsum)/(points.N),
+                         static_cast<Real_type>(tysum)/(points.N));
+        points.SetXMin(static_cast<Real_type>(txmin));
+        points.SetXMax(static_cast<Real_type>(txmax));
+        points.SetYMin(static_cast<Real_type>(tymin));
+        points.SetYMax(static_cast<Real_type>(tymax));
+        m_points = points;
 
-      } else {
-        getCout() << "\n  REDUCE_STRUCT : Unknown OMP Target tuning index = " << tune_idx << std::endl;
       }
+      stopTimer();
 
       break;
     }
@@ -163,14 +128,6 @@ void REDUCE_STRUCT::runOpenMPTargetVariant(VariantID vid, size_t tune_idx)
 
 }
 
-void REDUCE_STRUCT::setOpenMPTargetTuningDefinitions(VariantID vid)
-{
-  addVariantTuningName(vid, "default");
-  if (vid == RAJA_OpenMPTarget) {
-    addVariantTuningName(vid, "new");
-  }
-}
-
 } // end namespace basic
 } // end namespace rajaperf
 
diff --git a/src/basic/REDUCE_STRUCT.hpp b/src/basic/REDUCE_STRUCT.hpp
index 658d9eae4..c85e7397f 100644
--- a/src/basic/REDUCE_STRUCT.hpp
+++ b/src/basic/REDUCE_STRUCT.hpp
@@ -91,7 +91,6 @@ class REDUCE_STRUCT : public KernelBase
   void setOpenMPTuningDefinitions(VariantID vid);
   void setCudaTuningDefinitions(VariantID vid);
   void setHipTuningDefinitions(VariantID vid);
-  void setOpenMPTargetTuningDefinitions(VariantID vid);
 
   template < size_t block_size, typename MappingHelper >
   void runCudaVariantBase(VariantID vid);
diff --git a/src/basic/TRAP_INT-OMPTarget.cpp b/src/basic/TRAP_INT-OMPTarget.cpp
index 2c5e4cf56..c14206754 100644
--- a/src/basic/TRAP_INT-OMPTarget.cpp
+++ b/src/basic/TRAP_INT-OMPTarget.cpp
@@ -63,60 +63,29 @@ void TRAP_INT::runOpenMPTargetVariant(VariantID vid, size_t tune_idx)
 
   } else if ( vid == RAJA_OpenMPTarget ) {
 
-    if (tune_idx == 0) {
-
-      startTimer();
-      for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
+    startTimer();
+    for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
 
-        RAJA::ReduceSum<RAJA::omp_target_reduce, Real_type> sumx(m_sumx_init);
+      Real_type tsumx = m_sumx_init;
 
-        RAJA::forall<RAJA::omp_target_parallel_for_exec<threads_per_team>>(
-          RAJA::RangeSegment(ibegin, iend), [=](Index_type i) {
+      RAJA::forall<RAJA::omp_target_parallel_for_exec<threads_per_team>>(
+        RAJA::RangeSegment(ibegin, iend),
+        RAJA::expt::Reduce<RAJA::operators::plus>(&tsumx),
+        [=] (Index_type i, Real_type& sumx) {
           TRAP_INT_BODY;
-        });
-
-        m_sumx += static_cast<Real_type>(sumx.get()) * h;
-
-      }
-      stopTimer();
-
-    } else if (tune_idx == 1) {
-
-      startTimer();
-      for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
-
-        Real_type tsumx = m_sumx_init;
+        }
+      );
 
-        RAJA::forall<RAJA::omp_target_parallel_for_exec<threads_per_team>>(
-          RAJA::RangeSegment(ibegin, iend),
-          RAJA::expt::Reduce<RAJA::operators::plus>(&tsumx),
-          [=] (Index_type i, Real_type& sumx) {
-            TRAP_INT_BODY;
-          }
-        );
+      m_sumx += static_cast<Real_type>(tsumx) * h;
 
-        m_sumx += static_cast<Real_type>(tsumx) * h;
-
-      }
-      stopTimer();
-
-    } else {
-      getCout() << "\n  TRAP_INT : Unknown OMP Target tuning index = " << tune_idx << std::endl;
     }
+    stopTimer();
 
   } else {
      getCout() << "\n  TRAP_INT : Unknown OMP Target variant id = " << vid << std::endl;
   }
 }
 
-void TRAP_INT::setOpenMPTargetTuningDefinitions(VariantID vid)
-{
-  addVariantTuningName(vid, "default");
-  if (vid == RAJA_OpenMPTarget) {
-    addVariantTuningName(vid, "new");
-  }
-}
-
 } // end namespace basic
 } // end namespace rajaperf
 
diff --git a/src/basic/TRAP_INT.hpp b/src/basic/TRAP_INT.hpp
index 8f8ca9337..657cc10d9 100644
--- a/src/basic/TRAP_INT.hpp
+++ b/src/basic/TRAP_INT.hpp
@@ -75,7 +75,6 @@ class TRAP_INT : public KernelBase
   void setOpenMPTuningDefinitions(VariantID vid);
   void setCudaTuningDefinitions(VariantID vid);
   void setHipTuningDefinitions(VariantID vid);
-  void setOpenMPTargetTuningDefinitions(VariantID vid);
   void setSyclTuningDefinitions(VariantID vid);
 
   template < size_t block_size, typename MappingHelper >
diff --git a/src/comm/HALO_EXCHANGE_FUSED.hpp b/src/comm/HALO_EXCHANGE_FUSED.hpp
index a0962be3a..fb3da04b4 100644
--- a/src/comm/HALO_EXCHANGE_FUSED.hpp
+++ b/src/comm/HALO_EXCHANGE_FUSED.hpp
@@ -161,7 +161,6 @@ class HALO_EXCHANGE_FUSED : public HALO_base
   void setOpenMPTuningDefinitions(VariantID vid);
   void setCudaTuningDefinitions(VariantID vid);
   void setHipTuningDefinitions(VariantID vid);
-  void setOpenMPTargetTuningDefinitions(VariantID vid);
 
   void runSeqVariantDirect(VariantID vid);
   void runOpenMPVariantDirect(VariantID vid);
diff --git a/src/comm/HALO_PACKING_FUSED.hpp b/src/comm/HALO_PACKING_FUSED.hpp
index 065c0be3a..55ad4da6b 100644
--- a/src/comm/HALO_PACKING_FUSED.hpp
+++ b/src/comm/HALO_PACKING_FUSED.hpp
@@ -139,7 +139,6 @@ class HALO_PACKING_FUSED : public HALO_base
   void setOpenMPTuningDefinitions(VariantID vid);
   void setCudaTuningDefinitions(VariantID vid);
   void setHipTuningDefinitions(VariantID vid);
-  void setOpenMPTargetTuningDefinitions(VariantID vid);
 
   void runSeqVariantDirect(VariantID vid);
   void runOpenMPVariantDirect(VariantID vid);
diff --git a/src/lcals/FIRST_MIN-OMPTarget.cpp b/src/lcals/FIRST_MIN-OMPTarget.cpp
index 578bdfe63..29127297b 100644
--- a/src/lcals/FIRST_MIN-OMPTarget.cpp
+++ b/src/lcals/FIRST_MIN-OMPTarget.cpp
@@ -60,49 +60,25 @@ void FIRST_MIN::runOpenMPTargetVariant(VariantID vid, size_t tune_idx)
 
   } else if ( vid == RAJA_OpenMPTarget ) {
 
-    if (tune_idx == 0) {
+    using VL_TYPE = RAJA::expt::ValLoc<Real_type>;
 
-      startTimer();
-      for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
-
-        RAJA::ReduceMinLoc<RAJA::omp_target_reduce, Real_type, Index_type> loc(
-                                                    m_xmin_init, m_initloc);
-
-        RAJA::forall<RAJA::omp_target_parallel_for_exec<threads_per_team>>(
-          RAJA::RangeSegment(ibegin, iend), [=](Index_type i) {
-          FIRST_MIN_BODY_RAJA;
-        });
-
-        m_minloc = loc.getLoc();
-
-      }
-      stopTimer();
-
-    } else if (tune_idx == 1) {
-
-      using VL_TYPE = RAJA::expt::ValLoc<Real_type>;
-
-      startTimer();
-      for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
-
-        VL_TYPE tloc(m_xmin_init, m_initloc);
+    startTimer();
+    for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
 
-        RAJA::forall<RAJA::omp_target_parallel_for_exec<threads_per_team>>(
-          RAJA::RangeSegment(ibegin, iend),
-          RAJA::expt::Reduce<RAJA::operators::minimum>(&tloc),
-          [=](Index_type i, VL_TYPE& loc) {
-            loc.min(x[i], i);
-          }
-        );
+      VL_TYPE tloc(m_xmin_init, m_initloc);
 
-        m_minloc = static_cast<Index_type>(tloc.getLoc());
+      RAJA::forall<RAJA::omp_target_parallel_for_exec<threads_per_team>>(
+        RAJA::RangeSegment(ibegin, iend),
+        RAJA::expt::Reduce<RAJA::operators::minimum>(&tloc),
+        [=](Index_type i, VL_TYPE& loc) {
+          loc.min(x[i], i);
+        }
+      );
 
-      }
-      stopTimer();
+      m_minloc = static_cast<Index_type>(tloc.getLoc());
 
-    } else {
-      getCout() << "\n  FIRST_MIN : Unknown OMP Target tuning index = " << tune_idx << std::endl;
     }
+    stopTimer();
 
   } else {
      getCout() << "\n  FIRST_MIN : Unknown OMP Target variant id = " << vid << std::endl;
@@ -110,14 +86,6 @@ void FIRST_MIN::runOpenMPTargetVariant(VariantID vid, size_t tune_idx)
 
 }
 
-void FIRST_MIN::setOpenMPTargetTuningDefinitions(VariantID vid)
-{
-  addVariantTuningName(vid, "default");
-  if (vid == RAJA_OpenMPTarget) {
-    addVariantTuningName(vid, "new");
-  }
-}
-
 } // end namespace lcals
 } // end namespace rajaperf
 
diff --git a/src/lcals/FIRST_MIN.hpp b/src/lcals/FIRST_MIN.hpp
index 1660739fb..a0d4a6786 100644
--- a/src/lcals/FIRST_MIN.hpp
+++ b/src/lcals/FIRST_MIN.hpp
@@ -87,7 +87,6 @@ class FIRST_MIN : public KernelBase
   void setOpenMPTuningDefinitions(VariantID vid);
   void setCudaTuningDefinitions(VariantID vid);
   void setHipTuningDefinitions(VariantID vid);
-  void setOpenMPTargetTuningDefinitions(VariantID vid);
   void setSyclTuningDefinitions(VariantID vid); 
 
   template < size_t block_size, typename MappingHelper >
diff --git a/src/stream/DOT-OMPTarget.cpp b/src/stream/DOT-OMPTarget.cpp
index 238f8fbae..f7c9d3a2a 100644
--- a/src/stream/DOT-OMPTarget.cpp
+++ b/src/stream/DOT-OMPTarget.cpp
@@ -60,46 +60,23 @@ void DOT::runOpenMPTargetVariant(VariantID vid, size_t tune_idx)
 
     case RAJA_OpenMPTarget : {
 
-      if (tune_idx == 0) {
-
-        startTimer();
-        for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
+      startTimer();
+      for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
 
-          RAJA::ReduceSum<RAJA::omp_target_reduce, Real_type> dot(m_dot_init);
+        Real_type tdot = m_dot_init;
 
-          RAJA::forall<RAJA::omp_target_parallel_for_exec<threads_per_team>>(
-            RAJA::RangeSegment(ibegin, iend), [=](Index_type i) {
+        RAJA::forall<RAJA::omp_target_parallel_for_exec<threads_per_team>>(
+          RAJA::RangeSegment(ibegin, iend),
+          RAJA::expt::Reduce<RAJA::operators::plus>(&tdot),
+          [=] (Index_type i, Real_type& dot) {
             DOT_BODY;
-          });
-
-          m_dot += static_cast<Real_type>(dot.get());
-
-        }
-        stopTimer();
-
-      } else if (tune_idx == 1) {
-
-        startTimer();
-        for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
-
-          Real_type tdot = m_dot_init;
+          }
+        );
 
-          RAJA::forall<RAJA::omp_target_parallel_for_exec<threads_per_team>>(
-            RAJA::RangeSegment(ibegin, iend),
-            RAJA::expt::Reduce<RAJA::operators::plus>(&tdot),
-            [=] (Index_type i, Real_type& dot) {
-              DOT_BODY;
-            }
-          );
+        m_dot += static_cast<Real_type>(tdot);
 
-          m_dot += static_cast<Real_type>(tdot);
-
-        }
-        stopTimer();
-
-      } else {
-        getCout() << "\n  DOT : Unknown OMP Target tuning index = " << tune_idx << std::endl;
       }
+      stopTimer();
 
       break;
     }
@@ -112,14 +89,6 @@ void DOT::runOpenMPTargetVariant(VariantID vid, size_t tune_idx)
 
 }
 
-void DOT::setOpenMPTargetTuningDefinitions(VariantID vid)
-{
-  addVariantTuningName(vid, "default");
-  if (vid == RAJA_OpenMPTarget) {
-    addVariantTuningName(vid, "new");
-  }
-}
-
 } // end namespace stream
 } // end namespace rajaperf
 
diff --git a/src/stream/DOT.hpp b/src/stream/DOT.hpp
index 2626dbc5e..e1c3cc90b 100644
--- a/src/stream/DOT.hpp
+++ b/src/stream/DOT.hpp
@@ -56,10 +56,8 @@ class DOT : public KernelBase
   void runKokkosVariant(VariantID vid, size_t tune_idx);
 
   void setSeqTuningDefinitions(VariantID vid);
-  void setOpenMPTuningDefinitions(VariantID vid);
   void setCudaTuningDefinitions(VariantID vid);
   void setHipTuningDefinitions(VariantID vid);
-  void setOpenMPTargetTuningDefinitions(VariantID vid);
   void setSyclTuningDefinitions(VariantID vid);
 
   template < size_t block_size, typename MappingHelper >