diff --git a/examples/spu_2p.cpp b/examples/spu_2p.cpp
index 9b28eed7..e80462bc 100644
--- a/examples/spu_2p.cpp
+++ b/examples/spu_2p.cpp
@@ -34,9 +34,10 @@
 */
 
 #include <cassert>
+#include <cstddef>
 
 #include <algorithm>
-#include <cstddef>
+#include <array>
 #include <functional>
 #include <iostream>
 #include <iterator>
@@ -61,7 +62,7 @@
 
 #include <SimpleFluid2p.hpp>
 #include <SinglePointUpwindTwoPhase.hpp>
-#include <array>
+
 template <class Ostream, class Collection>
 Ostream&
 operator<<(Ostream& os, const Collection& c)
diff --git a/src/CSRMatrixBlockAssembler.hpp b/src/CSRMatrixBlockAssembler.hpp
index d876b6f7..d3f44c11 100644
--- a/src/CSRMatrixBlockAssembler.hpp
+++ b/src/CSRMatrixBlockAssembler.hpp
@@ -42,8 +42,7 @@
 #include <algorithm>
 #include <vector>
 
-#include <dune/porsol/opmtransport/src/JacobianSystem.hpp>
-#include <dune/porsol/opmpressure/src/sparse_sys.h>
+#include <sparse_sys.h>
 
 namespace Opm {
     namespace ImplicitTransportDefault {
diff --git a/src/CSRMatrixUmfpackSolver.hpp b/src/CSRMatrixUmfpackSolver.hpp
index 06f19aa0..daaf836a 100644
--- a/src/CSRMatrixUmfpackSolver.hpp
+++ b/src/CSRMatrixUmfpackSolver.hpp
@@ -36,7 +36,7 @@
 #ifndef OPM_CSRMATRIXUMFPACKSOLVER_HPP_HEADER
 #define OPM_CSRMATRIXUMFPACKSOLVER_HPP_HEADER
 
-#include <dune/porsol/opmtransport/examples/call_umfpack.h>
+#include <call_umfpack.h>
 
 namespace Opm {
     namespace ImplicitTransportLinAlgSupport {
diff --git a/src/SinglePointUpwindTwoPhase.hpp b/src/SinglePointUpwindTwoPhase.hpp
index 02752e8c..d1286d33 100644
--- a/src/SinglePointUpwindTwoPhase.hpp
+++ b/src/SinglePointUpwindTwoPhase.hpp
@@ -152,23 +152,6 @@ namespace Opm {
 
             std::copy(porevol.begin(), porevol.end(), store_.porevol());
         }
-        /*
-        template <class Grid>
-        void init(const TwophaseFluid&       fluid    ,
-                		const Grid&                g        ,
-                		const std::vector<double>& porevol  ,
-                		const double*              grav  = 0,
-                		const double*              trans = 0)
-                {
-        		   fluid_ = fluid;
-        		   gravity_ = grav;
-        		   f2hf_.resize(2 * g.number_of_faces, -1);
-        		   store_(g.number_of_cells,g.cell_facepos[ g.number_of_cells ]);
-                    if (gravity_) {
-                        store_.drho() = fluid_.density(0) - fluid_.density(1);
-
-                        this->computeStaticGravity(g, grav, trans);
-                    }
 
                     for (int c = 0, i = 0; c < g.number_of_cells; ++c) {
                         for (; i < g.cell_facepos[c + 1]; ++i) {