diff --git a/CMakeLists.txt b/CMakeLists.txt
index 25b0f65d..e81a9366 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,7 +117,7 @@ ecbuild_find_package( NAME loki )
 ecbuild_find_package( NAME atlas )
 
 ecbuild_add_option( FEATURE FIELD_API_DISABLE_MAPPED_MEMORY
-  DESCRIPTION "Use ACC mapped memory by default in Field API objects"
+  DESCRIPTION "Disable the use of ACC mapped memory in Field API objects"
   CONDITION HAVE_FIELD_API AND field_api_HAVE_ACC AND field_api_HAVE_CUDA
   DEFAULT OFF )
 if( HAVE_FIELD_API_DISABLE_MAPPED_MEMORY )
diff --git a/src/cloudsc_loki/CMakeLists.txt b/src/cloudsc_loki/CMakeLists.txt
index 707d3cb2..1493bb7a 100644
--- a/src/cloudsc_loki/CMakeLists.txt
+++ b/src/cloudsc_loki/CMakeLists.txt
@@ -619,10 +619,6 @@ if( HAVE_CUDA )
             ${COMMON_MODULE}/yomphyder.F90
             ${COMMON_MODULE}/yoethf.F90
             ${COMMON_MODULE}/yoecldp.F90
-            ${COMMON_MODULE}/cloudsc_field_state_mod.F90
-            ${COMMON_MODULE}/cloudsc_flux_type_mod.F90
-            ${COMMON_MODULE}/cloudsc_aux_type_mod.F90
-            ${COMMON_MODULE}/cloudsc_state_type_mod.F90
         INCLUDES ${COMMON_INCLUDE}
         DEFINITIONS CLOUDSC_GPU_TIMING
         DATA_OFFLOAD REMOVE_OPENMP