diff --git a/descriptors/json_descriptor.hpp b/descriptors/json_descriptor.hpp
index 5a160c0e1..1e9094309 100644
--- a/descriptors/json_descriptor.hpp
+++ b/descriptors/json_descriptor.hpp
@@ -279,19 +279,19 @@ template <class DataFacadeT> class JSONDescriptor final : public BaseDescriptor<
             json_result.values["alternative_names"] = json_alternate_names_array;
         }
 
-        JSON::Object json_hint_object;
-        json_hint_object.values["checksum"] = facade->GetCheckSum();
-        JSON::Array json_location_hint_array;
-        std::string hint;
-        for (const auto i : osrm::irange<std::size_t>(0, raw_route.segment_end_coordinates.size()))
-        {
-            ObjectEncoder::EncodeToBase64(raw_route.segment_end_coordinates[i].source_phantom, hint);
-            json_location_hint_array.values.push_back(hint);
-        }
-        ObjectEncoder::EncodeToBase64(raw_route.segment_end_coordinates.back().target_phantom, hint);
-        json_location_hint_array.values.push_back(hint);
-        json_hint_object.values["locations"] = json_location_hint_array;
-        json_result.values["hint_data"] = json_hint_object;
+        // JSON::Object json_hint_object;
+        // json_hint_object.values["checksum"] = facade->GetCheckSum();
+        // JSON::Array json_location_hint_array;
+        // std::string hint;
+        // for (const auto i : osrm::irange<std::size_t>(0, raw_route.segment_end_coordinates.size()))
+        // {
+        //     ObjectEncoder::EncodeToBase64(raw_route.segment_end_coordinates[i].source_phantom, hint);
+        //     json_location_hint_array.values.push_back(hint);
+        // }
+        // ObjectEncoder::EncodeToBase64(raw_route.segment_end_coordinates.back().target_phantom, hint);
+        // json_location_hint_array.values.push_back(hint);
+        // json_hint_object.values["locations"] = json_location_hint_array;
+        // json_result.values["hint_data"] = json_hint_object;
 
         // render the content to the output array
         TIMER_START(route_render);
diff --git a/plugins/distance_table.hpp b/plugins/distance_table.hpp
index eab1063e7..6519136ca 100644
--- a/plugins/distance_table.hpp
+++ b/plugins/distance_table.hpp
@@ -71,23 +71,23 @@ template <class DataFacadeT> class DistanceTablePlugin final : public BasePlugin
             return;
         }
 
-        const bool checksum_OK = (route_parameters.check_sum == facade->GetCheckSum());
+        // const bool checksum_OK = (route_parameters.check_sum == facade->GetCheckSum());
         unsigned max_locations =
             std::min(100u, static_cast<unsigned>(route_parameters.coordinates.size()));
         PhantomNodeArray phantom_node_vector(max_locations);
         for (const auto i : osrm::irange(0u, max_locations))
         {
-            if (checksum_OK && i < route_parameters.hints.size() &&
-                !route_parameters.hints[i].empty())
-            {
-                PhantomNode current_phantom_node;
-                ObjectEncoder::DecodeFromBase64(route_parameters.hints[i], current_phantom_node);
-                if (current_phantom_node.is_valid(facade->GetNumberOfNodes()))
-                {
-                    phantom_node_vector[i].emplace_back(std::move(current_phantom_node));
-                    continue;
-                }
-            }
+            // if (checksum_OK && i < route_parameters.hints.size() &&
+            //     !route_parameters.hints[i].empty())
+            // {
+            //     PhantomNode current_phantom_node;
+            //     ObjectEncoder::DecodeFromBase64(route_parameters.hints[i], current_phantom_node);
+            //     if (current_phantom_node.is_valid(facade->GetNumberOfNodes()))
+            //     {
+            //         phantom_node_vector[i].emplace_back(std::move(current_phantom_node));
+            //         continue;
+            //     }
+            // }
             facade->IncrementalFindPhantomNodeForCoordinate(route_parameters.coordinates[i],
                                                             phantom_node_vector[i],
                                                             1);
@@ -105,10 +105,11 @@ template <class DataFacadeT> class DistanceTablePlugin final : public BasePlugin
             reply = http::Reply::StockReply(http::Reply::badRequest);
             return;
         }
