diff --git a/dumux/discretization/staggered/freeflow/velocityoutput.hh b/dumux/discretization/staggered/freeflow/velocityoutput.hh
index d9d5e40672da8bc39499b511ac45115e61cca3fc..57ad84f92112e3782560c270296960f0fc88e91e 100644
--- a/dumux/discretization/staggered/freeflow/velocityoutput.hh
+++ b/dumux/discretization/staggered/freeflow/velocityoutput.hh
@@ -65,7 +65,8 @@ public:
     , sol_(sol)
     {
         // check if velocity vectors shall be written to the VTK file
-        enableOutput_ = getParamFromGroup<bool>(gridVariables.curGridVolVars().problem().paramGroup(), "Vtk.AddVelocity");
+        // enable per default
+        enableOutput_ = getParamFromGroup<bool>(gridVariables.curGridVolVars().problem().paramGroup(), "Vtk.AddVelocity", true);
     }
 
     //! Returns whether to enable the velocity output or not
@@ -103,7 +104,7 @@ private:
     const GridVariables& gridVariables_;
     const SolutionVector& sol_;
 
-    bool enableOutput_;
+    bool enableOutput_ = true;
 };
 
 } // end namespace Dumux
diff --git a/dumux/io/staggeredvtkoutputmodule.hh b/dumux/io/staggeredvtkoutputmodule.hh
index 94f2784694a47c30d3275874c9b25dd046aba5ca..6a3d839c66ed4771767134423cd0cff6ca23160d 100644
--- a/dumux/io/staggeredvtkoutputmodule.hh
+++ b/dumux/io/staggeredvtkoutputmodule.hh
@@ -29,41 +29,13 @@
 #include <dumux/io/vtkoutputmodule.hh>
 #include <dumux/io/pointcloudvtkwriter.hh>
 #include <dumux/io/vtksequencewriter.hh>
-
-#include <dune/common/deprecated.hh>
+#include <dumux/discretization/staggered/freeflow/velocityoutput.hh>
 
 namespace Dumux {
 
 template<class Scalar, class GlobalPosition>
 class PointCloudVtkWriter;
 
-template<class ...Dummy>
-class StaggeredVtkOutputModule;
-
-template<class TypeTag>
-class DUNE_DEPRECATED_MSG("Use StaggeredVtkOutputModule<GridVariables, SolutionVector> instead!") StaggeredVtkOutputModule<TypeTag>
-: public StaggeredVtkOutputModule<typename GET_PROP_TYPE(TypeTag, GridVariables),
-                                  typename GET_PROP_TYPE(TypeTag, SolutionVector)>
-{
-    using ParentType = StaggeredVtkOutputModule<typename GET_PROP_TYPE(TypeTag, GridVariables),
-                                                typename GET_PROP_TYPE(TypeTag, SolutionVector)>;
-public:
-    using ParentType::ParentType;
-
-    template<class Problem, class FVGridGeometry, class GridVariables, class SolutionVector>
-    DUNE_DEPRECATED_MSG("Use StaggeredVtkOutputModule(gridVariables, sol, name) instead!")
-    StaggeredVtkOutputModule(const Problem& problem,
-                             const FVGridGeometry& fvGridGeometry,
-                             const GridVariables& gridVariables,
-                             const SolutionVector& sol,
-                             const std::string& name,
-                             const std::string& paramGroup = "",
-                             Dune::VTK::DataMode dm = Dune::VTK::conforming,
-                             bool verbose = true)
-    : ParentType(gridVariables, sol, name, paramGroup, dm, verbose) {}
-
-};
-
 /*!
  * \ingroup InputOutput
  * \brief A VTK output module to simplify writing dumux simulation data to VTK format
@@ -73,7 +45,7 @@ public:
  * \tparam SolutionVector The solution vector
  */
 template<class GridVariables, class SolutionVector>
-class StaggeredVtkOutputModule<GridVariables, SolutionVector>
+class StaggeredVtkOutputModule
 : public VtkOutputModule<GridVariables, SolutionVector>
 {
     using ParentType = VtkOutputModule<GridVariables, SolutionVector>;
@@ -123,6 +95,8 @@ public:
                       gridVariables.curGridVolVars().problem().fvGridGeometry().gridView().comm().size() )
 
     {
+        // enable velocity output per default
+        this->addVelocityOutput(std::make_shared<StaggeredFreeFlowVelocityOutput<GridVariables, SolutionVector>>(gridVariables, sol));
         writeFaceVars_ = getParamFromGroup<bool>(paramGroup, "Vtk.WriteFaceData", false);
         coordinatesInitialized_ = false;
     }
diff --git a/test/freeflow/navierstokes/test_angeli.cc b/test/freeflow/navierstokes/test_angeli.cc
index 76607dd72edd09499dd73af5056ab1ac916237fa..b946a99885e3551bd5cc40cb91d201b7f21a289e 100644
--- a/test/freeflow/navierstokes/test_angeli.cc
+++ b/test/freeflow/navierstokes/test_angeli.cc
@@ -155,9 +155,7 @@ int main(int argc, char** argv) try
     // intialize the vtk output module
     StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
-    using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
     VtkOutputFields::init(vtkWriter); //!< Add model specific output fields
-    vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables, x));
     vtkWriter.addField(problem->getAnalyticalPressureSolution(), "pressureExact");
     vtkWriter.addField(problem->getAnalyticalVelocitySolution(), "velocityExact");
     vtkWriter.addFaceField(problem->getAnalyticalVelocitySolutionOnFace(), "faceVelocityExact");
