diff --git a/examples/CLICSiD/include/BarrelDetector.h b/examples/CLICSiD/include/BarrelDetector.h
deleted file mode 100644
index 7993073a4b4aab0f63b9731b1069202e8339241c..0000000000000000000000000000000000000000
--- a/examples/CLICSiD/include/BarrelDetector.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * BarrelDetector.h
- *
- *  Created on: Apr 3, 2013
- *      Author: Christian Grefe, CERN
- */
-
-#ifndef BARRELDETECTOR_H_
-#define BARRELDETECTOR_H_
-
-#include "DD4hep/Detector.h"
-
-namespace DD4hep {
-
-namespace Geometry {
-class BarrelDetector: virtual public DetElement {
-
-public:
-	BarrelDetector(const DetElement& e) : DetElement(e) {};
-	virtual ~BarrelDetector() {}
-
-	bool isBarrel() const {
-		return true;
-	}
-};
-
-} /* namespace Geometry */
-} /* namespace DD4hep */
-#endif /* BARRELDETECTOR_H_ */
diff --git a/examples/CLICSiD/include/Calorimeter.h b/examples/CLICSiD/include/Calorimeter.h
deleted file mode 100644
index 1854a6923412f72567461e16f7141ca808276c2a..0000000000000000000000000000000000000000
--- a/examples/CLICSiD/include/Calorimeter.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Calorimeter.h
- *
- *  Created on: Mar 27, 2013
- *      Author: Christian Grefe, CERN
- */
-
-#ifndef CALORIMETER_H_
-#define CALORIMETER_H_
-
-#include "DD4hep/Detector.h"
-#include "LayeredSubdetector.h"
-
-namespace DD4hep {
-
-namespace Geometry {
-
-class Calorimeter: public LayeredSubdetector {
-
-public:
-	Calorimeter(const DetElement& e) : DetElement(e), LayeredSubdetector(e) {}
-	virtual ~Calorimeter() {}
-
-	virtual bool isCalorimeter() const {
-		return true;
-	}
-};
-}
-} /* namespace DD4hep */
-#endif /* CALORIMETER_H_ */
diff --git a/examples/CLICSiD/include/CylindricalBarrelCalorimeter.h b/examples/CLICSiD/include/CylindricalBarrelCalorimeter.h
deleted file mode 100644
index 53bb07bdd609701553527ab648b1c48d01391d58..0000000000000000000000000000000000000000
--- a/examples/CLICSiD/include/CylindricalBarrelCalorimeter.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * CylindricalBarrelCalorimeter.h
- *
- *  Created on: Apr 17, 2013
- *      Author: Christian Grefe, CERN
- */
-
-#ifndef CYLINDRICALBARRELCALORIMETER_H_
-#define CYLINDRICALBARRELCALORIMETER_H_
-
-#include "CylindricalCalorimeter.h"
-#include "BarrelDetector.h"
-
-namespace DD4hep {
-namespace Geometry {
-
-class CylindricalBarrelCalorimeter: public CylindricalCalorimeter, public BarrelDetector {
-public:
-	CylindricalBarrelCalorimeter(const DetElement& e) : DetElement(e), CylindricalCalorimeter(e), BarrelDetector(e) {}
-	virtual ~CylindricalBarrelCalorimeter() {}
-};
-
-} /* namespace Geometry */
-} /* namespace DD4hep */
-#endif /* CYLINDRICALBARRELCALORIMETER_H_ */
diff --git a/examples/CLICSiD/include/CylindricalCalorimeter.h b/examples/CLICSiD/include/CylindricalCalorimeter.h
deleted file mode 100644
index 3e1d16b3a97b3cc6c9763432fa4604593fc383d8..0000000000000000000000000000000000000000
--- a/examples/CLICSiD/include/CylindricalCalorimeter.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * CylindricalCalorimeter.h
- *
- *  Created on: Apr 17, 2013
- *      Author: Christian Grefe, CERN
- */
-
-#ifndef CYLINDRICALCALORIMETER_H_
-#define CYLINDRICALCALORIMETER_H_
-
-#include "CylindricalDetector.h"
-#include "Calorimeter.h"
-
-namespace DD4hep {
-namespace Geometry {
-
-class CylindricalCalorimeter: public Calorimeter, public CylindricalDetector {
-public:
-	CylindricalCalorimeter(const DetElement& e) : DetElement(e), Calorimeter(e), CylindricalDetector(e) {}
-	virtual ~CylindricalCalorimeter() {}
-};
-
-} /* namespace Geometry */
-} /* namespace DD4hep */
-#endif /* CYLINDRICALCALORIMETER_H_ */
diff --git a/examples/CLICSiD/include/CylindricalDetector.h b/examples/CLICSiD/include/CylindricalDetector.h
deleted file mode 100644
index 8ac0767a47deb92cbbe96b5922199aef421b036d..0000000000000000000000000000000000000000
--- a/examples/CLICSiD/include/CylindricalDetector.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * CylindricalDetector.h
- *
- *  Created on: Apr 16, 2013
- *      Author: Christian Grefe, CERN
- */
-
-#ifndef CYLINDRICALDETECTOR_H_
-#define CYLINDRICALDETECTOR_H_
-
-#include "DD4hep/Detector.h"
-#include "DD4hep/Shapes.h"
-
-namespace DD4hep {
-namespace Geometry {
-
-class CylindricalDetector: virtual public DetElement {
-public:
-	CylindricalDetector(const DetElement& e) : DetElement(e) {}
-	virtual ~CylindricalDetector() {}
-
-	double getRMin() const {
-		return getCylinder()->GetRmin();
-	}
-	double getRMax() const {
-		return getCylinder()->GetRmax();
-	}
-	double getZMin() const {
-		return -getCylinder()->GetDZ() / 2.;
-	}
-	double getZMax() const {
-		return getCylinder()->GetDZ() / 2.;
-	}
-
-protected:
-	 Tube getCylinder() const {
-		return Tube(volume().solid());
-	}
-};
-
-} /* namespace Geometry */
-} /* namespace DD4hep */
-#endif /* CYLINDRICALDETECTOR_H_ */
diff --git a/examples/CLICSiD/include/CylindricalEndcapCalorimeter.h b/examples/CLICSiD/include/CylindricalEndcapCalorimeter.h
deleted file mode 100644
index 65a2efa12b457050842f1b0f9ee84c3b200d462c..0000000000000000000000000000000000000000
--- a/examples/CLICSiD/include/CylindricalEndcapCalorimeter.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * CylindricalEndcapCalorimeter.h
- *
- *  Created on: Apr 17, 2013
- *      Author: Christian Grefe, CERN
- */
-
-#ifndef CYLINDRICALENDCAPCALORIMETER_H_
-#define CYLINDRICALENDCAPCALORIMETER_H_
-
-#include "CylindricalCalorimeter.h"
-#include "EndcapDetector.h"
-
-namespace DD4hep {
-namespace Geometry {
-
-class CylindricalEndcapCalorimeter: public CylindricalCalorimeter, public EndcapDetector {
-public:
-	CylindricalEndcapCalorimeter(const DetElement& e) : DetElement(e), CylindricalCalorimeter(e), EndcapDetector(e) {}
-	virtual ~CylindricalEndcapCalorimeter() {}
-};
-
-} /* namespace Geometry */
-} /* namespace DD4hep */
-#endif /* CYLINDRICALENDCAPCALORIMETER_H_ */
diff --git a/examples/CLICSiD/include/EndcapDetector.h b/examples/CLICSiD/include/EndcapDetector.h
deleted file mode 100644
index 1c7dafec5d820a425d56afc0f540348cc469e379..0000000000000000000000000000000000000000
--- a/examples/CLICSiD/include/EndcapDetector.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * EndcapDetector.h
- *
- *  Created on: Apr 16, 2013
- *      Author: Christian Grefe, CERN
- */
-
-#ifndef ENDCAPDETECTOR_H_
-#define ENDCAPDETECTOR_H_
-
-#include "DD4hep/Detector.h"
-
-namespace DD4hep {
-namespace Geometry {
-
-class EndcapDetector: virtual public DetElement {
-public:
-	EndcapDetector(const DetElement& e) : DetElement(e) {}
-	virtual ~EndcapDetector() {}
-
-	bool isEndcap() const {
-		return true;
-	}
-};
-
-} /* namespace Geometry */
-} /* namespace DD4hep */
-#endif /* ENDCAPDETECTOR_H_ */
diff --git a/examples/CLICSiD/include/Exceptions.h b/examples/CLICSiD/include/Exceptions.h
deleted file mode 100644
index 46895559ccf8ef4ad1a6f24f4fadfb5fcc0980b0..0000000000000000000000000000000000000000
--- a/examples/CLICSiD/include/Exceptions.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// $Id: Exceptions.h 513 2013-04-05 14:31:53Z gaede $
-//====================================================================
-//  AIDA Detector description implementation for LCD
-//--------------------------------------------------------------------
-//
-//  Author     : A.Muennich
-//
-//====================================================================
-#ifndef EXCEPTIONS_H
-#define EXCEPTIONS_H
-
-#include <exception> 
-
-namespace DD4hep {
-  
-
-  //define some exception to throw
-  class OutsideGeometryException : public std::exception{
-    
-  protected:
-    std::string message;
-    OutsideGeometryException() {  /*no_op*/ ; } 
-    
-  public: 
-    OutsideGeometryException( std::string text ){
-     message = "OutsideGeometryException: " + text ;
-    }
-    virtual const char* what() const  throw() { return  message.c_str() ; } 
-    virtual ~OutsideGeometryException() throw() { /*no_op*/; } 
-  }; 
-}
-#endif
diff --git a/examples/CLICSiD/include/LayerStack.h b/examples/CLICSiD/include/LayerStack.h
deleted file mode 100644
index 624a07829de86731bd915425c15eff02ce4f71ed..0000000000000000000000000000000000000000
--- a/examples/CLICSiD/include/LayerStack.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * LayerStack.h
- *
- *  Created on: Apr 18, 2013
- *      Author: Christian Grefe, CERN
- */
-
-#ifndef LAYERSTACK_H_
-#define LAYERSTACK_H_
-
-#include "DD4hep/Detector.h"
-
-#include <vector>
-
-namespace DD4hep {
-namespace Geometry {
-
-class LayerStack {
-public:
-	LayerStack(const DetElement& det);
-	LayerStack(const LayerStack& layerStack, const DetElement& det);
-	virtual ~LayerStack();
-	virtual int getNumberOfLayers() const = 0;
-	virtual int getNumberOfModules(int layerIndex = 1) const = 0;
-	virtual DetElement getModule(int layerIndex = 1, int moduleIndex = 1) const = 0;
-	double getThickness(int layerIndex = 1, int moduleIndex = 1) const;
-	double getRadiationLengths(int layerIndex = 1, int moduleIndex = 1) const;
-	double getInteractionLengths(int layerIndex = 1, int moduleIndex = 1) const;
-	double getTotalThickness(int moduleIndex = 1) const;
-	double getTotalInteractionLengths(int moduleIndex = 1) const;
-	double getTotalRadiationLengths(int moduleIndex = 1) const;
-	virtual int getNumberOfSlices(int layerIndex = 1, int moduleIndex = 1) const = 0;
-	virtual DetElement getSlice(int layerIndex = 1, int moduleIndex = 1, int sliceIndex = 1) const = 0;
-	virtual int getNumberOfSensors(int layerIndex = 1, int moduleIndex = 1) const = 0;
-	virtual DetElement getSensor(int layerIndex = 1, int moduleIndex = 1, int sensorIndex = 1) const = 0;
-
-protected:
-	DetElement det;
-};
-
-class PolyhedralCalorimeterLayerStack: public LayerStack {
-public:
-	PolyhedralCalorimeterLayerStack(const DetElement& det);
-	PolyhedralCalorimeterLayerStack(const PolyhedralCalorimeterLayerStack& layerStack, const DetElement& det);
-	virtual ~PolyhedralCalorimeterLayerStack();
-	int getNumberOfLayers() const;
-	int getNumberOfModules(int layerIndex = 1) const;
-	DetElement getModule(int layerIndex = 1, int moduleIndex = 1) const;
-	int getNumberOfSlices(int layerIndex = 1, int moduleIndex = 1) const;
-	DetElement getSlice(int layerIndex = 1, int moduleIndex = 1, int sliceIndex = 1) const;
-	int getNumberOfSensors(int layerIndex = 1, int moduleIndex = 1) const;
-	DetElement getSensor(int layerIndex = 1, int moduleIndex = 1, int sensorIndex = 1) const;
-};
-
-} /* namespace Geometry */
-} /* namespace DD4hep */
-#endif /* LAYERSTACK_H_ */
diff --git a/examples/CLICSiD/include/PolyhedralBarrelCalorimeter.h b/examples/CLICSiD/include/PolyhedralBarrelCalorimeter.h
deleted file mode 100644
index 5b109e2cce38f749e876faf65fd3bd3ac191998a..0000000000000000000000000000000000000000
--- a/examples/CLICSiD/include/PolyhedralBarrelCalorimeter.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * PolyhedralBarrelCalorimeter.h
- *
- *  Created on: Apr 3, 2013
- *      Author: Christian Grefe, CERN
- */
-
-#ifndef POLYHEDRALBARRELCALORIMETER_H_
-#define POLYHEDRALBARRELCALORIMETER_H_
-
-#include "BarrelDetector.h"
-#include "PolyhedralCalorimeter.h"
-
-namespace DD4hep {
-namespace Geometry {
-
-class PolyhedralBarrelCalorimeter: public BarrelDetector, public PolyhedralCalorimeter {
-public:
-	PolyhedralBarrelCalorimeter(const DetElement& e) : DetElement(e), BarrelDetector(e), PolyhedralCalorimeter(e) {}
-	virtual ~PolyhedralBarrelCalorimeter() {}
-};
-
-} /* namespace Geometry */
-} /* namespace DD4hep */
-#endif /* POLYHEDRALBARRELCALORIMETER_H_ */
diff --git a/examples/CLICSiD/include/PolyhedralCalorimeter.h b/examples/CLICSiD/include/PolyhedralCalorimeter.h
deleted file mode 100644
index 48ea7f734855b02624c72eaf249517e9fc65d0d5..0000000000000000000000000000000000000000
--- a/examples/CLICSiD/include/PolyhedralCalorimeter.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * PolyhedralCalorimeter.h
- *
- *  Created on: Apr 17, 2013
- *      Author: Christian Grefe, CERN
- */
-
-#ifndef POLYHEDRALCALORIMETER_H_
-#define POLYHEDRALCALORIMETER_H_
-
-#include "PolyhedralDetector.h"
-#include "Calorimeter.h"
-
-namespace DD4hep {
-namespace Geometry {
-
-class PolyhedralCalorimeter: public PolyhedralDetector, public Calorimeter {
-public:
-	PolyhedralCalorimeter(const DetElement& e) : DetElement(e), Calorimeter(e), PolyhedralDetector(e) {}
-	virtual ~PolyhedralCalorimeter() {}
-};
-
-} /* namespace Geometry */
-} /* namespace DD4hep */
-#endif /* POLYHEDRALCALORIMETER_H_ */
diff --git a/examples/CLICSiD/include/PolyhedralDetector.h b/examples/CLICSiD/include/PolyhedralDetector.h
deleted file mode 100644
index 3f53c2a7fb2fc0ebf0909e8f72229691255219ad..0000000000000000000000000000000000000000
--- a/examples/CLICSiD/include/PolyhedralDetector.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * PolyhedralDetector.h
- *
- *  Created on: Apr 3, 2013
- *      Author: Christian Grefe, CERN
- */
-
-#ifndef POLYHEDRALDETECTOR_H_
-#define POLYHEDRALDETECTOR_H_
-
-#include "DD4hep/Detector.h"
-
-namespace DD4hep {
-namespace Geometry {
-class PolyhedralDetector : virtual public DetElement {
-public:
-	PolyhedralDetector(const DetElement& e) : DetElement(e) {}
-	virtual ~PolyhedralDetector() {}
-
-	int getNSides() const {
-		return getPolyhedra()->GetNedges();
-	}
-	double getRMin() const {
-		return getPolyhedra()->GetRmin(0);
-	}
-	double getRMax() const {
-		return getPolyhedra()->GetRmax(0);
-	}
-	double getZMin() const {
-		return getPolyhedra()->GetZ(0);
-	}
-	double getZMax() const {
-		return getPolyhedra()->GetZ(1);
-	}
-
-protected:
-	PolyhedraRegular getPolyhedra() const {
-		return PolyhedraRegular(volume().solid());
-	}
-};
-} /* namespace Geometry */
-} /* namespace DD4hep */
-#endif /* POLYHEDRALDETECTOR_H_ */
diff --git a/examples/CLICSiD/include/PolyhedralEndcapCalorimeter.h b/examples/CLICSiD/include/PolyhedralEndcapCalorimeter.h
deleted file mode 100644
index 161a9c266d7354cca0aff2f0b9d43b8e7a4af5ee..0000000000000000000000000000000000000000
--- a/examples/CLICSiD/include/PolyhedralEndcapCalorimeter.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * PolyhedralEndcapCalorimeter.h
- *
- *  Created on: Apr 16, 2013
- *      Author: Christian Grefe, CERN
- */
-
-#ifndef POLYHEDRALENDCAPCALORIMETER_H_
-#define POLYHEDRALENDCAPCALORIMETER_H_
-
-#include "EndcapDetector.h"
-#include "PolyhedralCalorimeter.h"
-
-namespace DD4hep {
-namespace Geometry {
-
-class PolyhedralEndcapCalorimeter: public EndcapDetector, public PolyhedralCalorimeter {
-public:
-	PolyhedralEndcapCalorimeter(const DetElement& e) : DetElement(e), EndcapDetector(e), PolyhedralCalorimeter(e) {}
-	virtual ~PolyhedralEndcapCalorimeter() {}
-};
-
-} /* namespace Geometry */
-} /* namespace DD4hep */
-#endif /* POLYHEDRALENDCAPCALORIMETER_H_ */
diff --git a/examples/CLICSiD/src/LayeredSubdetector.cpp b/examples/CLICSiD/src/LayeredSubdetector.cpp
deleted file mode 100644
index c834df81b454d78a3f06f3680338d0119cfd28c9..0000000000000000000000000000000000000000
--- a/examples/CLICSiD/src/LayeredSubdetector.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include "LayeredSubdetector.h"
-
-namespace DD4hep {
-namespace Geometry {
-
-LayeredSubdetector::LayeredSubdetector(const DetElement& e) :
-		DetElement(e) {
-	getExtension();
-}
-
-LayeredSubdetector::~LayeredSubdetector() {
-
-}
-
-void LayeredSubdetector::getExtension() {
-	layerStack = isValid() ? extension<LayerStack>() : 0;
-	if (layerStack == 0) {
-		std::cout << "Failed to get the extension" << std::endl;
-	}
-}
-
-} /* namespace Geometry */
-} /* namespace DD4hep */