diff --git a/src/DDCaloHitCreator.cc b/src/DDCaloHitCreator.cc
index 61b0500..d29f180 100644
--- a/src/DDCaloHitCreator.cc
+++ b/src/DDCaloHitCreator.cc
@@ -70,11 +70,6 @@ DDCaloHitCreator::~DDCaloHitCreator()
 
 pandora::StatusCode DDCaloHitCreator::CreateCaloHits(const EVENT::LCEvent *const pLCEvent)
 {
-
-  //fg: there cannot be any reasonable default for this string - so we set it to sth. that will cause an exception in case 
-  //    the cellID encoding string is not in the collection: 
-  UTIL::CellIDDecoder<CalorimeterHit>::setDefaultEncoding("undefined_cellID_encoding:100");
-  
     PANDORA_RETURN_RESULT_IF(pandora::STATUS_CODE_SUCCESS, !=, this->CreateECalCaloHits(pLCEvent));
     PANDORA_RETURN_RESULT_IF(pandora::STATUS_CODE_SUCCESS, !=, this->CreateHCalCaloHits(pLCEvent));
     PANDORA_RETURN_RESULT_IF(pandora::STATUS_CODE_SUCCESS, !=, this->CreateMuonCaloHits(pLCEvent));
diff --git a/src/DDSimpleMuonDigi.cc b/src/DDSimpleMuonDigi.cc
index caee371..c0bc80d 100644
--- a/src/DDSimpleMuonDigi.cc
+++ b/src/DDSimpleMuonDigi.cc
@@ -110,11 +110,6 @@ void DDSimpleMuonDigi::init() {
   _nRun = -1;
   _nEvt = 0;
 
-  //fg: there cannot be any reasonable default for this string - so we set it to sth. that will cause an exception in case 
-  //    the cellID encoding string is not in the collection: 
-  UTIL::CellIDDecoder<CalorimeterHit>::setDefaultEncoding("undefined_cellID_encoding:100");
-
-
   //Get the number of Layers in the Endcap
   int layersEndcap=0, layersBarrel=0;