diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfalpressureproperties2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfalpressureproperties2p.hh
deleted file mode 100644
index bc672076fb6722b041df06c138bd53159b1de1b2..0000000000000000000000000000000000000000
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfalpressureproperties2p.hh
+++ /dev/null
@@ -1,34 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * 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_FVMPFALPROPERTIES2P_HH
-#define DUMUX_FVMPFALPROPERTIES2P_HH
-
-
-#warning This file is deprecated. Use fvmpfal2dpressureproperties2p.hh instead.
-#include "fvmpfal2dpressureproperties2p.hh"
-
-namespace Dumux
-{
-namespace Properties
-{
-NEW_TYPE_TAG(FVMPFALPressureTwoP, INHERITS_FROM(FvMpfaL2dPressureTwoP));
-}
-}
-#endif
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfalpressureproperties2padaptive.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfalpressureproperties2padaptive.hh
deleted file mode 100644
index f568ac1df66cfd9fcddd0baeaa96326a46da5bc9..0000000000000000000000000000000000000000
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfalpressureproperties2padaptive.hh
+++ /dev/null
@@ -1,35 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * 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_FVMPFALPROPERTIES2P_ADAPTIVE_HH
-#define DUMUX_FVMPFALPROPERTIES2P_ADAPTIVE_HH
-
-
-#warning This file is deprecated. Use fvmpfal2dpressureproperties2padaptive.hh instead.
-#include "fvmpfal2dpressureproperties2padaptive.hh"
-
-namespace Dumux
-{
-namespace Properties
-{
-NEW_TYPE_TAG(FVMPFALPressureTwoPAdaptive, INHERITS_FROM(FvMpfaL2dPressureTwoPAdaptive));
-}
-}
-#endif
-
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaopressure2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaopressure2p.hh
deleted file mode 100644
index 4fe17b15e860650e9312f1b923b1e1a3421f4697..0000000000000000000000000000000000000000
--- a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaopressure2p.hh
+++ /dev/null
@@ -1,23 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * 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_FVMPFAOPRESSURE2P_HH
-#define DUMUX_FVMPFAOPRESSURE2P_HH
-
-#warning This file is deprecated. Use fvmpfao2dpressure2p.hh instead.
-#endif
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaopressureproperties2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaopressureproperties2p.hh
deleted file mode 100644
index 18a60c2403d47f39696ee05d215d5dc1a235fb1d..0000000000000000000000000000000000000000
--- a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaopressureproperties2p.hh
+++ /dev/null
@@ -1,40 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * 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/>. *
- *****************************************************************************/
-
-/*!
- * \ingroup MPFA
- * \ingroup Properties
- * \file
- *
- * \brief Properties for the MPFA-O method.
- */
-#ifndef DUMUX_FVMPFAOPROPERTIES2P_HH
-#define DUMUX_FVMPFAOPROPERTIES2P_HH
-
-#warning This file is deprecated. Use fvmpfao2dpressureproperties2p.hh instead.
-#include "fvmpfao2dpressureproperties2p.hh"
-
-namespace Dumux
-{
-namespace Properties
-{
-NEW_TYPE_TAG(FVMPFAOPressureTwoP, INHERITS_FROM(FvMpfaO2dPressureTwoP));
-}
-}
-#endif
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaovelocity2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaovelocity2p.hh
deleted file mode 100644
index 9a4ffc534d3b3207036e78ca79521d9f4f18e3ff..0000000000000000000000000000000000000000
--- a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaovelocity2p.hh
+++ /dev/null
@@ -1,24 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * 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_MPFAOVELOCITY2P_HH
-#define DUMUX_MPFAOVELOCITY2P_HH
-
-#warning This file is deprecated. Use fvmpfao2dpressurevelocity2p.hh instead.
-#endif