diff --git a/Control/PileUpComps/src/BkgStreamsCache.cxx b/Control/PileUpComps/src/BkgStreamsCache.cxx
index d202b7e0741d8b983fb928eaeac9b63c93c59ed0..32e72338aa80be944397fae6d90fd5cc50dd3230 100644
--- a/Control/PileUpComps/src/BkgStreamsCache.cxx
+++ b/Control/PileUpComps/src/BkgStreamsCache.cxx
@@ -25,7 +25,6 @@
 #include "AthenaKernel/errorcheck.h"
 
 #include "BkgStreamsCache.h"
-#define DEBUG_PILEUP
 
 BkgStreamsCache::BkgStreamsCache( const std::string& type,
                                   const std::string& name,
diff --git a/Control/PileUpComps/src/PileUpEventLoopMgr.cxx b/Control/PileUpComps/src/PileUpEventLoopMgr.cxx
index 7aee88e634ffdeaeb3df29b35ee904160336d938..8643d39d59c33c15d1724d7eb951f8b18c5d5230 100644
--- a/Control/PileUpComps/src/PileUpEventLoopMgr.cxx
+++ b/Control/PileUpComps/src/PileUpEventLoopMgr.cxx
@@ -32,7 +32,6 @@
 #include "xAODEventInfo/EventInfoAuxContainer.h" // NEW EDM
 
 // xAOD include(s):
-#include "xAODCore/tools/PrintHelpers.h"
 #include "EventInfoUtils/EventInfoFromxAOD.h"
 
 // Gaudi headers
@@ -406,7 +405,6 @@ StatusCode PileUpEventLoopMgr::nextEvent(int maxevt)
                                    std::max( pEventSignal->errorState(xAOD::EventInfo::Core),
                                              pEvent->errorState(xAOD::EventInfo::Core) ) );
       }
-      ATH_MSG_VERBOSE ( "BCID =" << pOverEvent->bcid() );
 
       // when doing overlay add the hard-scatter event as sub-event
       if( m_isEventOverlayJob ) {
diff --git a/Control/PileUpTools/PileUpTools/PileUpMergeSvc.icc b/Control/PileUpTools/PileUpTools/PileUpMergeSvc.icc
index c8f090041756cd52e8828b263f4c7d4508bb506f..4da2d1a66afc9085f01f701fc7e8ac92a46dedd5 100755
--- a/Control/PileUpTools/PileUpTools/PileUpMergeSvc.icc
+++ b/Control/PileUpTools/PileUpTools/PileUpMergeSvc.icc
@@ -16,7 +16,6 @@
 #include "StoreGate/ActiveStoreSvc.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "AthenaKernel/ClassID_traits.h"
-//#include "EventInfo/EventID.h"
 #include "AthenaBaseComps/AthMsgStreamMacros.h"
 
 namespace {
diff --git a/Control/PileUpTools/src/PileUpStream.cxx b/Control/PileUpTools/src/PileUpStream.cxx
index 52a25ddfa452be5d8975e585a865dea75205e70e..06dbf5aa9a38bc5fa59235137ba4cbd396079e05 100755
--- a/Control/PileUpTools/src/PileUpStream.cxx
+++ b/Control/PileUpTools/src/PileUpStream.cxx
@@ -26,9 +26,6 @@
 
 class IOpaqueAddress;
 
-#include <iostream>
-using namespace std;
-
 /// Structors
 PileUpStream::PileUpStream():
   m_name("INVALID"), p_svcLoc(0), p_sel(0), p_SG(0), p_iter(0), 
@@ -87,9 +84,9 @@ PileUpStream::PileUpStream(const std::string& name,
          serviceLocator()->service("ActiveStoreSvc", p_activeStore).isSuccess() &&
          serviceLocator()->service("PileUpMergeSvc", p_mergeSvc, true).isSuccess() ) ) {
 
-    const string errMsg("PileUpStream:: can not create stream");
+    const std::string errMsg("PileUpStream:: can not create stream");
     ATH_MSG_ERROR ( errMsg );
-    throw runtime_error(errMsg);
+    throw std::runtime_error(errMsg);
   } else  m_ownEvtIterator=true;
 }
 
@@ -107,9 +104,9 @@ PileUpStream::PileUpStream(const std::string& name,
 	serviceLocator()->service(selecName, p_sel).isSuccess() &&
         serviceLocator()->service("PileUpMergeSvc", p_mergeSvc, true).isSuccess() &&
 	p_sel->createContext(p_iter).isSuccess() )) {
-    const string errMsg("PileUpStream: can not create stream");
+    const std::string errMsg("PileUpStream: can not create stream");
     ATH_MSG_ERROR ( errMsg );
-    throw runtime_error(errMsg);
+    throw std::runtime_error(errMsg);
   } else  m_ownEvtIterator=true;
 }
 
