diff --git a/dumux/boxmodels/2p2c/2p2cmodel.hh b/dumux/boxmodels/2p2c/2p2cmodel.hh
index f950f2d239aee9bd731d231214d770bbf22c6a37..09f86661b3b9c33bea832261a6d0ce7f5d324404 100644
--- a/dumux/boxmodels/2p2c/2p2cmodel.hh
+++ b/dumux/boxmodels/2p2c/2p2cmodel.hh
@@ -215,6 +215,9 @@ public:
 
         setSwitched_(false);
         resetPhasePresence_();
+        /*this->localJacobian().updateStaticData(this->curSolFunction(),
+         this->prevSolFunction());
+         */
     };
 
     /*!
@@ -652,11 +655,9 @@ protected:
             if (xll + xlg > xlMax)
             {
                 // liquid phase appears
-                /*
-                std::cout << "Liquid phase appears at vertex " << globalIdx
+                std::cout << "liquid phase appears at vertex " << globalIdx
                         << ", coordinates: " << globalPos << ", xll + xlg: "
                         << xll + xlg << std::endl;
-                */
                 newPhasePresence = bothPhases;
                 if (formulation == pgSl)
                     globalSol[globalIdx][switchIdx] = 0.001;
@@ -682,11 +683,9 @@ protected:
             if (xgl + xgg > xgMax)
             {
                 // gas phase appears
-                /*
                 std::cout << "gas phase appears at vertex " << globalIdx
                         << ", coordinates: " << globalPos << ", x_gl + x_gg: "
                         << xgl + xgg << std::endl;
-                */
                 newPhasePresence = bothPhases;
                 if (formulation == pgSl)
                     globalSol[globalIdx][switchIdx] = 0.999;
@@ -704,11 +703,9 @@ protected:
             {
                 wouldSwitch = true;
                 // gas phase disappears
-                /*
                 std::cout << "Gas phase disappears at vertex " << globalIdx
                         << ", coordinates: " << globalPos << ", Sg: "
                         << volVars.saturation(gPhaseIdx) << std::endl;
-                */
                 newPhasePresence = lPhaseOnly;
 
                 globalSol[globalIdx][switchIdx]
@@ -718,11 +715,9 @@ protected:
             {
                 wouldSwitch = true;
                 // liquid phase disappears
-                /*
                 std::cout << "Liquid phase disappears at vertex " << globalIdx
                         << ", coordinates: " << globalPos << ", Sl: "
                         << volVars.saturation(lPhaseIdx) << std::endl;
-                */
                 newPhasePresence = gPhaseOnly;
 
                 globalSol[globalIdx][switchIdx]
diff --git a/dumux/boxmodels/2p2c/2p2cnewtoncontroller.hh b/dumux/boxmodels/2p2c/2p2cnewtoncontroller.hh
index 17bea69cbfa3a1c819de07600c8e4f35da07226c..4910f04b89081143bfe7b4038c7484f97f6900b3 100644
--- a/dumux/boxmodels/2p2c/2p2cnewtoncontroller.hh
+++ b/dumux/boxmodels/2p2c/2p2cnewtoncontroller.hh
@@ -68,7 +68,7 @@ public:
     TwoPTwoCNewtonController()
     {
         this->setRelTolerance(1e-7);
-        this->setTargetSteps(10);
+        this->setTargetSteps(9);
         this->setMaxSteps(18);
     };
 
diff --git a/dumux/boxmodels/2p2c/2p2cvolumevariables.hh b/dumux/boxmodels/2p2c/2p2cvolumevariables.hh
index ecacb0fd466a8d13f92f63ea37663e89152a7a3e..9fdc897f4bc6e4dff7421b188e8e3373adb11dd8 100644
--- a/dumux/boxmodels/2p2c/2p2cvolumevariables.hh
+++ b/dumux/boxmodels/2p2c/2p2cvolumevariables.hh
@@ -159,10 +159,10 @@ public:
         /////////////
         // update the temperature part of the energy module
         Scalar T = asImp_().getTemperature(priVars,
-                                           element,
-                                           elemGeom,
-                                           scvIdx,
-                                           problem);
+                                             element,
+                                             elemGeom,
+                                             scvIdx,
+                                             problem);
         Valgrind::CheckDefined(T);
         for (int i = 0; i < numPhases; ++i)
             fs.setTemperature(i, T);
@@ -431,23 +431,15 @@ public:
 #endif
 
 protected:
-    Scalar getTemperature(const PrimaryVariables &priVars,
-                          const Element &element,
-                          const FVElementGeometry &elemGeom,
-                          int scvIdx,
-                          const Problem &problem)
+
+    Scalar getTemperature_(const PrimaryVariables &priVars,
+                         const Element &element,
+                         const FVElementGeometry &elemGeom,
+                         int scvIdx,
+                         const Problem &problem)
     {
         return problem.temperature(element, elemGeom, scvIdx);
     }
-    
-    template <class MutableParameters>
-    void updateEnergy(MutableParameters &mutParams,
-                      const PrimaryVariables &priVars,
-                      const Element &element,
-                      const FVElementGeometry &elemGeom,
-                      int scvIdx,
-                      const Problem &problem)
-    {};        
 
     Scalar porosity_;        //!< Effective porosity within the control volume
     Scalar mobility_[numPhases];  //!< Effective mobility within the control volume