diff --git a/dumux/material/fluidsystems/h2oairfluidsystem.hh b/dumux/material/fluidsystems/h2oairfluidsystem.hh
index 7e1014ee0e7a125ff09648ad1c26466d73c350bd..907f7d97b5e839e5dce5c07f9bd4bae1638cfbbf 100644
--- a/dumux/material/fluidsystems/h2oairfluidsystem.hh
+++ b/dumux/material/fluidsystems/h2oairfluidsystem.hh
@@ -687,24 +687,6 @@ public:
             // lambda_air is approximately 0.78*lambda_N2+0.22*lambda_O2
             const Scalar lambdaPureAir = 0.0255535;
 
-//TODO: arithmetic mean correct? partial pressure for lambdaH2O?
-//            if (useComplexRelations){
-//                Scalar xAir = fluidState.moleFraction(phaseIdx, AirIdx);
-//                Scalar xH2O = fluidState.moleFraction(phaseIdx, H2OIdx);
-//                Scalar lambdaAir = xAir * lambdaPureAir;
-//
-//                // Assuming Raoult's, Daltons law and ideal gas
-//                // in order to obtain the partial density of water in the air phase
-//                const Scalar temperature = fluidState.temperature(phaseIdx) ;
-//                const Scalar pressure = fluidState.pressure(phaseIdx);
-//                const Scalar partialPressure  = pressure * xH2O;
-//
-//                // thermal conductivity of vapor
-//                Scalar lambdaH2O = H2O::gasThermalConductivity(temperature, partialPressure);
-//
-//                return lambdaAir + lambdaH2O;
-//            }
-//            else
             return lambdaPureAir; // conductivity of pure air [W/(m K)]
         }
     }
@@ -722,45 +704,6 @@ public:
                                int phaseIdx)
     {
         DUNE_THROW(Dune::NotImplemented, "FluidSystems::H2OAir::heatCapacity()");
-//        if (phaseIdx == wPhaseIdx) {
-//            return H2O::liquidHeatCapacity(fluidState.temperature(phaseIdx),
-//                                           fluidState.pressure(phaseIdx));
-//        }
-//
-//        // for the gas phase, assume ideal mixture, i.e. molecules of
-//        // one component don't "see" the molecules of the other
-//        // component
-//
-//        Scalar c_pN2;
-//        Scalar c_pH2O;
-//        // let the water and nitrogen components do things their own way
-//        if (useComplexRelations) {
-//            c_pN2 = N2::gasHeatCapacity(fluidState.temperature(phaseIdx),
-//                                        fluidState.pressure(phaseIdx)
-//                                        * fluidState.moleFraction(phaseIdx, AirIdx));
-//
-//            c_pH2O = H2O::gasHeatCapacity(fluidState.temperature(phaseIdx),
-//                                          fluidState.pressure(phaseIdx)
-//                                          * fluidState.moleFraction(phaseIdx, H2OIdx));
-//        }
-//        else {
-//            // assume an ideal gas for both components. See:
-//            //
-//            // http://en.wikipedia.org/wiki/Heat_capacity
-//            Scalar c_vN2molar = Dumux::Constants<Scalar>::R*2.39;
-//            Scalar c_pN2molar = Dumux::Constants<Scalar>::R + c_vN2molar;
-//
-//            Scalar c_vH2Omolar = Dumux::Constants<Scalar>::R*3.37; // <- correct??
-//            Scalar c_pH2Omolar = Dumux::Constants<Scalar>::R + c_vH2Omolar;
-//
-//            c_pN2 = c_pN2molar/molarMass(AirIdx);
-//            c_pH2O = c_pH2Omolar/molarMass(H2OIdx);
-//        }
-//
-//        // mangle both components together
-//        return
-//            c_pH2O*fluidState.massFraction(nPhaseIdx, H2OIdx)
-//            + c_pN2*fluidState.massFraction(nPhaseIdx, AirIdx);
     }
 };