diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a0a0318583a6d8bbcd2f37571c5611d402ce045e..6cd75ba0e3aba25be8cc0587e1331b1188da755d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ starpu-simgrid:
     - cd build
     - . $HOME/spack/share/spack/setup-env.sh
     - spack load hwloc && spack load fxt && spack load simgrid && spack load starpu
-    - cmake .. -DCHAMELEON_SIMULATION=ON -DCHAMELEON_USE_CUDA=ON -DCHAMELEON_USE_MAGMA=OFF -DCHAMELEON_USE_MPI=OFF
+    - cmake .. -DCHAMELEON_SIMULATION=ON -DCHAMELEON_USE_CUDA=ON -DCHAMELEON_USE_MPI=OFF
     - make -j2
     - ctest -V
 
diff --git a/CTestConfig.cmake b/CTestConfig.cmake
index c2999e9d741be336cb7cadbb6f7386851345c469..ddb6f3e0c1e6d7050496a35081ad4958f1b9c587 100644
--- a/CTestConfig.cmake
+++ b/CTestConfig.cmake
@@ -16,7 +16,7 @@ set(CTEST_DROP_SITE_CDASH TRUE)
 #--------------------------------------------------------------------
 # BUILDNAME variable construction
 # This variable will be used to set the build name which will appear
-# on the Morse-Magma dashboard http://cdash.inria.fr/CDash/
+# on the Chameleon dashboard http://cdash.inria.fr/CDash/
 #--------------------------------------------------------------------
 # Start with the short system name, e.g. "Linux", "FreeBSD" or "Windows"
 if(NOT BUILDNAME)
@@ -39,7 +39,7 @@ if(NOT BUILDNAME)
         set(BUILDNAME "${BUILDNAME}-${CMAKE_BUILD_TYPE}")
     endif(CMAKE_BUILD_TYPE)
 
-    # Specific options of Magma-Morse
+    # Specific options of Chameleon
     if(CHAMELEON_SCHED_QUARK)
         set(BUILDNAME "${BUILDNAME}-Quark")
     endif(CHAMELEON_SCHED_QUARK)
diff --git a/ChangeLog b/ChangeLog
index dcdeab28521c5860a56baf28363ff78ff7591ccd..f58b24a5b830349053cc0885cc8797b74372c21c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
-chameleon-???
+chameleon-1.0.0
 ------------------------------------------------------------------------
 
+- MAGMA kernels are no longer supported in Chameleon
 - Add SVD/EVD drivers based on parallel first stage, and sequential LAPACK second stage and solve
 - Add First stage algorithm fo r the SVD/EVD solvers
 - add timing drivers time_zpotrs_tile and time_zgeqrs_tile
diff --git a/INSTALL.txt b/INSTALL.txt
index 9470afb3ccb637bdbd7f873e39d610116cf23c5f..a35db9bbde9b180c45d907190711ad613288bfb8 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -5,18 +5,18 @@
 This is a brief discussion about CHAMELEON usage.
 For more information, please read the document users_guide.
 
-Compilation of CHAMELEON libraries and executables are done with CMake 
+Compilation of CHAMELEON libraries and executables are done with CMake
 (http://www.cmake.org/). This version has been tested with CMake 2.8.8.
 
-Usage: three steps are required to compile and install CHAMELEON 
+Usage: three steps are required to compile and install CHAMELEON
 
-1) configure : 
-> cmake path/to/chameleon -DOPTION1= -DOPTION2= ... 
+1) configure :
+> cmake path/to/chameleon -DOPTION1= -DOPTION2= ...
 see the "Options" section to get list of options
 see the "Dependencies detection" for details about libraries detection
 
-2) build : 
-> make 
+2) build :
+> make
 do not hesitate to use -j[ncores] option to speedup the compilation
 
 3) install (optional) :
@@ -37,7 +37,7 @@ lapack  : netlib, openblas, eigen or intel mkl
 lapacke : netlib, openblas or intel mkl
 tmg     : netlib, openblas or intel mkl
 