diff --git a/test/freeflow/navierstokes/test_channel.cc b/test/freeflow/navierstokes/test_channel.cc
index b72e30520e1271951ea743ea2186e8910e692a2b..bee7ed183fd72be3295274245c615602bc303e85 100644
--- a/test/freeflow/navierstokes/test_channel.cc
+++ b/test/freeflow/navierstokes/test_channel.cc
@@ -156,8 +156,6 @@ int main(int argc, char** argv) try
     // initialize the vtk output module
     using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
     StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
-    using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
-    vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables, x));
     VtkOutputFields::init(vtkWriter); //!< Add model specific output fields
     vtkWriter.write(0.0);
 
diff --git a/test/freeflow/navierstokes/test_channel_navierstokes.input b/test/freeflow/navierstokes/test_channel_navierstokes.input
index 112b0f2a1d47fa6bb814210743c85d331d2f3bbc..8583ee9652fccac58aac861b4c5567be5bfa5985 100644
--- a/test/freeflow/navierstokes/test_channel_navierstokes.input
+++ b/test/freeflow/navierstokes/test_channel_navierstokes.input
@@ -16,5 +16,4 @@ MaxSteps = 10
 MaxRelativeShift = 1e-5
 
 [Vtk]
-AddVelocity = true
 WriteFaceData = false
diff --git a/test/freeflow/navierstokes/test_channel_stokes.input b/test/freeflow/navierstokes/test_channel_stokes.input
index 651184566d82b7a8ae13f871dfedbbbcd30a4c22..ed56ca7244765073bde8fd562d9cb9f6ba26b776 100644
--- a/test/freeflow/navierstokes/test_channel_stokes.input
+++ b/test/freeflow/navierstokes/test_channel_stokes.input
@@ -16,10 +16,8 @@ MaxSteps = 10
 MaxRelativeShift = 1e-8
 
 [Vtk]
-AddVelocity = true
 WriteFaceData = false
 
-
 [Assembly]
 NumericDifference.BaseEpsilon =  1e-8
 
diff --git a/test/freeflow/navierstokes/test_channel_stokesni_conduction.input b/test/freeflow/navierstokes/test_channel_stokesni_conduction.input
index ebc6488b7575d34694ddd7cd38548610b2409494..cb06ec9a95ec981026f291f18aeed775b469334d 100644
--- a/test/freeflow/navierstokes/test_channel_stokesni_conduction.input
+++ b/test/freeflow/navierstokes/test_channel_stokesni_conduction.input
@@ -16,5 +16,4 @@ MaxSteps = 10
 MaxRelativeShift = 1e-8
 
 [Vtk]
-AddVelocity = true
 WriteFaceData = false
diff --git a/test/freeflow/navierstokes/test_channel_stokesni_convection.input b/test/freeflow/navierstokes/test_channel_stokesni_convection.input
index dbaf6ddb5d40950afbfb651c7d8714d52e647f92..353c4b358286f1d98507288cf168d8b1190ca478 100644
--- a/test/freeflow/navierstokes/test_channel_stokesni_convection.input
+++ b/test/freeflow/navierstokes/test_channel_stokesni_convection.input
@@ -16,5 +16,4 @@ MaxSteps = 10
 MaxRelativeShift = 1e-8
 
 [Vtk]
-AddVelocity = true
 WriteFaceData = false
diff --git a/test/freeflow/navierstokes/test_closedsystem.cc b/test/freeflow/navierstokes/test_closedsystem.cc
index 3d64a81497c41ab113a48bbfc72c6daf0efa6aef..6b5791708df6f7aaa6071ae152f8565b83428ccd 100644
--- a/test/freeflow/navierstokes/test_closedsystem.cc
+++ b/test/freeflow/navierstokes/test_closedsystem.cc
@@ -149,8 +149,6 @@ int main(int argc, char** argv) try
     // intialize the vtk output module
     using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
     StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
-    using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
-    vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables, x));
     VtkOutputFields::init(vtkWriter); //!< Add model specific output fields
     vtkWriter.write(0.0);
 
diff --git a/test/freeflow/navierstokes/test_donea.cc b/test/freeflow/navierstokes/test_donea.cc
index 0eb4ce99c6b23957ba7590699bb19837ccb993df..e6ad45c4664d62ad5aab7c5bc1e66cba88bef16b 100644
--- a/test/freeflow/navierstokes/test_donea.cc
+++ b/test/freeflow/navierstokes/test_donea.cc
@@ -139,8 +139,6 @@ int main(int argc, char** argv) try
     // intialize the vtk output module
     using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
     StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
