diff --git a/Trigger/TrigEvent/TrigInDetEventTPCnv/src/TrigVertexCnv_p1.cxx b/Trigger/TrigEvent/TrigInDetEventTPCnv/src/TrigVertexCnv_p1.cxx
index 1ba215c70365cf2c728046c011d90c892f9d0b1c..1292e2fa4cd84f7fbb4fd3dce3cc90caf8a53bae 100644
--- a/Trigger/TrigEvent/TrigInDetEventTPCnv/src/TrigVertexCnv_p1.cxx
+++ b/Trigger/TrigEvent/TrigInDetEventTPCnv/src/TrigVertexCnv_p1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigInDetEvent/TrigVertex.h"
@@ -31,37 +31,17 @@ void TrigVertexCnv_p1::persToTrans( const TrigVertex_p1 *persObj,
   
   transObj->m_algId             = static_cast<TrigVertex::AlgoId>(persObj->m_algId) ;
   
-  if(&(persObj->m_tracks)!=NULL){  
-    m_TrigInDetTrackVectorCnv.persToTrans( &(persObj->m_tracks), &m_trackInVertexVector, log);
-    if(m_trackInVertexVector.size() != 0){
-
-      //TrackInVertexList L;
-      //L.clear();
-      //
-      //TrackInVertexVector::const_iterator iVBeg = m_trackInVertexVector.begin();
-      //TrackInVertexVector::const_iterator iVEnd = m_trackInVertexVector.end();
-      //for(TrackInVertexVector::const_iterator iV=iVBeg; iV != iVEnd; ++iV){
-      //	L.push_back(*iV);
-      //}
-      //	
-      //transObj->m_tracks = new TrackInVertexList;
-      //*(transObj->m_tracks) = L;
-      
-      if (transObj->m_tracks)
-        transObj->m_tracks->assign (m_trackInVertexVector.begin(),
-                                    m_trackInVertexVector.end());
-      else
-        transObj->m_tracks =
-          new TrackInVertexList (m_trackInVertexVector.begin(),
-                                 m_trackInVertexVector.end());
-      transObj->m_ownTracks = true;
-      
-
-    }
-  } else {
-    log << MSG::DEBUG << "TrigVertexCnv_p1::persToTrans: No tracks associated to the vertex" << endmsg;
+  m_TrigInDetTrackVectorCnv.persToTrans( &(persObj->m_tracks), &m_trackInVertexVector, log);
+  if(!m_trackInVertexVector.empty()) {
+    if (transObj->m_tracks)
+      transObj->m_tracks->assign (m_trackInVertexVector.begin(),
+                                  m_trackInVertexVector.end());
+    else
+      transObj->m_tracks =
+        new TrackInVertexList (m_trackInVertexVector.begin(),
+                               m_trackInVertexVector.end());
+    transObj->m_ownTracks = true;
   }
-  
 }
 
 //-----------------------------------------------------------------------------
diff --git a/Trigger/TrigEvent/TrigInDetEventTPCnv/src/TrigVertexCnv_p2.cxx b/Trigger/TrigEvent/TrigInDetEventTPCnv/src/TrigVertexCnv_p2.cxx
index d67eb1221db5cc298f97cd40662d701c8552b9be..cc1f8be114107879e79fe1ec38348cb71b9fb143 100644
--- a/Trigger/TrigEvent/TrigInDetEventTPCnv/src/TrigVertexCnv_p2.cxx
+++ b/Trigger/TrigEvent/TrigInDetEventTPCnv/src/TrigVertexCnv_p2.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigInDetEvent/TrigVertex.h"
@@ -44,37 +44,18 @@ void TrigVertexCnv_p2::persToTrans( const TrigVertex_p2 *persObj,
   
   fesetenv (&fenv);
 
-  if(&(persObj->m_tracks)!=NULL){  
-    m_TrigInDetTrackVectorCnv.persToTrans( &(persObj->m_tracks), &m_trackInVertexVector, log);
-    if(m_trackInVertexVector.size() != 0){
-
-      //TrackInVertexList L;
-      //L.clear();
-      //
-      //TrackInVertexVector::const_iterator iVBeg = m_trackInVertexVector.begin();
-      //TrackInVertexVector::const_iterator iVEnd = m_trackInVertexVector.end();
-      //for(TrackInVertexVector::const_iterator iV=iVBeg; iV != iVEnd; ++iV){
-      //	L.push_back(*iV);
-      //}
-      //	
-      //transObj->m_tracks = new TrackInVertexList;
-      //*(transObj->m_tracks) = L;
-      
-      if (transObj->m_tracks)
-        transObj->m_tracks->assign (m_trackInVertexVector.begin(),
-                                    m_trackInVertexVector.end());
-      else
-        transObj->m_tracks =
-          new TrackInVertexList (m_trackInVertexVector.begin(),
-                                 m_trackInVertexVector.end());
-      transObj->m_ownTracks = true;
+  m_TrigInDetTrackVectorCnv.persToTrans( &(persObj->m_tracks), &m_trackInVertexVector, log);
+  if(!m_trackInVertexVector.empty()) {
       
-
-    }
-  } else {
-    log << MSG::DEBUG << "TrigVertexCnv_p2::persToTrans: No tracks associated to the vertex" << endmsg;
+    if (transObj->m_tracks)
+      transObj->m_tracks->assign (m_trackInVertexVector.begin(),
+                                  m_trackInVertexVector.end());
+    else
+      transObj->m_tracks =
+        new TrackInVertexList (m_trackInVertexVector.begin(),
+                               m_trackInVertexVector.end());
+    transObj->m_ownTracks = true;
   }
-  
 }
 
 //-----------------------------------------------------------------------------