diff --git a/DataFormats/L1TCorrelator/src/classes_def.xml b/DataFormats/L1TCorrelator/src/classes_def.xml
index 6f5b865066d4c..2ba68a5f58872 100644
--- a/DataFormats/L1TCorrelator/src/classes_def.xml
+++ b/DataFormats/L1TCorrelator/src/classes_def.xml
@@ -20,28 +20,28 @@
   <class name="edm::Wrapper<l1t::RegionalOutput<l1t::TkEmCollection>>" />
 
   <class name="l1t::TkEGTau" ClassVersion="3">
-   <version ClassVersion="3" checksum="2091429364"/>
+   <version ClassVersion="3" checksum="1344857878"/>
   </class>
   <class name="std::vector<l1t::TkEGTau>"/>
   <class name="edm::Wrapper<std::vector<l1t::TkEGTau> >"/>
   <class name="edm::Ref<std::vector<l1t::TkEGTau>,l1t::TkEGTau,edm::refhelper::FindUsingAdvance<std::vector<l1t::TkEGTau>,l1t::TkEGTau> >"/>
 
   <class name="l1t::L1TrkTau" ClassVersion="3">
-   <version ClassVersion="3" checksum="4132905380"/>
+   <version ClassVersion="3" checksum="3436503984"/>
   </class>
   <class name="std::vector<l1t::L1TrkTau>"/>
   <class name="edm::Wrapper<std::vector<l1t::L1TrkTau> >"/>
   <class name="edm::Ref<std::vector<l1t::L1TrkTau>,l1t::L1TrkTau,edm::refhelper::FindUsingAdvance<std::vector<l1t::L1TrkTau>,l1t::L1TrkTau> >"/>
 
   <class name="l1t::L1CaloTkTau" ClassVersion="3">
-   <version ClassVersion="3" checksum="731058509"/>
+   <version ClassVersion="3" checksum="758332481"/>
   </class>
   <class name="std::vector<l1t::L1CaloTkTau>"/>
   <class name="edm::Wrapper<std::vector<l1t::L1CaloTkTau> >"/>
   <class name="edm::Ref<std::vector<l1t::L1CaloTkTau>,l1t::L1CaloTkTau,edm::refhelper::FindUsingAdvance<std::vector<l1t::L1CaloTkTau>,l1t::L1CaloTkTau> >"/>
 
   <class name="l1t::io_v1::TkElectron" ClassVersion="3">
-   <version ClassVersion="3" checksum="1493701125"/>
+   <version ClassVersion="3" checksum="3437522575"/>
   </class>
   <class name="std::vector<l1t::io_v1::TkElectron>"/>
   <class name="edm::Wrapper<std::vector<l1t::io_v1::TkElectron> >"/>
@@ -52,7 +52,7 @@
   <class name="edm::Wrapper<l1t::RegionalOutput<l1t::TkElectronCollection>>" />
 
   <class name="l1t::io_v1::TkJet" ClassVersion="3">
-   <version ClassVersion="3" checksum="2867462231"/>
+   <version ClassVersion="3" checksum="1543321493"/>
   </class>
   <class name="std::vector<l1t::io_v1::TkJet>"/>
   <class name="edm::Wrapper<std::vector<l1t::io_v1::TkJet> >"/>
@@ -60,7 +60,7 @@
   <class name="edm::RefProd< std::vector<l1t::io_v1::TkJet> >"/>
 
   <class name="l1t::io_v1::TkTriplet" ClassVersion="3">
-    <version ClassVersion="3" checksum="765075353"/>
+    <version ClassVersion="3" checksum="543507275"/>
   </class>
   <class name="std::vector<l1t::io_v1::TkTriplet>"/>
   <class name="edm::Wrapper<std::vector<l1t::io_v1::TkTriplet> >"/>
@@ -76,7 +76,7 @@
   <class name="edm::Wrapper<std::vector<l1t::io_v1::TkHTMiss> >"/>
 
   <class name="l1t::TkMuon" ClassVersion="3">
-   <version ClassVersion="3" checksum="1122123778"/>
+   <version ClassVersion="3" checksum="1993063572"/>
   </class>
   <class name="std::vector<l1t::TkMuon>"/>
   <class name="edm::Wrapper<std::vector<l1t::TkMuon> >"/>
@@ -84,21 +84,21 @@
   <class name="std::vector<edm::Ref<std::vector<l1t::TkMuon>,l1t::TkMuon,edm::refhelper::FindUsingAdvance<std::vector<l1t::TkMuon>,l1t::TkMuon> > >"/>
 
   <class name="l1t::TkGlbMuon" ClassVersion="3">