-    using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
-    vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables, x));
     VtkOutputFields::init(vtkWriter); //!< Add model specific output fields
     vtkWriter.addField(problem->getAnalyticalPressureSolution(), "pressureExact");
     vtkWriter.addField(problem->getAnalyticalVelocitySolution(), "velocityExact");
diff --git a/test/freeflow/navierstokes/test_hydrostaticpressure.input b/test/freeflow/navierstokes/test_hydrostaticpressure.input
index a48eb5fb26b694193d612146c8322f686880890b..4dcaf50ac099bf6febb0216d1ea236648f075fcb 100644
--- a/test/freeflow/navierstokes/test_hydrostaticpressure.input
+++ b/test/freeflow/navierstokes/test_hydrostaticpressure.input
@@ -19,5 +19,4 @@ MaxSteps = 10
 MaxRelativeShift = 1e-5
 
 [Vtk]
-AddVelocity = true
 WriteFaceData = false
diff --git a/test/freeflow/navierstokes/test_kovasznay.cc b/test/freeflow/navierstokes/test_kovasznay.cc
index 897b9dfa506d5df2050f6ba4444a2c9e03f6d401..0d54568d9285a9aba77244f5986e1407e9f2144d 100644
--- a/test/freeflow/navierstokes/test_kovasznay.cc
+++ b/test/freeflow/navierstokes/test_kovasznay.cc
@@ -136,8 +136,6 @@ int main(int argc, char** argv) try
     // intialize the vtk output module
     using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
     StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
-    using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
-    vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables, x));
     VtkOutputFields::init(vtkWriter); //!< Add model specific output fields
     vtkWriter.addField(problem->getAnalyticalPressureSolution(), "pressureExact");
     vtkWriter.addField(problem->getAnalyticalVelocitySolution(), "velocityExact");
diff --git a/test/freeflow/navierstokes/test_liddrivencavity_re1.input b/test/freeflow/navierstokes/test_liddrivencavity_re1.input
index 8a7be861e59cc1888271094676a6a3824e57cc14..286d9c374e40237b2e67f79d3cde4ad00d40d5e8 100644
--- a/test/freeflow/navierstokes/test_liddrivencavity_re1.input
+++ b/test/freeflow/navierstokes/test_liddrivencavity_re1.input
@@ -20,5 +20,4 @@ MaxSteps = 10
 MaxRelativeShift = 1e-5
 
 [Vtk]
-AddVelocity = true
 WriteFaceData = false
diff --git a/test/freeflow/navierstokes/test_liddrivencavity_re1000.input b/test/freeflow/navierstokes/test_liddrivencavity_re1000.input
index d0204fd129c6001ee600cc3ed6051fd78af79baf..cd5be48163103ec699c0a3a6d4c75654687d96a7 100644
--- a/test/freeflow/navierstokes/test_liddrivencavity_re1000.input
+++ b/test/freeflow/navierstokes/test_liddrivencavity_re1000.input
@@ -25,7 +25,6 @@ MaxRelativeShift = 1e-8
 NumericDifference.BaseEpsilon = 1e-8
 
 [Vtk]
-AddVelocity = true
 WriteFaceData = false
 
 [Implicit]
diff --git a/test/freeflow/navierstokes/test_navierstokes_1d.cc b/test/freeflow/navierstokes/test_navierstokes_1d.cc
index 65ae0eabb7031539a0a0951b1dde30373033f080..7b19b1038a9505900d4d587b76c7a38b9fea7743 100644
--- a/test/freeflow/navierstokes/test_navierstokes_1d.cc
+++ b/test/freeflow/navierstokes/test_navierstokes_1d.cc
@@ -125,8 +125,6 @@ int main(int argc, char** argv) try
     // intialize the vtk output module
     using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
     StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
-    using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
-    vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables, x));
     VtkOutputFields::init(vtkWriter); //!< Add model specific output fields
     vtkWriter.addField(problem->getAnalyticalPressureSolution(), "pressureExact");
     vtkWriter.addField(problem->getAnalyticalVelocitySolution(), "velocityExact");
diff --git a/test/freeflow/navierstokes/test_navierstokes_1d.input b/test/freeflow/navierstokes/test_navierstokes_1d.input
index 28c4f696f16bc534bfa8464e4cc3e7d302d3cf27..a6a61d826508d3a3da14a34c5b40a3d524227cbe 100644
--- a/test/freeflow/navierstokes/test_navierstokes_1d.input
+++ b/test/freeflow/navierstokes/test_navierstokes_1d.input
@@ -17,4 +17,3 @@ MaxRelativeShift = 1e-9
 
 [Vtk]
 WriteFaceData = false
-AddVelocity = true
diff --git a/test/freeflow/navierstokes/test_navierstokes_angeli.input b/test/freeflow/navierstokes/test_navierstokes_angeli.input
index 230e41dda782f4fda467451e08112be334bd52d4..787d776fc0f31babd2b6c3c381c844f97f7aeef4 100644
--- a/test/freeflow/navierstokes/test_navierstokes_angeli.input
+++ b/test/freeflow/navierstokes/test_navierstokes_angeli.input
@@ -25,4 +25,3 @@ MaxRelativeShift = 1e-5
 
 [Vtk]
 WriteFaceData = false
