diff --git a/src/mesh/ConnectivityMatrix.hpp b/src/mesh/ConnectivityMatrix.hpp
index 192535cd4639bfd0bfc612c8b5b83159967dcf1c..0e7804432902f262e8765c9ffa102e05addb2086 100644
--- a/src/mesh/ConnectivityMatrix.hpp
+++ b/src/mesh/ConnectivityMatrix.hpp
@@ -4,11 +4,6 @@
 #include <Kokkos_Core.hpp>
 #include <Kokkos_StaticCrsGraph.hpp>
 
-
-#if 0
-typedef Kokkos::StaticCrsGraph<unsigned int, Kokkos::HostSpace> ConnectivityMatrix;
-#else
-
 class ConnectivityMatrix
 {
  private:
@@ -41,18 +36,17 @@ class ConnectivityMatrix
   }
 
   KOKKOS_INLINE_FUNCTION
-  ConnectivityMatrix& operator=(const std::vector<std::vector<unsigned int>>& initializer)
+  ConnectivityMatrix(const std::vector<std::vector<unsigned int>>& initializer)
+      : m_host_matrix(Kokkos::create_staticcrsgraph<HostMatrix>("connecticity_matrix", initializer))
   {
-    m_host_matrix = Kokkos::create_staticcrsgraph<HostMatrix>("connecticity_matrix", initializer);
-    return *this;
+    ;
   }
 
   [[deprecated("Must only define connectivities so that only unsigned int should be treated")]]
-  KOKKOS_INLINE_FUNCTION
-  ConnectivityMatrix& operator=(const std::vector<std::vector<unsigned short>>& initializer)
+  ConnectivityMatrix(const std::vector<std::vector<unsigned short>>& initializer)
+  : m_host_matrix(Kokkos::create_staticcrsgraph<HostMatrix>("connecticity_matrix", initializer))
   {
-    m_host_matrix = Kokkos::create_staticcrsgraph<HostMatrix>("connecticity_matrix", initializer);
-    return *this;
+    ;
   }
 
   ConnectivityMatrix& operator=(const ConnectivityMatrix&) = default;
@@ -64,10 +58,7 @@ class ConnectivityMatrix
   ~ConnectivityMatrix() = default;
 };
 
-#endif
-
 #warning use right type (unsigned short) instead of a clone of ConnectivityMatrix
 using ConnectivityMatrixShort = ConnectivityMatrix;
 
-
 #endif // CONNECTIVITY_MATRIX_HPP
diff --git a/src/scheme/SubItemValuePerItem.hpp b/src/scheme/SubItemValuePerItem.hpp
index 283a9bf27e145bb094d93361d2c0cecf658f241c..09dde640fc95d43257176cccca13544647e654a5 100644
--- a/src/scheme/SubItemValuePerItem.hpp
+++ b/src/scheme/SubItemValuePerItem.hpp
@@ -15,6 +15,7 @@ class SubItemValuePerItem
 {
 #warning should eventually filter const from DataType
  private:
+  [[deprecated ("must use a specific class for subitem per item numbering")]]
   ConnectivityMatrix m_subitem_id_per_item_matrix;
 
   Kokkos::View<DataType*> m_values;