@@ -186,9 +183,9 @@ bool PileUpStream::setupStore()
 void PileUpStream::setActiveStore()
 {
   if (0 == p_activeStore) {
-    const string errMsg("PileUpStream::setActiveStore(): no ActiveStoreSvc ptr set, INVALID STREAM STATE ");
+    const std::string errMsg("PileUpStream::setActiveStore(): no ActiveStoreSvc ptr set, INVALID STREAM STATE ");
     ATH_MSG_ERROR ( errMsg );
-    throw runtime_error(errMsg);
+    throw std::runtime_error(errMsg);
   }
   p_activeStore->setStore(&store());
   return;
diff --git a/Database/IOVDbSvc/src/IOVDbSvc.cxx b/Database/IOVDbSvc/src/IOVDbSvc.cxx
index 8813832f3f6410713580b03001accbe5aab08c69..a998c44fdf0dec73ca5c6e6c0f92bbbb7bd6a259 100644
--- a/Database/IOVDbSvc/src/IOVDbSvc.cxx
+++ b/Database/IOVDbSvc/src/IOVDbSvc.cxx
@@ -432,11 +432,6 @@ StatusCode IOVDbSvc::loadAddresses(StoreID::type /*storeID*/, tadList& /*list*/
 }
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include "CxxUtils/SealDebug.h"
-#include <iostream>
-using namespace std;
-#include "AthenaKernel/EventContextClid.h"
-
 StatusCode IOVDbSvc::updateAddress(StoreID::type storeID, SG::TransientAddress* tad,
                                    const EventContext& /*ctx*/)
 {
diff --git a/Event/EventInfoUtils/EventInfoUtils/EventInfoFromxAOD.h b/Event/EventInfoUtils/EventInfoUtils/EventInfoFromxAOD.h
index 0cc815af8ecdc0f1bdc84b3c3f21b0f2557f7f65..915a6eddabe2b22a809e581f44442ba5a12c5836 100644
--- a/Event/EventInfoUtils/EventInfoUtils/EventInfoFromxAOD.h
+++ b/Event/EventInfoUtils/EventInfoUtils/EventInfoFromxAOD.h
@@ -4,7 +4,6 @@
   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
-// $Id: EventInfoCnvTool.h 793565 2017-01-23 22:00:14Z leggett $
 #ifndef EVENTINFOFROMXAOD_H
 #define EVENTINFOFROMXAOD_H
 
diff --git a/Event/xAOD/xAODEventInfo/Root/EventInfo_v1.cxx b/Event/xAOD/xAODEventInfo/Root/EventInfo_v1.cxx
index 44fcbaefaa87a357e4ed29dd893569182c118e8e..ecee2946ba568c108b4cde13a93c7bd159453a2f 100644
--- a/Event/xAOD/xAODEventInfo/Root/EventInfo_v1.cxx
+++ b/Event/xAOD/xAODEventInfo/Root/EventInfo_v1.cxx
@@ -565,7 +565,7 @@ namespace xAOD {
    
    const std::string& EventInfo_v1::PileUpType2Name(PileUpType typ)
    {
-      static std::string typNam[PileUp_NTYPES+1] = {
+      static const std::string typNam[PileUp_NTYPES+1] = {
          "Unknown" /*99*/,
          "Signal" /*0*/,
          "MinimumBias" /*1*/,
@@ -579,7 +579,7 @@ namespace xAOD {
 
    EventInfo_v1::PileUpType EventInfo_v1::PileUpInt2Type(unsigned short typ)
    {
-      static PileUpType typEnum[PileUp_NTYPES+1] = {
+      static const PileUpType typEnum[PileUp_NTYPES+1] = {
          Unknown /*99*/, Signal /*0*/, MinimumBias /*1*/, Cavern /*2*/, HaloGas /*3*/, ZeroBias /*4*/
       };
       int t = (typ==99)? 0: (int)typ+1;
diff --git a/MuonSpectrometer/MuonDigitization/CSC_Digitization/src/CscDigitizationTool.cxx b/MuonSpectrometer/MuonDigitization/CSC_Digitization/src/CscDigitizationTool.cxx
index 8c7c0d178bff1f8095c4670ef4e88fb53f20b63f..2b35a2bbed47a53347e9e5b82767cfe73f5d9df6 100644
--- a/MuonSpectrometer/MuonDigitization/CSC_Digitization/src/CscDigitizationTool.cxx
+++ b/MuonSpectrometer/MuonDigitization/CSC_Digitization/src/CscDigitizationTool.cxx
@@ -214,9 +214,6 @@ StatusCode CscDigitizationTool::processAllSubEvents() {
 
 }
 
-#include <iostream>
-using namespace std;
-
 StatusCode CscDigitizationTool::CoreDigitization(CscDigitContainer* cscDigits,CscSimDataCollection* cscSimData) {
   
   // get the iterator pairs for this DetEl