-AddVelocity = true
diff --git a/test/freeflow/navierstokes/test_navierstokes_kovasznay.input b/test/freeflow/navierstokes/test_navierstokes_kovasznay.input
index 03029c6f4623315826bb61f7d797442e77a78394..1ac0582f42bd170bba6c60edb099d72103080691 100644
--- a/test/freeflow/navierstokes/test_navierstokes_kovasznay.input
+++ b/test/freeflow/navierstokes/test_navierstokes_kovasznay.input
@@ -18,4 +18,3 @@ MaxRelativeShift = 1e-5
 
 [Vtk]
 WriteFaceData = false
-AddVelocity = true
diff --git a/test/freeflow/navierstokes/test_stokes_channel_3d.cc b/test/freeflow/navierstokes/test_stokes_channel_3d.cc
index bff1f348a54cedd7317ef0f2eb8a3e3696430769..3c72b1ecf63c0b59f20119ebfe7f1d32aa72f838 100644
--- a/test/freeflow/navierstokes/test_stokes_channel_3d.cc
+++ b/test/freeflow/navierstokes/test_stokes_channel_3d.cc
@@ -133,8 +133,6 @@ int main(int argc, char** argv) try
     // intialize the vtk output module
     using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
     StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
-    using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
-    vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables, x));
     VtkOutputFields::init(vtkWriter); //!< Add model specific output fields
     vtkWriter.write(0.0);
 
diff --git a/test/freeflow/navierstokes/test_stokes_channel_3d.input b/test/freeflow/navierstokes/test_stokes_channel_3d.input
index ce28a56783b4b492a37b7bad3a5a4aa6c648addb..7193f13d9b169550e0f695113b53d0d9067121da 100644
--- a/test/freeflow/navierstokes/test_stokes_channel_3d.input
+++ b/test/freeflow/navierstokes/test_stokes_channel_3d.input
@@ -20,7 +20,6 @@ MaxSteps = 10
 MaxRelativeShift = 1e-8
 
 [Vtk]
-AddVelocity = true
 WriteFaceData = false
 
 [FluxOverPlane]
diff --git a/test/freeflow/navierstokes/test_stokes_channel_pseudo3d.input b/test/freeflow/navierstokes/test_stokes_channel_pseudo3d.input
index 462959a1c6ea09ca25b417ac58fc865659cf79c1..e450d1a3b7a0259b60763e538f19c8350e47af73 100644
--- a/test/freeflow/navierstokes/test_stokes_channel_pseudo3d.input
+++ b/test/freeflow/navierstokes/test_stokes_channel_pseudo3d.input
@@ -22,4 +22,3 @@ NumericDifference.BaseEpsilon = 1e-8
 
 [Vtk]
 WriteFaceData = false
-AddVelocity = true
diff --git a/test/freeflow/navierstokes/test_stokes_donea.input b/test/freeflow/navierstokes/test_stokes_donea.input
index 1304128ffdee14e4d4726d9d1977df12e5af7bb9..cf34501bff789d31c8d358002e03b4ba14a01c17 100644
--- a/test/freeflow/navierstokes/test_stokes_donea.input
+++ b/test/freeflow/navierstokes/test_stokes_donea.input
@@ -13,4 +13,3 @@ MaxRelativeShift = 1e-5
 
 [Vtk]
 WriteFaceData = false
-AddVelocity = true
diff --git a/test/freeflow/navierstokesnc/test_channel.cc b/test/freeflow/navierstokesnc/test_channel.cc
index e31b2dae413a89d76b451a1f7a7f6a590d8f4fbb..70fbdd037a494c87331c57ad23f1ae5db06cc888 100644
--- a/test/freeflow/navierstokesnc/test_channel.cc
+++ b/test/freeflow/navierstokesnc/test_channel.cc
@@ -154,8 +154,6 @@ int main(int argc, char** argv) try
     // intialize the vtk output module
     using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
     StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
-    using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
-    vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables, x));
     VtkOutputFields::init(vtkWriter); //!< Add model specific output fields
     vtkWriter.addField(problem->getDeltaP(), "deltaP");
     vtkWriter.write(0.0);
diff --git a/test/freeflow/navierstokesnc/test_densitydrivenflow.cc b/test/freeflow/navierstokesnc/test_densitydrivenflow.cc
index 05deb3c1c70d67d9d89b8c41d79f7d521c3b282d..f4491998c7b7a2c9d08cb2dbb4a72eb31a794c71 100644
--- a/test/freeflow/navierstokesnc/test_densitydrivenflow.cc
+++ b/test/freeflow/navierstokesnc/test_densitydrivenflow.cc
@@ -153,8 +153,6 @@ int main(int argc, char** argv) try
     // intialize the vtk output module
     using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
     StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
-    using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
-    vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables, x));
     VtkOutputFields::init(vtkWriter); //!< Add model specific output fields
     vtkWriter.addField(problem->getDeltaRho(), "deltaRho");
     vtkWriter.write(0.0);
