diff --git a/dune/gfe/mixedriemanniantrsolver.hh b/dune/gfe/mixedriemanniantrsolver.hh
index c59aa8b9aa1de33e41ecfc643a1f53e68cd5ad13..d291e0e8a7b40c6bd83759b85ed9261169120e6a 100644
--- a/dune/gfe/mixedriemanniantrsolver.hh
+++ b/dune/gfe/mixedriemanniantrsolver.hh
@@ -49,14 +49,6 @@ class MixedRiemannianTrustRegionSolver
     typedef Dune::MultiTypeBlockVector<CorrectionType0, CorrectionType1> CorrectionType;
     typedef Dune::Functions::TupleVector<std::vector<TargetSpace0>, std::vector<TargetSpace1> > SolutionType;
 
-#if 0
-#ifdef SECOND_ORDER
-    typedef Dune::GlobalP2Mapper<typename GridType::LeafGridView> GUIndex;
-#else
-    typedef GlobalUniqueIndex<typename GridType::LeafGridView, gridDim> GUIndex;
-#endif
-#endif
-
 public:
 
     MixedRiemannianTrustRegionSolver()
diff --git a/src/cosserat-continuum.cc b/src/cosserat-continuum.cc
index af7da69d0a318116df926a1615a62319ad5eabe4..fba0757183cc82bfa5c8f31d2feeb611a76cbdad 100644
--- a/src/cosserat-continuum.cc
+++ b/src/cosserat-continuum.cc
@@ -1,7 +1,5 @@
 #include <config.h>
 
-#define SECOND_ORDER
-
 #include <fenv.h>
 
 // Includes for the ADOL-C automatic differentiation library
@@ -45,6 +43,9 @@
 const int dim = 2;
 const int dimworld = 2;
 
+// Order of the approximation space
+const int order = 2;
+
 // Image space of the geodesic fe functions
 typedef RigidBodyMotion<double,3> TargetSpace;
 
@@ -149,13 +150,7 @@ int main (int argc, char *argv[]) try
     typedef GridType::LeafGridView GridView;
     GridView gridView = grid->leafGridView();
 
-#ifdef THIRD_ORDER
-    typedef Dune::Functions::PQkNodalBasis<typename GridType::LeafGridView, 3> FEBasis;
-#elif defined SECOND_ORDER
-    typedef Dune::Functions::PQkNodalBasis<typename GridType::LeafGridView, 2> FEBasis;
-#else
-    typedef Dune::Functions::PQkNodalBasis<typename GridType::LeafGridView, 1> FEBasis;
-#endif
+    typedef Dune::Functions::PQkNodalBasis<typename GridType::LeafGridView, order> FEBasis;
     FEBasis feBasis(gridView);
 
     typedef DuneFunctionsBasis<FEBasis> FufemFEBasis;
diff --git a/src/mixed-cosserat-continuum.cc b/src/mixed-cosserat-continuum.cc
index effef0855819beeae44a1e52b905e05244378275..420f254f6c67313a3127a067b421f0a82f83a9e1 100644
--- a/src/mixed-cosserat-continuum.cc
+++ b/src/mixed-cosserat-continuum.cc
@@ -1,7 +1,5 @@
 #include <config.h>
 
-#define SECOND_ORDER
-
 #include <fenv.h>
 
 // Includes for the ADOL-C automatic differentiation library