-   <version ClassVersion="3"  checksum="3336698296"/>
+   <version ClassVersion="3"  checksum="1513281930"/>
   </class>
   <class name="std::vector<l1t::TkGlbMuon>"/>
   <class name="edm::Wrapper<std::vector<l1t::TkGlbMuon> >"/>
   <class name="edm::Ref<std::vector<l1t::TkGlbMuon>,l1t::TkGlbMuon,edm::refhelper::FindUsingAdvance<std::vector<l1t::TkGlbMuon>,l1t::TkGlbMuon> >"/>
 
   <class name="l1t::TkTau" ClassVersion="3">
-   <version ClassVersion="3" checksum="3715552284"/>
+   <version ClassVersion="3" checksum="1425936068"/>
   </class>
   <class name="std::vector<l1t::TkTau>"/>
   <class name="edm::Wrapper<std::vector<l1t::TkTau> >"/>
   <class name="edm::Ref<std::vector<l1t::TkTau>,l1t::TkTau,edm::refhelper::FindUsingAdvance<std::vector<l1t::TkTau>,l1t::TkTau> >"/>
 
   <class name="l1t::TkPhiCandidate" ClassVersion="3">
-   <version ClassVersion="3" checksum="501058403"/>
+   <version ClassVersion="3" checksum="2213041545"/>
   </class>
   <class name="std::vector<l1t::TkPhiCandidate>" />
   <class name="edm::Wrapper<std::vector<l1t::TkPhiCandidate>>" />
diff --git a/DataFormats/L1TMuonPhase2/src/classes_def.xml b/DataFormats/L1TMuonPhase2/src/classes_def.xml
index a31740aed46f9..c40decd904a56 100644
--- a/DataFormats/L1TMuonPhase2/src/classes_def.xml
+++ b/DataFormats/L1TMuonPhase2/src/classes_def.xml
@@ -8,7 +8,7 @@
     <class name="edm::Ref<l1t::MuonStubCollection>" splitLevel="0"/>
 
      <class name="l1t::io_v1::TrackerMuon" ClassVersion="3">
-       <version ClassVersion="3" checksum="3913298862"/>
+       <version ClassVersion="3" checksum="720000434"/>
      </class>
      <class name="std::vector<l1t::io_v1::TrackerMuon>"/>
      <class name="edm::Wrapper<std::vector<l1t::io_v1::TrackerMuon > >"/>
diff --git a/DataFormats/L1TParticleFlow/src/classes_def.xml b/DataFormats/L1TParticleFlow/src/classes_def.xml
index c67da0a435acc..47f81e67d8515 100644
--- a/DataFormats/L1TParticleFlow/src/classes_def.xml
+++ b/DataFormats/L1TParticleFlow/src/classes_def.xml
@@ -10,7 +10,7 @@
 
   <class name="l1t::io_v1::PFTrack::TrackRef" />
   <class name="l1t::io_v1::PFTrack"  ClassVersion="3">
-      <version ClassVersion="3" checksum="3854171349"/>
+      <version ClassVersion="3" checksum="2193628913"/>
   </class>
   <class name="l1t::PFTrackCollection" />
   <class name="edm::Wrapper<l1t::PFTrackCollection>" />
diff --git a/DataFormats/L1Trigger/src/classes_def.xml b/DataFormats/L1Trigger/src/classes_def.xml
index dfa94d445f109..81cb865340139 100644
--- a/DataFormats/L1Trigger/src/classes_def.xml
+++ b/DataFormats/L1Trigger/src/classes_def.xml
@@ -277,7 +277,7 @@
   <class name="edm::Ptr<l1t::io_v1::L1Candidate>"/>
 
   <class name="l1t::io_v1::Vertex" ClassVersion="3">
-    <version ClassVersion="3" checksum="318255824"/>
+    <version ClassVersion="3" checksum="3405271232"/>
   </class>
   <class name="std::vector<l1t::io_v1::Vertex>"/>
   <class name="edm::Wrapper<std::vector<l1t::io_v1::Vertex> >"/>
diff --git a/DataFormats/Phase2TrackerCluster/src/classes_def.xml b/DataFormats/Phase2TrackerCluster/src/classes_def.xml
index 95a89e2b8804f..7190f41219402 100644
--- a/DataFormats/Phase2TrackerCluster/src/classes_def.xml
+++ b/DataFormats/Phase2TrackerCluster/src/classes_def.xml
@@ -1,6 +1,6 @@
 <lcgdict>