diff --git a/test/freeflow/navierstokesnc/test_msfreeflow.cc b/test/freeflow/navierstokesnc/test_msfreeflow.cc
index 2357c25959aefcac23db05390d4e7bee9827bfd1..91dbaba810296d29760f4c936c440d46171fd8a9 100644
--- a/test/freeflow/navierstokesnc/test_msfreeflow.cc
+++ b/test/freeflow/navierstokesnc/test_msfreeflow.cc
@@ -153,8 +153,6 @@ int main(int argc, char** argv) try
     // intialize the vtk output module
     using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
     StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
-    using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
-    vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables, x));
     VtkOutputFields::init(vtkWriter); //! Add model specific output fields
     vtkWriter.write(0.0);
 
diff --git a/test/freeflow/navierstokesnc/test_stokes2c_advection.input b/test/freeflow/navierstokesnc/test_stokes2c_advection.input
index d3558dec4cc951d7515cdc0c0690064f7242b4ae..7b79ad42474cf32304666bfc251750d25b625734 100644
--- a/test/freeflow/navierstokesnc/test_stokes2c_advection.input
+++ b/test/freeflow/navierstokesnc/test_stokes2c_advection.input
@@ -19,5 +19,4 @@ MaxSteps = 10
 MaxRelativeShift = 1e-8
 
 [Vtk]
-AddVelocity = true
 WriteFaceData = false
diff --git a/test/freeflow/navierstokesnc/test_stokes2c_densitydrivenflow.input b/test/freeflow/navierstokesnc/test_stokes2c_densitydrivenflow.input
index ae643fd64ca37b001645e3b6a3708531745bb237..e3dcd14f576da8ceff8486d1fec4e2dab36558dd 100644
--- a/test/freeflow/navierstokesnc/test_stokes2c_densitydrivenflow.input
+++ b/test/freeflow/navierstokesnc/test_stokes2c_densitydrivenflow.input
@@ -20,5 +20,4 @@ MaxSteps = 10
 MaxRelativeShift = 1e-8
 
 [Vtk]
-AddVelocity = true
 WriteFaceData = false
diff --git a/test/freeflow/navierstokesnc/test_stokes2c_purediffusion.input b/test/freeflow/navierstokesnc/test_stokes2c_purediffusion.input
index bb365a1671bd4d476d1cd8a6371e85e9c11fb8d0..4fa305b802a40addcbd8bb0c01ad5aa8bdce9ad3 100644
--- a/test/freeflow/navierstokesnc/test_stokes2c_purediffusion.input
+++ b/test/freeflow/navierstokesnc/test_stokes2c_purediffusion.input
@@ -16,5 +16,4 @@ MaxSteps = 10
 MaxRelativeShift = 1e-8
 
 [Vtk]
-AddVelocity = true
 WriteFaceData = false
diff --git a/test/freeflow/navierstokesnc/test_stokes2cni_advection.input b/test/freeflow/navierstokesnc/test_stokes2cni_advection.input
index 8580cc0dff70f35bc4cc5ecf247571f82e91f12b..43a8a92c73bd2c1789611063fac6ec00c2d85e10 100644
--- a/test/freeflow/navierstokesnc/test_stokes2cni_advection.input
+++ b/test/freeflow/navierstokesnc/test_stokes2cni_advection.input
@@ -19,5 +19,4 @@ MaxSteps = 10
 MaxRelativeShift = 1e-8
 
 [Vtk]
-AddVelocity = true
 WriteFaceData = false
diff --git a/test/freeflow/navierstokesnc/test_stokes2cni_diffusion.input b/test/freeflow/navierstokesnc/test_stokes2cni_diffusion.input
index ec46ddaf8e7b06ac342df09bcfd8991732af21cb..82d99aacafae206fcf24800644457db573405462 100644
--- a/test/freeflow/navierstokesnc/test_stokes2cni_diffusion.input
+++ b/test/freeflow/navierstokesnc/test_stokes2cni_diffusion.input
@@ -16,5 +16,4 @@ MaxSteps = 10
 MaxRelativeShift = 1e-8
 
 [Vtk]
-AddVelocity = true
 WriteFaceData = false
diff --git a/test/freeflow/rans/test_pipe_laufer.cc b/test/freeflow/rans/test_pipe_laufer.cc
index 79bb451eb46974ca930daaa18b0b0d4f101cfcca..8b4d2a70fe2af081e21f67532ceb28667fe560ec 100644
--- a/test/freeflow/rans/test_pipe_laufer.cc
+++ b/test/freeflow/rans/test_pipe_laufer.cc
@@ -149,8 +149,6 @@ int main(int argc, char** argv) try
     // intialize the vtk output module
     using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
     StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
-    using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
-    vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables, x));
     VtkOutputFields::init(vtkWriter); //!< Add model specific output fields
     vtkWriter.write(0.0);
 
diff --git a/test/freeflow/rans/test_pipe_laufer.input b/test/freeflow/rans/test_pipe_laufer.input
index b0245e8898ea05886f7d7c25b812d520bf72190d..05350ff926cae7b7c0dcc3eb165b5932799a8f06 100644
--- a/test/freeflow/rans/test_pipe_laufer.input
+++ b/test/freeflow/rans/test_pipe_laufer.input
@@ -37,5 +37,4 @@ TargetSteps = 5
 MaxRelativeShift = 1e-5
 
 [Vtk]
