diff --git a/DataStructures/ImportNode.cpp b/DataStructures/ExternalMemoryNode.cpp
similarity index 92%
rename from DataStructures/ImportNode.cpp
rename to DataStructures/ExternalMemoryNode.cpp
index 8975d408a..866304864 100644
--- a/DataStructures/ImportNode.cpp
+++ b/DataStructures/ExternalMemoryNode.cpp
@@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "ImportNode.h"
+#include "ExternalMemoryNode.h"
 
 #include <limits>
 
@@ -52,13 +52,3 @@ ExternalMemoryNode ExternalMemoryNode::max_value()
                               false,
                               false);
 }
-
-void ImportNode::Clear()
-{
-    keyVals.Clear();
-    lat = 0;
-    lon = 0;
-    node_id = 0;
-    bollard = false;
-    trafficLight = false;
-}
diff --git a/DataStructures/ImportNode.h b/DataStructures/ExternalMemoryNode.h
similarity index 91%
rename from DataStructures/ImportNode.h
rename to DataStructures/ExternalMemoryNode.h
index b8a945120..88c4187ce 100644
--- a/DataStructures/ImportNode.h
+++ b/DataStructures/ExternalMemoryNode.h
@@ -29,7 +29,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define IMPORTNODE_H_
 
 #include "QueryNode.h"
-#include "../DataStructures/HashTable.h"
 
 #include <string>
 
@@ -47,11 +46,4 @@ struct ExternalMemoryNode : NodeInfo
     bool trafficLight;
 };
 
-struct ImportNode : public ExternalMemoryNode
-{
-    HashTable<std::string, std::string> keyVals;
-
-    inline void Clear();
-};
-
 #endif /* IMPORTNODE_H_ */
diff --git a/Extractor/ExtractionWay.h b/Extractor/ExtractionWay.h
index 2c32a257a..740c4beaf 100644
--- a/Extractor/ExtractionWay.h
+++ b/Extractor/ExtractionWay.h
@@ -28,7 +28,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef EXTRACTION_WAY_H
 #define EXTRACTION_WAY_H
 
-#include "../DataStructures/HashTable.h"
 #include "../DataStructures/TravelMode.h"
 #include "../typedefs.h"
 
diff --git a/Extractor/ExtractorCallbacks.cpp b/Extractor/ExtractorCallbacks.cpp
index 8647677c9..170c4437a 100644
--- a/Extractor/ExtractorCallbacks.cpp
+++ b/Extractor/ExtractorCallbacks.cpp
@@ -30,8 +30,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "ExtractionNode.h"
 #include "ExtractionWay.h"
 
+#include "../DataStructures/ExternalMemoryNode.h"
 #include "../DataStructures/Restriction.h"
-#include "../DataStructures/ImportNode.h"
 #include "../Util/container.hpp"
 #include "../Util/simple_logger.hpp"
 
diff --git a/Extractor/ExtractorStructs.h b/Extractor/ExtractorStructs.h
index 39c4bbf2b..f2b4e4860 100644
--- a/Extractor/ExtractorStructs.h
+++ b/Extractor/ExtractorStructs.h
@@ -28,23 +28,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef EXTRACTORSTRUCTS_H_
 #define EXTRACTORSTRUCTS_H_
 
-#include "../DataStructures/HashTable.h"
-#include "../DataStructures/ImportNode.h"
+#include "../DataStructures/ExternalMemoryNode.h"
 #include "../typedefs.h"
 
 #include <limits>
 #include <string>
 
-struct ExtractorRelation
-{
-    ExtractorRelation() : type(unknown) {}
-    enum
-    { unknown = 0,
-      ferry,
-      turnRestriction } type;
-    HashTable<std::string, std::string> keyVals;
-};
-
 struct WayIDStartAndEndEdge
 {
     unsigned wayID;
diff --git a/Extractor/RestrictionParser.cpp b/Extractor/RestrictionParser.cpp
index 785c4c102..6fc5ca979 100644
--- a/Extractor/RestrictionParser.cpp
+++ b/Extractor/RestrictionParser.cpp
@@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "ExtractionWay.h"
 #include "ScriptingEnvironment.h"
 
-#include "../DataStructures/ImportNode.h"
+#include "../DataStructures/ExternalMemoryNode.h"
 #include "../Util/LuaUtil.h"
 #include "../Util/OSRMException.h"
 #include "../Util/SimpleLogger.h"
diff --git a/Extractor/ScriptingEnvironment.cpp b/Extractor/ScriptingEnvironment.cpp
index c6b786d8a..b6f56592f 100644
--- a/Extractor/ScriptingEnvironment.cpp
+++ b/Extractor/ScriptingEnvironment.cpp
@@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "ExtractionHelperFunctions.h"
 #include "ExtractionNode.h"
 #include "ExtractionWay.h"
-#include "../DataStructures/ImportNode.h"
+#include "../DataStructures/ExternalMemoryNode.h"
 #include "../Util/LuaUtil.h"
 #include "../Util/OSRMException.h"
 #include "../Util/simple_logger.hpp"
diff --git a/Server/DataStructures/BaseDataFacade.h b/Server/DataStructures/BaseDataFacade.h
index 9b77b292a..016a7fa0c 100644
--- a/Server/DataStructures/BaseDataFacade.h
+++ b/Server/DataStructures/BaseDataFacade.h
@@ -31,7 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // Exposes all data access interfaces to the algorithms via base class ptr
 
 #include "../../DataStructures/EdgeBasedNode.h"
-#include "../../DataStructures/ImportNode.h"
+#include "../../DataStructures/ExternalMemoryNode.h"
 #include "../../DataStructures/phantom_node.hpp"
 #include "../../DataStructures/Range.h"
 #include "../../DataStructures/TurnInstructions.h"
diff --git a/Util/GraphLoader.h b/Util/GraphLoader.h
index 5ce600bd0..107cd65c9 100644
--- a/Util/GraphLoader.h
+++ b/Util/GraphLoader.h
@@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define GRAPHLOADER_H
 
 #include "OSRMException.h"
-#include "../DataStructures/ImportNode.h"
+#include "../DataStructures/ExternalMemoryNode.h"
 #include "../DataStructures/ImportEdge.h"
 #include "../DataStructures/QueryNode.h"
 #include "../DataStructures/Restriction.h"