diff --git a/RecoTracker/FinalTrackSelectors/src/DuplicateListMerger.cc b/RecoTracker/FinalTrackSelectors/src/DuplicateListMerger.cc
index 7dfc3c4..28b0df5 100644
--- a/RecoTracker/FinalTrackSelectors/src/DuplicateListMerger.cc
+++ b/RecoTracker/FinalTrackSelectors/src/DuplicateListMerger.cc
@@ -378,7 +378,8 @@ void DuplicateListMerger::produce(edm::Event& iEvent, const edm::EventSetup& iSe
   }
 
   edm::ProductID nPID = refTrks.id();
-  edm::TestHandle<TrackCollection> out_gtHandle(out_generalTracks.get(),nPID);
+  edm::Provenance trkProv = iEvent.getProvenance(nPID);
+  edm::Handle<TrackCollection> out_gtHandle(out_generalTracks.get(),&trkProv);
 
   fillerMVA.insert(out_gtHandle,mvaVec.begin(),mvaVec.end());
   fillerMVA.fill();
diff --git a/RecoTracker/FinalTrackSelectors/src/TrackListMerger.cc b/RecoTracker/FinalTrackSelectors/src/TrackListMerger.cc
index ead69b5..3a007a5 100644
--- a/RecoTracker/FinalTrackSelectors/src/TrackListMerger.cc
+++ b/RecoTracker/FinalTrackSelectors/src/TrackListMerger.cc
@@ -693,7 +693,9 @@ namespace cms
     statCount.end(outputTrks->size());
 
     edm::ProductID nPID = refTrks.id();
-    edm::TestHandle<reco::TrackCollection> outHandle(outputTrks.get(),nPID);
+    edm::Provenance trkProv = e.getProvenance(nPID);
+    edm::Handle<reco::TrackCollection> outHandle(outputTrks.get(),&trkProv);
+
     fillerMVA.insert(outHandle,mvaVec.begin(),mvaVec.end());
     fillerMVA.fill();
 
diff --git a/RecoTracker/TkHitPairs/src/HitPairGeneratorFromLayerPair.cc b/RecoTracker/TkHitPairs/src/HitPairGeneratorFromLayerPair.cc
index b7d6bbc..85b4ab8 100644
--- a/RecoTracker/TkHitPairs/src/HitPairGeneratorFromLayerPair.cc
+++ b/RecoTracker/TkHitPairs/src/HitPairGeneratorFromLayerPair.cc
@@ -86,10 +86,7 @@ void HitPairGeneratorFromLayerPair::hitPairs(
   for (std::size_t i=0; i!=ds.size(); ++i) {
     result.push_back( OrderedHitPair( ds.hit(i,HitDoublets::inner),ds.hit(i,HitDoublets::outer) ));
   }
-  if (theMaxElement!=0 && result.size() >= theMaxElement){
-     result.clear();
-    edm::LogError("TooManyPairs")<<"number of pairs exceed maximum, no pairs produced";
-  }
+  
 }