diff --git a/cmake/modules/FindValgrind.cmake b/cmake/modules/FindValgrind.cmake
deleted file mode 100644
index e7251791b3a7d879217c98c71571bdcdfa1c3928..0000000000000000000000000000000000000000
--- a/cmake/modules/FindValgrind.cmake
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Module that checks whether Valgrind's header memcheck.h is present
-#
-# Variables used by this module which you may want to set:
-# VALGRIND_ROOT         Path list to search for memcheck.h
-#
-# Sets the follwing variable:
-#
-# Valgrind_FOUND          True if Valgrind was found
-# VALGRIND_INCLUDE_DIR    Path to Valgrind's include dirs.
-
-
-# look for header files, only at positions given by the user
-find_path(VALGRIND_INCLUDE_DIR
-  NAMES "valgrind/memcheck.h"
-  PATHS ${VALGRIND_ROOT}
-  PATH_SUFFIXES "include"
-  NO_DEFAULT_PATH
-)
-# look for header files, including default paths
-find_path(VALGRIND_INCLUDE_DIR
-  NAMES "valgrind/memcheck.h"
-  PATH_SUFFIXES "include"
-)
-
-# handle package arguments
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(
-  "Valgrind"
-  DEFAULT_MSG
-  VALGRIND_INCLUDE_DIR
-)
-
-# set HAVE_VALGRIND for config.h
-set(HAVE_VALGRIND ${Valgrind_FOUND})
-
-# register all Valgrind related flags
-if(Valgrind_FOUND)
-  dune_register_package_flags(INCLUDE_DIRS "${VALGRIND_INCLUDE_DIR}")
-endif()
-
-# text for feature summary
-set_package_properties("Valgrind" PROPERTIES
-  DESCRIPTION "Memory debugging, memory leak detection, profiling"
-  PURPOSE "Identify undefined variables with Memcheck")
diff --git a/config.h.cmake b/config.h.cmake
index 04807297455da0e0511801214c0ad5f419ab939b..f7f2bc4b053db7fe4ce5ba41320f5226b48b11db 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -43,9 +43,6 @@
 /* Define the path to dumux */
 #define DUMUX_SOURCE_DIR "${CMAKE_SOURCE_DIR}"
 
-/* Define to 1 if Valgrind was found */
-#cmakedefine HAVE_VALGRIND 1
-
 /* Define to 1 if gnuplot was found */
 #cmakedefine HAVE_GNUPLOT 1
 
diff --git a/dumux/common/valgrind.hh b/dumux/common/valgrind.hh
index 435492e75003b720550d0a8b7f7f003526ed10e2..d10ac3a79613e78747d5efe87c285bcdae22f21e 100644
--- a/dumux/common/valgrind.hh
+++ b/dumux/common/valgrind.hh
@@ -23,6 +23,7 @@
  */
 #ifndef DUMUX_VALGRIND_HH
 #define DUMUX_VALGRIND_HH
+#warning "This header is deprecated and will be removed after release 3.3"
 
 #if ! HAVE_VALGRIND
 namespace Valgrind