diff --git a/python/dune/perftool/pdelab/driver/constraints.py b/python/dune/perftool/pdelab/driver/constraints.py
index a75016c2336146443e31bc43889fec49b5c56a83..d472882cf3b0e8c02b941b76e0bf85ea205e0cdd 100644
--- a/python/dune/perftool/pdelab/driver/constraints.py
+++ b/python/dune/perftool/pdelab/driver/constraints.py
@@ -91,17 +91,11 @@ def name_bctype_lambda(name, func):
 
 @preamble
 def define_intersection_lambda(name, func):
-    from dune.perftool.ufl.execution import Expression
     from ufl.classes import Expr
     if func is None:
         func = 0.
     if isinstance(func, (int, float)):
         return "auto {} = [&](const auto& x){{ return {}; }};".format(name, float(func))
-    elif isinstance(func, Expression):
-        if expression.is_global:
-            return "auto {} = [&](const auto& x){{ {} }};".format(name, func.c_expr[0])
-        else:
-            return "auto {} = [&](const auto& is, const auto& x){{ {} }};".format(name, func.c_expr[0])
     elif isinstance(func, Expr):
         # Set up a visitor
         with global_context(integral_type="exterior_facet", formdata=get_formdata(), driver=True):
diff --git a/python/dune/perftool/pdelab/driver/interpolate.py b/python/dune/perftool/pdelab/driver/interpolate.py
index 424388a0e5a2b2651d5121ff493a30d23cb3ef95..9a79c554f37894628b45c364c129189e3714f83b 100644
--- a/python/dune/perftool/pdelab/driver/interpolate.py
+++ b/python/dune/perftool/pdelab/driver/interpolate.py
@@ -94,15 +94,9 @@ def name_boundary_lambda(boundary):
 
 @preamble
 def define_boundary_lambda(name, boundary):
-    from dune.perftool.ufl.execution import Expression
     from ufl.classes import Expr
     if boundary is None:
         return "auto {} = [&](const auto& x){{ return 0.0; }};".format(name)
-    elif isinstance(boundary, Expression):
-        if boundary.is_global:
-            return "auto {} = [&](const auto& x){{ {} }};".format(name, boundary.c_expr[0])
-        else:
-            return "auto {} = [&](const auto& e, const auto& x){{ {} }};".format(name, boundary.c_expr[0])
     elif isinstance(boundary, Expr):
         # Set up a visitor
         with global_context(integral_type="exterior_facet", formdata=get_formdata(), driver=True):
diff --git a/test/poisson/opcount_poisson_dg.ufl b/test/poisson/opcount_poisson_dg.ufl
index ddafecb5bca487e35796c151bab18fced4ca817f..d731f77c3a9c180a630af3a161e0deaa896bacf5 100644
--- a/test/poisson/opcount_poisson_dg.ufl
+++ b/test/poisson/opcount_poisson_dg.ufl
@@ -1,4 +1,3 @@
-dim = 2
 degree = 1
 cell = "quadrilateral"
 
diff --git a/test/poisson/poisson_matrix_free.mini b/test/poisson/poisson_matrix_free.mini
deleted file mode 100644
index 5709ef999b6447810847c80948fb010994fd07fc..0000000000000000000000000000000000000000
--- a/test/poisson/poisson_matrix_free.mini
+++ /dev/null
@@ -1,15 +0,0 @@
-__name = poisson_matrix_free
-
-lowerleft = 0.0 0.0
-upperright = 1.0 1.0
-elements = 32 32
-elementType = simplical
-
-[wrapper.vtkcompare]
-name = {__name}
-reference = poisson_ref
-extension = vtu
-
-[formcompiler]
-matrix_free = 1
-compare_l2errorsquared = 1e-7