diff --git a/Server/DataStructures/SharedDataFacade.h b/Server/DataStructures/SharedDataFacade.h
index 5e90deee2..21f2cb99a 100644
--- a/Server/DataStructures/SharedDataFacade.h
+++ b/Server/DataStructures/SharedDataFacade.h
@@ -142,7 +142,6 @@ private:
         m_query_graph.reset(
             new QueryGraph(node_list, edge_list)
         );
-
     }
 
     void LoadNodeAndEdgeInformation() {
@@ -296,7 +295,6 @@ public:
         }
     }
 
-
     //search graph access
     unsigned GetNumberOfNodes() const {
         return m_query_graph->GetNumberOfNodes();
diff --git a/Server/DataStructures/SharedDataType.h b/Server/DataStructures/SharedDataType.h
index e3565ad1c..5efb19f3b 100644
--- a/Server/DataStructures/SharedDataType.h
+++ b/Server/DataStructures/SharedDataType.h
@@ -87,34 +87,19 @@ struct SharedDataLayout {
 
     void PrintInformation() const {
         SimpleLogger().Write(logDEBUG) << "-";
-        SimpleLogger().Write(logDEBUG) << "GetSizeOfLayout: " << GetSizeOfLayout();
         SimpleLogger().Write(logDEBUG) << "name_index_list_size:       " << name_index_list_size;
-        SimpleLogger().Write(logDEBUG) << "  " << GetNameIndexOffset();
         SimpleLogger().Write(logDEBUG) << "name_char_list_size:        " << name_char_list_size;
-        SimpleLogger().Write(logDEBUG) << "  " << GetNameListOffset();
         SimpleLogger().Write(logDEBUG) << "name_id_list_size:          " << name_id_list_size;
-        SimpleLogger().Write(logDEBUG) << "  " << GetNameIDListOffset();
         SimpleLogger().Write(logDEBUG) << "via_node_list_size:         " << via_node_list_size;
-        SimpleLogger().Write(logDEBUG) << "  " << GetViaNodeListOffset();
         SimpleLogger().Write(logDEBUG) << "graph_node_list_size:       " << graph_node_list_size;
-        SimpleLogger().Write(logDEBUG) << "  " << GetGraphNodeListOffset();
         SimpleLogger().Write(logDEBUG) << "graph_edge_list_size:       " << graph_edge_list_size;
-        SimpleLogger().Write(logDEBUG) << "  " << GetGraphEdgeListOffset();
         SimpleLogger().Write(logDEBUG) << "timestamp_length:           " << timestamp_length;
-        SimpleLogger().Write(logDEBUG) << "  " << GetTimeStampOffset();
         SimpleLogger().Write(logDEBUG) << "coordinate_list_size:       " << coordinate_list_size;
-        SimpleLogger().Write(logDEBUG) << "  " << GetCoordinateListOffset();
         SimpleLogger().Write(logDEBUG) << "turn_instruction_list_size: " << turn_instruction_list_size;
-        SimpleLogger().Write(logDEBUG) << "  " << GetTurnInstructionListOffset();
         SimpleLogger().Write(logDEBUG) << "r_search_tree_size:         " << r_search_tree_size;
-        SimpleLogger().Write(logDEBUG) << "  " << GetRSearchTreeOffset();
-        SimpleLogger().Write(logDEBUG) << "geometries_indicators:     " << geometries_indicators << "/" << ((geometries_indicators/8) + 1);
-        SimpleLogger().Write(logDEBUG) << "  " << GetGeometriesIndicatorOffset();
+        SimpleLogger().Write(logDEBUG) << "geometries_indicators:      " << geometries_indicators << "/" << ((geometries_indicators/8) + 1);
         SimpleLogger().Write(logDEBUG) << "geometries_index_list_size: " << geometries_index_list_size;
-        SimpleLogger().Write(logDEBUG) << "  " << GetGeometriesIndexListOffset();
         SimpleLogger().Write(logDEBUG) << "geometries_list_size:       " << geometries_list_size;
-        SimpleLogger().Write(logDEBUG) << "  " << GetGeometryListOffset();
-        SimpleLogger().Write(logDEBUG) << "checksum offset: " << GetChecksumOffset();
         SimpleLogger().Write(logDEBUG) << "sizeof(checksum):           " << sizeof(checksum);
         SimpleLogger().Write(logDEBUG) << "ram index file name:        " << ram_index_file_name;
     }
diff --git a/datastore.cpp b/datastore.cpp
index 0b836c3c5..691606a76 100644
--- a/datastore.cpp
+++ b/datastore.cpp
@@ -341,7 +341,6 @@ int main( const int argc, const char * argv[] ) {
 
         OriginalEdgeData current_edge_data;
         for(unsigned i = 0; i < number_of_original_edges; ++i) {
-            // SimpleLogger().Write() << i << "/" << number_of_edges;
             edges_input_stream.read(
                 (char*)&(current_edge_data),
                 sizeof(OriginalEdgeData)