diff --git a/.gitsuper b/.gitsuper
index 7a552826b4e3142d01ebecdc395af1082a853364..bf285779d3af75abb7eabd65b65e31462a75dee2 100644
--- a/.gitsuper
+++ b/.gitsuper
@@ -13,11 +13,11 @@ status = 1a3bcab04b011a5d6e44f9983cae6ff89fa695e8 bin (heads/master)
 	 741e4f8e53bdd3e1b6e19d84eb22b6e3dc48526c dune-python (remotes/origin/releases/2.5)
 	 26cc8cb4161a3a51002ab2a81b8c81d2c951ee79 dune-testtools (remotes/origin/p/renemilk/testname_listing_hack_no-skiptest)
 	 8fe883e99c58c9f0c2f92457d546a0ac9f5a9bf9 dune-uggrid (v2.5.2-1-g8fe883e9)
-	+d0feadd46cc8cd4e390caf213bb9abdaeee01b63 dune-xt-common (heads/dailywork_tleibner)
-	+4b2963ea87844c40ab55d45c89ff2f75e0f75025 dune-xt-data (heads/dailywork_tleibner)
-	+a41cbe763a4102293873f2d93ccea5b845e56c98 dune-xt-functions (heads/new-master)
-	+8fedbef74590f64f409eb57e2c945d13bb4732e8 dune-xt-grid (heads/dailywork_tleibner)
-	+d3ab2989fa11a3707686f0f0b5472a4c850dbd3a dune-xt-la (heads/match-dune-gdt-refactor)
+	+0a68a9c971451632566cb16a4f8acc7314f34d92 dune-xt-common (heads/master)
+	+7694fbeee4a57b162d404a497e6254721468a3ee dune-xt-data (heads/master)
+	+183273c3ab84ff6969a07571bea8d47db897c3bb dune-xt-functions (heads/new-master)
+	+57baa1280bc0724a005e5c00507ce8e16abe1f59 dune-xt-grid (heads/master)
+	+0974256ea7dab44cbf80e318946c08cab564aa13 dune-xt-la (heads/match-dune-gdt-refactor)
 	 09d0378f616b94d68bcdd9fc6114813181849ec0 scripts (heads/master)
 commit = 2fc14026f7e772a0e6c908789d5cfb20671d62df
 
@@ -89,27 +89,27 @@ commit = 8fe883e99c58c9f0c2f92457d546a0ac9f5a9bf9
 [submodule.dune-xt-common]
 remote = git@github.com:dune-community/dune-xt-common.git
 status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master)
-commit = d0feadd46cc8cd4e390caf213bb9abdaeee01b63
+commit = 0a68a9c971451632566cb16a4f8acc7314f34d92
 
 [submodule.dune-xt-data]
 remote = https://github.com/dune-community/dune-xt-data
 status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master)
-commit = 4b2963ea87844c40ab55d45c89ff2f75e0f75025
+commit = 7694fbeee4a57b162d404a497e6254721468a3ee
 
 [submodule.dune-xt-functions]
 remote = git@github.com:dune-community/dune-xt-functions.git
 status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master)
-commit = a41cbe763a4102293873f2d93ccea5b845e56c98
+commit = 183273c3ab84ff6969a07571bea8d47db897c3bb
 
 [submodule.dune-xt-grid]
 remote = git@github.com:dune-community/dune-xt-grid.git
 status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master)
-commit = 8fedbef74590f64f409eb57e2c945d13bb4732e8
+commit = 57baa1280bc0724a005e5c00507ce8e16abe1f59
 
 [submodule.dune-xt-la]
 remote = git@github.com:dune-community/dune-xt-la.git
 status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master)
-commit = d3ab2989fa11a3707686f0f0b5472a4c850dbd3a
+commit = 0974256ea7dab44cbf80e318946c08cab564aa13
 
 [submodule.scripts]
 remote = https://github.com/wwu-numerik/scripts.git
diff --git a/python/dune/xt/functions/interfaces.hh b/python/dune/xt/functions/interfaces.hh
index ad376e74937655cad2983c8a3274f099b9196791..fa4511c9a3169839f87697bb58453fc3d9c0fc1c 100644
--- a/python/dune/xt/functions/interfaces.hh
+++ b/python/dune/xt/functions/interfaces.hh
@@ -270,7 +270,6 @@ bind_GridFunctionInterface(pybind11::module& m, const std::string& grid_id)
           .c_str());
 
   c.def_property_readonly("static_id", [](const C& /*self*/) { return C::static_id(); });
-  c.def_property_readonly("type", [](const C& self) { return self.type(); });
   c.def_property_readonly("name", [](const C& self) { return self.name(); });
 
   c.def("visualize",
@@ -466,7 +465,6 @@ pybind11::class_<FunctionInterface<d, r, rC, double>> bind_FunctionInterface(pyb
                       .c_str());
 
   c.def_property_readonly("static_id", [](const C& /*self*/) { return C::static_id(); });
-  c.def_property_readonly("type", [](const C& self) { return self.type(); });
   c.def_property_readonly("name", [](const C& self) { return self.name(); });
 
   //  c.def("visualize",
diff --git a/python/test/constant.py b/python/test/constant.py
index f76bfeb802007787aeb329f863a8bf5a732d26f8..dd964758de11d6eb49811c1d0bb199ed28423e2d 100644
--- a/python/test/constant.py
+++ b/python/test/constant.py
@@ -9,10 +9,11 @@
 
 import pytest
 import dune.xt.grid as xtg
+from dune.xt.grid import types
 import dune.xt.functions as xtf
 
 
-@pytest.fixture(params=xtg.available_types)
+@pytest.fixture(params=xtg.types.available_types)
 def function_provider(request):
     grid_type = request.param
     dim = 1
@@ -26,7 +27,7 @@ def function_provider(request):
 
 
 def test_available():
-    assert len(xtg.available_types) > 0
+    assert len(xtg.types.available_types) > 0
 
 
 def test_grid_provider(function_provider):