diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8d3b21cf13d4481067e4f4db2ab358bee64ec6d6..6eeba4b49011a21a9a13c46407ceb1b3c727c811 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,6 @@ include(DuneMacros)
 dune_project()
 
 add_subdirectory("src")
-add_subdirectory("m4")
 add_subdirectory("dune")
 add_subdirectory("doc")
 add_subdirectory("cmake/modules")
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index ad66661a2ef38a18f85bba81af570112d1e557cb..0000000000000000000000000000000000000000
--- a/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-# we need the module file to be able to build via dunecontrol
-EXTRA_DIST = dune.module \
-  CMakeLists.txt \
-  config.h.cmake
-
-SUBDIRS = src m4 dune doc cmake
-
-if BUILD_DOCS
-# TODO: set up documentation tree automatically
-#SUBDIRS += doc
-endif
-
-# don't follow the full GNU-standard
-# we need automake 1.9 or newer
-AUTOMAKE_OPTIONS = foreign 1.9
-
-# pass most important options when "make distcheck" is used
-DISTCHECK_CONFIGURE_FLAGS = --with-dune-common=$(DUNE_COMMON_ROOT) --with-dune-geometry=$(DUNE_GEOMETRY_ROOT) --with-dune-localfunctions=$(DUNE_LOCALFUNCTIONS_ROOT) --with-dune-grid=$(DUNE_GRID_ROOT) --with-dune-istl=$(DUNE_ISTL_ROOT)  CXX="$(CXX)" CC="$(CC)"
-
-include $(top_srcdir)/am/top-rules
-include $(top_srcdir)/am/global-rules
-
-# Generate package configuration files for finding
-# installed modules with CMake
-include $(top_srcdir)/am/cmake-pkg-config
-
diff --git a/cmake/Makefile.am b/cmake/Makefile.am
deleted file mode 100644
index 26735eb4029328e305290cf95dfdc43a0e5fa55d..0000000000000000000000000000000000000000
--- a/cmake/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = modules
-
-include $(top_srcdir)/am/global-rules
diff --git a/cmake/modules/Makefile.am b/cmake/modules/Makefile.am
deleted file mode 100644
index 8d3bacce5720a00f85f4bc84a73f15af5f7f3c9e..0000000000000000000000000000000000000000
--- a/cmake/modules/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-MODULES = DuneMatrixVectorMacros.cmake
-modulesdir = $(datadir)/dune/cmake/modules
-dist_modules_DATA = ${MODULES}
-
-include $(top_srcdir)/am/global-rules
-EXTRA_DIST = CMakeLists.txt
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index ce119d494d57fa4dedf258efbb312e6678d7dffe..0000000000000000000000000000000000000000
--- a/configure.ac
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-AC_PREREQ([2.62])
-DUNE_AC_INIT # gets module version from dune.module file
-AC_CONFIG_SRCDIR([src/dune_matrix_vector.cc])
-AC_CONFIG_HEADERS([config.h])
-
-# we need no more than the standard DE-stuff
-# this module depends on dune-common dune-geometry dune-localfunctions dune-grid dune-istl
-# this implies checking for [dune-common], [dune-geometry], [dune-localfunctions], [dune-grid], [dune-istl]
-DUNE_CHECK_ALL
-
-# implicitly set the Dune-flags everywhere
-AC_SUBST(AM_CPPFLAGS, $DUNE_CPPFLAGS)
-AC_SUBST(AM_LDFLAGS, $DUNE_LDFLAGS)
-LIBS="$DUNE_LIBS"
-
-AC_CONFIG_FILES([
-  Makefile
-  src/Makefile
-  cmake/Makefile
-  cmake/modules/Makefile
-  doc/Makefile
-  doc/doxygen/Makefile
-  doc/doxygen/Doxyfile
-  dune/Makefile
-  dune/matrix-vector/Makefile
-  m4/Makefile
-  dune-matrix-vector.pc
-])
-AC_OUTPUT
-# finally print the summary information
-DUNE_SUMMARY_ALL
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index b1ea71966ad3811216d9d90ae556aff04d4eb5f8..0000000000000000000000000000000000000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-
-SUBDIRS = doxygen
-CURDIR = doc
-BASEDIR = ..
-
-# add list of html files to generate from wml
-PAGES=
-
-docdir=$(datadir)/doc/dune-matrix-vector
-
-EXTRA_DIST = CMakeLists.txt
-
-include $(top_srcdir)/am/webstuff
-include $(top_srcdir)/am/global-rules
diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am
deleted file mode 100644
index a4917f4dffcf42997a809eadcdbffb6be0bd740c..0000000000000000000000000000000000000000
--- a/doc/doxygen/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-
-BASEDIR=../..
-CURDIR=doc/doxygen
-
-EXTRA_DIST = CMakeLists.txt
-
-include $(top_srcdir)/am/doxygen
-include $(top_srcdir)/am/global-rules
-
diff --git a/dune/Makefile.am b/dune/Makefile.am
deleted file mode 100644
index 3b353c064bdb0347b78e9a3e477c1bfa7802a786..0000000000000000000000000000000000000000
--- a/dune/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBDIRS = matrix-vector
-
-EXTRA_DIST = CMakeLists.txt
-
-include $(top_srcdir)/am/global-rules
diff --git a/dune/matrix-vector/Makefile.am b/dune/matrix-vector/Makefile.am
deleted file mode 100644
index cc67fae19de8c6c69cd6181782adca69443eb156..0000000000000000000000000000000000000000
--- a/dune/matrix-vector/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-matrix_vectorincludedir = $(includedir)/dune/matrix-vector
-matrix_vectorinclude_HEADERS = matrix-vector.hh
-
-EXTRA_DIST = CMakeLists.txt
-
-include $(top_srcdir)/am/global-rules
diff --git a/dune/matrix-vector/matrix-vector.hh b/dune/matrix-vector/matrix-vector.hh
deleted file mode 100644
index bdc9609c57a44af972588233e43b54d4c54b13ce..0000000000000000000000000000000000000000
--- a/dune/matrix-vector/matrix-vector.hh
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef DUNE_MATRIX_VECTOR.hh
-#define DUNE_MATRIX_VECTOR.hh
-
-// add your classes here
-
-#endif // DUNE_MATRIX_VECTOR.hh
diff --git a/m4/CMakeLists.txt b/m4/CMakeLists.txt
deleted file mode 100644
index c92e1f2b49e8c2e99eb83a1d1a9ed0c5b9a4b2d9..0000000000000000000000000000000000000000
--- a/m4/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-
-install(PROGRAMS dune-matrix-vector.m4 DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/dune/aclocal)
-
diff --git a/m4/Makefile.am b/m4/Makefile.am
deleted file mode 100644
index b0eb77317b7ff96fa40a7a58093906a1cb973602..0000000000000000000000000000000000000000
--- a/m4/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-M4FILES = dune-matrix-vector.m4
-
-aclocaldir = $(datadir)/dune/aclocal
-aclocal_DATA = $(M4FILES)
-
-EXTRA_DIST = $(M4FILES) CMakeLists.txt
-
-include $(top_srcdir)/am/global-rules
diff --git a/m4/dune-matrix-vector.m4 b/m4/dune-matrix-vector.m4
deleted file mode 100644
index 8646bfc422e845522ff766478872050273ddf470..0000000000000000000000000000000000000000
--- a/m4/dune-matrix-vector.m4
+++ /dev/null
@@ -1,17 +0,0 @@
-dnl -*- autoconf -*-
-# Macros needed to find dune-matrix-vector and dependent libraries.  They are called by
-# the macros in ${top_src_dir}/dependencies.m4, which is generated by
-# "dunecontrol autogen"
-
-# Additional checks needed to build dune-matrix-vector
-# This macro should be invoked by every module which depends on dune-matrix-vector, as
-# well as by dune-matrix-vector itself
-AC_DEFUN([DUNE_MATRIX_VECTOR_CHECKS])
-
-# Additional checks needed to find dune-matrix-vector
-# This macro should be invoked by every module which depends on dune-matrix-vector, but
-# not by dune-matrix-vector itself
-AC_DEFUN([DUNE_MATRIX_VECTOR_CHECK_MODULE],
-[
-  DUNE_CHECK_MODULES([dune-matrix-vector],[matrix-vector/matrix-vector.hh])
-])
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index 6677a6d92f22568b76ae805dbc6cbbfe9ee18a01..0000000000000000000000000000000000000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,41 +0,0 @@
-
-SUBDIRS =
-
-noinst_PROGRAMS = dune_matrix_vector
-
-dune_matrix_vector_SOURCES = dune_matrix_vector.cc
-
-dune_matrix_vector_CPPFLAGS = $(AM_CPPFLAGS) \
-	$(DUNEMPICPPFLAGS) \
-	$(UG_CPPFLAGS) \
-	$(ALBERTA_CPPFLAGS) \
-	$(ALUGRID_CPPFLAGS)
-# The libraries have to be given in reverse order (most basic libraries
-# last).  Also, due to some misunderstanding, a lot of libraries include the
-# -L option in LDFLAGS instead of LIBS -- so we have to include the LDFLAGS
-# here as well.
-dune_matrix_vector_LDADD = \
-	$(DUNE_LDFLAGS) $(DUNE_LIBS) \
-	$(ALUGRID_LDFLAGS) $(ALUGRID_LIBS) \
-	$(ALBERTA_LDFLAGS) $(ALBERTA_LIBS) \
-	$(UG_LDFLAGS) $(UG_LIBS) \
-	$(DUNEMPILIBS)	\
-	$(LDADD)
-dune_matrix_vector_LDFLAGS = $(AM_LDFLAGS) \
-	$(DUNEMPILDFLAGS) \
-	$(UG_LDFLAGS) \
-	$(ALBERTA_LDFLAGS) \
-	$(ALUGRID_LDFLAGS) \
-	$(DUNE_LDFLAGS)
-
-# don't follow the full GNU-standard
-# we need automake 1.9
-AUTOMAKE_OPTIONS = foreign 1.9
-
-# pass most important options when "make distcheck" is used
-DISTCHECK_CONFIGURE_FLAGS = --with-dune-common=$(DUNE_COMMON_ROOT) --with-dune-geometry=$(DUNE_GEOMETRY_ROOT) --with-dune-localfunctions=$(DUNE_LOCALFUNCTIONS_ROOT) --with-dune-grid=$(DUNE_GRID_ROOT) --with-dune-istl=$(DUNE_ISTL_ROOT)  CXX="$(CXX)" CC="$(CC)"
-
-EXTRA_DIST = CMakeLists.txt
-
-include $(top_srcdir)/am/global-rules
-
diff --git a/stamp-regenerate-config-h b/stamp-regenerate-config-h
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/stamp-vc b/stamp-vc
deleted file mode 100644
index ea2c89e7d0add59fdefb1c3278dc5e54b73990ea..0000000000000000000000000000000000000000
--- a/stamp-vc
+++ /dev/null
@@ -1 +0,0 @@
-A stamp file to signify that this directory comes from a version control system, not an unpacked tarball