diff --git a/DQM/TrackingMonitor/src/TrackAnalyzer.cc b/DQM/TrackingMonitor/src/TrackAnalyzer.cc
index 0acaab355a2ea..3c4e0a8d0b6f0 100644
--- a/DQM/TrackingMonitor/src/TrackAnalyzer.cc
+++ b/DQM/TrackingMonitor/src/TrackAnalyzer.cc
@@ -863,7 +863,7 @@ void TrackAnalyzer::bookHistosForBeamSpot(DQMStore::IBooker& ibooker) {
     if (Folder == "Tr") {
       histname = "DistanceOfClosestApproachToBSdz_";
       DistanceOfClosestApproachToBSdz =
-          ibooker.book1D(histname + CategoryName, histname + CategoryName, 100, -1.1, 1.1);
+          ibooker.book1D(histname + CategoryName, histname + CategoryName, 100, -20.1, 20.1);
       DistanceOfClosestApproachToBSdz->setAxisTitle("Track d_{z} wrt beam spot (cm)", 1);
       DistanceOfClosestApproachToBSdz->setAxisTitle("Number of Tracks", 2);
 
diff --git a/DQM/TrackingMonitor/src/TrackEfficiencyClient.cc b/DQM/TrackingMonitor/src/TrackEfficiencyClient.cc
index fb7faafae7add..8ce4e6df21169 100644
--- a/DQM/TrackingMonitor/src/TrackEfficiencyClient.cc
+++ b/DQM/TrackingMonitor/src/TrackEfficiencyClient.cc
@@ -162,7 +162,7 @@ void TrackEfficiencyClient::dqmEndJob(DQMStore::IBooker& ibooker_, DQMStore::IGe
   edm::LogInfo("TrackEfficiencyClient") << "TrackEfficiencyClient::endLuminosityBlock";
 
   bookMEs(ibooker_);
-  FolderName_ = "Tracking/TrackParameters";
+  FolderName_ = "Tracking/TrackParameters/TrackEfficiency";
   std::vector<std::string> s1 = igetter_.getSubdirs();
 
   igetter_.cd("Tracking");
diff --git a/DQM/TrackingMonitorSource/python/TrackingSourceConfigTier0_Cosmic_cff.py b/DQM/TrackingMonitorSource/python/TrackingSourceConfigTier0_Cosmic_cff.py
deleted file mode 100644
index 15e5f02ee2ac1..0000000000000
--- a/DQM/TrackingMonitorSource/python/TrackingSourceConfigTier0_Cosmic_cff.py
+++ /dev/null
@@ -1,83 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-# TrackingMonitor ####
-# Clone for Cosmic Track Finder
-import DQM.TrackingMonitor.TrackerCosmicsTrackingMonitor_cfi
-TrackMon_cosmicTk = DQM.TrackingMonitor.TrackerCosmicsTrackingMonitor_cfi.TrackerCosmicTrackMon.clone()
-TrackMon_cosmicTk.TrackProducer                    = 'cosmictrackfinderP5'
-TrackMon_cosmicTk.AlgoName                         = 'CosmicTk'
-TrackMon_cosmicTk.FolderName                       = 'Tracking/TrackParameters'
-TrackMon_cosmicTk.doSeedParameterHistos            = True
-
-# Clone for CKF Tracks
-import DQM.TrackingMonitor.TrackerCosmicsTrackingMonitor_cfi
-TrackMon_ckf = DQM.TrackingMonitor.TrackerCosmicsTrackingMonitor_cfi.TrackerCosmicTrackMon.clone()
-TrackMon_ckf.TrackProducer                         = 'ctfWithMaterialTracksP5'
-TrackMon_ckf.AlgoName                              = 'CKFTk'
-TrackMon_ckf.FolderName                            = 'Tracking/TrackParameters'
-TrackMon_ckf.doSeedParameterHistos                 = True
-
-# Clone for Road Search  Tracks
-#import DQM.TrackingMonitor.TrackerCosmicsTrackingMonitor_cfi
-#TrackMon_rs = DQM.TrackingMonitor.TrackerCosmicsTrackingMonitor_cfi.TrackerCosmicTrackMon.clone()
-#TrackMon_rs.TrackProducer                          = 'rsWithMaterialTracksP5'
-#TrackMon_rs.AlgoName                               = 'RSTk'
-#TrackMon_rs.FolderName                             = 'Tracking/TrackParameters'
-#TrackMon_rs.doSeedParameterHistos                  = True
-
-# Clone for Beam Halo Muon Tracks
-import DQM.TrackingMonitor.TrackerCosmicsTrackingMonitor_cfi
-TrackMon_bhmuon = DQM.TrackingMonitor.TrackerCosmicsTrackingMonitor_cfi.TrackerCosmicTrackMon.clone()
-TrackMon_bhmuon.TrackProducer                      = 'ctfWithMaterialTracksBeamHaloMuon'
-TrackMon_bhmuon.AlgoName                           = 'BHMuonTk'
-TrackMon_bhmuon.FolderName                         = 'Tracking/TrackParameters'
-TrackMon_bhmuon.doSeedParameterHistos              = True
-
-# Tracking Efficiency
-# Clone for Cosmic Tracks
-import DQM.TrackingMonitor.TrackEfficiencyMonitor_cfi
-TrackEffMon_cosmicTk = DQM.TrackingMonitor.TrackEfficiencyMonitor_cfi.TrackEffMon.clone()
-TrackEffMon_cosmicTk.TKTrackCollection             = 'cosmictrackfinderP5'
-TrackEffMon_cosmicTk.AlgoName                      = 'CosmicTk'
-TrackEffMon_cosmicTk.FolderName                    = 'Tracking/TrackParameters/TrackEfficiency'
-
-# Clone for CKF Tracks
-import DQM.TrackingMonitor.TrackEfficiencyMonitor_cfi
-TrackEffMon_ckf = DQM.TrackingMonitor.TrackEfficiencyMonitor_cfi.TrackEffMon.clone()
-TrackEffMon_ckf.TKTrackCollection                  = 'ctfWithMaterialTracksP5'
-TrackEffMon_ckf.AlgoName                           = 'CKFTk'
-TrackEffMon_ckf.FolderName                         = 'Tracking/TrackParameters/TrackEfficiency'
-
-# Clone for RS Tracks
-#import DQM.TrackingMonitor.TrackEfficiencyMonitor_cfi
-#TrackEffMon_rs = DQM.TrackingMonitor.TrackEfficiencyMonitor_cfi.TrackEffMon.clone()
-#TrackEffMon_rs.TKTrackCollection                   = 'rsWithMaterialTracksP5'
-#TrackEffMon_rs.AlgoName                            = 'RSTk'
-#TrackEffMon_rs.FolderName                          = 'Tracking/TrackParameters/TrackEfficiency'
-
-# Clone for Beam Halo  Tracks
-import DQM.TrackingMonitor.TrackEfficiencyMonitor_cfi
-TrackEffMon_bhmuon = DQM.TrackingMonitor.TrackEfficiencyMonitor_cfi.TrackEffMon.clone()
-TrackEffMon_bhmuon.TKTrackCollection               = 'ctfWithMaterialTracksBeamHaloMuon'
-TrackEffMon_bhmuon.AlgoName                        = 'BHMuonTk'
-TrackEffMon_bhmuon.FolderName                      = 'Tracking/TrackParameters/TrackEfficiency'
-
-# Split Tracking
-from  DQM.TrackingMonitor.TrackSplittingMonitor_cfi import *
-TrackSplitMonitor.FolderName = 'Tracking/TrackParameters/SplitTracks'
-
-
-# DQM Services
-from DQMServices.Core.DQMEDAnalyzer import DQMEDAnalyzer
-dqmInfoTracking = DQMEDAnalyzer('DQMEventInfo',
-     subSystemFolder = cms.untracked.string('Tracking')
-)
-
-# Sequences 
-TrackingDQMTier0_cosmicTk = cms.Sequence(TrackMon_cosmicTk*TrackEffMon_cosmicTk)
-
-TrackingDQMTier0_ckf = cms.Sequence(TrackMon_ckf*TrackEffMon_ckf)
-
-#TrackingDQMTier0_rs = cms.Sequence(TrackMon_rs*TrackEffMon_rs)
-
-TrackingDQMTier0 = cms.Sequence(TrackMon_cosmicTk*TrackMon_ckf*TrackEffMon_ckf*TrackSplitMonitor*dqmInfoTracking)
diff --git a/DQM/TrackingMonitorSource/python/TrackingSourceConfig_Tier0_cff.py b/DQM/TrackingMonitorSource/python/TrackingSourceConfig_Tier0_cff.py
index 8ef75bd3f2616..e0c430159905f 100644
--- a/DQM/TrackingMonitorSource/python/TrackingSourceConfig_Tier0_cff.py
+++ b/DQM/TrackingMonitorSource/python/TrackingSourceConfig_Tier0_cff.py
@@ -14,7 +14,7 @@
 TrackMon_ckf 					   = DQM.TrackingMonitor.TrackEfficiencyMonitor_cfi.TrackEffMon.clone()
 TrackMon_ckf.TKTrackCollection                     = 'generalTracks'#ctfWithMaterialTracksBeamHaloMuon'#rsWithMaterialTracksP5'#muons'#globalCosmicMuons'#ctfWithMaterialTracksP5'
 TrackMon_ckf.AlgoName                              = 'CKFTk'
-TrackMon_ckf.FolderName                            = 'Tracking/TrackParameters'
+TrackMon_ckf.FolderName                            = 'Tracking/TrackParameters/TrackEfficiency'
 
 # Clone for RS Tracks
 #import DQM.TrackingMonitor.TrackEfficiencyMonitor_cfi