diff --git a/packages/implicit.cmake b/packages/implicit.cmake
index 93659c77e..159e1476e 100644
--- a/packages/implicit.cmake
+++ b/packages/implicit.cmake
@@ -1,72 +1,70 @@
 #===============================================================================
 # @file   implicit.cmake
 #
 # @author Nicolas Richart <nicolas.richart@epfl.ch>
 #
 # @date creation: Tue Oct 16 2012
 # @date last modification: Fri Aug 21 2015
 #
 # @brief  package description for the implicit solver
 #
 # @section LICENSE
 #
 # Copyright (©)  2010-2012, 2014,  2015 EPFL  (Ecole Polytechnique  Fédérale de
 # Lausanne)  Laboratory (LSMS  -  Laboratoire de  Simulation  en Mécanique  des
 # Solides)
 #
 # Akantu is free  software: you can redistribute it and/or  modify it under the
 # terms  of the  GNU Lesser  General Public  License as  published by  the Free
 # Software Foundation, either version 3 of the License, or (at your option) any
 # later version.
 #
 # Akantu is  distributed in the  hope that it  will be useful, but  WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A  PARTICULAR PURPOSE. See  the GNU  Lesser General  Public License  for more
 # details.
 #
 # You should  have received  a copy  of the GNU  Lesser General  Public License
 # along with Akantu. If not, see <http://www.gnu.org/licenses/>.
 #
 #===============================================================================
-
 package_declare(implicit META
   DESCRIPTION "Add support for implicit time scheme")
 
-
 package_declare_sources(implicit
   model/non_linear_solver_linear.cc
   model/non_linear_solver_linear.hh
   model/non_linear_solver_newton_raphson.cc
   model/non_linear_solver_newton_raphson.hh
   )
 
 set(AKANTU_IMPLICIT_SOLVER "Mumps"
   CACHE STRING "Solver activated in Akantu")
 set_property(CACHE AKANTU_IMPLICIT_SOLVER PROPERTY STRINGS
   Mumps
-  PETSc
-  Mumps+PETSc
+  #PETSc
+  #Mumps+PETSc
   )
 
 if(AKANTU_IMPLICIT_SOLVER MATCHES "Mumps")
   package_add_dependencies(implicit PRIVATE Mumps)
 else()
   package_remove_dependencies(implicit Mumps)
 endif()
 
 if(AKANTU_IMPLICIT_SOLVER MATCHES "PETSc")
   package_add_dependencies(implicit
     PRIVATE PETSc)
 else()
   package_remove_dependency(implicit PETSc)
 endif()
 
 package_declare_documentation(implicit
   "This package activates the sparse solver necessary to solve implicitely static/dynamic"
   "finite element problems."
   "It depends on:"
   "\\begin{itemize}"
   "  \\item \\href{http://mumps.enseeiht.fr/}{MUMPS}, a parallel sparse direct solver."
   "  \\item \\href{http://www.labri.fr/perso/pelegrin/scotch/}{Scotch}, a graph partitioner."
   "\\end{itemize}"
   )
diff --git a/packages/petsc.cmake b/packages/petsc.cmake
index aea47c2cf..6224175f2 100644
--- a/packages/petsc.cmake
+++ b/packages/petsc.cmake
@@ -1,68 +1,67 @@
 #===============================================================================
 # @file   petsc.cmake
 #
 # @author Alejandro M. Aragón <alejandro.aragon@epfl.ch>
 # @author Aurelia Isabel Cuba Ramos <aurelia.cubaramos@epfl.ch>
 # @author Nicolas Richart <nicolas.richart@epfl.ch>
 #
 # @date creation: Mon Nov 21 2011
 # @date last modification: Tue Jan 19 2016
 #
 # @brief  package description for PETSc support
 #
 # @section LICENSE
 #
 # Copyright (©)  2010-2012, 2014,  2015 EPFL  (Ecole Polytechnique  Fédérale de
 # Lausanne)  Laboratory (LSMS  -  Laboratoire de  Simulation  en Mécanique  des
 # Solides)
 #
 # Akantu is free  software: you can redistribute it and/or  modify it under the
 # terms  of the  GNU Lesser  General Public  License as  published by  the Free
 # Software Foundation, either version 3 of the License, or (at your option) any
 # later version.
 #
 # Akantu is  distributed in the  hope that it  will be useful, but  WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A  PARTICULAR PURPOSE. See  the GNU  Lesser General  Public License  for more
 # details.
 #
 # You should  have received  a copy  of the GNU  Lesser General  Public License
 # along with Akantu. If not, see <http://www.gnu.org/licenses/>.
 #
 #===============================================================================
-
 package_declare(PETSc EXTERNAL
   DESCRIPTION "Add PETSc support in akantu"
   EXTRA_PACKAGE_OPTIONS ARGS COMPONENTS C
   DEPENDS parallel)
 
 package_declare_sources(petsc
   model/dof_manager_petsc.hh
   model/dof_manager_petsc.cc
   solver/sparse_matrix_petsc.hh
   solver/sparse_matrix_petsc.cc
   solver/solver_petsc.hh
   solver/solver_petsc.cc
   solver/petsc_wrapper.hh
   )
 
 package_declare_extra_files_to_package(PETSc
   PROJECT
     cmake/Modules/FindPETSc.cmake
     cmake/Modules/FindPackageMultipass.cmake
     cmake/Modules/ResolveCompilerPaths.cmake
     cmake/Modules/CorrectWindowsPaths.cmake
   )
 
 package_declare_documentation(PETSc
   "This package enables PETSc as a solver in Akantu"
   ""
   "Under Ubuntu (14.04 LTS) the installation can be performed using the commands:"
   "\\begin{command}"
   "  > sudo apt-get install libpetsc3.4.2-dev"
   "\\end{command}"
   ""
 )
 
 package_set_package_system_dependency(PETSc deb libpetsc3.4.2)
 package_set_package_system_dependency(PETSc deb-src libpetsc3.4.2-dev)