diff --git a/python/dune/perftool/generation/__init__.py b/python/dune/perftool/generation/__init__.py
index c141e95df9792701e521b67f6ba149d1fc3f57c2..72fad9024cc46d3084b8318a2ff7db4c0c91cc52 100644
--- a/python/dune/perftool/generation/__init__.py
+++ b/python/dune/perftool/generation/__init__.py
@@ -18,7 +18,6 @@ from dune.perftool.generation.cache import (cached,
 from dune.perftool.generation.cpp import (base_class,
                                           class_basename,
                                           class_member,
-                                          constructor_block,
                                           constructor_parameter,
                                           dump_accumulate_timer,
                                           include_file,
diff --git a/python/dune/perftool/generation/loopy.py b/python/dune/perftool/generation/loopy.py
index b0e7264b0c65f8b8351f087723a8445502e78c10..c61fec6a21dbe47e9a4147008ae616471af1a5bc 100644
--- a/python/dune/perftool/generation/loopy.py
+++ b/python/dune/perftool/generation/loopy.py
@@ -17,17 +17,17 @@ silenced_warning = generator_factory(item_tags=("silenced_warning",), no_deco=Tr
 kernel_cached = generator_factory(item_tags=("default_cached",), context_tags="kernel")
 
 
-class DuneGlobalArg(loopy.GlobalArg):
-    allowed_extra_kwargs = loopy.GlobalArg.allowed_extra_kwargs + ["managed"]
+class DuneGlobalArg(lp.GlobalArg):
+    allowed_extra_kwargs = lp.GlobalArg.allowed_extra_kwargs + ["managed"]
 
 
 @generator_factory(item_tags=("argument", "globalarg"),
                    context_tags="kernel",
                    cache_key_generator=lambda n, **kw: n)
-def globalarg(name, shape=loopy.auto, managed=True, **kw):
+def globalarg(name, shape=lp.auto, managed=True, **kw):
     if isinstance(shape, str):
         shape = (shape,)
-    dtype = kw.pop("dtype", numpy.float64)
+    dtype = kw.pop("dtype", np.float64)
     return DuneGlobalArg(name, dtype=dtype, shape=shape, managed=managed, **kw)
 
 
diff --git a/python/dune/perftool/sumfact/amatrix.py b/python/dune/perftool/sumfact/amatrix.py
index 0d41c26b032c78cd95507b59825fb5076bdd3405..5e717f164f6df96e869a8249c3a482f5575feb18 100644
--- a/python/dune/perftool/sumfact/amatrix.py
+++ b/python/dune/perftool/sumfact/amatrix.py
@@ -5,7 +5,6 @@ from dune.perftool.options import get_option
 from dune.perftool.pdelab.argument import name_coefficientcontainer
 
 from dune.perftool.generation import (class_member,
-                                      constructor_block,
                                       domain,
                                       function_mangler,
                                       get_global_context_value,