diff --git a/Descriptors/DescriptionFactory.h b/Descriptors/DescriptionFactory.h
index 3d5f49bb6..ed22a11cb 100644
--- a/Descriptors/DescriptionFactory.h
+++ b/Descriptors/DescriptionFactory.h
@@ -112,12 +112,6 @@ public:
             pathDescription[i].length = FixedPointCoordinate::ApproximateEuclideanDistance(pathDescription[i-1].location, pathDescription[i].location);
         }
 
-        for (unsigned i = 0; i < pathDescription.size(); ++i)
-        {
-            const std::string name = facade->GetEscapedNameForNameID(pathDescription[0].name_id);
-            // SimpleLogger().Write(logDEBUG) << "df [" << i << "] name: " << name << ", duration: " << pathDescription[i].duration << ", length: " << pathDescription[i].length << ", coordinate: " << pathDescription[i].location;
-        }
-
         /*Simplify turn instructions
         Input :
         10. Turn left on B 36 for 20 km
diff --git a/Descriptors/JSONDescriptor.h b/Descriptors/JSONDescriptor.h
index e4aad4192..9b6985b4f 100644
--- a/Descriptors/JSONDescriptor.h
+++ b/Descriptors/JSONDescriptor.h
@@ -132,7 +132,6 @@ public:
         //check if first segment is non-zero
         std::string road_name;
         int source_duration = phantom_nodes.source_phantom.GetForwardWeightPlusOffset();
-        // SimpleLogger().Write(logDEBUG) << "-> source_traversed_in_reverse: " << (raw_route.source_traversed_in_reverse ? "y" : "n");
         if (!raw_route.source_traversed_in_reverse)
         {
             source_duration = phantom_nodes.source_phantom.GetReverseWeightPlusOffset();
@@ -164,18 +163,6 @@ public:
         }
         BOOST_ASSERT(target_duration >= 0);
 
-        // if (target_duration > 0)
-        // {
-        //     SimpleLogger().Write(logDEBUG) << "adding target \"" << road_name << "\" at " << phantom_nodes.target_phantom.location << ", duration: " << target_duration;
-        // }
-        // else
-        // {
-        //     SimpleLogger().Write(logDEBUG) << "ignoring target \"" << road_name << "\"";
-        // }
-        // SimpleLogger().Write(logDEBUG) << "-> target_traversed_in_reverse: " << (raw_route.target_traversed_in_reverse ? "y" : "n");
-
-        //END OF TODO
-
         description_factory.SetStartSegment(phantom_nodes.source_phantom, raw_route.source_traversed_in_reverse);
         reply.content.push_back("0,"
                 "\"status_message\": \"Found route between points\",");
@@ -244,7 +231,6 @@ public:
 
         //only one alternative route is computed at this time, so this is hardcoded
 
-
         if(raw_route.lengthOfAlternativePath != INVALID_EDGE_WEIGHT)
         {
             alternate_descriptionFactory.SetStartSegment(phantom_nodes.source_phantom, raw_route.alt_source_traversed_in_reverse);