diff --git a/Geometry/EcalTestBeam/plugins/EcalTBGeometryBuilder.cc b/Geometry/EcalTestBeam/plugins/EcalTBGeometryBuilder.cc
index b2faaf24fffbd..b49756c3cf840 100644
--- a/Geometry/EcalTestBeam/plugins/EcalTBGeometryBuilder.cc
+++ b/Geometry/EcalTestBeam/plugins/EcalTBGeometryBuilder.cc
@@ -43,8 +43,6 @@ EcalTBGeometryBuilder::~EcalTBGeometryBuilder() {}
 
 // ------------ method called to produce the data  ------------
 EcalTBGeometryBuilder::ReturnType EcalTBGeometryBuilder::produce(const IdealGeometryRecord& iRecord) {
-  edm::ESHandle<CaloSubdetectorGeometry> pG;
-
   auto pCaloGeom = std::make_unique<CaloGeometry>();
 
   // TODO: Look for ECAL parts
diff --git a/Geometry/EcalTestBeam/plugins/EcalTBGeometryBuilder.h b/Geometry/EcalTestBeam/plugins/EcalTBGeometryBuilder.h
index 05062e487c699..6c178294dac87 100644
--- a/Geometry/EcalTestBeam/plugins/EcalTBGeometryBuilder.h
+++ b/Geometry/EcalTestBeam/plugins/EcalTBGeometryBuilder.h
@@ -22,7 +22,6 @@
 // user include files
 #include "FWCore/Framework/interface/ESProducer.h"
 
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/ESGetToken.h"
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
diff --git a/SimG4CMS/EcalTestBeam/interface/EcalTBMCInfoProducer.h b/SimG4CMS/EcalTestBeam/interface/EcalTBMCInfoProducer.h
index 78bcb48d35211..d1d704ea99fd2 100644
--- a/SimG4CMS/EcalTestBeam/interface/EcalTBMCInfoProducer.h
+++ b/SimG4CMS/EcalTestBeam/interface/EcalTBMCInfoProducer.h
@@ -6,7 +6,6 @@
  *
  */
 #include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
diff --git a/SimG4CMS/EcalTestBeam/interface/FakeTBEventHeaderProducer.h b/SimG4CMS/EcalTestBeam/interface/FakeTBEventHeaderProducer.h
index b274860afb4a9..f17e2ca11d32a 100644
--- a/SimG4CMS/EcalTestBeam/interface/FakeTBEventHeaderProducer.h
+++ b/SimG4CMS/EcalTestBeam/interface/FakeTBEventHeaderProducer.h
@@ -10,7 +10,6 @@
  */
 
 #include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
diff --git a/SimG4CMS/EcalTestBeam/interface/FakeTBHodoscopeRawInfoProducer.h b/SimG4CMS/EcalTestBeam/interface/FakeTBHodoscopeRawInfoProducer.h
index 99a92d9c4bff0..f486ae98dfc5e 100644
--- a/SimG4CMS/EcalTestBeam/interface/FakeTBHodoscopeRawInfoProducer.h
+++ b/SimG4CMS/EcalTestBeam/interface/FakeTBHodoscopeRawInfoProducer.h
@@ -10,7 +10,6 @@
  */
 
 #include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
diff --git a/SimG4CMS/EcalTestBeam/interface/TBHodoActiveVolumeRawInfoProducer.h b/SimG4CMS/EcalTestBeam/interface/TBHodoActiveVolumeRawInfoProducer.h
index ac8b9b68ab852..ee00df4358599 100644
--- a/SimG4CMS/EcalTestBeam/interface/TBHodoActiveVolumeRawInfoProducer.h
+++ b/SimG4CMS/EcalTestBeam/interface/TBHodoActiveVolumeRawInfoProducer.h
@@ -7,7 +7,6 @@
  */
 
 #include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
diff --git a/SimG4CMS/FP420/interface/FP420Test.h b/SimG4CMS/FP420/interface/FP420Test.h
index 5defc1f9b52d4..db49e64540091 100644
--- a/SimG4CMS/FP420/interface/FP420Test.h
+++ b/SimG4CMS/FP420/interface/FP420Test.h
@@ -12,9 +12,6 @@
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-// necessary objects:
-#include "FWCore/Framework/interface/ESHandle.h"
-
 //
 //
 #include "SimG4Core/Notification/interface/Observer.h"
diff --git a/SimG4CMS/FP420/plugins/FP420SD.cc b/SimG4CMS/FP420/plugins/FP420SD.cc
index 2a2e13e3c6041..31080ab4dcc3c 100644
--- a/SimG4CMS/FP420/plugins/FP420SD.cc
+++ b/SimG4CMS/FP420/plugins/FP420SD.cc
@@ -19,7 +19,6 @@
 #include "SimG4CMS/FP420/interface/FP420G4HitCollection.h"
 #include "SimG4CMS/FP420/interface/FP420NumberingScheme.h"
 
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
diff --git a/SimG4CMS/Tracker/test/SimHitTrackerAnalyzer.cc b/SimG4CMS/Tracker/test/SimHitTrackerAnalyzer.cc
index 61449fc1931a5..a11cb13ae5d0c 100644
--- a/SimG4CMS/Tracker/test/SimHitTrackerAnalyzer.cc
+++ b/SimG4CMS/Tracker/test/SimHitTrackerAnalyzer.cc
@@ -25,7 +25,6 @@
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"