diff --git a/runtime/quark/CMakeLists.txt b/runtime/quark/CMakeLists.txt
index c6412acc493b121e49b3a4a329796b5411dad93d..db92c2a9bbc2755ca15b7a896432782c7c7cb83e 100644
--- a/runtime/quark/CMakeLists.txt
+++ b/runtime/quark/CMakeLists.txt
@@ -86,7 +86,6 @@ set(RUNTIME_COMMON
   control/runtime_descriptor.c
   control/runtime_options.c
   control/runtime_profiling.c
-  codelets/codelet_dataflush.c
   ${RUNTIME_COMMON_GENERATED}
   )
 
diff --git a/runtime/quark/codelets/codelet_dataflush.c b/runtime/quark/codelets/codelet_dataflush.c
deleted file mode 100644
index cbec78c35a0739516c61a3c7d36a99c2cfbb3148..0000000000000000000000000000000000000000
--- a/runtime/quark/codelets/codelet_dataflush.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- *
- * @copyright (c) 2009-2014 The University of Tennessee and The University
- *                          of Tennessee Research Foundation.
- *                          All rights reserved.
- * @copyright (c) 2012-2014 Inria. All rights reserved.
- * @copyright (c) 2012-2014, 2016 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved.
- *
- **/
-
-/**
- *
- * @file codelet_dataflush.c
- *
- *  MORSE codelets kernel
- *  MORSE is a software package provided by Univ. of Tennessee,
- *  Univ. of California Berkeley and Univ. of Colorado Denver
- *
- * @version 2.5.0
- * @comment This file has been automatically generated
- *          from Plasma 2.5.0 for MORSE 1.0.0
- * @author Mathieu Faverge
- *
- * @date 2014-02-05
- *
- **/
-#include "chameleon_quark.h"
-
-void MORSE_TASK_flush_data( const MORSE_option_t *options,
-                           const MORSE_desc_t *A, int Am, int An )
-{
-    (void)options; (void)A; (void)Am; (void)An;
-
-    /*
-     * This is useful for StarPU and PaRSEC MPI implementation, if it happens in
-     * Quark, it will need to be done carefuly to not break other runtimes.
-     */
-}
-
-void MORSE_TASK_flush_desc( const MORSE_option_t *options,
-                           MORSE_enum uplo, const MORSE_desc_t *A )
-{
-    (void)options; (void)uplo; (void)A;
-
-    /*
-     * This is useful for StarPU and PaRSEC MPI implementation, if it happens in
-     * Quark, it will need to be done carefuly to not break other runtimes.
-     */
-}
-
-void MORSE_TASK_flush_all()
-{
-}
diff --git a/runtime/quark/control/runtime_descriptor.c b/runtime/quark/control/runtime_descriptor.c
index 2b08dd846a3916e1013243867373b91f0ac9470e..d9198f0e57e58739835bfcc74bced8e245a8bd6b 100644
--- a/runtime/quark/control/runtime_descriptor.c
+++ b/runtime/quark/control/runtime_descriptor.c
@@ -64,18 +64,31 @@ int RUNTIME_desc_release( const MORSE_desc_t *desc )
     return MORSE_SUCCESS;
 }
 
-int RUNTIME_desc_getoncpu( const MORSE_desc_t *desc )
+void
+RUNTIME_desc_flush( const MORSE_desc_t     *desc,
+                    const MORSE_sequence_t *sequence )
 {
     (void)desc;
-    return MORSE_SUCCESS;
+    (void)sequence;
+    return;
 }
 
-int RUNTIME_desc_getoncpu_async( const MORSE_desc_t *desc,
-                                 MORSE_sequence_t   *sequence )
+
+void
+RUNTIME_flush( )
+{
+    return;
+}
+
+void
+RUNTIME_data_flush( const MORSE_sequence_t *sequence,
+                    const MORSE_desc_t *A, int Am, int An )
 {
-    (void)desc;
     (void)sequence;
-    return MORSE_SUCCESS;
+    (void)A;
+    (void)Am;
+    (void)An;
+    return;
 }
 
 void *RUNTIME_desc_getaddr( const MORSE_desc_t *desc, int m, int n )