diff --git a/common/src/KokkosFFT_Helpers.hpp b/common/src/KokkosFFT_Helpers.hpp
index be7bea93..f564f08b 100644
--- a/common/src/KokkosFFT_Helpers.hpp
+++ b/common/src/KokkosFFT_Helpers.hpp
@@ -79,8 +79,8 @@ void roll(const ExecutionSpace& exec_space, ViewType& inout, axis_type<2> shift,
   int n0 = inout.extent_int(0), n1 = inout.extent_int(1);
 
   ViewType tmp("tmp", n0, n1);
-  [[maybe_unused]] int len0 = (n0 - 1) / 2 + 1;
-  [[maybe_unused]] int len1 = (n1 - 1) / 2 + 1;
+  int len0 = (n0 - 1) / 2 + 1;
+  int len1 = (n1 - 1) / 2 + 1;
 
   using range_type = Kokkos::MDRangePolicy<
       ExecutionSpace,
@@ -88,10 +88,9 @@ void roll(const ExecutionSpace& exec_space, ViewType& inout, axis_type<2> shift,
   using tile_type  = typename range_type::tile_type;
   using point_type = typename range_type::point_type;
 
-  range_type range(
-      exec_space, point_type{{0, 0}}, point_type{{len0, len1}},
-      tile_type{{4, 4}}  // [TO DO] Choose optimal tile sizes for each device
-  );
+  // [TO DO] Choose optimal tile sizes for each device
+  range_type range(exec_space, point_type{0, 0}, point_type{len0, len1},
+                   tile_type{4, 4});
 
   axis_type<2> shift0 = {0}, shift1 = {0}, shift2 = {n0 / 2, n1 / 2};
   for (int i = 0; static_cast<std::size_t>(i) < DIM1; i++) {
diff --git a/common/src/KokkosFFT_layouts.hpp b/common/src/KokkosFFT_layouts.hpp
index c98f1825..305e1309 100644
--- a/common/src/KokkosFFT_layouts.hpp
+++ b/common/src/KokkosFFT_layouts.hpp
@@ -30,10 +30,8 @@ auto get_extents(const InViewType& in, const OutViewType& out,
                      "input axes are not valid for the view");
 
   constexpr std::size_t rank = InViewType::rank;
-  [[maybe_unused]] int inner_most_axis =
-      std::is_same_v<array_layout_type, typename Kokkos::LayoutLeft>
-          ? 0
-          : (rank - 1);
+  int inner_most_axis =
+      std::is_same_v<array_layout_type, Kokkos::LayoutLeft> ? 0 : (rank - 1);
 
   // index map after transpose over axis
   auto [map, map_inv] = KokkosFFT::Impl::get_map_axes(in, axes);
@@ -97,10 +95,10 @@ auto get_extents(const InViewType& in, const OutViewType& out,
                                        1, std::multiplies<>());
   int fft_size = std::accumulate(fft_extents.begin(), fft_extents.end(), 1,
                                  std::multiplies<>());
-  [[maybe_unused]] int howmany = total_fft_size / fft_size;
+  int howmany  = total_fft_size / fft_size;
 
   return std::tuple<std::vector<int>, std::vector<int>, std::vector<int>, int>(
-      {in_extents, out_extents, fft_extents, howmany});
+      in_extents, out_extents, fft_extents, howmany);
 }
 }  // namespace Impl
 };  // namespace KokkosFFT
diff --git a/common/src/KokkosFFT_normalization.hpp b/common/src/KokkosFFT_normalization.hpp
index 363f611d..c5a24024 100644
--- a/common/src/KokkosFFT_normalization.hpp
+++ b/common/src/KokkosFFT_normalization.hpp
@@ -29,8 +29,8 @@ auto get_coefficients(ViewType, Direction direction,
                       Normalization normalization, std::size_t fft_size) {
   using value_type = KokkosFFT::Impl::base_floating_point_type<
       typename ViewType::non_const_value_type>;
-  value_type coef                    = 1;
-  [[maybe_unused]] bool to_normalize = false;
+  value_type coef   = 1;
+  bool to_normalize = false;
 
   switch (normalization) {
     case Normalization::forward:
@@ -56,7 +56,7 @@ auto get_coefficients(ViewType, Direction direction,
     default:  // No normalization
       break;
   };
-  return std::tuple<value_type, bool>({coef, to_normalize});
+  return std::tuple<value_type, bool>(coef, to_normalize);
 }
 
 template <typename ExecutionSpace, typename ViewType>
diff --git a/common/src/KokkosFFT_utils.hpp b/common/src/KokkosFFT_utils.hpp
index 1de7b7b8..2747c364 100644
--- a/common/src/KokkosFFT_utils.hpp
+++ b/common/src/KokkosFFT_utils.hpp
@@ -34,9 +34,9 @@ template <typename ViewType>
 auto convert_negative_shift(const ViewType& view, int _shift, int _axis) {
   static_assert(Kokkos::is_view_v<ViewType>,
                 "convert_negative_shift: ViewType must be a Kokkos::View.");
-  int axis                    = convert_negative_axis(view, _axis);
-  int extent                  = view.extent(axis);
-  [[maybe_unused]] int shift0 = 0, shift1 = 0, shift2 = extent / 2;
+  int axis   = convert_negative_axis(view, _axis);
+  int extent = view.extent(axis);
+  int shift0 = 0, shift1 = 0, shift2 = extent / 2;
 
   if (_shift < 0) {
     shift0 = -_shift + extent % 2;  // add 1 for odd case
@@ -48,7 +48,7 @@ auto convert_negative_shift(const ViewType& view, int _shift, int _axis) {
     shift2 = 0;
   }
 
-  return std::tuple<int, int, int>({shift0, shift1, shift2});
+  return std::tuple<int, int, int>(shift0, shift1, shift2);
 }
 
 template <typename ContainerType, typename ValueType>
diff --git a/fft/src/KokkosFFT_Host_plans.hpp b/fft/src/KokkosFFT_Host_plans.hpp
index a18c21bd..d99cf195 100644
--- a/fft/src/KokkosFFT_Host_plans.hpp
+++ b/fft/src/KokkosFFT_Host_plans.hpp
@@ -37,7 +37,7 @@ template <typename ExecutionSpace, typename PlanType, typename InViewType,
 auto create_plan(const ExecutionSpace& exec_space,
                  std::unique_ptr<PlanType>& plan, const InViewType& in,
                  const OutViewType& out, BufferViewType&, InfoType&,
-                 [[maybe_unused]] Direction direction, axis_type<fft_rank> axes,
+                 Direction direction, axis_type<fft_rank> axes,
                  shape_type<fft_rank> s) {
   static_assert(
       KokkosFFT::Impl::are_operatable_views_v<ExecutionSpace, InViewType,
diff --git a/fft/src/KokkosFFT_ROCM_plans.hpp b/fft/src/KokkosFFT_ROCM_plans.hpp
index e26cbd22..ec29ec4a 100644
--- a/fft/src/KokkosFFT_ROCM_plans.hpp
+++ b/fft/src/KokkosFFT_ROCM_plans.hpp
@@ -16,8 +16,7 @@ namespace KokkosFFT {
 namespace Impl {
 // Helper to get input and output array type and direction from transform type
 template <typename TransformType>
-auto get_in_out_array_type(TransformType type,
-                           [[maybe_unused]] Direction direction) {
+auto get_in_out_array_type(TransformType type, Direction direction) {
   rocfft_array_type in_array_type, out_array_type;
   rocfft_transform_type fft_direction;