diff --git a/DataStructures/SearchEngine.h b/DataStructures/SearchEngine.h
index 45fa6fa10..0945befb2 100644
--- a/DataStructures/SearchEngine.h
+++ b/DataStructures/SearchEngine.h
@@ -64,13 +64,13 @@ public:
 
 };
 
-SearchEngineHeapPtr SearchEngineData::forwardHeap;
-SearchEngineHeapPtr SearchEngineData::backwardHeap;
+// SearchEngineHeapPtr SearchEngineData::forwardHeap;
+// SearchEngineHeapPtr SearchEngineData::backwardHeap;
 
-SearchEngineHeapPtr SearchEngineData::forwardHeap2;
-SearchEngineHeapPtr SearchEngineData::backwardHeap2;
+// SearchEngineHeapPtr SearchEngineData::forwardHeap2;
+// SearchEngineHeapPtr SearchEngineData::backwardHeap2;
 
-SearchEngineHeapPtr SearchEngineData::forwardHeap3;
-SearchEngineHeapPtr SearchEngineData::backwardHeap3;
+// SearchEngineHeapPtr SearchEngineData::forwardHeap3;
+// SearchEngineHeapPtr SearchEngineData::backwardHeap3;
 
 #endif // SEARCHENGINE_H
diff --git a/DataStructures/SearchEngineData.h b/DataStructures/SearchEngineData.h
index 71b61f8df..770ec9da8 100644
--- a/DataStructures/SearchEngineData.h
+++ b/DataStructures/SearchEngineData.h
@@ -45,14 +45,10 @@ struct _HeapData {
 };
 
 // typedef StaticGraph<QueryEdge::EdgeData> QueryGraph;
-typedef BinaryHeap< NodeID, NodeID, int, _HeapData, UnorderedMapStorage<NodeID, int> > QueryHeapType;
-typedef boost::thread_specific_ptr<QueryHeapType> SearchEngineHeapPtr;
 
 struct SearchEngineData {
-    typedef StaticGraph<QueryEdge::EdgeData> QueryGraph;
-    typedef QueryHeapType   QueryHeap;
-
-    SearchEngineData() { }
+    typedef BinaryHeap< NodeID, NodeID, int, _HeapData, UnorderedMapStorage<NodeID, int> > QueryHeap;
+    typedef boost::thread_specific_ptr<QueryHeap> SearchEngineHeapPtr;
 
     static SearchEngineHeapPtr forwardHeap;
     static SearchEngineHeapPtr backwardHeap;
@@ -68,4 +64,11 @@ struct SearchEngineData {
     void InitializeOrClearThirdThreadLocalStorage(const unsigned number_of_nodes);
 };
 
+SearchEngineData::SearchEngineHeapPtr SearchEngineData::forwardHeap;
+SearchEngineData::SearchEngineHeapPtr SearchEngineData::backwardHeap;
+SearchEngineData::SearchEngineHeapPtr SearchEngineData::forwardHeap2;
+SearchEngineData::SearchEngineHeapPtr SearchEngineData::backwardHeap2;
+SearchEngineData::SearchEngineHeapPtr SearchEngineData::forwardHeap3;
+SearchEngineData::SearchEngineHeapPtr SearchEngineData::backwardHeap3;
+
 #endif // SEARCH_ENGINE_DATA_H
diff --git a/DataStructures/SharedMemoryVectorWrapper.h b/DataStructures/SharedMemoryVectorWrapper.h
index 6e44cb39c..906f3e34e 100644
--- a/DataStructures/SharedMemoryVectorWrapper.h
+++ b/DataStructures/SharedMemoryVectorWrapper.h
@@ -24,7 +24,6 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #include "../Util/SimpleLogger.h"
 
 #include <boost/assert.hpp>
-#include <boost/shared_ptr.hpp>
 #include <boost/type_traits.hpp>
 
 #include <algorithm>
@@ -33,9 +32,9 @@ or see http://www.gnu.org/licenses/agpl.txt.
 
 template<typename DataT>
 class ShMemIterator : public std::iterator<std::input_iterator_tag, DataT> {
-    boost::shared_ptr<DataT> p;
+    DataT * p;
 public:
-    ShMemIterator(boost::shared_ptr<DataT> & x) :p(x) {}
+    ShMemIterator(DataT * x) : p(x) {}
     ShMemIterator(const ShMemIterator & mit) : p(mit.p) {}
     ShMemIterator& operator++() {
         ++p;
@@ -60,7 +59,7 @@ public:
 template<typename DataT>
 class SharedMemoryWrapper {
 private:
-    boost::shared_ptr<DataT> m_ptr;
+    DataT * m_ptr;
     std::size_t m_size;
 
 public:
@@ -73,7 +72,7 @@ public:
         m_size(size)
     { }
 
-    void swap(const SharedMemoryWrapper<DataT> & other) {
+    void swap( SharedMemoryWrapper<DataT> & other ) {
         std::swap( m_size, other.m_size);
         std::swap( m_ptr , other.m_ptr );
     }
diff --git a/DataStructures/StaticGraph.h b/DataStructures/StaticGraph.h
index eabc062c7..f1bee48a2 100644
--- a/DataStructures/StaticGraph.h
+++ b/DataStructures/StaticGraph.h
@@ -101,12 +101,6 @@ public:
         _nodes.swap(nodes);
         _edges.swap(edges);
 
-        if( !UseSharedMemory ) {
-            //Add dummy node to end of _nodes array;
-            _nodes.push_back(_nodes.back());
-        } else {
-            //TODO: Move to graph array construction
-        }
 #ifndef NDEBUG
         Percent p(GetNumberOfNodes());
         for(unsigned u = 0; u < GetNumberOfNodes(); ++u) {
diff --git a/Server/DataStructures/BaseDataFacade.h b/Server/DataStructures/BaseDataFacade.h
index 1bd7fd47f..ff423791a 100644
--- a/Server/DataStructures/BaseDataFacade.h
+++ b/Server/DataStructures/BaseDataFacade.h
@@ -52,7 +52,7 @@ public:
 
     virtual EdgeDataT &GetEdgeData( const EdgeID e ) = 0;
 
-    virtual const EdgeDataT &GetEdgeData( const EdgeID e ) const = 0;
+    // virtual const EdgeDataT &GetEdgeData( const EdgeID e ) const = 0;
 
     virtual EdgeID BeginEdges( const NodeID n ) const = 0;
 
diff --git a/Server/DataStructures/SharedDataFacade.h b/Server/DataStructures/SharedDataFacade.h
index a67a02bf0..305ca850c 100644
--- a/Server/DataStructures/SharedDataFacade.h
+++ b/Server/DataStructures/SharedDataFacade.h
@@ -159,9 +159,9 @@ public:
         return m_query_graph->GetEdgeData(e);
     }
 
-    const EdgeDataT &GetEdgeData( const EdgeID e ) const {
-        return m_query_graph->GetEdgeData(e);
-    }
+    // const EdgeDataT &GetEdgeData( const EdgeID e ) const {
+    //     return m_query_graph->GetEdgeData(e);
+    // }
 
     EdgeID BeginEdges( const NodeID n ) const {
         return m_query_graph->BeginEdges(n);