diff --git a/DDDetectors/src/BoxSegment_geo.cpp b/DDDetectors/src/BoxSegment_geo.cpp
index 3f7079ace996fce6b937db7f42c38cb7c94ff9a0..709c17254bea4f7a55268b2abdcfa96cc07dccf0 100644
--- a/DDDetectors/src/BoxSegment_geo.cpp
+++ b/DDDetectors/src/BoxSegment_geo.cpp
@@ -24,15 +24,26 @@ static Ref_t create_element(Detector& description, xml_h e, Ref_t sens)  {
   xml_det_t   x_det = e;
   string      name  = x_det.nameStr();
   xml_comp_t  box    (x_det.child(_U(box)));
-  xml_dim_t   pos    (x_det.child(_U(position)));
-  xml_dim_t   rot    (x_det.child(_U(rotation)));
+  xml_dim_t   pos    (x_det.child(_U(position), false));
+  xml_dim_t   rot    (x_det.child(_U(rotation), false));
   Material    mat    (description.material(x_det.materialStr()));
   DetElement  det    (name,x_det.id());
   Volume      det_vol(name+"_vol",Box(box.x(),box.y(),box.z()), mat);
   Volume      mother = description.pickMotherVolume(det);
-  Transform3D transform(Rotation3D(RotationZYX(rot.z(),rot.y(),rot.x())),Position(pos.x(),pos.y(),pos.z()));
-  PlacedVolume phv = mother.placeVolume(det_vol,transform);
+  Transform3D transform;
 
+  if ( pos && rot )   {
+    transform = Transform3D(Rotation3D(RotationZYX(rot.z(),rot.y(),rot.x())),
+			    Position(pos.x(),pos.y(),pos.z()));
+  }
+  else if ( rot )   {
+    transform = Transform3D(Rotation3D(RotationZYX(rot.z(),rot.y(),rot.x())),
+			    Position());
+  }
+  else if ( pos )   {
+    transform = Transform3D(Rotation3D(), Position(pos.x(),pos.y(),pos.z()));
+  }
+  PlacedVolume phv = mother.placeVolume(det_vol,transform);
   det_vol.setVisAttributes(description, x_det.visStr());
   det_vol.setLimitSet(description, x_det.limitsStr());
   det_vol.setRegion(description, x_det.regionStr());
@@ -51,4 +62,4 @@ static Ref_t create_element(Detector& description, xml_h e, Ref_t sens)  {
 
 // first argument is the type from the xml file
 DECLARE_DETELEMENT(DD4hep_BoxSegment,create_element)
-DECLARE_DEPRECATED_DETELEMENT(BoxSegment,create_element)
+
diff --git a/DDDetectors/src/CylindricalBarrelCalorimeter_geo.cpp b/DDDetectors/src/CylindricalBarrelCalorimeter_geo.cpp
index 83f6e1df76b9bd3fa628dd75c55f3d181c46e1c0..38f22f91c03915922ecc2e224ca50898ccfc7907 100644
--- a/DDDetectors/src/CylindricalBarrelCalorimeter_geo.cpp
+++ b/DDDetectors/src/CylindricalBarrelCalorimeter_geo.cpp
@@ -77,4 +77,4 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
 }
 
 DECLARE_DETELEMENT(DD4hep_CylindricalBarrelCalorimeter,create_detector)
-DECLARE_DEPRECATED_DETELEMENT(CylindricalBarrelCalorimeter,create_detector)
+
diff --git a/DDDetectors/src/CylindricalEndcapCalorimeter_geo.cpp b/DDDetectors/src/CylindricalEndcapCalorimeter_geo.cpp
index 1c84e4e20f3a07a6ef386c5c75d059c0ced2f1ff..1fc40c555c181e69d819505d7d5ebf8f5df2c364 100644
--- a/DDDetectors/src/CylindricalEndcapCalorimeter_geo.cpp
+++ b/DDDetectors/src/CylindricalEndcapCalorimeter_geo.cpp
@@ -101,4 +101,3 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
 }
 
 DECLARE_DETELEMENT(DD4hep_CylindricalEndcapCalorimeter,create_detector)
-DECLARE_DEPRECATED_DETELEMENT(CylindricalEndcapCalorimeter,create_detector)
diff --git a/DDDetectors/src/DiskTracker_geo.cpp b/DDDetectors/src/DiskTracker_geo.cpp
index a6e91eb8261f48b90e03ed5cbb1f738ef6ec6038..792823339728562b62f6cf43d5fd44ed64d13bb1 100644
--- a/DDDetectors/src/DiskTracker_geo.cpp
+++ b/DDDetectors/src/DiskTracker_geo.cpp
@@ -85,4 +85,3 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
 }
 
 DECLARE_DETELEMENT(DD4hep_DiskTracker,create_detector)
-DECLARE_DEPRECATED_DETELEMENT(DiskTracker,create_detector)
diff --git a/DDDetectors/src/EcalBarrel_geo.cpp b/DDDetectors/src/EcalBarrel_geo.cpp
index 1c52c31b65aaa0b14dfde2dca3d085afafd05525..6a019b0d69584fe104c52c797c5c6459f0ff8d43 100644
--- a/DDDetectors/src/EcalBarrel_geo.cpp
+++ b/DDDetectors/src/EcalBarrel_geo.cpp
@@ -161,4 +161,3 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
 }
 
 DECLARE_DETELEMENT(DD4hep_EcalBarrel,create_detector)
