diff --git a/FunctionSpace/BasisScalar.h b/FunctionSpace/BasisScalar.h
index 450b5cc95a863564376ae77d9c306e0430e07b94..9ecac8c3161dfdf21ac9898e28ad0530b228b6ad 100644
--- a/FunctionSpace/BasisScalar.h
+++ b/FunctionSpace/BasisScalar.h
@@ -25,9 +25,6 @@ class BasisScalar: public Basis{
   std::vector<std::vector<Polynomial*>*>* face;
   std::vector            <Polynomial*>*   cell;
 
-  std::vector<const Polynomial*>* basis;
-  std::vector<const Polynomial*>* revBasis;
-
  public:
   //! Deletes this BasisScalar
   //!
diff --git a/FunctionSpace/BasisVector.h b/FunctionSpace/BasisVector.h
index 5506d4cea7537271df901943aa943ddcb7311b96..69c46ec311f5346e26496c20b7b40cee58b4e4b9 100644
--- a/FunctionSpace/BasisVector.h
+++ b/FunctionSpace/BasisVector.h
@@ -25,9 +25,6 @@ class BasisVector: public Basis{
   std::vector<std::vector<std::vector<Polynomial>*>*>* face;
   std::vector            <std::vector<Polynomial>*>*   cell;
 
-  std::vector<const std::vector<Polynomial>*>* basis;
-  std::vector<const std::vector<Polynomial>*>* revBasis;
-
  public:
   //! Deletes this BasisVector
   //!
diff --git a/FunctionSpace/HexEdgeBasis.cpp b/FunctionSpace/HexEdgeBasis.cpp
index 22ca9fddde96ab1a492bb23232936a4597bd6b8d..f456994021c31ff7ef520335d332e0d6a5060758 100644
--- a/FunctionSpace/HexEdgeBasis.cpp
+++ b/FunctionSpace/HexEdgeBasis.cpp
@@ -4,14 +4,15 @@
 
 using namespace std;
 
-HexEdgeBasis::HexEdgeBasis(const int order){
+HexEdgeBasis::HexEdgeBasis(int order){
+  /*
   // Set Basis Type //
   this->order = order;
   
   type = 1;
   dim  = 3;
 
-  nVertex =  0                              ;
+  nVertex =  0;
   nEdge   = 12                 * (order + 1);
   nFace   = 12         * order * (order + 1);
   nCell   =  3 * order * order * (order + 1);
@@ -46,7 +47,7 @@ HexEdgeBasis::HexEdgeBasis(const int order){
   Polynomial* liftingSub    = new Polynomial[12];
 
 
-  // Integrated and classical Legendre Polynomial //
+  // Legendre Polynomial //
   Legendre::integrated(intLegendre, orderPlus);
   Legendre::legendre(legendre, order);
 
@@ -452,11 +453,14 @@ HexEdgeBasis::HexEdgeBasis(const int order){
   // Set Basis //
   this->basis = new std::vector<const std::vector<Polynomial>*>
     (basis.begin(), basis.end());
+  */
 }
 
 HexEdgeBasis::~HexEdgeBasis(void){
+  /*
   for(int i = 0; i < size; i++)
     delete (*basis)[i];
 
   delete basis;
+  */
 }
diff --git a/FunctionSpace/HexEdgeBasis.h b/FunctionSpace/HexEdgeBasis.h
index 6c3a6dc8c6424e91d9df5b4021c4d51a7394067a..8990e7c7cd81396441e734a415f6b99b97a62241 100644
--- a/FunctionSpace/HexEdgeBasis.h
+++ b/FunctionSpace/HexEdgeBasis.h
@@ -20,7 +20,7 @@ class HexEdgeBasis: public BasisVector{
   //! @param order The order of the Basis
   //!
   //! Returns a new Edge-Basis for Hexahedra of the given order
-  HexEdgeBasis(const int order);
+  HexEdgeBasis(int order);
   
   //! Deletes this Basis
   //!
diff --git a/FunctionSpace/HexNodeBasis.cpp b/FunctionSpace/HexNodeBasis.cpp
index 05bb6fc614da6f776511c50d25f5bcaca0284085..cd3c99b97b34f61f0934bc57053ad4bd0262a1f4 100644
--- a/FunctionSpace/HexNodeBasis.cpp
+++ b/FunctionSpace/HexNodeBasis.cpp
@@ -3,7 +3,8 @@
 
 using namespace std;
 
-HexNodeBasis::HexNodeBasis(const int order){
+HexNodeBasis::HexNodeBasis(int order){
+  /*
   // Set Basis Type //
   this->order = order;
 
@@ -90,7 +91,7 @@ HexNodeBasis::HexNodeBasis(const int order){
     (Polynomial(1, 0, 1, 0))                          +
      Polynomial(1, 0, 0, 1);
 
-  /*
+
   // Basis //
   basis = new std::vector<const Polynomial*>(size);
 
@@ -217,7 +218,7 @@ HexNodeBasis::HexNodeBasis(const int order){
     }
   }
 
-  */
+
   // Free Temporary Sapce //
   delete[] legendre;
   delete[] lifting;
@@ -225,9 +226,11 @@ HexNodeBasis::HexNodeBasis(const int order){
   delete[] xi;
   delete[] eta;
   delete[] lambda;
+*/
 }
 
 HexNodeBasis::~HexNodeBasis(void){
+  /*
   // Vertex Based //
   for(int i = 0; i < nVertex; i++)
     delete (*node)[i];
@@ -262,4 +265,5 @@ HexNodeBasis::~HexNodeBasis(void){
     delete (*cell)[i];
 
   delete cell;
+  */
 }
diff --git a/FunctionSpace/HexNodeBasis.h b/FunctionSpace/HexNodeBasis.h
index e3d16036081a0732b98aa193595f25528008da74..3aced988834c4a1999d7da301e044f8368beb5ad 100644
--- a/FunctionSpace/HexNodeBasis.h
+++ b/FunctionSpace/HexNodeBasis.h
@@ -20,7 +20,7 @@ class HexNodeBasis: public BasisScalar{
   //! @param order The order of the Basis
   //!
   //! Returns a new Node-Basis for Hexahedra of the given order
-  HexNodeBasis(const int order);
+  HexNodeBasis(int order);
 
   //! @return Deletes this Basis
   //!
diff --git a/FunctionSpace/QuadEdgeBasis.cpp b/FunctionSpace/QuadEdgeBasis.cpp
index f14e14c67b4b09b49fd5c272325f99402052c516..3b76a66b6b4f1e45ed26b6617d226b2962171cea 100644
--- a/FunctionSpace/QuadEdgeBasis.cpp
+++ b/FunctionSpace/QuadEdgeBasis.cpp
@@ -3,7 +3,7 @@
 
 using namespace std;
 
-QuadEdgeBasis::QuadEdgeBasis(const int order){
+QuadEdgeBasis::QuadEdgeBasis(int order){
   // Set Basis Type //
   this->order = order;
   
diff --git a/FunctionSpace/QuadEdgeBasis.h b/FunctionSpace/QuadEdgeBasis.h
index 0d16fdfe3af6621cc7add66a478c8b43e474fb55..a0400dd6de69c97fc4c42ffdc5fb2f84deb5461d 100644
--- a/FunctionSpace/QuadEdgeBasis.h
+++ b/FunctionSpace/QuadEdgeBasis.h
@@ -20,7 +20,7 @@ class QuadEdgeBasis: public BasisVector{
   //! @param order The order of the Basis
   //!
   //! Returns a new Edge-Basis for Quads of the given order
-  QuadEdgeBasis(const int order);
+  QuadEdgeBasis(int order);
   
   //! Deletes this Basis
   //!
diff --git a/FunctionSpace/QuadNodeBasis.cpp b/FunctionSpace/QuadNodeBasis.cpp
index 687d3edb771ec4c526798477b5a60a35be637f30..2d1e2e233d727ff0cfc57ad3eeca7860f11fbf24 100644
--- a/FunctionSpace/QuadNodeBasis.cpp
+++ b/FunctionSpace/QuadNodeBasis.cpp
@@ -3,7 +3,7 @@
 
 using namespace std;
 
-QuadNodeBasis::QuadNodeBasis(const int order){
+QuadNodeBasis::QuadNodeBasis(int order){
   // Set Basis Type //
   this->order = order;
 
diff --git a/FunctionSpace/QuadNodeBasis.h b/FunctionSpace/QuadNodeBasis.h
index 9ae85cfee6dffec4985f17fb0a8b99071dd6beea..308aa78cf300f8b5cace6d700fcbd2b6cc76ab0c 100644
--- a/FunctionSpace/QuadNodeBasis.h
+++ b/FunctionSpace/QuadNodeBasis.h
@@ -20,7 +20,7 @@ class QuadNodeBasis: public BasisScalar{
   //! @param order The order of the Basis
   //!
   //! Returns a new Node-Basis for Quads of the given order
-  QuadNodeBasis(const int order);
+  QuadNodeBasis(int order);
 
   //! @return Deletes this Basis
   //!