-    <class name="Phase2TrackerCluster1D" ClassVersion="2">
-        <version ClassVersion="2" checksum="1003486686"/>
+    <class name="Phase2TrackerCluster1D" ClassVersion="3">
+        <version ClassVersion="3" checksum="612125678"/>
     </class>
     <class name="std::vector< Phase2TrackerCluster1D >"/>
     <class name="std::vector< edmNew::DetSet< Phase2TrackerCluster1D > >"/>
diff --git a/DataFormats/Phase2TrackerDigi/interface/Phase2TrackerDigi.h b/DataFormats/Phase2TrackerDigi/interface/Phase2TrackerDigi.h
index c4da4ceaf130f..730728502ca25 100644
--- a/DataFormats/Phase2TrackerDigi/interface/Phase2TrackerDigi.h
+++ b/DataFormats/Phase2TrackerDigi/interface/Phase2TrackerDigi.h
@@ -9,61 +9,65 @@
  * Persistent digi for the Phase 2 tracker 
  */
 
-class Phase2TrackerDigi {
-public:
-  typedef uint16_t PackedDigiType;
+namespace io_v1 {
+  class Phase2TrackerDigi {
+  public:
+    typedef uint16_t PackedDigiType;
 
-  Phase2TrackerDigi(unsigned int packed_channel) : theChannel(packed_channel) {}
+    Phase2TrackerDigi(unsigned int packed_channel) : theChannel(packed_channel) {}
 
-  Phase2TrackerDigi(unsigned int row, unsigned int col) { theChannel = pixelToChannel(row, col); }
+    Phase2TrackerDigi(unsigned int row, unsigned int col) { theChannel = pixelToChannel(row, col); }
 
-  Phase2TrackerDigi(unsigned int row, unsigned int col, bool ot_flag) {
-    theChannel = pixelToChannel(row, col);
-    if (ot_flag)
-      theChannel |= (1 << 15);
-  }
+    Phase2TrackerDigi(unsigned int row, unsigned int col, bool ot_flag) {
+      theChannel = pixelToChannel(row, col);
+      if (ot_flag)
+        theChannel |= (1 << 15);
+    }
 
-  Phase2TrackerDigi() : theChannel(0) {}
+    Phase2TrackerDigi() : theChannel(0) {}
 
-  // Access to digi information - pixel sensors
-  unsigned int row() const { return channelToRow(theChannel); }
-  unsigned int column() const { return channelToColumn(theChannel); }
-  // Access to digi information - strip sensors
-  unsigned int strip() const { return row(); }
-  unsigned int edge() const { return column(); }  // CD: any better name for that?
-  // Access to the (raw) channel number
-  unsigned int channel() const { return 0x7FFF & theChannel; }
-  // Access Overthreshold bit
-  bool overThreshold() const { return (otBit(theChannel) ? true : false); }
+    // Access to digi information - pixel sensors
+    unsigned int row() const { return channelToRow(theChannel); }
+    unsigned int column() const { return channelToColumn(theChannel); }
+    // Access to digi information - strip sensors
+    unsigned int strip() const { return row(); }
+    unsigned int edge() const { return column(); }  // CD: any better name for that?
+    // Access to the (raw) channel number
+    unsigned int channel() const { return 0x7FFF & theChannel; }
+    // Access Overthreshold bit
+    bool overThreshold() const { return (otBit(theChannel) ? true : false); }
 
-  static std::pair<unsigned int, unsigned int> channelToPixel(unsigned int ch) {
-    return std::pair<unsigned int, unsigned int>(channelToRow(ch), channelToColumn(ch));
-  }
+    static std::pair<unsigned int, unsigned int> channelToPixel(unsigned int ch) {
+      return std::pair<unsigned int, unsigned int>(channelToRow(ch), channelToColumn(ch));
+    }
 
-  static PackedDigiType pixelToChannel(unsigned int row, unsigned int col) {
-    assert(row < 1016);
-    assert(col < 32);
-    return row | (col << 10);
-  }
+    static PackedDigiType pixelToChannel(unsigned int row, unsigned int col) {
+      assert(row < 1016);
+      assert(col < 32);
+      return row | (col << 10);
+    }
 
-private:
-  PackedDigiType theChannel;
-  static unsigned int channelToRow(unsigned int ch) { return ch & 0x03FF; }
-  static unsigned int channelToColumn(unsigned int ch) { return ((ch >> 10) & 0x1F); }
-  static unsigned int otBit(unsigned int ch) { return ((ch >> 15) & 0x1); }
-};
+  private:
+    PackedDigiType theChannel;
+    static unsigned int channelToRow(unsigned int ch) { return ch & 0x03FF; }
+    static unsigned int channelToColumn(unsigned int ch) { return ((ch >> 10) & 0x1F); }
+    static unsigned int otBit(unsigned int ch) { return ((ch >> 15) & 0x1); }
+  };
 
-// Comparison operators
-inline bool operator<(const Phase2TrackerDigi& one, const Phase2TrackerDigi& other) {
-  return one.channel() < other.channel();
-}
+  // Comparison operators
+  inline bool operator<(const Phase2TrackerDigi& one, const Phase2TrackerDigi& other) {
+    return one.channel() < other.channel();
+  }
 
-// distance operators
-inline int operator-(const Phase2TrackerDigi& one, const Phase2TrackerDigi& other) {
-  return int(one.channel()) - int(other.channel());
-}
+  // distance operators
+  inline int operator-(const Phase2TrackerDigi& one, const Phase2TrackerDigi& other) {
+    return int(one.channel()) - int(other.channel());
+  }
+}  // namespace io_v1
+using Phase2TrackerDigi = io_v1::Phase2TrackerDigi;
 
 #include <iostream>
