diff --git a/src/localgeodesicfefunction.hh b/src/localgeodesicfefunction.hh
index 086af32838ec9ba02217af31665ff7991ce06679..744d7c12143186e2783fb184c798f33a16e352e6 100644
--- a/src/localgeodesicfefunction.hh
+++ b/src/localgeodesicfefunction.hh
@@ -69,6 +69,8 @@ evaluate(const Dune::FieldVector<ctype, dim>& local)
     return result;
 #endif
 
+#warning Some code out-commented
+#if 0
     Dune::FieldVector<ctype, dim+1> barycentricCoordinates;
 
     barycentricCoordinates[0] = 1;
@@ -92,6 +94,7 @@ evaluate(const Dune::FieldVector<ctype, dim>& local)
     solver.solve();
 
     return solver.getSol();
+#endif
 }
 
 template <int dim, class ctype, class TargetSpace>
diff --git a/src/targetspacertrsolver.cc b/src/targetspacertrsolver.cc
index fdf5b1ffc5e82b223acb942bbcf362a3370db74d..0d9e5116b599ee17fc9e6a74dc33126f3dedb047 100644
--- a/src/targetspacertrsolver.cc
+++ b/src/targetspacertrsolver.cc
@@ -28,7 +28,7 @@ setup(const AverageDistanceAssembler<TargetSpace>* assembler,
     // First create a Gauss-seidel base solver
     TrustRegionGSStep<MatrixType, CorrectionType>* innerSolverStep = new TrustRegionGSStep<MatrixType, CorrectionType>;
 
-    EnergyNorm<MatrixType, CorrectionType>* energyNorm = new EnergyNorm<MatrixType, CorrectionType>(*baseSolverStep);
+    EnergyNorm<MatrixType, CorrectionType>* energyNorm = new EnergyNorm<MatrixType, CorrectionType>(*innerSolverStep);
 
     innerSolver_ = new ::LoopSolver<CorrectionType>(innerSolverStep,
                                                     innerIterations,
@@ -49,6 +49,7 @@ setup(const AverageDistanceAssembler<TargetSpace>* assembler,
 template <class TargetSpace>
 void TargetSpaceRiemannianTRSolver<TargetSpace>::solve()
 {
+#if 0
     MaxNormTrustRegion<blocksize> trustRegion(x_.size(), initialTrustRegionRadius_);
 
     std::vector<std::vector<BoxConstraint<field_type,blocksize> > > trustRegionObstacles((mgStep) 
@@ -182,5 +183,5 @@ void TargetSpaceRiemannianTRSolver<TargetSpace>::solve()
             std::cout << "--- Current energy: " << energy << " ---" << std::endl;
 
     }
-
+#endif
 }