diff --git a/dumux/porousmediumflow/2p1c/implicit/CMakeLists.txt b/dumux/porousmediumflow/2p1c/implicit/CMakeLists.txt
index d5c0899adf06164a0f194e86e8a06f13d6b90c91..0373b7ebc4e621671c07ab48e6cf5ad0a41801f4 100644
--- a/dumux/porousmediumflow/2p1c/implicit/CMakeLists.txt
+++ b/dumux/porousmediumflow/2p1c/implicit/CMakeLists.txt
@@ -1,11 +1,11 @@
 
 #install headers
 install(FILES
+darcyslaw.hh
 indices.hh
 localresidual.hh
 model.hh
-newtoncontroller.hh
-properties.hh
-propertydefaults.hh
+primaryvariableswitch.hh
 volumevariables.hh
+vtkoutputfields.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2p1c/implicit)
diff --git a/dumux/porousmediumflow/2p1c/implicit/properties.hh b/dumux/porousmediumflow/2p1c/implicit/properties.hh
deleted file mode 100644
index 99ad0da677c20a8e53e1bec5066b36ff38162a8f..0000000000000000000000000000000000000000
--- a/dumux/porousmediumflow/2p1c/implicit/properties.hh
+++ /dev/null
@@ -1,69 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- *   See the file COPYING for full copying permissions.                      *
- *                                                                           *
- *   This program is free software: you can redistribute it and/or modify    *
- *   it under the terms of the GNU General Public License as published by    *
- *   the Free Software Foundation, either version 2 of the License, or       *
- *   (at your option) any later version.                                     *
- *                                                                           *
- *   This program is distributed in the hope that it will be useful,         *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of          *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the            *
- *   GNU General Public License for more details.                            *
- *                                                                           *
- *   You should have received a copy of the GNU General Public License       *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
- *****************************************************************************/
-/*!
- * \ingroup TwoPOneCModel
- */
-/*!
- * \file
- *
- * \brief Defines the properties required for the 2p1cn fully implicit model.
- *
- *Important note: The 2p1c model requires the use of the non-isothermal extension found in dumux/implicit/nonisothermal
- */
-#ifndef DUMUX_2P1C_PROPERTIES_HH
-#define DUMUX_2P1C_PROPERTIES_HH
-
-#include <dumux/implicit/box/properties.hh>
-#include <dumux/implicit/cellcentered/properties.hh>
-#include <dumux/porousmediumflow/nonisothermal/implicit/model.hh>
-
-namespace Dumux
-{
-
-namespace Properties
-{
-//////////////////////////////////////////////////////////////////
-// Type tags
-//////////////////////////////////////////////////////////////////
-NEW_TYPE_TAG(TwoPOneCNI, INHERITS_FROM(NonIsothermal));
-NEW_TYPE_TAG(BoxTwoPOneCNI, INHERITS_FROM(BoxModel, TwoPOneCNI));
-NEW_TYPE_TAG(CCTwoPOneCNI, INHERITS_FROM(CCModel, TwoPOneCNI));
-
-//////////////////////////////////////////////////////////////////
-// Property tags
-//////////////////////////////////////////////////////////////////
-
-NEW_PROP_TAG(NumPhases);   //!< Number of fluid phases in the system
-NEW_PROP_TAG(NumComponents); //!< Number of fluid components in the system
-NEW_PROP_TAG(SpatialParams); //!< The type of the spatial parameters
-NEW_PROP_TAG(FluidSystem); //!< Type of the multi-component relations
-
-NEW_PROP_TAG(MaterialLaw);   //!< The material law which ought to be used (extracted from the spatial parameters)
-
-NEW_PROP_TAG(ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
-
-NEW_PROP_TAG(ImplicitMassUpwindWeight); //!< The value of the upwind parameter for the mobility
-NEW_PROP_TAG(ImplicitMobilityUpwindWeight); //!< Weight for the upwind mobility in the velocity calculation
-NEW_PROP_TAG(UseBlockingOfSpuriousFlow); //!< Determines whether Blocking ofspurious flow is used
-NEW_PROP_TAG(BaseFluxVariables); //! The base flux variables
-NEW_PROP_TAG(SpatialParamsForchCoeff); //!< Property for the forchheimer coefficient
-}
-}
-
-#endif