-AddVelocity = true
 WriteFaceData = false
diff --git a/test/freeflow/rans/test_pipe_laufer_reference.input b/test/freeflow/rans/test_pipe_laufer_reference.input
index ef597de3f08a2da497d017ae1a9029a9177a96b8..398523ccd1c90b5b63ae7b8c9123d6427c262a4d 100644
--- a/test/freeflow/rans/test_pipe_laufer_reference.input
+++ b/test/freeflow/rans/test_pipe_laufer_reference.input
@@ -31,5 +31,4 @@ TargetSteps = 5
 MaxRelativeShift = 1e-6
 
 [Vtk]
-AddVelocity = true
 WriteFaceData = false
diff --git a/test/freeflow/rans/test_pipe_laufer_reference_wallfunction.input b/test/freeflow/rans/test_pipe_laufer_reference_wallfunction.input
index b0e86caf4e7ee138374549c37ccd4037e7660041..e1dccd2249a9d3e4d142ba745d64ab9861bfecfc 100644
--- a/test/freeflow/rans/test_pipe_laufer_reference_wallfunction.input
+++ b/test/freeflow/rans/test_pipe_laufer_reference_wallfunction.input
@@ -30,5 +30,4 @@ TargetSteps = 5
 MaxRelativeShift = 1e-5
 
 [Vtk]
-AddVelocity = true
 WriteFaceData = true
diff --git a/test/freeflow/rans/test_pipe_zeroeqni.input b/test/freeflow/rans/test_pipe_zeroeqni.input
index 924d1259068a63aa870eca9865b69c759c6b2e03..9826fde70816d78ae246bd799636ab2acca0c0d6 100644
--- a/test/freeflow/rans/test_pipe_zeroeqni.input
+++ b/test/freeflow/rans/test_pipe_zeroeqni.input
@@ -29,5 +29,4 @@ MaxSteps = 10
 MaxRelativeShift = 1e-5
 
 [Vtk]
-AddVelocity = true
 WriteFaceData = false
diff --git a/test/freeflow/ransnc/test_flatplate.cc b/test/freeflow/ransnc/test_flatplate.cc
index 86969a129b0153f1aad36cec611dc4663ce7825e..40612bd1751f838209caf7db73ff6a9fb06b989d 100644
--- a/test/freeflow/ransnc/test_flatplate.cc
+++ b/test/freeflow/ransnc/test_flatplate.cc
@@ -145,8 +145,6 @@ int main(int argc, char** argv) try
     // intialize the vtk output module
     using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
     StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
-    using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
-    vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables, x));
     VtkOutputFields::init(vtkWriter); //!< Add model specific output fields
     vtkWriter.write(0.0);
 
diff --git a/test/freeflow/ransnc/test_flatplate2c.input b/test/freeflow/ransnc/test_flatplate2c.input
index d55a97171556db467dee87ba06ed1c1cf37b9eea..7ebd7c9baeb919cd936f45eaf9e9027b392f3645 100644
--- a/test/freeflow/ransnc/test_flatplate2c.input
+++ b/test/freeflow/ransnc/test_flatplate2c.input
@@ -27,6 +27,3 @@ NumericEpsilon.BaseEpsilon = 1e-8
 MaxSteps = 10
 TargetSteps = 8
 MaxRelativeShift = 1e-5
-
-[Vtk]
-AddVelocity = true
diff --git a/test/freeflow/ransnc/test_flatplate2cni.input b/test/freeflow/ransnc/test_flatplate2cni.input
index b23acfd7ee636916bc0126169bb926412cb8b552..ed2afed061316d3bfae2075e28539d04d86d8fad 100644
--- a/test/freeflow/ransnc/test_flatplate2cni.input
+++ b/test/freeflow/ransnc/test_flatplate2cni.input
@@ -27,6 +27,3 @@ NumericDifferenceMethod = 0
 MaxSteps = 10
 TargetSteps = 8
 MaxRelativeShift = 1e-5
-
-[Vtk]
-AddVelocity = true
diff --git a/test/freeflow/ransnc/test_flatplate2cni_wallfunction.input b/test/freeflow/ransnc/test_flatplate2cni_wallfunction.input
index 53b88eeca2ee4beaca00ae65a3b5188b8dd9655e..a39400964f9003fe7dabcbf70aae2bb0ef09ab80 100644
--- a/test/freeflow/ransnc/test_flatplate2cni_wallfunction.input
+++ b/test/freeflow/ransnc/test_flatplate2cni_wallfunction.input
@@ -28,6 +28,3 @@ NumericDifferenceMethod = 0
 MaxSteps = 10
 TargetSteps = 8
 MaxRelativeShift = 1e-5
