Remove parameterized modules to allow compilation with R16B