diff --git a/CalibTracker/SiStripCommon/plugins/TkDetMapESProducer.cc b/CalibTracker/SiStripCommon/plugins/TkDetMapESProducer.cc
index f634d29508a81..69adaab6cab95 100644
--- a/CalibTracker/SiStripCommon/plugins/TkDetMapESProducer.cc
+++ b/CalibTracker/SiStripCommon/plugins/TkDetMapESProducer.cc
@@ -294,8 +294,7 @@ namespace {
 }  // namespace
 
 std::unique_ptr<TkDetMap> TkDetMapESProducer::produce(const TrackerTopologyRcd& tTopoRcd) {
-  const auto& geomDetRcd = tTopoRcd.getRecord<IdealGeometryRecord>();
-  const auto& geomDet = geomDetRcd.get(geomDetToken_);
+  const auto& geomDet = tTopoRcd.get(geomDetToken_);
   const auto TkDetIdList = TrackerGeometryUtils::getSiStripDetIds(geomDet);
 
   const auto& tTopo = tTopoRcd.get(tTopoToken_);
diff --git a/RecoLocalCalo/HcalRecAlgos/plugins/HcalChannelPropertiesEP.cc b/RecoLocalCalo/HcalRecAlgos/plugins/HcalChannelPropertiesEP.cc
index 426a8cf728443..e9ea228b97193 100644
--- a/RecoLocalCalo/HcalRecAlgos/plugins/HcalChannelPropertiesEP.cc
+++ b/RecoLocalCalo/HcalRecAlgos/plugins/HcalChannelPropertiesEP.cc
@@ -53,10 +53,8 @@ class HcalChannelPropertiesEP : public edm::ESProducer {
   inline ~HcalChannelPropertiesEP() override {}
 
   ReturnType1 produce1(const HcalChannelPropertiesAuxRecord& rcd) {
-    const auto& htopoRecord = rcd.getRecord<HcalRecNumberingRecord>();
-    const HcalTopology& htopo = htopoRecord.get(topoToken_);
-    const auto& paramsRecord = rcd.getRecord<HcalRecoParamsRcd>();
-    const HcalRecoParams& params = paramsRecord.get(paramsToken_);
+    const HcalTopology& htopo = rcd.get(topoToken_);
+    const HcalRecoParams& params = rcd.get(paramsToken_);
 
     ReturnType1 prod = std::make_unique<HcalRecoParams>(params);
     prod->setTopo(&htopo);
@@ -74,14 +72,10 @@ class HcalChannelPropertiesEP : public edm::ESProducer {
     // Retrieve various event setup records and data products
     const HcalDbRecord& dbRecord = rcd.getRecord<HcalDbRecord>();
     const HcalDbService& cond = dbRecord.get(condToken_);
-    const auto& paramsRecord = rcd.getRecord<HcalChannelPropertiesAuxRecord>();
-    const HcalRecoParams& params = paramsRecord.get(myParamsToken_);
-    const auto& severityRecord = rcd.getRecord<HcalSeverityLevelComputerRcd>();
-    const HcalSeverityLevelComputer& severity = severityRecord.get(sevToken_);
-    const auto& qualRecord = dbRecord.getRecord<HcalChannelQualityRcd>();
-    const HcalChannelQuality& qual = qualRecord.get(qualToken_);
-    const auto& geomRecord = rcd.getRecord<CaloGeometryRecord>();
-    const CaloGeometry& geom = geomRecord.get(geomToken_);
+    const HcalRecoParams& params = rcd.get(myParamsToken_);
+    const HcalSeverityLevelComputer& severity = rcd.get(sevToken_);
+    const HcalChannelQuality& qual = dbRecord.get(qualToken_);
+    const CaloGeometry& geom = rcd.get(geomToken_);
 
     // HcalTopology is taken from "params" created by the "produce1" method
     const HcalTopology& htopo(*params.topo());