diff --git a/Algorithms/CRC32.cpp b/Algorithms/CRC32.cpp
index 643837514..25aabc55b 100644
--- a/Algorithms/CRC32.cpp
+++ b/Algorithms/CRC32.cpp
@@ -83,9 +83,3 @@ unsigned CRC32::operator()(char *str, unsigned len){
     crc =((*this).*(crcFunction))(str, len, crc);
     return crc;
 }
-
-
-CRC32::~CRC32() {
-    // TODO Auto-generated destructor stub
-}
-
diff --git a/Algorithms/CRC32.h b/Algorithms/CRC32.h
index 5e4493e3c..d84a56808 100644
--- a/Algorithms/CRC32.h
+++ b/Algorithms/CRC32.h
@@ -40,7 +40,7 @@ private:
 public:
     CRC32();
     unsigned operator()(char *str, unsigned len);
-    virtual ~CRC32();
+    virtual ~CRC32() {};
 };
 
 #endif /* CRC32_H_ */
diff --git a/Contractor/EdgeBasedGraphFactory.cpp b/Contractor/EdgeBasedGraphFactory.cpp
index a38a2d9ce..c4caf2b8b 100644
--- a/Contractor/EdgeBasedGraphFactory.cpp
+++ b/Contractor/EdgeBasedGraphFactory.cpp
@@ -255,7 +255,6 @@ void EdgeBasedGraphFactory::Run() {
                         //distance += ComputeTurnPenalty(u, v, w);
                         assert(edgeData1.edgeBasedNodeID != edgeData2.edgeBasedNodeID);
                         OriginalEdgeData oed(v,edgeData2.nameID, turnInstruction);
-                        //TODO: replace v by pointer to oed-list
                         EdgeBasedEdge newEdge(edgeData1.edgeBasedNodeID, edgeData2.edgeBasedNodeID, edgeBasedEdges.size(), distance, true, false );
                         originalEdgeData.push_back(oed);
                         edgeBasedEdges.push_back(newEdge);
diff --git a/DataStructures/ImportEdge.h b/DataStructures/ImportEdge.h
index 25686e159..27d7fa9e0 100644
--- a/DataStructures/ImportEdge.h
+++ b/DataStructures/ImportEdge.h
@@ -105,28 +105,22 @@ public:
     EdgeBasedEdge() :
         _source(0), _target(0), _edgeID(0)/*, _nameID1(0)*/, _weight(0), _forward(0), _backward(0)/*, _turnInstruction(0)*/ { assert(false); } //shall not be used.
 
-    explicit EdgeBasedEdge(NodeID s, NodeID t, NodeID v, /*unsigned n1,*/ EdgeWeight w, bool f, bool b/*, short ty*/) :
-            _source(s), _target(t), _edgeID(v), /*_nameID1(n1),*/ _weight(w), _forward(f), _backward(b)/*, _turnInstruction(ty)*/ { assert(ty >= 0); }
+    explicit EdgeBasedEdge(NodeID s, NodeID t, NodeID v, EdgeWeight w, bool f, bool b) :
+            _source(s), _target(t), _edgeID(v), _weight(w), _forward(f), _backward(b){}
 
     NodeID target() const {return _target; }
     NodeID source() const {return _source; }
     EdgeWeight weight() const {return _weight; }
     NodeID id() const { return _edgeID; }
-//    short turnInstruction() const { assert(_turnInstruction >= 0); return _turnInstruction; }
     bool isBackward() const { return _backward; }
     bool isForward() const { return _forward; }
 
-//    unsigned getNameIDOfTurnTarget() const { return _nameID1; }
-
     NodeID _source;
     NodeID _target;
     NodeID _edgeID;
-//    unsigned _nameID1;
     EdgeWeight _weight;
     bool _forward;
     bool _backward;
-//    short _turnInstruction;
-
 };
 
 struct MinimalEdgeData {
diff --git a/DataStructures/SearchEngine.h b/DataStructures/SearchEngine.h
index 208331f6f..5ad6563ef 100644
--- a/DataStructures/SearchEngine.h
+++ b/DataStructures/SearchEngine.h
@@ -525,7 +525,6 @@ private:
 				recursionStack.push(std::make_pair(edge.first, middle));
 			} else {
 				assert(!ed.shortcut);
-				//TODO: Hier die lookups in den nodehelpdeks machen
 				unpackedPath.push_back(_PathData(ed.id, nodeHelpDesk->getNameIndexFromEdgeID(ed.id), nodeHelpDesk->getTurnInstructionFromEdgeID(ed.id), ed.distance) );
 			}
 		}
diff --git a/Docs b/Docs
index bab2887f8..fb995ad0b 160000
--- a/Docs
+++ b/Docs
@@ -1 +1 @@
-Subproject commit bab2887f8f7b17d6346e5f18d0464a66d8ae4e98
+Subproject commit fb995ad0b006ba90d0c5497e8c49ec215537c016