diff --git a/dune/subgrid/subgrid/subgridindexstorage.hh b/dune/subgrid/subgrid/subgridindexstorage.hh
index f7fc6f0999fae65c9c374a60bce9ed04a47a231a..f80402d57b033e9c2284948a7f5f5b063aef1933 100644
--- a/dune/subgrid/subgrid/subgridindexstorage.hh
+++ b/dune/subgrid/subgrid/subgridindexstorage.hh
@@ -84,7 +84,7 @@ class SubGridIndexStorageBase
         typedef typename HostIdSet::IdType HostIdType;
 
         //! type map GeometryTypes to MultilevelCounters
-        typedef typename std::map<GeometryType, MultilevelCounter> EntityCounter;
+        typedef std::map<GeometryType, MultilevelCounter> EntityCounter;
 
         enum {dim = std::remove_const<GridType>::type::dimension};
 
@@ -153,9 +153,7 @@ class SubGridIndexStorageBase
 
         //! print information about stored indices
         virtual void report() const
-        {
-            return;
-        }
+        {}
 
     protected:
 
@@ -181,7 +179,6 @@ class SubGridIndexStorageBase
                         levelTypes[it->first.dim()][level].push_back(it->first);
                 }
             }
-            return;
         }
 
 
@@ -915,8 +912,6 @@ class SubGridVectorSubindexSetter
 
             // recursive call of template meta program to set indices for codim-1 subentities
             SubGridVectorSubindexSetter<GridType, codim-1>::insertSubEntities(indexStorage, e, isLeaf, level);
-
-            return;
         }
 };