diff --git a/src/pfaedle/router/ShapeBuilder.cpp b/src/pfaedle/router/ShapeBuilder.cpp
index a17de80..bf5857c 100644
--- a/src/pfaedle/router/ShapeBuilder.cpp
+++ b/src/pfaedle/router/ShapeBuilder.cpp
@@ -346,7 +346,6 @@ std::map<size_t, EdgeListHops> ShapeBuilder::shapeify(
     const TripTrie<pfaedle::gtfs::Trip>* trie, HopCache* hopCache) const {
   LOG(VDEBUG) << "Map-matching trie " << trie;
 
-  // TODO(patrick): assumes the trie is not empty, check this!
   assert(trie->getNdTrips().size());
   assert(trie->getNdTrips().begin()->second.size());
   RoutingAttrs rAttrs = getRAttrs(trie->getNdTrips().begin()->second[0]);
@@ -838,9 +837,8 @@ double ShapeBuilder::timePen(int candTime, int schedTime) const {
 // _____________________________________________________________________________
 EdgeCandGroup ShapeBuilder::timeExpand(const EdgeCand& ec, int time) const {
   EdgeCandGroup ret;
-  // TODO(patrick): heuristic for time expansion variance
-  // for (int i = -5; i < 6; i++) {
-  // for (int i = -10; i < 1; i++) {
+  // TODO(patrick): heuristic for time expansion variance, currently
+  // unused
   for (int i = 0; i < 1; i++) {
     EdgeCand ecNew = ec;
     // in 30 sec steps
diff --git a/src/pfaedle/router/TripTrie.tpp b/src/pfaedle/router/TripTrie.tpp
index b0a6c28..9f78915 100644
--- a/src/pfaedle/router/TripTrie.tpp
+++ b/src/pfaedle/router/TripTrie.tpp
@@ -193,7 +193,6 @@ size_t TripTrie<TRIP>::getMatchChild(size_t parentNid,
                                      const std::string& platform, POINT pos,
                                      int time, bool timeEx) const {
   for (size_t child : _nds[parentNid].childs) {
-    // TODO(patrick): use similarity classification here?
     if (_nds[child].stopName == stopName && _nds[child].platform == platform &&
         util::geo::dist(_nds[child].pos, pos) < 1 &&
         (!timeEx || _nds[child].time == time)) {