diff --git a/src/KOKKOS/atom_kokkos.h b/src/KOKKOS/atom_kokkos.h
index f5649f927e..f5cf4916cf 100644
--- a/src/KOKKOS/atom_kokkos.h
+++ b/src/KOKKOS/atom_kokkos.h
@@ -56,9 +56,6 @@ class AtomKokkos : public Atom {
 
   // SPIN package
 
-  // DAT::tdual_sp_array k_sp;
-  // DAT::tdual_fm_array k_fm;
-  // DAT::tdual_fm_long_array k_fm_long;
   DAT::tdual_float_1d_4 k_sp;
   DAT::tdual_f_array k_fm;
   DAT::tdual_f_array k_fm_long;
diff --git a/src/KOKKOS/atom_vec_spin_kokkos.cpp b/src/KOKKOS/atom_vec_spin_kokkos.cpp
index 5e3ff19831..e9bbeebe28 100644
--- a/src/KOKKOS/atom_vec_spin_kokkos.cpp
+++ b/src/KOKKOS/atom_vec_spin_kokkos.cpp
@@ -189,7 +189,6 @@ struct AtomVecSpinKokkos_PackComm {
   
   AtomVecSpinKokkos_PackComm(
       const typename DAT::tdual_x_array &x,
-      // const typename DAT::tdual_sp_array &sp,
       const typename DAT::tdual_float_1d_4 &sp,
       const typename DAT::tdual_xfloat_2d &buf,
       const typename DAT::tdual_int_2d &list,
@@ -201,7 +200,6 @@ struct AtomVecSpinKokkos_PackComm {
       _xprd(xprd),_yprd(yprd),_zprd(zprd),
       _xy(xy),_xz(xz),_yz(yz) {
         const size_t maxsend = (buf.view<DeviceType>().extent(0)*buf.view<DeviceType>().extent(1))/3;
-        // const size_t elements = 3;
         const size_t elements = 7;
         buffer_view<DeviceType>(_buf,buf,maxsend,elements);
         _pbc[0] = pbc[0]; _pbc[1] = pbc[1]; _pbc[2] = pbc[2];
@@ -1270,16 +1268,10 @@ void AtomVecSpinKokkos::sync_overlapping_device(ExecutionSpace space, unsigned i
       perform_async_copy<DAT::tdual_int_1d>(atomKK->k_mask,space);
     if ((mask & IMAGE_MASK) && atomKK->k_image.need_sync<LMPDeviceType>())
       perform_async_copy<DAT::tdual_imageint_1d>(atomKK->k_image,space);
-    // if ((mask & SP_MASK) && atomKK->k_sp.need_sync<LMPDeviceType>())
-    //   perform_async_copy<DAT::tdual_sp_array>(atomKK->k_sp,space);
     if ((mask & SP_MASK) && atomKK->k_sp.need_sync<LMPDeviceType>())
       perform_async_copy<DAT::tdual_float_1d_4>(atomKK->k_sp,space);
-    // if ((mask & FM_MASK) && atomKK->k_sp.need_sync<LMPDeviceType>())
-    //   perform_async_copy<DAT::tdual_fm_array>(atomKK->k_fm,space);
     if ((mask & FM_MASK) && atomKK->k_sp.need_sync<LMPDeviceType>())
       perform_async_copy<DAT::tdual_f_array>(atomKK->k_fm,space);
-    // if ((mask & FML_MASK) && atomKK->k_fm_long.need_sync<LMPDeviceType>())
-    //   perform_async_copy<DAT::tdual_fm_long_array>(atomKK->k_fm_long,space);
     if ((mask & FML_MASK) && atomKK->k_fm_long.need_sync<LMPDeviceType>())
       perform_async_copy<DAT::tdual_f_array>(atomKK->k_fm_long,space);
   } else {
@@ -1297,16 +1289,10 @@ void AtomVecSpinKokkos::sync_overlapping_device(ExecutionSpace space, unsigned i
       perform_async_copy<DAT::tdual_int_1d>(atomKK->k_mask,space);
     if ((mask & IMAGE_MASK) && atomKK->k_image.need_sync<LMPHostType>())
       perform_async_copy<DAT::tdual_imageint_1d>(atomKK->k_image,space);
-    // if ((mask & SP_MASK) && atomKK->k_sp.need_sync<LMPHostType>())
-    //   perform_async_copy<DAT::tdual_sp_array>(atomKK->k_sp,space);
     if ((mask & SP_MASK) && atomKK->k_sp.need_sync<LMPHostType>())
       perform_async_copy<DAT::tdual_float_1d_4>(atomKK->k_sp,space);
-    // if ((mask & FM_MASK) && atomKK->k_fm.need_sync<LMPHostType>())
-    //   perform_async_copy<DAT::tdual_fm_array>(atomKK->k_fm,space);
     if ((mask & FM_MASK) && atomKK->k_fm.need_sync<LMPHostType>())
       perform_async_copy<DAT::tdual_f_array>(atomKK->k_fm,space);
-    // if ((mask & FML_MASK) && atomKK->k_fm_long.need_sync<LMPHostType>())
-    //   perform_async_copy<DAT::tdual_fm_long_array>(atomKK->k_fm_long,space);
     if ((mask & FML_MASK) && atomKK->k_fm_long.need_sync<LMPHostType>())
       perform_async_copy<DAT::tdual_f_array>(atomKK->k_fm_long,space);
   }
diff --git a/src/KOKKOS/kokkos_type.h b/src/KOKKOS/kokkos_type.h
index b0fbdf1f9f..af5adeee73 100644
--- a/src/KOKKOS/kokkos_type.h
+++ b/src/KOKKOS/kokkos_type.h
@@ -773,17 +773,10 @@ typedef tdual_virial_array::t_dev_const_randomread t_virial_array_randomread;
 
 //3d SP_FLOAT array n*4
 #ifdef LMP_KOKKOS_NO_LEGACY
-// typedef Kokkos::DualView<X_FLOAT*[4], Kokkos::LayoutLeft, LMPDeviceType> tdual_sp_array;
 typedef Kokkos::DualView<X_FLOAT*[4], Kokkos::LayoutLeft, LMPDeviceType> tdual_float_1d_4;
 #else
-// typedef Kokkos::DualView<X_FLOAT*[4], Kokkos::LayoutRight, LMPDeviceType> tdual_sp_array;
 typedef Kokkos::DualView<X_FLOAT*[4], Kokkos::LayoutRight, LMPDeviceType> tdual_float_1d_4;
 #endif
-// typedef tdual_sp_array::t_dev t_sp_array;
-// typedef tdual_sp_array::t_dev_const t_sp_array_const;
-// typedef tdual_sp_array::t_dev_um t_sp_array_um;
-// typedef tdual_sp_array::t_dev_const_um t_sp_array_const_um;
-// typedef tdual_sp_array::t_dev_const_randomread t_sp_array_randomread;
 typedef tdual_float_1d_4::t_dev t_sp_array;
 typedef tdual_float_1d_4::t_dev_const t_sp_array_const;
 typedef tdual_float_1d_4::t_dev_um t_sp_array_um;
@@ -792,12 +785,6 @@ typedef tdual_float_1d_4::t_dev_const_randomread t_sp_array_randomread;
 
 //3d FM_FLOAT array n*3
 
-// typedef Kokkos::DualView<F_FLOAT*[3], Kokkos::LayoutRight, LMPDeviceType> tdual_fm_array;
-// typedef tdual_fm_array::t_dev t_fm_array;
-// typedef tdual_fm_array::t_dev_const t_fm_array_const;
-// typedef tdual_fm_array::t_dev_um t_fm_array_um;
-// typedef tdual_fm_array::t_dev_const_um t_fm_array_const_um;
-// typedef tdual_fm_array::t_dev_const_randomread t_fm_array_randomread;
 typedef tdual_f_array::t_dev t_fm_array;
 typedef tdual_f_array::t_dev_const t_fm_array_const;
 typedef tdual_f_array::t_dev_um t_fm_array_um;
@@ -806,12 +793,6 @@ typedef tdual_f_array::t_dev_const_randomread t_fm_array_randomread;
 
 //3d FML_FLOAT array n*3
 
-// typedef Kokkos::DualView<F_FLOAT*[3], Kokkos::LayoutRight, LMPDeviceType> tdual_fm_long_array;
-// typedef tdual_fm_long_array::t_dev t_fm_long_array;
-// typedef tdual_fm_long_array::t_dev_const t_fm_long_array_const;
-// typedef tdual_fm_long_array::t_dev_um t_fm_long_array_um;
-// typedef tdual_fm_long_array::t_dev_const_um t_fm_long_array_const_um;
-// typedef tdual_fm_long_array::t_dev_const_randomread t_fm_long_array_randomread;
 typedef tdual_f_array::t_dev t_fm_long_array;
 typedef tdual_f_array::t_dev_const t_fm_long_array_const;
 typedef tdual_f_array::t_dev_um t_fm_long_array_um;
@@ -1057,12 +1038,6 @@ typedef tdual_virial_array::t_host_const_randomread t_virial_array_randomread;
 // Spin types
 
 //2d X_FLOAT array n*4
-// typedef Kokkos::DualView<X_FLOAT*[4], Kokkos::LayoutRight, LMPDeviceType> tdual_sp_array;
-// typedef tdual_sp_array::t_host t_sp_array;
-// typedef tdual_sp_array::t_host_const t_sp_array_const;
-// typedef tdual_sp_array::t_host_um t_sp_array_um;
-// typedef tdual_sp_array::t_host_const_um t_sp_array_const_um;
-// typedef tdual_sp_array::t_host_const_randomread t_sp_array_randomread;
 typedef tdual_float_1d_4::t_host t_sp_array;
 typedef tdual_float_1d_4::t_host_const t_sp_array_const;
 typedef tdual_float_1d_4::t_host_um t_sp_array_um;
@@ -1070,12 +1045,6 @@ typedef tdual_float_1d_4::t_host_const_um t_sp_array_const_um;
 typedef tdual_float_1d_4::t_host_const_randomread t_sp_array_randomread;
 
 //2d F_FLOAT array n*3
-// typedef Kokkos::DualView<F_FLOAT*[3], Kokkos::LayoutRight, LMPDeviceType> tdual_fm_array;
-// typedef tdual_fm_array::t_host t_fm_array;
-// typedef tdual_fm_array::t_host_const t_fm_array_const;
-// typedef tdual_fm_array::t_host_um t_fm_array_um;
-// typedef tdual_fm_array::t_host_const_um t_fm_array_const_um;
-// typedef tdual_fm_array::t_host_const_randomread t_fm_array_randomread;
 typedef tdual_f_array::t_host t_fm_array;
 typedef tdual_f_array::t_host_const t_fm_array_const;
 typedef tdual_f_array::t_host_um t_fm_array_um;
@@ -1083,12 +1052,6 @@ typedef tdual_f_array::t_host_const_um t_fm_array_const_um;
 typedef tdual_f_array::t_host_const_randomread t_fm_array_randomread;
 
 //2d F_FLOAT array n*3
-// typedef Kokkos::DualView<F_FLOAT*[3], Kokkos::LayoutRight, LMPDeviceType> tdual_fm_long_array;
-// typedef tdual_fm_long_array::t_host t_fm_long_array;
-// typedef tdual_fm_long_array::t_host_const t_fm_long_array_const;
-// typedef tdual_fm_long_array::t_host_um t_fm_long_array_um;
-// typedef tdual_fm_long_array::t_host_const_um t_fm_long_array_const_um;
-// typedef tdual_fm_long_array::t_host_const_randomread t_fm_long_array_randomread;
 typedef tdual_f_array::t_host t_fm_long_array;
 typedef tdual_f_array::t_host_const t_fm_long_array_const;
 typedef tdual_f_array::t_host_um t_fm_long_array_um;