-DECLARE_DEPRECATED_DETELEMENT(EcalBarrel,create_detector)
diff --git a/DDDetectors/src/ForwardDetector_geo.cpp b/DDDetectors/src/ForwardDetector_geo.cpp
index 006d50c57504f7f4caea9cb72e0c0d4f844f8da6..37747b282210588a8a28b6315ba9496e1cef7587 100644
--- a/DDDetectors/src/ForwardDetector_geo.cpp
+++ b/DDDetectors/src/ForwardDetector_geo.cpp
@@ -195,4 +195,4 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
 }
 
 DECLARE_DETELEMENT(DD4hep_ForwardDetector,create_detector)
-DECLARE_DEPRECATED_DETELEMENT(ForwardDetector,create_detector)
+
diff --git a/DDDetectors/src/MultiLayerTracker_geo.cpp b/DDDetectors/src/MultiLayerTracker_geo.cpp
index 4798586af1f5f73fa3ef8d33dec1a87bb3ca393b..7de04855cb0c315649e2881986af02dd144ec073 100644
--- a/DDDetectors/src/MultiLayerTracker_geo.cpp
+++ b/DDDetectors/src/MultiLayerTracker_geo.cpp
@@ -78,4 +78,4 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
 }
 
 DECLARE_DETELEMENT(DD4hep_MultiLayerTracker,create_detector)
-DECLARE_DEPRECATED_DETELEMENT(MultiLayerTracker,create_detector)
+
diff --git a/DDDetectors/src/PolyconeSupport_geo.cpp b/DDDetectors/src/PolyconeSupport_geo.cpp
index 097d2bda66ec973e721d26136aae1d64aea380d8..fb4b3d0306886aa2f8e7c68ed6db9ec72f28e3cd 100644
--- a/DDDetectors/src/PolyconeSupport_geo.cpp
+++ b/DDDetectors/src/PolyconeSupport_geo.cpp
@@ -60,4 +60,3 @@ static Ref_t create_detector(Detector& description, xml_h e, Ref_t sens)  {
 }
 
 DECLARE_DETELEMENT(DD4hep_PolyconeSupport,create_detector)
-DECLARE_DEPRECATED_DETELEMENT(PolyconeSupport,create_detector)
diff --git a/DDDetectors/src/PolyhedraBarrelCalorimeter2_geo.cpp b/DDDetectors/src/PolyhedraBarrelCalorimeter2_geo.cpp
index 029d9bab329371823ad1438b142ad08cf46c2ce8..be45bda26ce995d352061274f981c59d3b643aa7 100644
--- a/DDDetectors/src/PolyhedraBarrelCalorimeter2_geo.cpp
+++ b/DDDetectors/src/PolyhedraBarrelCalorimeter2_geo.cpp
@@ -185,4 +185,3 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
 }
 
 DECLARE_DETELEMENT(DD4hep_PolyhedraBarrelCalorimeter2, create_detector)
-DECLARE_DEPRECATED_DETELEMENT(PolyhedraBarrelCalorimeter2,create_detector)
diff --git a/DDDetectors/src/PolyhedraEndcapCalorimeter2_geo.cpp b/DDDetectors/src/PolyhedraEndcapCalorimeter2_geo.cpp
index f9782d49425513f086a63fa70ea9c104e3328a2e..f770f1190031223b1cde103cf442b9fedd22b7b0 100644
--- a/DDDetectors/src/PolyhedraEndcapCalorimeter2_geo.cpp
+++ b/DDDetectors/src/PolyhedraEndcapCalorimeter2_geo.cpp
@@ -131,4 +131,4 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
 }
 
 DECLARE_DETELEMENT(DD4hep_PolyhedraEndcapCalorimeter2,create_detector)
-DECLARE_DEPRECATED_DETELEMENT(PolyhedraEndcapCalorimeter2,create_detector)
+
diff --git a/DDDetectors/src/SiTrackerBarrel_geo.cpp b/DDDetectors/src/SiTrackerBarrel_geo.cpp
index b6970a911def44acc7dd82c0f683f4d7d592cc27..99a70eef8a0092f6e39eca0418c95e8e863c8556 100644
--- a/DDDetectors/src/SiTrackerBarrel_geo.cpp
+++ b/DDDetectors/src/SiTrackerBarrel_geo.cpp
@@ -168,4 +168,4 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
 }
 
 DECLARE_DETELEMENT(DD4hep_SiTrackerBarrel,create_detector)
-DECLARE_DEPRECATED_DETELEMENT(SiTrackerBarrel,create_detector)
+
diff --git a/DDDetectors/src/SiTrackerEndcap2_geo.cpp b/DDDetectors/src/SiTrackerEndcap2_geo.cpp
index 3337d6529008d131ff305b6cddb15e60865e88b7..2dc3d9cd8f1b89122c349b27364789c625b6baed 100644
--- a/DDDetectors/src/SiTrackerEndcap2_geo.cpp
+++ b/DDDetectors/src/SiTrackerEndcap2_geo.cpp
@@ -133,4 +133,4 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
 }
 
 DECLARE_DETELEMENT(DD4hep_SiTrackerEndcap2,create_detector)
-DECLARE_DEPRECATED_DETELEMENT(SiTrackerEndcap2,create_detector)
+
diff --git a/DDDetectors/src/TubeSegment_geo.cpp b/DDDetectors/src/TubeSegment_geo.cpp
index 36fcb987b4b46f877706ca525c38e45c5481d7a2..866e0bffc12493603116402ab31536a3dcdfb53b 100644
--- a/DDDetectors/src/TubeSegment_geo.cpp
+++ b/DDDetectors/src/TubeSegment_geo.cpp
@@ -51,4 +51,4 @@ static Ref_t create_element(Detector& description, xml_h e, Ref_t sens)  {
 }
 
 DECLARE_DETELEMENT(DD4hep_TubeSegment,create_element)
-DECLARE_DEPRECATED_DETELEMENT(TubeSegment,create_element)
+