diff --git a/dumux/material/constraintsolvers/compositionfromfugacities.hh b/dumux/material/constraintsolvers/compositionfromfugacities.hh
index 8c256fafbbabe44ffc865058def2fd4b28a622d8..62d89f7b3ad55ce12c45c726fda6c9a25fa54a53 100644
--- a/dumux/material/constraintsolvers/compositionfromfugacities.hh
+++ b/dumux/material/constraintsolvers/compositionfromfugacities.hh
@@ -60,15 +60,15 @@ public:
                              int phaseIdx,
                              const ComponentVector &fugVec)
     {
-        if (FluidSystem::isIdealMixture(phaseIdx))
-            return;
-
-        // Pure component fugacities
-        for (int i = 0; i < numComponents; ++ i) {
-            //std::cout << f << " -> " << mutParams.fugacity(phaseIdx, i)/f << "\n";
-            fluidState.setMoleFraction(phaseIdx,
-                                   i,
-                                   1.0/numComponents);
+        if (!FluidSystem::isIdealMixture(phaseIdx))
+        {
+            // Pure component fugacities
+            for (unsigned int i = 0; i < numComponents; ++ i)
+            {
+                fluidState.setMoleFraction(phaseIdx,
+                                           i,
+                                           1.0/numComponents);
+            }
         }
     }
 
@@ -207,7 +207,6 @@ protected:
 
         Scalar rho = FluidSystem::density(fluidState, paramCache, phaseIdx);
         fluidState.setDensity(phaseIdx, rho);
-        return;
     }
 
     template <class FluidState>
@@ -291,21 +290,17 @@ protected:
         Dune::FieldVector<Scalar, numComponents> origComp;
         Scalar relError = 0;
         Scalar sumDelta = 0;
-        Scalar sumx = 0;
-        for (int i = 0; i < numComponents; ++i) {
+        for (unsigned int i = 0; i < numComponents; ++i)
+        {
             origComp[i] = fluidState.moleFraction(phaseIdx, i);
             relError = std::max(relError, std::abs(x[i]));
-
-            sumx += std::abs(fluidState.moleFraction(phaseIdx, i));
             sumDelta += std::abs(x[i]);
         }
 
-#if 1
         // chop update to at most 20% change in composition
         const Scalar maxDelta = 0.2;
         if (sumDelta > maxDelta)
             x /= (sumDelta/maxDelta);
-#endif
 
         //Scalar curDefect = calculateDefect_(fluidState, phaseIdx, targetFug);
         //Scalar nextDefect;