diff --git a/Calibration/IsolatedParticles/interface/MatchingSimTrack.h b/Calibration/IsolatedParticles/interface/MatchingSimTrack.h
index bf1c84d67b76b..65651476041e6 100644
--- a/Calibration/IsolatedParticles/interface/MatchingSimTrack.h
+++ b/Calibration/IsolatedParticles/interface/MatchingSimTrack.h
@@ -22,7 +22,6 @@
#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
#include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h"
-#include "SimTracker/Records/interface/TrackAssociatorRecord.h"
namespace spr {
diff --git a/Calibration/IsolatedParticles/plugins/IsolatedGenParticles.cc b/Calibration/IsolatedParticles/plugins/IsolatedGenParticles.cc
index 7ec5dc03c3392..9363fde7f1ca7 100644
--- a/Calibration/IsolatedParticles/plugins/IsolatedGenParticles.cc
+++ b/Calibration/IsolatedParticles/plugins/IsolatedGenParticles.cc
@@ -71,7 +71,6 @@
#include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
#include "SimGeneral/HepPDTRecord/interface/ParticleDataTable.h"
-#include "SimTracker/Records/interface/TrackAssociatorRecord.h"
// track associator
#include "TrackingTools/TrajectoryState/interface/FreeTrajectoryState.h"
diff --git a/Calibration/IsolatedParticles/plugins/IsolatedTracksCone.cc b/Calibration/IsolatedParticles/plugins/IsolatedTracksCone.cc
index b11c09ba028e5..4d9a6fc653808 100644
--- a/Calibration/IsolatedParticles/plugins/IsolatedTracksCone.cc
+++ b/Calibration/IsolatedParticles/plugins/IsolatedTracksCone.cc
@@ -101,7 +101,6 @@
#include "TrackingTools/TrackAssociator/interface/TrackDetectorAssociator.h"
// tracker hit associator
-#include "SimTracker/Records/interface/TrackAssociatorRecord.h"
#include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h"
#include "RecoCaloTools/Navigation/interface/CaloNavigator.h"
diff --git a/Calibration/IsolatedParticles/plugins/IsolatedTracksHcalScale.cc b/Calibration/IsolatedParticles/plugins/IsolatedTracksHcalScale.cc
index e3670218df38b..446b3ea5c36e8 100644
--- a/Calibration/IsolatedParticles/plugins/IsolatedTracksHcalScale.cc
+++ b/Calibration/IsolatedParticles/plugins/IsolatedTracksHcalScale.cc
@@ -92,7 +92,6 @@
#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
// track associator
-#include "SimTracker/Records/interface/TrackAssociatorRecord.h"
#include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h"
#include "TrackingTools/TrajectoryState/interface/FreeTrajectoryState.h"
#include "TrackingTools/TrackAssociator/interface/TrackDetectorAssociator.h"
diff --git a/Calibration/IsolatedParticles/plugins/IsolatedTracksNxN.cc b/Calibration/IsolatedParticles/plugins/IsolatedTracksNxN.cc
index 259a05b66da96..72967463cfc1a 100644
--- a/Calibration/IsolatedParticles/plugins/IsolatedTracksNxN.cc
+++ b/Calibration/IsolatedParticles/plugins/IsolatedTracksNxN.cc
@@ -134,7 +134,6 @@
#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
// track associator
-#include "SimTracker/Records/interface/TrackAssociatorRecord.h"
#include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h"
#include "TrackingTools/TrajectoryState/interface/FreeTrajectoryState.h"
#include "TrackingTools/TrackAssociator/interface/TrackDetectorAssociator.h"
diff --git a/Calibration/IsolatedParticles/plugins/StudyCaloGen.cc b/Calibration/IsolatedParticles/plugins/StudyCaloGen.cc
index e15be0e8a046d..5ae0ae1fb3e00 100644
--- a/Calibration/IsolatedParticles/plugins/StudyCaloGen.cc
+++ b/Calibration/IsolatedParticles/plugins/StudyCaloGen.cc
@@ -35,7 +35,6 @@
#include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
#include "SimGeneral/HepPDTRecord/interface/ParticleDataTable.h"
-#include "SimTracker/Records/interface/TrackAssociatorRecord.h"
// track associator
#include "TrackingTools/TrajectoryState/interface/FreeTrajectoryState.h"
diff --git a/MuonAnalysis/MuonAssociators/plugins/BuildFile.xml b/MuonAnalysis/MuonAssociators/plugins/BuildFile.xml
index afa7f595a4ced..e106085532aff 100644
--- a/MuonAnalysis/MuonAssociators/plugins/BuildFile.xml
+++ b/MuonAnalysis/MuonAssociators/plugins/BuildFile.xml
@@ -1,7 +1,6 @@
-
diff --git a/MuonAnalysis/MuonAssociators/plugins/MuonMCClassifier.cc b/MuonAnalysis/MuonAssociators/plugins/MuonMCClassifier.cc
index 2b086f298ae2d..105136a983d22 100644
--- a/MuonAnalysis/MuonAssociators/plugins/MuonMCClassifier.cc
+++ b/MuonAnalysis/MuonAssociators/plugins/MuonMCClassifier.cc
@@ -56,7 +56,6 @@
#include "DataFormats/HepMCCandidate/interface/GenParticleFwd.h"
#include "SimDataFormats/Associations/interface/MuonToTrackingParticleAssociator.h"
-#include "SimTracker/Records/interface/TrackAssociatorRecord.h"
#include
#include "CommonTools/Utils/interface/StringCutObjectSelector.h"
diff --git a/RecoMuon/GlobalTrackingTools/src/DynamicTruncation.cc b/RecoMuon/GlobalTrackingTools/src/DynamicTruncation.cc
index 22ddcda9f2bf0..8b2e15211990d 100644
--- a/RecoMuon/GlobalTrackingTools/src/DynamicTruncation.cc
+++ b/RecoMuon/GlobalTrackingTools/src/DynamicTruncation.cc
@@ -26,7 +26,6 @@
#include "RecoMuon/TrackingTools/interface/MuonPatternRecoDumper.h"
#include "TrackingTools/KalmanUpdators/interface/Chi2MeasurementEstimator.h"
#include "TrackPropagation/SteppingHelixPropagator/interface/SteppingHelixPropagator.h"
-#include "SimTracker/Records/interface/TrackAssociatorRecord.h"
#define MAX_THR 1e7
diff --git a/RecoVertex/ConfigurableVertexReco/test/BuildFile.CVRAnalysis b/RecoVertex/ConfigurableVertexReco/test/BuildFile.CVRAnalysis
index 2733e30a3c33e..8a854e8cc095e 100644
--- a/RecoVertex/ConfigurableVertexReco/test/BuildFile.CVRAnalysis
+++ b/RecoVertex/ConfigurableVertexReco/test/BuildFile.CVRAnalysis
@@ -1,5 +1,4 @@