-inline std::ostream& operator<<(std::ostream& o, const Phase2TrackerDigi& digi) { return o << " " << digi.channel(); }
-
+namespace io_v1 {
+  inline std::ostream& operator<<(std::ostream& o, const Phase2TrackerDigi& digi) { return o << " " << digi.channel(); }
+}  // namespace io_v1
 #endif  // DataFormats_Phase2TrackerDigi_Phase2TrackerDigi_H
diff --git a/DataFormats/Phase2TrackerDigi/interface/Phase2TrackerDigiFwd.h b/DataFormats/Phase2TrackerDigi/interface/Phase2TrackerDigiFwd.h
index 12590ddbaae0b..93813ab3c09c6 100644
--- a/DataFormats/Phase2TrackerDigi/interface/Phase2TrackerDigiFwd.h
+++ b/DataFormats/Phase2TrackerDigi/interface/Phase2TrackerDigiFwd.h
@@ -1,6 +1,9 @@
 #ifndef DataFormats_Phase2TrackerDigi_Phase2TrackerDigiFwd_h
 #define DataFormats_Phase2TrackerDigi_Phase2TrackerDigiFwd_h
 
-class Phase2TrackerDigi;
+namespace io_v1 {
+  class Phase2TrackerDigi;
+}
+using Phase2TrackerDigi = io_v1::Phase2TrackerDigi;
 
 #endif
diff --git a/DataFormats/Phase2TrackerDigi/src/classes_def.xml b/DataFormats/Phase2TrackerDigi/src/classes_def.xml
index d16771941ea58..d824ca83f5380 100644
--- a/DataFormats/Phase2TrackerDigi/src/classes_def.xml
+++ b/DataFormats/Phase2TrackerDigi/src/classes_def.xml
@@ -1,37 +1,37 @@
 <lcgdict>
-   <class name="Phase2TrackerDigi" ClassVersion="10">
-    <version ClassVersion="10" checksum="2375310555"/>
+   <class name="io_v1::Phase2TrackerDigi" ClassVersion="3">
+    <version ClassVersion="3" checksum="534131035"/>
    </class>
-   <class name="edm::Ref< edm::DetSetVector< Phase2TrackerDigi >, Phase2TrackerDigi >"/>
-   <class name="std::vector< edm::Ref< edm::DetSetVector< Phase2TrackerDigi >, Phase2TrackerDigi > >"/>
-   <class name="edm::DetSet<Phase2TrackerDigi>"/>
+   <class name="edm::Ref< edm::DetSetVector< io_v1::Phase2TrackerDigi >, io_v1::Phase2TrackerDigi >"/>
+   <class name="std::vector< edm::Ref< edm::DetSetVector< io_v1::Phase2TrackerDigi >, io_v1::Phase2TrackerDigi > >"/>
+   <class name="edm::DetSet<io_v1::Phase2TrackerDigi>"/>
    <class name="Phase2ITQCore" ClassVersion="3">
     <version ClassVersion="3" checksum="2154561050"/>
    </class>                                 
    <class name="Phase2ITChipBitStream" ClassVersion="3">
     <version ClassVersion="3" checksum="2503829339"/>
    </class>                                 
