diff --git a/src/AMSlib/AMS.cpp b/src/AMSlib/AMS.cpp
index f90dedb..0fcd421 100644
--- a/src/AMSlib/AMS.cpp
+++ b/src/AMSlib/AMS.cpp
@@ -673,28 +673,14 @@ void AMSConfigureFSDatabase(AMSDBType db_type, const char *db_path)
 
 #ifdef __ENABLE_MPI__
 AMSExecutor AMSCreateDistributedExecutor(AMSCAbstrModel model,
-                                         AMSDType data_type,
-                                         AMSResourceType resource_type,
-                                         AMSPhysicFn call_back,
                                          MPI_Comm Comm,
                                          int process_id,
                                          int world_size)
+
 {
-  if (data_type == AMSDType::AMS_DOUBLE) {
-    auto *dWF = _AMSCreateExecutor<double>(
-        model, data_type, resource_type, call_back, process_id, world_size);
-    dWF->set_communicator(Comm);
-    return _AMSRegisterExecutor(data_type, dWF);
-
-  } else if (data_type == AMSDType::AMS_SINGLE) {
-    auto *sWF = _AMSCreateExecutor<float>(
-        model, data_type, resource_type, call_back, process_id, world_size);
-    sWF->set_communicator(Comm);
-    return _AMSRegisterExecutor(data_type, sWF);
-  } else {
-    throw std::invalid_argument("Data type is not supported by AMSLib!");
-    return static_cast<AMSExecutor>(-1);
-  }
+  auto *dWF = _AMSCreateExecutor(model, process_id, world_size);
+  dWF->set_communicator(Comm);
+  return _AMSRegisterExecutor(dWF);
 }
 #endif
 }  // namespace ams
diff --git a/src/AMSlib/AMSTensor.cpp b/src/AMSlib/AMSTensor.cpp
index 2c90303..9702fa3 100644
--- a/src/AMSlib/AMSTensor.cpp
+++ b/src/AMSlib/AMSTensor.cpp
@@ -47,7 +47,6 @@ AMSTensor::AMSTensor(uint8_t* data,
       _location(location),
       _owned(!view)
 {
-#warning add a check to verify that user provided data are contiguous
   _bytes = _elements * _element_size;
   _elements = computeNumElements(shapes);
   if (!_data) {
diff --git a/tests/AMSlib/ams_interface/CMakeLists.txt b/tests/AMSlib/ams_interface/CMakeLists.txt
index c10c15b..87e10f0 100644
--- a/tests/AMSlib/ams_interface/CMakeLists.txt
+++ b/tests/AMSlib/ams_interface/CMakeLists.txt
@@ -1,5 +1,4 @@
 function(ADD_API_UNIT_TEST gname name cmd)
-  message(WARNING "ARGS are  ${cmd}")
   add_test(NAME ${name} COMMAND bash -c "${cmd}")
   set_tests_properties(${name} PROPERTIES LABELS ${gname})
 endfunction()