diff --git a/src/assemblers_tmpl.cc b/src/assemblers_tmpl.cc
index d4e815c95502f17f0cff4c6dcf0b6f169f4ee589..805ee78ce10a097c6c2f145a15ecb4c57caa3b72 100644
--- a/src/assemblers_tmpl.cc
+++ b/src/assemblers_tmpl.cc
@@ -4,7 +4,6 @@
 
 #include <dune/common/fmatrix.hh>
 #include <dune/common/fvector.hh>
-// #include <dune/grid/yaspgrid.hh>
 #include <dune/grid/alugrid.hh>
 
 #include <dune/fufem/functionspacebases/p1nodalbasis.hh>
@@ -15,7 +14,6 @@ typedef Dune::BCRSMatrix<SmallMatrix> MatrixType;
 typedef Dune::BlockVector<SmallVector> VectorType;
 
 typedef Dune::ALUGrid<DIM, DIM, Dune::simplex, Dune::nonconforming> GridType;
-// typedef Dune::YaspGrid<DIM> GridType;
 typedef GridType::LeafGridView GridView;
 typedef P1NodalBasis<GridView, double> P1Basis;
 
diff --git a/src/mysolver_tmpl.cc b/src/mysolver_tmpl.cc
index 522d7d6cd34f05915761f8b90cb03763630fe4f3..a91b0f7acb4762d8e7f64664a803758e3ebd0a65 100644
--- a/src/mysolver_tmpl.cc
+++ b/src/mysolver_tmpl.cc
@@ -4,7 +4,6 @@
 
 #include <dune/common/fmatrix.hh>
 #include <dune/common/fvector.hh>
-//#include <dune/grid/yaspgrid.hh>
 #include <dune/grid/alugrid.hh>
 #include <dune/istl/bcrsmatrix.hh>
 #include <dune/istl/bvector.hh>
@@ -21,7 +20,6 @@ typedef MyConvexProblem<MatrixType, VectorType> MyConvexProblemType;
 typedef MyBlockProblem<MyConvexProblemType> MyBlockProblemType;
 
 typedef Dune::ALUGrid<DIM, DIM, Dune::simplex, Dune::nonconforming> GridType;
-// typedef Dune::YaspGrid<DIM> GridType;
 
 template class MySolver<DIM, MatrixType, VectorType, GridType,
                         MyBlockProblemType>;
diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc
index 478fb6332313684bdf23b7d63a1d87a275f01510..97e5a76c9dced27f768480319e4ef8334cc5419d 100644
--- a/src/one-body-sample.cc
+++ b/src/one-body-sample.cc
@@ -42,7 +42,6 @@
 #include <dune/grid/alugrid.hh>
 #include <dune/grid/common/mcmgmapper.hh>
 #include <dune/grid/utility/structuredgridfactory.hh>
-// #include <dune/grid/yaspgrid.hh>
 #include <dune/istl/bcrsmatrix.hh>
 #include <dune/istl/bvector.hh>
 
diff --git a/src/vtk_tmpl.cc b/src/vtk_tmpl.cc
index f1d50ca9608403dc3ec5c7937d23b74a874429fa..23785948c09bd10bc04d444be236a27d8d7f8a75 100644
--- a/src/vtk_tmpl.cc
+++ b/src/vtk_tmpl.cc
@@ -4,7 +4,6 @@
 
 #include <dune/common/fmatrix.hh>
 #include <dune/common/fvector.hh>
-//#include <dune/grid/yaspgrid.hh>
 #include <dune/grid/alugrid.hh>
 #include <dune/istl/bvector.hh>
 
@@ -18,7 +17,6 @@ typedef Dune::FieldMatrix<double, DIM, DIM> SmallMatrix;
 typedef Dune::BlockVector<SmallVector> VectorType;
 
 typedef Dune::ALUGrid<DIM, DIM, Dune::simplex, Dune::nonconforming> GridType;
-// typedef Dune::YaspGrid<> GridType;
 typedef GridType::LeafGridView GridView;
 typedef P1NodalBasis<GridView, double> P1Basis;
 typedef P0Basis<GridView, double> MyP0Basis;