+
         JSON::Object json_object;
         JSON::Array json_array;
-        const unsigned number_of_locations = static_cast<unsigned>(phantom_node_vector.size());
-        for (unsigned row = 0; row < number_of_locations; ++row)
+        const auto number_of_locations = phantom_node_vector.size();
+        for (const auto row : osrm::irange<std::size_t>(0, number_of_locations))
         {
             JSON::Array json_row;
             auto row_begin_iterator = result_table->begin() + (row * number_of_locations);
diff --git a/plugins/viaroute.hpp b/plugins/viaroute.hpp
index b29915ba0..cc0826815 100644
--- a/plugins/viaroute.hpp
+++ b/plugins/viaroute.hpp
@@ -83,7 +83,7 @@ template <class DataFacadeT> class ViaRoutePlugin final : public BasePlugin
         SimpleLogger().Write() << "coordinates ok";
 
         std::vector<phantom_node_pair> phantom_node_pair_list(route_parameters.coordinates.size());
-        const bool checksum_OK = (route_parameters.check_sum == facade->GetCheckSum());
+        // const bool checksum_OK = (route_parameters.check_sum == facade->GetCheckSum());
 
         for (const auto i : osrm::irange<std::size_t>(0, route_parameters.coordinates.size()))
         {
@@ -92,19 +92,19 @@ template <class DataFacadeT> class ViaRoutePlugin final : public BasePlugin
                                    << route_parameters.hints.size();
 
             // TODO: Remove hinting mechanism
-            if (checksum_OK && i < route_parameters.hints.size() &&
-                !route_parameters.hints[i].empty())
-            {
-                SimpleLogger().Write() << "decoding hint " << i;
+            // if (checksum_OK && i < route_parameters.hints.size() &&
+            //     !route_parameters.hints[i].empty())
+            // {
+            //     SimpleLogger().Write() << "decoding hint " << i;
 
-                ObjectEncoder::DecodeFromBase64(route_parameters.hints[i],
-                                                phantom_node_pair_list[i]);
-                if (phantom_node_pair_list[i].first.is_valid(facade->GetNumberOfNodes()))
-                {
-                    SimpleLogger().Write() << "decoded PhantomNode";
-                    continue;
-                }
-            }
+            //     ObjectEncoder::DecodeFromBase64(route_parameters.hints[i],
+            //                                     phantom_node_pair_list[i]);
+            //     if (phantom_node_pair_list[i].first.is_valid(facade->GetNumberOfNodes()))
+            //     {
+            //         SimpleLogger().Write() << "decoded PhantomNode";
+            //         continue;
+            //     }
+            // }
             std::vector<PhantomNode> phantom_node_vector;
             SimpleLogger().Write() << "finding coordinate";
 
@@ -143,11 +143,9 @@ template <class DataFacadeT> class ViaRoutePlugin final : public BasePlugin
 
         // are all phantoms from a tiny cc?
         const auto component_id = phantom_node_pair_list.front().first.component_id;
-        BOOST_ASSERT(0 != component_id);
 
         auto check_component_id_is_equal = [component_id](const phantom_node_pair &phantom_pair)
         {
-            BOOST_ASSERT(0 != phantom_pair.first.component_id);
             return component_id == phantom_pair.first.component_id;
         };
 
diff --git a/routing_algorithms/many_to_many.hpp b/routing_algorithms/many_to_many.hpp
index 636510f69..f1e996096 100644
--- a/routing_algorithms/many_to_many.hpp
+++ b/routing_algorithms/many_to_many.hpp
@@ -67,7 +67,7 @@ template <class DataFacadeT> class ManyToManyRouting final : public BasicRouting
     std::shared_ptr<std::vector<EdgeWeight>> operator()(const PhantomNodeArray &phantom_nodes_array)
         const
     {
-        const unsigned number_of_locations = static_cast<unsigned>(phantom_nodes_array.size());
+        const auto number_of_locations = phantom_nodes_array.size();
         std::shared_ptr<std::vector<EdgeWeight>> result_table =
             std::make_shared<std::vector<EdgeWeight>>(number_of_locations * number_of_locations,
                                                       std::numeric_limits<EdgeWeight>::max());