diff --git a/CHANGELOG b/CHANGELOG
index 1c8d9e97fefa0c69ae0246dd5d6a80867bf16c2f..8ba4045e7c7cef839c4b356141508cdf6dc0546a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,13 @@
 Differences Between DuMuX 2.6 and DuMuX 2.7
 ===================================================
+* Deprecated CLASSES/FILES, to be removed after 2.6:
+  - CellData2P2Cmultiphysics, replaced by CellData2P2CMultiPhysics
+
+* Deprecated MEMBER FUNCTIONS, to be removed after 2.6:
+  - The 1p2c volume variables no longer use the method tortuosity() from
+    spatial params class, the value is now calculated within the effective
+    diffusivity model. Thus the method is deprecated in the spacial params
+    classes FVSpatialParamsOneP and ImplicitSpatialParamsOneP.
 
 * DELETED classes/files, property names, constants/enums, 
   member functions, which have been deprecated in DuMuX 2.6:
diff --git a/dumux/decoupled/2p2c/celldata2p2cadaptive.hh b/dumux/decoupled/2p2c/celldata2p2cadaptive.hh
index f97c1fccffd8048ec30a71c157d286fb11a9f068..048650b7739b8ba550de8d961ff115cbd033ebf6 100644
--- a/dumux/decoupled/2p2c/celldata2p2cadaptive.hh
+++ b/dumux/decoupled/2p2c/celldata2p2cadaptive.hh
@@ -38,7 +38,7 @@ namespace Dumux
  * @tparam TypeTag The Type Tag
  */
 template<class TypeTag>
-class CellData2P2CAdaptive: public CellData2P2Cmultiphysics<TypeTag>
+class CellData2P2CAdaptive: public CellData2P2CMultiPhysics<TypeTag>
 {
 private:
     typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
@@ -106,7 +106,7 @@ public:
 
 
     //! Constructs an adaptive CellData object
-    CellData2P2CAdaptive() : CellData2P2Cmultiphysics<TypeTag>()
+    CellData2P2CAdaptive() : CellData2P2CMultiPhysics<TypeTag>()
     {
         for (int i = 0; i < numPhases;i++)
             upwindError_[i] = 0;
diff --git a/dumux/decoupled/2p2c/celldata2p2cmultiphysics.hh b/dumux/decoupled/2p2c/celldata2p2cmultiphysics.hh
index 253d8ff4e8f2b0dc603cd3059cc416a76f652d2c..81dc4d90b8cd422d39b3da089ed6cf233bdde34c 100644
--- a/dumux/decoupled/2p2c/celldata2p2cmultiphysics.hh
+++ b/dumux/decoupled/2p2c/celldata2p2cmultiphysics.hh
@@ -19,6 +19,8 @@
 #ifndef DUMUX_ELEMENTDATA2P2C_MULTYPHYSICS_HH
 #define DUMUX_ELEMENTDATA2P2C_MULTYPHYSICS_HH
 
+#include <dune/common/deprecated.hh>
+
 #include "2p2cproperties.hh"
 #include "celldata2p2c.hh"
 #include <dumux/decoupled/2p2c/pseudo1p2cfluidstate.hh>
@@ -317,10 +319,11 @@ public:
 };
 
 template<class TypeTag>
-class CellData2P2Cmultiphysics : public CellData2P2CMultiPhysics<TypeTag>
+class DUNE_DEPRECATED_MSG("Use CellData2P2CMultiPhysics instead")
+CellData2P2Cmultiphysics : public CellData2P2CMultiPhysics<TypeTag>
 {
 public:
-    //! DEPRECATED!! Constructor for a local storage object
+    //! Constructor for a local storage object
     CellData2P2Cmultiphysics() : CellData2P2CMultiPhysics<TypeTag>()
     {}
 };
diff --git a/dumux/implicit/1p2c/1p2cvolumevariables.hh b/dumux/implicit/1p2c/1p2cvolumevariables.hh
index 9134571340191664cad6940576be94317f09d541..0606fea24bacf6b952eac183369942d418c3d395 100644
--- a/dumux/implicit/1p2c/1p2cvolumevariables.hh
+++ b/dumux/implicit/1p2c/1p2cvolumevariables.hh
@@ -91,13 +91,6 @@ public:
         completeFluidState(priVars, problem, element, fvGeometry, scvIdx, fluidState_);
 
         porosity_ = problem.spatialParams().porosity(element, fvGeometry, scvIdx);
-        tortuosity_ = problem.spatialParams().tortuosity(element, fvGeometry, scvIdx);
-        if (tortuosity_ > 0)
-        {
-        	std::cerr << "ERROR: You are still using the tortuosity method in your spatialParams, which is not used anymore.\n"
-        			  << "Please remove it, the calculation is done within the effective diffusivity model.\n";
-        	exit(1);
-        }
 
         dispersivity_ = problem.spatialParams().dispersivity(element, fvGeometry, scvIdx);
 
@@ -281,7 +274,6 @@ protected:
     { }
 
     Scalar porosity_;    //!< Effective porosity within the control volume
-    Scalar tortuosity_;
     GlobalPosition dispersivity_;
     Scalar diffCoeff_;
     FluidState fluidState_;
diff --git a/dumux/material/spatialparams/fvspatialparams1p.hh b/dumux/material/spatialparams/fvspatialparams1p.hh
index f7d055b4f576109c948914d905916e1ed1c4c731..e0fa233194552655063822f475a4332b99859e9a 100644
--- a/dumux/material/spatialparams/fvspatialparams1p.hh
+++ b/dumux/material/spatialparams/fvspatialparams1p.hh
@@ -31,6 +31,7 @@
 
 #include <dumux/common/basicproperties.hh>
 
+#include <dune/common/deprecated.hh>
 #include <dune/common/fmatrix.hh>
 
 namespace Dumux
@@ -199,8 +200,7 @@ public:
                    "a porosityAtPos() method.");
     }
 
-    // PRELIMINARY FUNCTION! DEPRECATED WHEN CREATED
-    double tortuosity(const Element &element) const
+    double DUNE_DEPRECATED tortuosity(const Element &element) const
     {
             return -1;
     }
diff --git a/dumux/material/spatialparams/implicitspatialparams1p.hh b/dumux/material/spatialparams/implicitspatialparams1p.hh
index cd6e592ea637d16f588f2df250cee020d864229a..77638087abbcb0da31a4a7ccba40339deb5e0df3 100644
--- a/dumux/material/spatialparams/implicitspatialparams1p.hh
+++ b/dumux/material/spatialparams/implicitspatialparams1p.hh
@@ -31,6 +31,7 @@
 
 #include <dumux/implicit/common/implicitproperties.hh>
 
+#include <dune/common/deprecated.hh>
 #include <dune/common/fmatrix.hh>
 
 namespace Dumux {
@@ -198,8 +199,7 @@ public:
         }
     }
 
-    // PRELIMINARY FUNCTION! DEPRECATED WHEN CREATED
-    double tortuosity(const Element &element,
+    double DUNE_DEPRECATED tortuosity(const Element &element,
                     const FVElementGeometry &fvGeometry,
                     const int scvIdx) const
     {