-runtime : quark (http://icl.cs.utk.edu/quark/) or 
+runtime : quark (http://icl.cs.utk.edu/quark/) or
           starpu (http://runtime.bordeaux.inria.fr/StarPU/)
 hwloc   : (http://www.open-mpi.org/projects/hwloc/)
 
@@ -46,7 +46,6 @@ optional libraries
 
 cuda   : (https://developer.nvidia.com/cuda-downloads)
 cublas : comes with cuda (http://docs.nvidia.com/cuda/cublas/)
-magma  : (http://icl.cs.utk.edu/magma/) (version 1.6.2 recommended)
 mpi    : openmpi (http://www.open-mpi.org/)
 FxT    : linux package (libfxt) or releases here http://download.savannah.gnu.org/releases/fkt/
 
@@ -59,19 +58,19 @@ Please look at the distrib/ directory which gives some hints for the installatio
 * Dependencies detection *
 -------------------------------------------
 
-You have different choices to detect dependencies on your system, either by 
-setting some environment variables containing paths to the libs and headers or 
+You have different choices to detect dependencies on your system, either by
+setting some environment variables containing paths to the libs and headers or
 by specifying them directly at cmake configure. Different cases :
 
-1) detection of dependencies through environment variables: 
+1) detection of dependencies through environment variables:
     - LD_LIBRARY_PATH should contain the list of paths where to find the libraries:
         * export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:install/path/to/your/lib
     - INCLUDE should contain the list of paths where to find the header files of libraries
         * export INCLUDE=$INCLUDE:install/path/to/your/headers
 
 2) detection with user's given paths:
-    - you can specify the path at cmake configure by invoking 
-      cmake path/to/your/CMakeLists.txt -DLIB_DIR=path/to/your/lib 
+    - you can specify the path at cmake configure by invoking
+      cmake path/to/your/CMakeLists.txt -DLIB_DIR=path/to/your/lib
       where LIB stands for the name of the lib to look for
         * example: cmake path/to/your/CMakeLists.txt -DSTARPU_DIR=path/to/starpudir \
                                                      -DCBLAS_DIR= ...
@@ -86,16 +85,15 @@ by specifying them directly at cmake configure. Different cases :
 * Options *
 -------------------------------------------
 
-You can optionally activate some options at cmake configure (like CUDA, MPI, ...) 
+You can optionally activate some options at cmake configure (like CUDA, MPI, ...)
 invoking cmake path/to/your/CMakeLists.txt -DOPTION1= -DOPTION2= ...
 example: cmake /home/toto/chameleon/ -DCMAKE_BUILD_TYPE=Debug \
                                       -DCMAKE_INSTALL_PREFIX=/home/toto/install/ \
-                                      -DCHAMELEON_USE_CUDA=ON \ 
-                                      -DCHAMELEON_USE_MAGMA=ON \
+                                      -DCHAMELEON_USE_CUDA=ON \
                                       -DCHAMELEON_USE_MPI=ON \
-                                      -DBLA_VENDOR=Intel10_64lp \ 
+                                      -DBLA_VENDOR=Intel10_64lp \
                                       -DSTARPU_DIR=/home/toto/install/starpu-1.1/build/include/starpu/1.1/ \
-                                      -DCHAMELEON_ENABLE_TRACING=ON 
+                                      -DCHAMELEON_ENABLE_TRACING=ON
 
 You can get the full list of options with -L[A][H] options of cmake command
 example: cmake -LH /home/toto/chameleon/
@@ -109,7 +107,7 @@ Some options (non-exhaustive list) :
 Basic CMake:
 ------------
 CMAKE_BUILD_TYPE=Debug|Release
-CMAKE_INSTALL_PREFIX=path/to/your/install/dir (where headers and libraries will be copied 
+CMAKE_INSTALL_PREFIX=path/to/your/install/dir (where headers and libraries will be copied
                                                when invoking make install)
 
 Related to specific modules (find_package):
@@ -120,44 +118,43 @@ STARPU_DIR=...
 STARPU_INCDIR=...
 STARPU_LIBDIR=...
 # same idea can be used for some packages, replace STARPU by one of these:
-BLAS - CBLAS - FXT - HWLOC - LAPACK - LAPACKE - MAGMA - QUARK - TMG
+BLAS - CBLAS - FXT - HWLOC - LAPACK - LAPACKE - QUARK - TMG
 
 CHAMELEON specific:
 --------------------
 CHAMELEON_USE_MPI=ON|OFF (default OFF)
-CHAMELEON_USE_CUDA=ON|OFF (default OFF) 
-CHAMELEON_USE_MAGMA=ON|OFF (default OFF)
+CHAMELEON_USE_CUDA=ON|OFF (default OFF)
 CHAMELEON_ENABLE_TRACING=ON|OFF (default OFF)
 CHAMELEON_SCHED_STARPU=ON|OFF (default ON)
 CHAMELEON_SCHED_QUARK=ON|OFF (default OFF)
 CHAMELEON_SIMULATION=ON|OFF (default OFF)
 
 Libraries detected with an official cmake module (see module files in CMAKE_ROOT/Modules/):
-CUDA - MPI - Threads 
+CUDA - MPI - Threads
 
 Libraries detected with our cmake modules (see module files in cmake_modules/morse/find/ directory of CHAMELEON sources):
-BLAS - CBLAS - FXT - HWLOC - LAPACK - LAPACKE - MAGMA - QUARK - STARPU - TMG 
+BLAS - CBLAS - FXT - HWLOC - LAPACK - LAPACKE - QUARK - STARPU - TMG
 
 
 -------------------------------------------
 * Use FxT profiling through StarPU *
 -------------------------------------------
 
-StarPU can generate its own trace log files by compiling it with the --with-fxt 
-option at the configure step (you can have to specify the directory where you 
-installed FxT by giving --with-fxt=... instead of --with-fxt alone). 
-By doing so, traces are generated after each execution of a program which uses 
+StarPU can generate its own trace log files by compiling it with the --with-fxt
+option at the configure step (you can have to specify the directory where you
+installed FxT by giving --with-fxt=... instead of --with-fxt alone).
+By doing so, traces are generated after each execution of a program which uses
 StarPU in the directory pointed by the STARPU_FXT_PREFIX environment variable.
 example: export STARPU_FXT_PREFIX=/home/toto/fxt_files/
 
-When executing a ./timing/... CHAMELEON program, if it has been enabled 
-(StarPU compiled with FxT and -DCHAMELEON_ENABLE_TRACING=ON), you can give the option --trace 
+When executing a ./timing/... CHAMELEON program, if it has been enabled
+(StarPU compiled with FxT and -DCHAMELEON_ENABLE_TRACING=ON), you can give the option --trace
 to tell the program to generate trace log files.
 
-Finally, to generate the trace file which can be opened with Vite program 
-(http://vite.gforge.inria.fr/), you have to use the starpu_fxt_tool tool of StarPU. 
-This tool should be in $STARPU_INSTALL_REPOSITORY/bin. 
-You can use it to generate the trace file like this: 
+Finally, to generate the trace file which can be opened with Vite program
+(http://vite.gforge.inria.fr/), you have to use the starpu_fxt_tool tool of StarPU.
+This tool should be in $STARPU_INSTALL_REPOSITORY/bin.
+You can use it to generate the trace file like this:
 > path/to/your/install/starpu/bin/starpu_fxt_tool -i prof_filename
 There is one file per mpi processus (prof_filename_0, prof_filename_1 ...).
 To generate a trace of mpi programs you can call it like this:
diff --git a/cmake_modules/GenPkgConfig.cmake b/cmake_modules/GenPkgConfig.cmake
index 16749d22039efaea07f120678cacf60a151b0dfe..44b431e1454cbe86285dce51eed25c7b950b3c0b 100644
--- a/cmake_modules/GenPkgConfig.cmake
+++ b/cmake_modules/GenPkgConfig.cmake
@@ -16,7 +16,7 @@
 #     Univ. of Tennessee,
 #     King Abdullah Univesity of Science and Technology
 #     Univ. of California Berkeley,
-#     Univ. of Colorado Denver. 
+#     Univ. of Colorado Denver.
 #
 #  @version 0.9.1
 #  @author Cedric Castagnede
@@ -57,7 +57,7 @@ ENDMACRO(CONVERT_LIBSTYLE_TO_PKGCONFIG)
 ###
 #
 # CLEAN_LIB_LIST: clean libraries lists to follow the pkg-config style
-#                 used in GENERATE_PKGCONFIG_FILE 
+#                 used in GENERATE_PKGCONFIG_FILE
 #
 ###
 MACRO(CLEAN_LIB_LIST _package)
@@ -96,7 +96,7 @@ MACRO(GENERATE_PKGCONFIG_FILE)
     set(CHAMELEON_PKGCONFIG_REQUIRED "")
     set(COREBLAS_PKGCONFIG_REQUIRED  "")
     set(CUDABLAS_PKGCONFIG_REQUIRED  "")
-    
+
     # A list of private packages required by this package but not exposed to
     # applications
     set(CHAMELEON_PKGCONFIG_REQUIRED_PRIVATE "")
@@ -127,12 +127,6 @@ MACRO(GENERATE_PKGCONFIG_FILE)
         list(APPEND CHAMELEON_PKGCONFIG_REQUIRED "coreblas")
 
         if(CHAMELEON_USE_CUDA)
-            if(CHAMELEON_USE_MAGMA)
-                list(APPEND CUDABLAS_PKGCONFIG_REQUIRED_PRIVATE  magma)
-                list(APPEND CHAMELEON_PKGCONFIG_REQUIRED_PRIVATE magma)
-            else()
-                
-            endif()
             list(APPEND CUDABLAS_PKGCONFIG_LIBS_PRIVATE ${CUDA_LIBRARIES})
             list(APPEND CHAMELEON_PKGCONFIG_REQUIRED "cudablas")
         endif()
@@ -142,7 +136,7 @@ MACRO(GENERATE_PKGCONFIG_FILE)
         if(CHAMELEON_USE_CUDA)
             list(APPEND CHAMELEON_PKGCONFIG_LIBS -lcudablas)
         endif()
-        list(APPEND CHAMELEON_PKGCONFIG_LIBS 
+        list(APPEND CHAMELEON_PKGCONFIG_LIBS
         -lcoreblas
         ${EXTRA_LIBRARIES}
         )
@@ -158,7 +152,7 @@ MACRO(GENERATE_PKGCONFIG_FILE)
     if(CHAMELEON_USE_CUDA)
         CLEAN_LIB_LIST(CUDABLAS)
     endif()
-    
+
     # Create .pc file
     # ---------------
     SET(_output_chameleon_file "${CMAKE_BINARY_DIR}/chameleon.pc")
diff --git a/cmake_modules/PrintOpts.cmake b/cmake_modules/PrintOpts.cmake
index 1e7c9208c91a7357422e152821c86ef20f8d6d2b..f21bce9af93d87884c32e816234189d28dbda16b 100644
--- a/cmake_modules/PrintOpts.cmake
+++ b/cmake_modules/PrintOpts.cmake
@@ -16,7 +16,7 @@
 #     Univ. of Tennessee,
 #     King Abdullah Univesity of Science and Technology
 #     Univ. of California Berkeley,
-#     Univ. of Colorado Denver. 
+#     Univ. of Colorado Denver.
 #
 #  @version 0.9.0
 #  @author Florent Pruvost
@@ -53,7 +53,6 @@ set(dep_message "${dep_message}"
 "       Kernels specific\n"
 "       BLAS ................: ${BLAS_VENDOR_FOUND}\n"
 "       LAPACK...............: ${LAPACK_VENDOR_FOUND}\n"
-"       MAGMA ...............: ${CHAMELEON_USE_MAGMA}\n"
 "\n"
 "       Trace ...............: ${CHAMELEON_ENABLE_TRACING}\n"
 "       Simulation mode .....: ${CHAMELEON_SIMULATION}\n"
diff --git a/cmake_modules/morse_cmake b/cmake_modules/morse_cmake
index 00aae15be5fd9d9662c9d4bf35453cafe9d66f81..0a974775b7192227b887dcba77515305083c1f13 160000
--- a/cmake_modules/morse_cmake
+++ b/cmake_modules/morse_cmake
@@ -1 +1 @@
-Subproject commit 00aae15be5fd9d9662c9d4bf35453cafe9d66f81
+Subproject commit 0a974775b7192227b887dcba77515305083c1f13
diff --git a/docs/texinfo/chapters/configuration.texi b/docs/texinfo/chapters/configuration.texi
index 883e82f38e672448996adf010735b3739dc440eb..92aec0af675cd1e3faf2736986293c155fc56d11 100644
--- a/docs/texinfo/chapters/configuration.texi
+++ b/docs/texinfo/chapters/configuration.texi
@@ -57,7 +57,6 @@ Example of configuration using the command line
 cmake ~/chameleon/ -DCMAKE_BUILD_TYPE=Debug          \
                    -DCMAKE_INSTALL_PREFIX=~/install  \
                    -DCHAMELEON_USE_CUDA=ON           \
-                   -DCHAMELEON_USE_MAGMA=ON          \
                    -DCHAMELEON_USE_MPI=ON            \
                    -DBLA_VENDOR=Intel10_64lp         \
                    -DSTARPU_DIR=~/install/starpu-1.1 \
@@ -120,9 +119,6 @@ to link with QUARK library (runtime system)
 to link with CUDA runtime (implementation paradigm for accelerated codes on
 GPUs) and cuBLAS library (optimized BLAS kernels on GPUs), can only be used with
 StarPU
-@item @option{-DCHAMELEON_USE_MAGMA}=@option{trigger} (default: @code{OFF})
-to link with MAGMA library (kernels on GPUs, higher level than cuBLAS), can only
-be used with StarPU
 
 @item @option{-DCHAMELEON_USE_MPI}=@option{trigger} (default: @code{OFF})
 to link with MPI library (message passing implementation for use of multiple
@@ -200,7 +196,7 @@ directory of the LIBNAME library headers installation
 directory of the LIBNAME libraries (.so, .a, .dylib, etc) installation
 @end table
 LIBNAME can be one of the following: BLAS - CBLAS - FXT - HWLOC -
-LAPACK - LAPACKE - MAGMA - QUARK - STARPU - TMG.
+LAPACK - LAPACKE - QUARK - STARPU - TMG.
 See paragraph about @ref{Dependencies detection} for details.
 
 Libraries detected with an official CMake module (see module files in
@@ -220,7 +216,6 @@ Libraries detected with CHAMELEON cmake modules (see module files in
 @item HWLOC
 @item LAPACK
 @item LAPACKE
-@item MAGMA
 @item QUARK
 @item STARPU
 @item TMG
@@ -343,9 +338,6 @@ precision) on mirage machine are available for now.
 Database of models is subject to change, it should be enrich in a near future.
 @end itemize
 
-One can additionally decide to enable the magma kernels by setting the cmake
-option @option{-DCHAMELEON_SIMULATION_MAGMA=ON} .
-
 @node Use out of core support with StarPU
 @section Use out of core support with StarPU
 
diff --git a/docs/texinfo/chapters/installing.texi b/docs/texinfo/chapters/installing.texi
index fec50baab727989d058965e42c973823436c69e8..edde68e8d3ab181a9e3f737f15c3def389a37b10 100644
--- a/docs/texinfo/chapters/installing.texi
+++ b/docs/texinfo/chapters/installing.texi
@@ -194,7 +194,6 @@ It is a standard component of any such system.
 @menu
 * OpenMPI::
 * Nvidia CUDA Toolkit::
-* MAGMA::
 * FxT::
 @end menu
 
@@ -231,27 +230,7 @@ enabled.
 
 @strong{Caution about the compatibility:} CHAMELEON has been mainly tested with
 CUDA releases from versions 4 to 7.5.
-Your compiler and MAGMA library must be compatible with CUDA.
-
-@node MAGMA
-@subsubsection MAGMA
-
-@uref{http://icl.cs.utk.edu/magma/, MAGMA} project aims to develop a dense
-linear algebra library similar to LAPACK but for heterogeneous/hybrid
-architectures, starting with current "Multicore+GPU" systems.
-CHAMELEON can use a set of high level MAGMA routines to accelerate
-computations on GPUs.
-To fully benefit from GPUs, the user should enable MAGMA in addition to
-CUDA/cuBLAS.
-
-@strong{Caution about the compatibility:} CHAMELEON has been mainly tested with
-MAGMA releases from versions 1.4 to 1.6.
-MAGMA library must be compatible with CUDA.
-MAGMA library should be built with sequential versions of BLAS/LAPACK.
-We should not get some MAGMA link flags embarking multithreaded
-BLAS/LAPACK because it could affect performances (take care about the
-MAGMA link flag @option{-lmkl_intel_thread} for example that we could inheritate
-from the pkg-config file @file{magma.pc}).
+Your compiler must be compatible with CUDA.
 
 @node FxT
 @subsubsection FxT
diff --git a/docs/texinfo/chapters/introduction.texi b/docs/texinfo/chapters/introduction.texi
index 695d252cdedd97883d5f183c3bf74d9a57e92aa8..b94921f37cc78db466d9e7e40806d004f5b9e7c9 100644
--- a/docs/texinfo/chapters/introduction.texi
+++ b/docs/texinfo/chapters/introduction.texi
@@ -181,11 +181,11 @@ task-based algorithms behave regarding different runtime systems
 implementations.
 Using CHAMELEON with @uref{http://runtime.bordeaux.inria.fr/StarPU/,
 StarPU} runtime system allows to exploit GPUs through
-kernels provided by @uref{https://developer.nvidia.com/cublas, cuBLAS} and
-@uref{http://icl.cs.utk.edu/magma/, MAGMA} and clusters of interconnected
-nodes with distributed memory (using @uref{http://www.open-mpi.org/, MPI}).
-Computation of very large systems with dense matrices on a cluster of nodes is
-still being experimented and stabilized.
+kernels provided by @uref{https://developer.nvidia.com/cublas, cuBLAS}
+and clusters of interconnected nodes with distributed memory (using
+@uref{http://www.open-mpi.org/, MPI}).  Computation of very large
+systems with dense matrices on a cluster of nodes is still being
+experimented and stabilized.
 It is not expected to get stable performances with the current version using
 MPI.
 
diff --git a/example/basic_zposv/CMakeLists.txt b/example/basic_zposv/CMakeLists.txt
index 89208ee18e6d85b2c7602f8c8b796905f0dcc479..555e7f72e27859f786328dc2a1f81cf030b5c11d 100644
--- a/example/basic_zposv/CMakeLists.txt
+++ b/example/basic_zposv/CMakeLists.txt
@@ -68,16 +68,13 @@ endif()
 
 if(NOT CHAMELEON_SIMULATION)
 
-    if(CHAMELEON_USE_CUDA OR CHAMELEON_USE_MAGMA)
+    if(CHAMELEON_USE_CUDA)
         list(APPEND libs_for_examples
         cudablas)
     endif()
     if(CHAMELEON_USE_CUDA)
         link_directories(${CUDA_LIBRARY_DIRS})
     endif()
-    if(CHAMELEON_USE_MAGMA)
-        link_directories(${MAGMA_LIBRARY_DIRS})
-    endif()
 
     list(APPEND libs_for_examples
          coreblas
diff --git a/example/lapack_to_morse/CMakeLists.txt b/example/lapack_to_morse/CMakeLists.txt
index 00ad921835813900f02c4240234d6afb25da6117..c627c5eea1e59ef8294fa973fe146b7a2cbc9669 100644
--- a/example/lapack_to_morse/CMakeLists.txt
+++ b/example/lapack_to_morse/CMakeLists.txt
@@ -25,7 +25,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 # compilation for other sources step1 and >
-set(LTM_SOURCES 
+set(LTM_SOURCES
     step1.c
     step2.c
     step3.c
@@ -63,22 +63,19 @@ elseif(CHAMELEON_SCHED_QUARK)
 endif()
 
 
-# specific compilation for step0 because we potentially want to use 
+# specific compilation for step0 because we potentially want to use
 # multithreaded BLAS and LAPACK libraries for this step
 unset(libs_for_step0)
 
 if(NOT CHAMELEON_SIMULATION)
 
-    if(CHAMELEON_USE_CUDA OR CHAMELEON_USE_MAGMA)
+    if(CHAMELEON_USE_CUDA)
         list(APPEND libs_for_ltm
         cudablas)
     endif()
     if(CHAMELEON_USE_CUDA)
         link_directories(${CUDA_LIBRARY_DIRS})
     endif()
-    if(CHAMELEON_USE_MAGMA)
-        link_directories(${MAGMA_LIBRARY_DIRS})
-    endif()
 
     list(APPEND libs_for_step0 ${libs_for_ltm})
 
@@ -104,7 +101,7 @@ if(NOT CHAMELEON_SIMULATION)
         list(APPEND libs_for_step0
              coreblas
              ${LAPACKE_LIBRARIES}
-             ${CBLAS_LIBRARIES} 
+             ${CBLAS_LIBRARIES}
              ${LAPACK_PAR_LIBRARIES}
              ${BLAS_PAR_LIBRARIES}
              ${HWLOC_LIBRARIES}
diff --git a/example/lapack_to_morse/step1.c b/example/lapack_to_morse/step1.c
index cb87ad8ea0e98b7e0e25c6618e3eb09609ddc9d0..7af0347280792a7226ffe2de9ad2774112123e74 100644
--- a/example/lapack_to_morse/step1.c
+++ b/example/lapack_to_morse/step1.c
@@ -40,7 +40,7 @@
  * MORSE_Set to give some specific parameters.
  * This code allows you to expoit parallelism coming from all the cores of your
  * computer and from gpus if you have properly linked with pthread and CUDA
- * ( + CUBLAS and MAGMA optionnaly ).
+ * ( + CUBLAS optionnaly ).
  * The precision is: double
  */
 int main(int argc, char *argv[]) {
diff --git a/example/link_chameleon/CMakeLists.txt b/example/link_chameleon/CMakeLists.txt
index fbaab584516a9544f10bde89bc0d9ab88f64b960..e13eab1a9e4a85ad5aa099fd8eb13809fc8943cb 100644
--- a/example/link_chameleon/CMakeLists.txt
+++ b/example/link_chameleon/CMakeLists.txt
@@ -27,7 +27,7 @@ if (MORSE_DISTRIB_DIR)
     if (MORSE_CHAMELEON_USE_QUARK)
         find_package(CHAMELEON COMPONENTS QUARK)
     else()
-        find_package(CHAMELEON COMPONENTS STARPU MPI CUDA MAGMA FXT)
+        find_package(CHAMELEON COMPONENTS STARPU MPI CUDA FXT)
     endif()
     if (CHAMELEON_FOUND)
         link_directories(${CHAMELEON_LIBRARY_DIRS_DEP})
diff --git a/example/link_chameleon/link_chameleon.c b/example/link_chameleon/link_chameleon.c
index b38b12d501abf720d6073a284947c3bec23da801..b63b45e327f14fa0cc3ffdc8adc5dee8e135e954 100644
--- a/example/link_chameleon/link_chameleon.c
+++ b/example/link_chameleon/link_chameleon.c
@@ -164,7 +164,7 @@ static void read_args(int argc, char *argv[], int *iparam){
  * Print a header message to summarize main parameters
  */
 static void print_header(char *prog_name, int * iparam) {
-#if defined(MAGMAMORSE_SIMULATION)
+#if defined(CHAMELEON_SIMULATION)
     double    eps = 0.;
 #else
     double    eps = LAPACKE_dlamch_work( 'e' );
@@ -208,7 +208,7 @@ static void print_header(char *prog_name, int * iparam) {
     }
 
 /*
- * test external application link with magmamorse
+ * test external application link with chameleon
  */
 int main(int argc, char *argv[]) {
 
diff --git a/example/out_of_core/CMakeLists.txt b/example/out_of_core/CMakeLists.txt
index 14aec88478b51dd70c1d072e57b6e7fa2a3cd76c..01bb2704125c0a655626d31dde07a5d7e66edffe 100644
--- a/example/out_of_core/CMakeLists.txt
+++ b/example/out_of_core/CMakeLists.txt
@@ -42,16 +42,13 @@ link_directories(${STARPU_LIBRARY_DIRS})
 
 if(NOT CHAMELEON_SIMULATION)
 
-    if(CHAMELEON_USE_CUDA OR CHAMELEON_USE_MAGMA)
+    if(CHAMELEON_USE_CUDA)
         list(APPEND libs_for_ooc
         cudablas)
     endif()
     if(CHAMELEON_USE_CUDA)
         link_directories(${CUDA_LIBRARY_DIRS})
     endif()
-    if(CHAMELEON_USE_MAGMA)
-        link_directories(${MAGMA_LIBRARY_DIRS})
-    endif()
 
     list(APPEND libs_for_ooc
          coreblas
diff --git a/include/chameleon_config.h.in b/include/chameleon_config.h.in
index 065558af0fff44f708f4534f535ccce782506d38..83350ba3a9532ab721de01357d3bddb647e13abc 100644
--- a/include/chameleon_config.h.in
+++ b/include/chameleon_config.h.in
@@ -41,7 +41,6 @@
 #cmakedefine CHAMELEON_USE_CUDA
 #cmakedefine CHAMELEON_USE_CUBLAS
 #cmakedefine CHAMELEON_USE_CUBLAS_V2
-#cmakedefine CHAMELEON_USE_MAGMA
 
 /* Simulating */
 #cmakedefine CHAMELEON_SIMULATION
diff --git a/include/morse_fortran.h b/include/morse_fortran.h
index 5cf58ae11509daf183e860396b822ed8b6eb2217..813a31b011577249061b2e5262672c332765a027 100644
--- a/include/morse_fortran.h
+++ b/include/morse_fortran.h
@@ -6,19 +6,19 @@
 ! This software is a computer program whose purpose is to process
 ! Matrices Over Runtime Systems @ Exascale (MORSE). More information
 ! can be found on the following website: http://www.inria.fr/en/teams/morse.
-! 
+!
 ! This software is governed by the CeCILL-B license under French law and
-! abiding by the rules of distribution of free software.  You can  use, 
+! abiding by the rules of distribution of free software.  You can  use,
 ! modify and/ or redistribute the software under the terms of the CeCILL-B
 ! license as circulated by CEA, CNRS and INRIA at the following URL
-! "http://www.cecill.info". 
-! 
+! "http://www.cecill.info".
+!
 ! As a counterpart to the access to the source code and  rights to copy,
 ! modify and redistribute granted by the license, users are provided only
 ! with a limited warranty  and the software's author,  the holder of the
 ! economic rights,  and the successive licensors  have only  limited
-! liability. 
-! 
+! liability.
+!
 ! In this respect, the user's attention is drawn to the risks associated
 ! with loading,  using,  modifying and/or developing or reproducing the
 ! software by the user in light of its specific status of free software,
@@ -26,10 +26,10 @@
 ! therefore means  that it is reserved for developers  and  experienced
 ! professionals having in-depth computer knowledge. Users are therefore
 ! encouraged to load and test the software's suitability as regards their
-! requirements in conditions enabling the security of their systems and/or 
-! data to be ensured and,  more generally, to use and operate it in the 
-! same conditions as regards security. 
-! 
+! requirements in conditions enabling the security of their systems and/or
+! data to be ensured and,  more generally, to use and operate it in the
+! same conditions as regards security.
+!
 ! The fact that you are presently reading this means that you have had
 ! knowledge of the CeCILL-B license and that you accept its terms.
 !
@@ -123,14 +123,14 @@
       parameter ( MorseNonsymPosv  = 243 )
       parameter ( MorseSymPosv     = 244 )
 
-      integer MorseNoPacking     
-      integer MorsePackSubdiag   
-      integer MorsePackSupdiag   
-      integer MorsePackColumn    
-      integer MorsePackLowerBand 
-      integer MorsePackRow       
-      integer MorsePackUpeprBand 
-      integer MorsePackAll       
+      integer MorseNoPacking
+      integer MorsePackSubdiag
+      integer MorsePackSupdiag
+      integer MorsePackColumn
+      integer MorsePackLowerBand
+      integer MorsePackRow
+      integer MorsePackUpeprBand
+      integer MorsePackAll
       parameter ( MorseNoPacking     = 291 )
       parameter ( MorsePackSubdiag   = 292 )
       parameter ( MorsePackSupdiag   = 293 )
@@ -239,4 +239,3 @@
       parameter ( PRIORITY = 16 )
       parameter ( CALLBACK = 17 )
       parameter ( REDUX    = 18 )
-
diff --git a/include/morse_kernels.h b/include/morse_kernels.h
index 2d29233992f8ea1e80d7f262caf5b89437f1f5a9..d043eba37bdf729988a8dccb5434c2e2552e248f 100644
--- a/include/morse_kernels.h
+++ b/include/morse_kernels.h
@@ -12,8 +12,8 @@
  *
  *  @file morse_kernels.h
  *
- *  MAGMA codelets kernel
- *  MAGMA is a software package provided by Univ. of Tennessee,
+ *  MORSE codelets kernel
+ *  MORSE is a software package provided by Univ. of Tennessee,
  *  Univ. of California Berkeley and Univ. of Colorado Denver,
  *  and INRIA Bordeaux Sud-Ouest
  *
diff --git a/include/morse_struct.h b/include/morse_struct.h
index 2aacefcdf501d36326ba63fbc2081400fae2af65..a87b8ca47c7f4716666ba6164450c1fe5416f415 100644
--- a/include/morse_struct.h
+++ b/include/morse_struct.h
@@ -161,7 +161,7 @@ typedef struct morse_request_s {
  *  sharing common exception handling.
  **/
 typedef struct morse_sequence_s {
-    MORSE_bool       status;    /* MAGMA_SUCCESS or appropriate error code */
+    MORSE_bool       status;    /* MORSE_SUCCESS or appropriate error code */
     MORSE_request_t *request;   /* failed request                          */
     void            *schedopt;
 } MORSE_sequence_t;
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
index a095b33b38da178dcab0ba38304ce5f919ecffcf..0bd42f7ce230e7afe08e49f33f6e4b94ff32ef9d 100644
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -124,17 +124,13 @@ endif()
 
 if(NOT CHAMELEON_SIMULATION)
 
-    if(CHAMELEON_USE_CUDA OR CHAMELEON_USE_MAGMA)
+    if(CHAMELEON_USE_CUDA)
         list(APPEND libs_for_tests
-        cudablas
-        )
+        cudablas)
     endif()
     if(CHAMELEON_USE_CUDA)
         link_directories(${CUDA_LIBRARY_DIRS})
     endif()
-    if(CHAMELEON_USE_MAGMA)
-        link_directories(${MAGMA_LIBRARY_DIRS})
-    endif()
 
     list(APPEND libs_for_tests
     coreblas
diff --git a/testing/lin/CMakeLists.txt b/testing/lin/CMakeLists.txt
index da3f049c41fbed9c7edb5fa6f27ac04ce0629461..290647bb4df6a729e77894b0c9e396bb4d86c418 100644
--- a/testing/lin/CMakeLists.txt
+++ b/testing/lin/CMakeLists.txt
@@ -153,7 +153,7 @@ elseif(MORSE_SCHED_QUARK)
     list(APPEND libs_for_tests coreblas)
 endif()
 
-foreach(_dep MAGMA LAPACKE LAPACK CBLAS BLAS CUDA HWLOC MPI DL)
+foreach(_dep LAPACKE LAPACK CBLAS BLAS CUDA HWLOC MPI DL)
     if(HAVE_${_dep})
         list(APPEND libs_for_tests ${${_dep}_LIBRARY})
     endif()
diff --git a/timing/CMakeLists.txt b/timing/CMakeLists.txt
index d30584ac43575b725abc8d244c92385a3d77bc17..61334fa4209b3e44a91e7381968027af4fe67b1e 100644
--- a/timing/CMakeLists.txt
+++ b/timing/CMakeLists.txt
@@ -222,17 +222,13 @@ endif()
 
 if(NOT CHAMELEON_SIMULATION)
 
-    if(CHAMELEON_USE_CUDA OR CHAMELEON_USE_MAGMA)
+    if(CHAMELEON_USE_CUDA)
         list(APPEND libs_for_timings
-        cudablas
-        )
+        cudablas)
     endif()
     if(CHAMELEON_USE_CUDA)
         link_directories(${CUDA_LIBRARY_DIRS})
     endif()
-    if(CHAMELEON_USE_MAGMA)
-        link_directories(${MAGMA_LIBRARY_DIRS})
-    endif()
 
     list(APPEND libs_for_timings
     coreblas
diff --git a/timing/time_zgetrf_incpiv_tile.c b/timing/time_zgetrf_incpiv_tile.c
index 907f53ac3423f1fbce55a4966274d5da2e3e733d..a0a20509a40e50a32e48b5c45bc2c42225253d62 100644
--- a/timing/time_zgetrf_incpiv_tile.c
+++ b/timing/time_zgetrf_incpiv_tile.c
@@ -36,13 +36,6 @@ RunTest(int *iparam, double *dparam, morse_time_t *t_)
         check = 0;
     }
 
-#if defined(CHAMELEON_USE_MAGMA)
-    if ( iparam[IPARAM_NB]%iparam[IPARAM_IB] != 0 ) {
-        fprintf(stderr, "NB must be a multiple of IB for LU on GPU\n");
-        exit(-1);
-    }
-#endif
-
     /* Allocate Data */
     PASTE_CODE_ALLOCATE_MATRIX_TILE( descA, 1, MORSE_Complex64_t, MorseComplexDouble, LDA, M, N );
     PASTE_CODE_ALLOCATE_MATRIX_TILE( descX,  check, MORSE_Complex64_t, MorseComplexDouble, LDB, M, NRHS );
diff --git a/timing/time_zgetrs_incpiv_tile.c b/timing/time_zgetrs_incpiv_tile.c
index 3ba081e9cdbd64632b5a7d2c39e1cf61a9529e54..29b9c41b2ec4bbc83896f124d2c70785601a84c8 100644
--- a/timing/time_zgetrs_incpiv_tile.c
+++ b/timing/time_zgetrs_incpiv_tile.c
@@ -37,13 +37,6 @@ RunTest(int *iparam, double *dparam, morse_time_t *t_)
         check = 0;
     }
 
-#if defined(CHAMELEON_USE_MAGMA)
-    if ( iparam[IPARAM_NB]%iparam[IPARAM_IB] != 0 ) {
-        fprintf(stderr, "NB must be a multiple of IB for LU on GPU\n");
-        exit(-1);
-    }
-#endif
-
     /* Allocate Data */
     PASTE_CODE_ALLOCATE_MATRIX_TILE( descA, 1, MORSE_Complex64_t, MorseComplexDouble, LDA, M, N );
     PASTE_CODE_ALLOCATE_MATRIX_TILE( descX,  check, MORSE_Complex64_t, MorseComplexDouble, LDB, M, NRHS );