diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaopressure2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaopressure2p.hh
deleted file mode 100644
index 7e31741d557c11e7886fe969c70fb55115166eba..0000000000000000000000000000000000000000
--- a/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaopressure2p.hh
+++ /dev/null
@@ -1,10 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-#ifndef DUMUX_FVMPFAOPRESSURE2P_OLD_HH
-#define DUMUX_FVMPFAOPRESSURE2P_OLD_HH
-
-#warning This file is deprecated. Use fvmpfa/omethod/fvmpfaopressure2p.hh instead
-
-#include <dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaopressure2p.hh>
-
-#endif
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaopressureproperties2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaopressureproperties2p.hh
deleted file mode 100644
index ad8f7430767b5687cc62033527a2c961eb8cb158..0000000000000000000000000000000000000000
--- a/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaopressureproperties2p.hh
+++ /dev/null
@@ -1,11 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-#ifndef DUMUX_FVMPFAOPROPERTIES2P_OLD_HH
-#define DUMUX_FVMPFAOPROPERTIES2P_OLD_HH
-
-#warning This file is deprecated. Use fvmpfa/omethod/fvmpfaopressureproperties2p.hh or \
-         fvmpfa/omethod/fvmpfaopressurepropertiessimple2p.hh instead
-
-#include <dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaopressurepropertiessimple2p.hh>
-
-#endif
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaovelocity2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaovelocity2p.hh
deleted file mode 100644
index cc44b48d95429d391dac3a13fe6d6caa45b8a5bb..0000000000000000000000000000000000000000
--- a/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaovelocity2p.hh
+++ /dev/null
@@ -1,10 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-#ifndef DUMUX_MPFAOVELOCITY2P_OLD_HH
-#define DUMUX_MPFAOVELOCITY2P_OLD_HH
-
-#warning This file is deprecated. Use fvmpfa/omethod/fvmpfaovelocity2p.hh instead
-
-#include <dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaovelocity2p.hh>
-
-#endif
diff --git a/dumux/decoupled/2p/impes/impesproblem2p.hh b/dumux/decoupled/2p/impes/impesproblem2p.hh
index 78bfd0f20796af91652e9f711d91da1971a9ad60..7d46bbfcf4d880ce576eb82f2789da23df149ba3 100644
--- a/dumux/decoupled/2p/impes/impesproblem2p.hh
+++ b/dumux/decoupled/2p/impes/impesproblem2p.hh
@@ -26,7 +26,7 @@
 #include <dumux/decoupled/common/impet.hh>
 #include <dumux/decoupled/common/impetproblem.hh>
 #include "impesproperties2p.hh"
-//DEPRECATED: include should be removed!!! -> Goal: Only include property files in the problem!
+//TODO: include should be removed!!! -> Goal: Only include property files in the problem!
 #include "impesproperties2padaptive.hh"