diff --git a/src/cb_EMCAL.cpp b/src/cb_EMCAL.cpp
deleted file mode 100644
index 6fa2099ba2c0d01b7983e1ba6e7274f0335e3a61..0000000000000000000000000000000000000000
--- a/src/cb_EMCAL.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-#include <XML/Helper.h>
-
-using namespace dd4hep;
-
-static Ref_t createDetector(Detector& desc, xml_h handle, SensitiveDetector sens) {
- xml::DetElement detElem = handle;
- std::string detName = detElem.nameStr();
- int detID = detElem.id();
-
- xml::Component dims = detElem.dimensions();
- double RIn = dims.inner_radius();
- //double rMin = dims.rmin();
- double thickness = dims.thickness();
- double ROut = thickness + rInner;
- double innerZ = dims.inner_z();
- double outerZ = dims.outer_z();
- double angle = dims.angle();
-
- Material mat = desc.material(detElem.materialStr());
-
- std::vector<double> coneROut = {ROut, ROut, ROut, ROut};
- std::vector<double> coneRIn = {ROut - 1. * cm, RIn, RIn, ROut - 1. * cm};
- std::vector<double> coneZ = {-cfgsolenoid.SizeZ / 2, -cfgsolenoid.SizeZ / 2 + 30 * cm, cfgsolenoid.SizeZ / 2 - 30 * cm, cfgsolenoid.SizeZ / 2};
-
- Polycone cone_solid("cb_EMCAL_GVol_Solid", 0. * deg, 360. * deg, 4, coneZ, rInner, coneROut);
- Volume detVol(detName, cone_solid, mat);
- //Logic = new G4LogicalVolume(Solid, worldMaterial, "cb_EMCAL_GVol_Logic");
- //Phys = new G4PVPlacement(0, G4ThreeVector(), "cb_EMCAL_GVol_Phys", Logic, motherVolume, false, 0);
- //
- //Tube outerTubeShape(rMin, rInner + thickness, innerZ + thickness);
- //Tube innerTubeShape(0, rInner, innerZ);
- //SubtractionSolid unchamferedShape(outerTubeShape, innerTubeShape);
- //Cone chamferShape(thickness, 0, rMin, 0, rMin + 2 * tan(angle) * thickness);
- //SubtractionSolid detShape(unchamferedShape, chamferShape, Position(0, 0, innerZ + thickness));
-
- detVol.setVisAttributes(desc.visAttributes(detElem.visStr()));
-
- DetElement det(detName, detID);
- Volume motherVol = desc.pickMotherVolume(det);
- PlacedVolume detPV = motherVol.placeVolume(detVol);
- det.setPlacement(detPV);
- return det;
-
-
-//struct cb_EMCAL_Config
-//{
-// double RIn;
-// double ROut;
-// double ROutshift = 5 * cm;
-// double Thickness = 40 * cm;
-// double SizeZ;
-//};
-//
-//
-//class cb_EMCAL_Design
-//{
-//public:
-// inline void Construct(cb_EMCAL_Config cfg, cb_Solenoid_Config cfgsolenoid, G4Material *worldMaterial, G4VPhysicalVolume *motherVolume)
-// {
-// spdlog::debug("Begin cb_EMCAL volume \n");
-//
-// ConstructionConfig = cfg;
-//
-// //........................EMCAL Barrel detector----------------------------------------------
-//
-// // working
-//
-// // G4double EMCALB_R_cone[4]={cb_EMCAL_GVol_RIn, cb_EMCAL_GVol_ROut, cb_EMCAL_GVol_ROut, cb_EMCAL_GVol_RIn };
-// // G4double cb_EMCAL_GVol_ConeZ[4]={ -SizeZ/2, -SizeZ/2+60*cm, SizeZ/2-60*cm, SizeZ/2};
-//
-//
-// double coneROut[4] = {cfg.ROut, cfg.ROut, cfg.ROut, cfg.ROut};
-// double coneRIn[4] = {cfg.ROut - 1. * cm, cfg.RIn, cfg.RIn, cfg.ROut - 1. * cm};
-// double coneZ[4] = {-cfgsolenoid.SizeZ / 2, -cfgsolenoid.SizeZ / 2 + 30 * cm, cfgsolenoid.SizeZ / 2 - 30 * cm, cfgsolenoid.SizeZ / 2};
-//
-// Solid = new G4Polycone("cb_EMCAL_GVol_Solid", 0. * deg, 360. * deg, 4, coneZ, coneRIn, coneROut);
-// Logic = new G4LogicalVolume(Solid, worldMaterial, "cb_EMCAL_GVol_Logic");
-// Phys = new G4PVPlacement(0, G4ThreeVector(), "cb_EMCAL_GVol_Phys", Logic, motherVolume, false, 0);
-//
-//
-// G4VisAttributes *visAttr = new G4VisAttributes(G4Color(0.3, 0.5, 0.9, 1.));
-// visAttr->SetLineWidth(1);
-// visAttr->SetForceSolid(false);
-// Logic->SetVisAttributes(visAttr);
-// }
-//
-//
-// inline void ConstructBars()
-// {
-// // Setting material
-// cb_EMCAL_det_Material = fMat->GetMaterial("PbWO4");
-// Logic->SetMaterial(cb_EMCAL_det_Material);
-//
-// // Visualising it differently
-// auto visualAttributes = new G4VisAttributes(G4Color(0.3, 0.5, 0.9, 1.));
-// visualAttributes->SetLineWidth(1);
-// visualAttributes->SetForceSolid(true);
-// Logic->SetVisAttributes(visualAttributes);
-// // fPhysicsEMCAL = new G4PVPlacement(0, G4ThreeVector(0,0,-40*cm), "EMCALbSolPhys",fLogicEMCAL,
-// // cb_EMCAL_GVol_Phys, false, 0 );
-// }
-//
-// G4Polycone *Solid; //pointer to the solid
-// G4LogicalVolume *Logic; //pointer to the logical
-// G4VPhysicalVolume *Phys; //pointer to the physical
-//
-// /// Parameters that was used in the moment of construction
-// cb_EMCAL_Config ConstructionConfig;
-
-}
-
-// clang-format off
-DECLARE_DETELEMENT(cb_EMCAL, createDetector)