-
-[Vtk]
-AddVelocity = true
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/test_stokes1p2cdarcy1p2chorizontal.cc b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/test_stokes1p2cdarcy1p2chorizontal.cc
index 7664a9ed62eebf2f9d817f1f61f4175d43f30f4c..0197c2208afbdc9c5349d754b77f809956f83d61 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/test_stokes1p2cdarcy1p2chorizontal.cc
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/test_stokes1p2cdarcy1p2chorizontal.cc
@@ -193,8 +193,6 @@ int main(int argc, char** argv) try
 
     StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName);
     GET_PROP_TYPE(StokesTypeTag, VtkOutputFields)::init(stokesVtkWriter);
-    using StokesVelocityOutput = typename GET_PROP_TYPE(StokesTypeTag, VelocityOutput);
-    stokesVtkWriter.addVelocityOutput(std::make_shared<StokesVelocityOutput>(*stokesGridVariables, stokesSol));
     stokesVtkWriter.write(0.0);
 
     VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyName);
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/test_stokes1p2cdarcy1p2chorizontal.input b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/test_stokes1p2cdarcy1p2chorizontal.input
index 3021588f84a6dc2eebc761b1c97a3c2dea9ff2b7..f890c4c15d68fb187a24954306e2e21d7c81c7c0 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/test_stokes1p2cdarcy1p2chorizontal.input
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/test_stokes1p2cdarcy1p2chorizontal.input
@@ -34,8 +34,5 @@ Tortuosity = 0.5
 Name = test_stokes1p2cdarcy1p2chorizontal
 EnableGravity = false
 
-[Vtk]
-AddVelocity = 1
-
 [Assembly.NumericDifference]
 BaseEpsilon = 1e-6
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical.cc b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical.cc
index 30bf4e121b273ef91a5bf6ee589691f87733825a..1f0673f05b206802e65b41b13d988e08ecc0c1f8 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical.cc
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical.cc
@@ -194,8 +194,6 @@ int main(int argc, char** argv) try
 
     StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName);
     GET_PROP_TYPE(StokesTypeTag, VtkOutputFields)::init(stokesVtkWriter);
-    using StokesVelocityOutput = typename GET_PROP_TYPE(StokesTypeTag, VelocityOutput);
-    stokesVtkWriter.addVelocityOutput(std::make_shared<StokesVelocityOutput>(*stokesGridVariables, stokesSol));
     stokesVtkWriter.write(0.0);
 
     VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyName);
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical.input b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical.input
index 976011231b72fa80cde1b8b36f40b59583b93f1a..45bdee9bf0f65d7355b6daf0174a050dd3aa00a5 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical.input
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical.input
@@ -30,8 +30,5 @@ Tortuosity = 0.5
 Name = test_stokes1p2cdarcy1p2cvertical
 EnableGravity = false
 
-[Vtk]
-AddVelocity = 1
-
 [Assembly.NumericDifference]
 BaseEpsilon = 1e-6
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical_diffusion.input b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical_diffusion.input
index aea1232f6bdb8116b502f82581d60ef418e2b4e6..e43b3cdd954563d15687ba39d6c635bdc4c484eb 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical_diffusion.input
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical_diffusion.input
@@ -29,6 +29,3 @@ Tortuosity = 1.0
 Name = test_stokes1p2cdarcy1p2cvertical_diffusion
 EnableGravity = false
 OnlyDiffusion = true
-
-[Vtk]
-AddVelocity = 1
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cdarcy2p2chorizontal.cc b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cdarcy2p2chorizontal.cc
index 95b7216eb849c27eb02db1e490bee47d19c0a567..2f8864a37ac9d3cca45a434b12e306995f882f19 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cdarcy2p2chorizontal.cc
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cdarcy2p2chorizontal.cc
@@ -186,8 +186,6 @@ int main(int argc, char** argv) try
 
     StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName);
     GET_PROP_TYPE(StokesTypeTag, VtkOutputFields)::init(stokesVtkWriter);
-    using StokesVelocityOutput = typename GET_PROP_TYPE(StokesTypeTag, VelocityOutput);
-    stokesVtkWriter.addVelocityOutput(std::make_shared<StokesVelocityOutput>(*stokesGridVariables, stokesSol));
     stokesVtkWriter.write(0.0);
 
     VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyName);
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cdarcy2p2chorizontal.input b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cdarcy2p2chorizontal.input
index 62dcb440c0eff8d83b10349ae2222e138a9dc677..c7c6e3e6ceb976f5093bbf999a03810a955f6010 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cdarcy2p2chorizontal.input
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cdarcy2p2chorizontal.input
@@ -48,7 +48,6 @@ EnableGravity = true
 InterfaceDiffusionCoefficientAvg = FreeFlowOnly
 
 [Vtk]
-AddVelocity = true
 WriteFaceData = false
 
 [Newton]
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cnidarcy2p2cnihorizontal.input b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cnidarcy2p2cnihorizontal.input
index 0199afc02cba16c8256c9bdde7d3db2796a96218..d9ea1983330b8ab8e49b2f2933d54721575a5d29 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cnidarcy2p2cnihorizontal.input
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cnidarcy2p2cnihorizontal.input
@@ -48,7 +48,6 @@ EnableGravity = true
 InterfaceDiffusionCoefficientAvg = FreeFlowOnly
 
 [Vtk]