-   <class name="std::vector<Phase2TrackerDigi>"/>
+   <class name="std::vector<io_v1::Phase2TrackerDigi>"/>
    <class name="edm::DetSet<Phase2ITChipBitStream>"/>
    <class name="edm::DetSet<Phase2ITQCore>"/>
    <class name="std::vector<Phase2ITChipBitStream>"/>
    <class name="std::vector<Phase2ITQCore>"/>
-   <class name="edm::DetSetVector<Phase2TrackerDigi>"/>
+   <class name="edm::DetSetVector<io_v1::Phase2TrackerDigi>"/>
    <class name="edm::DetSetVector<Phase2ITQCore>"/>
    <class name="edm::DetSetVector<Phase2ITChipBitStream>"/>
-   <class name="std::vector<edm::DetSet<Phase2TrackerDigi> >"/>
+   <class name="std::vector<edm::DetSet<io_v1::Phase2TrackerDigi> >"/>
    <class name="std::vector<edm::DetSet<Phase2ITQCore> >"/>
    <class name="std::vector<edm::DetSet<Phase2ITChipBitStream> >"/>
-   <class name="edm::Wrapper< edm::DetSet<Phase2TrackerDigi> >" splitLevel="0"/>
-   <class name="edm::Wrapper< std::vector<edm::DetSet<Phase2TrackerDigi> > >" splitLevel="0"/>
-   <class name="edm::Wrapper< edm::DetSetVector<Phase2TrackerDigi> >" splitLevel="0"/>
+   <class name="edm::Wrapper< edm::DetSet<io_v1::Phase2TrackerDigi> >" splitLevel="0"/>
+   <class name="edm::Wrapper< std::vector<edm::DetSet<io_v1::Phase2TrackerDigi> > >" splitLevel="0"/>
+   <class name="edm::Wrapper< edm::DetSetVector<io_v1::Phase2TrackerDigi> >" splitLevel="0"/>
    <class name="edm::Wrapper< edm::DetSetVector<Phase2ITQCore> >" splitLevel="0"/>
    <class name="edm::Wrapper< edm::DetSetVector<Phase2ITChipBitStream> >" splitLevel="0"/>
    <class name="Phase2TrackerCommissioningDigi" />
    <class name="std::vector<Phase2TrackerCommissioningDigi>"/>
    <class name="edm::DetSet<Phase2TrackerCommissioningDigi>"/>
    <class name="edm::Wrapper<edm::DetSet<Phase2TrackerCommissioningDigi> >" splitLevel="0"/>
-   <class name="edm::Ref<edm::DetSetVector<Phase2TrackerDigi>,Phase2TrackerDigi,edm::refhelper::FindForDetSetVector<Phase2TrackerDigi> >" />
-   <class name="vector<edm::Ref<edm::DetSetVector<Phase2TrackerDigi>,Phase2TrackerDigi,edm::refhelper::FindForDetSetVector<Phase2TrackerDigi> > >" />
+   <class name="edm::Ref<edm::DetSetVector<io_v1::Phase2TrackerDigi>,io_v1::Phase2TrackerDigi,edm::refhelper::FindForDetSetVector<io_v1::Phase2TrackerDigi> >" />
+   <class name="vector<edm::Ref<edm::DetSetVector<io_v1::Phase2TrackerDigi>,io_v1::Phase2TrackerDigi,edm::refhelper::FindForDetSetVector<io_v1::Phase2TrackerDigi> > >" />
 </lcgdict>
 
diff --git a/RecoTracker/FinalTrackSelectors/plugins/DuplicateTrackMerger.cc b/RecoTracker/FinalTrackSelectors/plugins/DuplicateTrackMerger.cc
index 28e63f4f3f898..4083e45976271 100644
--- a/RecoTracker/FinalTrackSelectors/plugins/DuplicateTrackMerger.cc
+++ b/RecoTracker/FinalTrackSelectors/plugins/DuplicateTrackMerger.cc
@@ -34,7 +34,6 @@
 #include "CondFormats/DataRecord/interface/GBRWrapperRcd.h"
 #include "TrackingTools/Records/interface/TrackingComponentsRecord.h"
 
-using namespace reco;
 namespace {
   class DuplicateTrackMerger final : public edm::stream::EDProducer<> {
   public: