diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2p.hh
deleted file mode 100644
index 12144090c5b01c4a301c4bd26dda3284b1f14568..0000000000000000000000000000000000000000
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2p.hh
+++ /dev/null
@@ -1,36 +0,0 @@
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation, either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-#ifndef DUMUX_FVMPFAL2OFABOUNDPRESSURE2P_HH
-#define DUMUX_FVMPFAL2OFABOUNDPRESSURE2P_HH
-
-#warning This file is deprecated. Use fvmpfal2dpressure2p.hh instead.
-#include "fvmpfal2dpressure2p.hh"
-
-namespace Dumux
-{
-template<class TypeTag>
-class FVMPFAL2PFABoundPressure2P: public FvMpfaL2dPressure2p<TypeTag>
-{
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
-
- DUNE_DEPRECATED_MSG("use FvMpfaL2dPressure2p(problem) instead")
- FVMPFAL2PFABoundPressure2P(Problem& problem):
- FvMpfaL2dPressure2p<TypeTag>(problem)
- {}
-};
-}
-#endif
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2padaptive.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2padaptive.hh
deleted file mode 100644
index dfd61c5cb04625d46756cd373a806df52bb44b27..0000000000000000000000000000000000000000
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2padaptive.hh
+++ /dev/null
@@ -1,36 +0,0 @@
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation, either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-#ifndef DUMUX_FVMPFAL2OFABOUNDPRESSURE2P_ADAPTIVE_HH
-#define DUMUX_FVMPFAL2OFABOUNDPRESSURE2P_ADAPTIVE_HH
-
-#warning This file is deprecated. Use fvmpfal2dpressure2padaptive.hh instead.
-#include "fvmpfal2dpressure2padaptive.hh"
-
-namespace Dumux
-{
-template<class TypeTag>
-class FVMPFAL2PFABoundPressure2PAdaptive: public FvMpfaL2dPressure2pAdaptive<TypeTag>
-{
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
-
- DUNE_DEPRECATED_MSG("use FvMpfaL2dPressure2pAdaptive(problem) instead")
- FVMPFAL2PFABoundPressure2PAdaptive(Problem& problem):
- FvMpfaL2dPressure2pAdaptive<TypeTag>(problem)
- {}
-};
-}
-#endif
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2p.hh
deleted file mode 100644
index ea4b1e5c4f9d438198e720ff331823c047a2b885..0000000000000000000000000000000000000000
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2p.hh
+++ /dev/null
@@ -1,37 +0,0 @@
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation, either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-
-#ifndef DUMUX_MPFAL2PFABOUNDVELOCITY2P_HH
-#define DUMUX_MPFAL2PFABOUNDVELOCITY2P_HH
-
-#warning This file is deprecated. Use fvmpfal2dpressurevelocity2p.hh instead.
-#include "fvmpfal2dpressurevelocity2p.hh"
-
-namespace Dumux
-{
-template<class TypeTag>
-class FVMPFAL2PFABoundPressure2P: public FvMpfaL2dPressureVelocity2p<TypeTag>
-{
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
-
- DUNE_DEPRECATED_MSG("use FvMpfaL2dPressureVelocity2p(problem) instead")
- FVMPFAL2PFABoundPressure2P(Problem& problem):
- FvMpfaL2dPressureVelocity2p<TypeTag>(problem)
- {}
-};
-}
-#endif
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2padaptive.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2padaptive.hh
deleted file mode 100644
index bcd29a2e7d3f09b2d5511cb6c1717c7df7e5e6a1..0000000000000000000000000000000000000000
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2padaptive.hh
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation, either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-
-#ifndef DUMUX_MPFAL2PFABOUNDVELOCITIES2P_ADAPTIVE_HH
-#define DUMUX_MPFAL2PFABOUNDVELOCITIES2P_ADAPTIVE_HH
-
-#warning This file is deprecated. Use fvmpfal2dpressurevelocity2padaptive.hh instead.
-#include "fvmpfal2dpressurevelocity2padaptive.hh"
-
-namespace Dumux
-{
-template<class TypeTag>
-class FVMPFAL2PFABoundPressure2P: public FvMpfaL2dPressureVelocity2pAdaptive<TypeTag>
-{
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
-
- DUNE_DEPRECATED_MSG("use FvMpfaL2dPressureVelocity2pAdaptive(problem) instead")
- FVMPFAL2PFABoundPressure2P(Problem& problem):
- FvMpfaL2dPressureVelocity2pAdaptive<TypeTag>(problem)
- {}
-};
-}
-#endif
-
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundpressure2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundpressure2p.hh
deleted file mode 100644
index 7ed5fc539f483e204f7fb02960ea38553fb4c859..0000000000000000000000000000000000000000
--- a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundpressure2p.hh
+++ /dev/null
@@ -1,36 +0,0 @@
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation, either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-#ifndef DUMUX_FVMPFAO2OFABOUNDPRESSURE2P_HH
-#define DUMUX_FVMPFAO2OFABOUNDPRESSURE2P_HH
-
-#warning This file is deprecated. Use fvmpfao2dpressure2p.hh instead.
-#include "fvmpfao2dpressure2p.hh"
-
-namespace Dumux
-{
-template<class TypeTag>
-class FVMPFAO2PFABoundPressure2P: public FvMpfaO2dPressure2p<TypeTag>
-{
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
-
- DUNE_DEPRECATED_MSG("use FvMpfaO2dPressure2p(problem) instead")
- FVMPFAO2PFABoundPressure2P(Problem& problem):
- FvMpfaO2dPressure2p<TypeTag>(problem)
- {}
-};
-}
-#endif
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundvelocity2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundvelocity2p.hh
deleted file mode 100644
index 61b0ddc9b628500caf79a78715ac3a33c2627137..0000000000000000000000000000000000000000
--- a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundvelocity2p.hh
+++ /dev/null
@@ -1,37 +0,0 @@
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation, either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-
-#ifndef DUMUX_MPFAO2PFABOUNDVELOCITIES2P_HH
-#define DUMUX_MPFAO2PFABOUNDVELOCITIES2P_HH
-
-#warning This file is deprecated. Use fvmpfao2dpressurevelocity2p.hh instead.
-#include "fvmpfao2dpressurevelocity2p.hh"
-
-namespace Dumux
-{
-template<class TypeTag>
-class FVMPFAO2PFABoundPressure2P: public FvMpfaO2dPressureVelocity2p<TypeTag>
-{
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
-
- DUNE_DEPRECATED_MSG("use FvMpfaO2dPressureVelocity2p(problem) instead")
- FVMPFAO2PFABoundPressure2P(Problem& problem):
- FvMpfaO2dPressureVelocity2p<TypeTag>(problem)
- {}
-};
-}
-#endif