-AddVelocity = true
 WriteFaceData = false
 
 [Newton]
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/test_stokes1pdarcy1phorizontal.cc b/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/test_stokes1pdarcy1phorizontal.cc
index 3ea7a0aedb166e5f666ac09e8961c752b9ca0a6b..c1caa48d32c8b0fe5decc723889131fa6133b04d 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/test_stokes1pdarcy1phorizontal.cc
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/test_stokes1pdarcy1phorizontal.cc
@@ -160,8 +160,6 @@ int main(int argc, char** argv) try
 
     StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName);
     GET_PROP_TYPE(StokesTypeTag, VtkOutputFields)::init(stokesVtkWriter);
-    using StokesVelocityOutput = typename GET_PROP_TYPE(StokesTypeTag, VelocityOutput);
-    stokesVtkWriter.addVelocityOutput(std::make_shared<StokesVelocityOutput>(*stokesGridVariables, stokesSol));
     stokesVtkWriter.write(0.0);
 
     VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyName);
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/test_stokes1pdarcy1phorizontal.input b/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/test_stokes1pdarcy1phorizontal.input
index 58537151260604847287be38a867ae36d6e32918..9072a25d560ccf20b9315e50c3c6ff0293f259c5 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/test_stokes1pdarcy1phorizontal.input
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/test_stokes1pdarcy1phorizontal.input
@@ -22,6 +22,3 @@ AlphaBeaversJoseph = 1.0
 [Problem]
 Name = test_stokes1pdarcy1phorizontal
 EnableGravity = false
-
-[Vtk]
-AddVelocity = 1
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/test_stokes1pdarcy1pvertical.cc b/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/test_stokes1pdarcy1pvertical.cc
index b6e51d5f91bf80d035ef6414a48c21ae3d405152..859451b901843d1efada3d459e6f9f6fa6e27cae 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/test_stokes1pdarcy1pvertical.cc
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/test_stokes1pdarcy1pvertical.cc
@@ -163,8 +163,6 @@ int main(int argc, char** argv) try
 
     StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName);
     GET_PROP_TYPE(StokesTypeTag, VtkOutputFields)::init(stokesVtkWriter);
-    using StokesVelocityOutput = typename GET_PROP_TYPE(StokesTypeTag, VelocityOutput);
-    stokesVtkWriter.addVelocityOutput(std::make_shared<StokesVelocityOutput>(*stokesGridVariables, stokesSol));
     stokesVtkWriter.write(0.0);
 
     VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyName);
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/test_stokes1pdarcy1pvertical.input b/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/test_stokes1pdarcy1pvertical.input
index 18e3f20b369d33867e5075020011a579e1d43323..7b604260f7f4e5b8d904c2e0b241f08363609453 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/test_stokes1pdarcy1pvertical.input
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/test_stokes1pdarcy1pvertical.input
@@ -23,8 +23,5 @@ AlphaBeaversJoseph = 1.0
 Name = test_stokes1pdarcy1pvertical
 EnableGravity = false
 
-[Vtk]
-AddVelocity = 1
-
 [Assembly.NumericDifference]
 BaseEpsilon = 1e-6
diff --git a/test/multidomain/boundary/stokesdarcy/1p_2p/test_stokes1pdarcy2pvertical.cc b/test/multidomain/boundary/stokesdarcy/1p_2p/test_stokes1pdarcy2pvertical.cc
index 430337e91e07217a7ba99fa6d5929bae96dc8ad5..35d4dc9ccc04a076ca7e788009f15786608a193a 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_2p/test_stokes1pdarcy2pvertical.cc
+++ b/test/multidomain/boundary/stokesdarcy/1p_2p/test_stokes1pdarcy2pvertical.cc
@@ -185,8 +185,6 @@ int main(int argc, char** argv) try
 
     StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName);
     GET_PROP_TYPE(StokesTypeTag, VtkOutputFields)::init(stokesVtkWriter);
-    using StokesVelocityOutput = typename GET_PROP_TYPE(StokesTypeTag, VelocityOutput);
-    stokesVtkWriter.addVelocityOutput(std::make_shared<StokesVelocityOutput>(*stokesGridVariables, stokesSol));
     stokesVtkWriter.write(0.0);
 
     VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyName);
diff --git a/test/multidomain/boundary/stokesdarcy/1p_2p/test_stokes1pdarcy2pvertical.input b/test/multidomain/boundary/stokesdarcy/1p_2p/test_stokes1pdarcy2pvertical.input
index 35fa237d71bc1afb86c390699818f2eb79fbdbf5..869307a12bece65bce25ebe5dc303d723fd9fe94 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_2p/test_stokes1pdarcy2pvertical.input
+++ b/test/multidomain/boundary/stokesdarcy/1p_2p/test_stokes1pdarcy2pvertical.input
@@ -37,9 +37,6 @@ VgN = 8.0
 Name = test_stokes1pdarcy2pvertical
 EnableGravity = false
 
-[Vtk]
-AddVelocity = 1
-
 [Assembly.NumericDifference]
 BaseEpsilon = 1e-6