diff --git a/src/ifcgeomserver/IfcGeomServer.cpp b/src/ifcgeomserver/IfcGeomServer.cpp
index 289fa176fc..7abc957b02 100644
--- a/src/ifcgeomserver/IfcGeomServer.cpp
+++ b/src/ifcgeomserver/IfcGeomServer.cpp
@@ -287,7 +287,7 @@ public:
 
 class Entity : public Command {
 private:
-	const IfcGeom::TriangulationElement<double, double>* geom;
+	const IfcGeom::TriangulationElement* geom;
 	bool append_line_data;
 	EntityExtension* eext_;
 protected:
@@ -396,7 +396,7 @@ protected:
 		}
 	}
 public:
-	Entity(const IfcGeom::TriangulationElement<double, double>* geom, EntityExtension* eext = 0) : Command(ENTITY), geom(geom), append_line_data(false), eext_(eext) {};
+	Entity(const IfcGeom::TriangulationElement* geom, EntityExtension* eext = 0) : Command(ENTITY), geom(geom), append_line_data(false), eext_(eext) {};
 };
 
 class Next : public Command {
@@ -462,9 +462,9 @@ static const std::array<std::string, 3> XYZ = { "X", "Y", "Z" };
 
 class QuantityWriter_v0 : public EntityExtension {
 private:
-	const IfcGeom::BRepElement<double, double>* elem_;
+	const IfcGeom::BRepElement* elem_;
 public:
-	QuantityWriter_v0(const IfcGeom::BRepElement<double, double>* elem) :
+	QuantityWriter_v0(const IfcGeom::BRepElement* elem) :
 		elem_(elem) 
 	{
 		put_json(TOTAL_SURFACE_AREA, 0.);
@@ -477,9 +477,9 @@ public:
 
 class QuantityWriter_v1 : public EntityExtension {
 private:
-	const IfcGeom::BRepElement<double, double>* elem_;
+	const IfcGeom::BRepElement* elem_;
 public:
-	QuantityWriter_v1(const IfcGeom::BRepElement<double, double>* elem) :
+	QuantityWriter_v1(const IfcGeom::BRepElement* elem) :
 		elem_(elem) {
 		double a, b, c, largest_face_area = 0.;
 
@@ -560,7 +560,7 @@ int main () {
 	double deflection = 1.e-3;
 	bool has_more = false;
 
-	IfcGeom::Iterator<double, double>* iterator = 0;
+	IfcGeom::Iterator* iterator = 0;
 	IfcParse::IfcFile* file = 0;
 	std::vector< std::pair<uint32_t, uint32_t> > setting_pairs;
 
@@ -595,7 +595,7 @@ int main () {
 			settings.set_deflection_tolerance(deflection);
 
 			file = new IfcParse::IfcFile(data, (int)len);
-			iterator = new IfcGeom::Iterator<double, double>(settings, file);
+			iterator = new IfcGeom::Iterator(settings, file);
 			has_more = iterator->initialize();
 
 			More(has_more).write(std::cout);
@@ -607,7 +607,7 @@ int main () {
 				exit_code = 1;
 				break;
 			}
-			const IfcGeom::TriangulationElement<double, double>* geom = static_cast<const IfcGeom::TriangulationElement<double, double>*>(iterator->get());
+			const IfcGeom::TriangulationElement* geom = static_cast<const IfcGeom::TriangulationElement*>(iterator->get());
 			std::unique_ptr<EntityExtension> eext;
 			if (emit_quantities) {
 				eext.reset(new QuantityWriter_v1(iterator->get_native()));