diff --git a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/CMakeLists.txt b/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/CMakeLists.txt
deleted file mode 100644
index 7766e36c283aec2cffe6cd95d88b0977080b0a1e..0000000000000000000000000000000000000000
--- a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/CMakeLists.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-################################################################################
-# Package: TrigFTK_RawDataTPCnv
-################################################################################
-
-# Declare the package name:
-atlas_subdir( TrigFTK_RawDataTPCnv )
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Database/AthenaPOOL/AthenaPoolCnvSvc
-                          Database/AthenaPOOL/AthenaPoolUtilities
-                          Trigger/TrigFTK/TrigFTK_RawData
-                          PRIVATE
-                          AtlasTest/TestTools
-                          Control/AthenaKernel
-                          GaudiKernel )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
-# Component(s) in the package:
-atlas_add_tpcnv_library( TrigFTK_RawDataTPCnv
-                         src/*.cxx
-                         PUBLIC_HEADERS TrigFTK_RawDataTPCnv
-                         PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                         LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities TrigFTK_RawData TestTools AthenaKernel GaudiKernel )
-
-atlas_add_dictionary( TrigFTK_RawDataTPCnvDict
-                      TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnvDict.h
-                      TrigFTK_RawDataTPCnv/selection.xml
-                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities TrigFTK_RawData TestTools AthenaKernel GaudiKernel TrigFTK_RawDataTPCnv )
-
-atlas_add_test( FTK_RawTrackCnv_p1_test
-                SOURCES
-                test/FTK_RawTrackCnv_p1_test.cxx
-                INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities TrigFTK_RawData TestTools AthenaKernel GaudiKernel TrigFTK_RawDataTPCnv )
-
diff --git a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/FTK_RawTrackCnv_p1.h b/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/FTK_RawTrackCnv_p1.h
deleted file mode 100644
index 994b85a06b3a359fe14fd8287d90103d6432db64..0000000000000000000000000000000000000000
--- a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/FTK_RawTrackCnv_p1.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TRIGFTK_RAWTRACKTPCNV_FTK_RAWTRACKCNV_p1_H
-#define TRIGFTK_RAWTRACKTPCNV_FTK_RAWTRACKCNV_p1_H
-
-#include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h"
-
-#include "TrigFTK_RawData/FTK_RawTrack.h"
-#include "TrigFTK_RawDataTPCnv/FTK_RawTrack_p1.h"
-
-class MsgStream;
-
-class FTK_RawTrackCnv_p1: public T_AthenaPoolTPCnvBase<FTK_RawTrack, FTK_RawTrack_p1>
-{
-public:
-
-  FTK_RawTrackCnv_p1() {}
-
-  virtual void persToTrans( const FTK_RawTrack_p1 *, FTK_RawTrack *, MsgStream& );
-  virtual void transToPers( const FTK_RawTrack *, FTK_RawTrack_p1 *, MsgStream& );
-
-  enum {th1=0, th2=1, th3=2, th4=3, th5=4,th6=5};
-  
-};
-
-#endif 
diff --git a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/FTK_RawTrackContainerCnv_p1.h b/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/FTK_RawTrackContainerCnv_p1.h
deleted file mode 100644
index 2644d2055840777c733101a9f5213f427a06dc88..0000000000000000000000000000000000000000
--- a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/FTK_RawTrackContainerCnv_p1.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TRIGFTK_RAWTRACKTPCNV_FTK_RAWTRACKCONTAINERCNV_P1_H
-#define TRIGFTK_RAWTRACKTPCNV_FTK_RAWTRACKCONTAINERCNV_P1_H
-
-#include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h"
-
-#include "TrigFTK_RawDataTPCnv/FTK_RawTrackCnv_p1.h"
-#include "TrigFTK_RawData/FTK_RawTrackContainer.h"
-#include "TrigFTK_RawDataTPCnv/FTK_RawTrackContainer_p1.h"
-
-class MsgStream;
-
-class FTK_RawTrackContainerCnv_p1 
-  : public T_AthenaPoolTPCnvBase<FTK_RawTrackContainer, FTK_RawTrackContainer_p1>
-{
-
- public:
-  
-  FTK_RawTrackContainerCnv_p1() {}
-
-  virtual void persToTrans( const FTK_RawTrackContainer_p1*, FTK_RawTrackContainer*, MsgStream& );
-  virtual void transToPers( const FTK_RawTrackContainer*,    FTK_RawTrackContainer_p1*, MsgStream& );
-  
-  virtual void initPrivateConverters( AthenaPoolTopLevelTPCnvBase *topCnv ) {
-    m_FTK_RawTrackVectorCnv.setTopConverter( topCnv, 0 );
-  }
-
- private:
-
- typedef T_AthenaPoolTPPtrVectorCnv< FTK_RawTrackContainer,
-                                     std::vector<TPObjRef>,
-                                     ITPConverterFor<FTK_RawTrack>  >   FTK_RawTrackVectorCnv_p1;
-
-  FTK_RawTrackVectorCnv_p1 m_FTK_RawTrackVectorCnv;
-
-};
-
-
-#endif
diff --git a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/FTK_RawTrackContainerCnv_tlp1.h b/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/FTK_RawTrackContainerCnv_tlp1.h
deleted file mode 100644
index 23bac6c4faecbe5ff29f55bb2487db4efe2128e5..0000000000000000000000000000000000000000
--- a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/FTK_RawTrackContainerCnv_tlp1.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TRIGFTK_RAWDATATPCNV_FTK_RAWTRACKCONTAINERCNV_tlp1_H
-#define TRIGFTK_RAWDATATPCNV_FTK_RAWTRACKCONTAINERCNV_tlp1_H
-
-#include "AthenaPoolCnvSvc/AthenaPoolTopLevelTPConverter.h"
-
-#include "FTK_RawTrackContainerCnv_p1.h"
-#include "FTK_RawTrackCnv_p1.h"
-#include "FTK_RawTrackContainer_tlp1.h"
-
-class FTK_RawTrackContainerCnv_tlp1 : public AthenaPoolTopLevelTPConverter<FTK_RawTrackContainerCnv_p1, FTK_RawTrackContainer_tlp1>
-{
-
- public:
-
-  FTK_RawTrackContainerCnv_tlp1();
-  virtual ~FTK_RawTrackContainerCnv_tlp1() {}
-
-  virtual void setPStorage( FTK_RawTrackContainer_tlp1 *storage );
-
-
- protected:
-
-  FTK_RawTrackContainerCnv_p1  m_FTK_RawTrackContainerCnv;
-  FTK_RawTrackCnv_p1           m_FTK_RawTrackCnv;
-
-
-};
-
-#endif
diff --git a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/FTK_RawTrackContainer_p1.h b/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/FTK_RawTrackContainer_p1.h
deleted file mode 100644
index 3f1496e488b06ca27fdf894920ff361fe42e4a55..0000000000000000000000000000000000000000
--- a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/FTK_RawTrackContainer_p1.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TRIGINDETEVENT_FTK_RAWTRACKCONTAINER_P1_H 
-#define TRIGINDETEVENT_FTK_RAWTRACKCONTAINER_P1_H 
-
-#include "AthenaPoolUtilities/TPObjRef.h"
-#include <vector>
-
-class FTK_RawTrackContainer_p1{
-
- public:
-
-  FTK_RawTrackContainer_p1() {}
-  friend class FTK_RawTrackContainerCnv_p1;
-
- private:
-
-  std::vector<TPObjRef> m_FTK_RawTrackVector;
-
-};
-
-#endif
-
diff --git a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/FTK_RawTrackContainer_tlp1.h b/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/FTK_RawTrackContainer_tlp1.h
deleted file mode 100644
index 33924d2e02d87d89d4fd56897df0049fa693546b..0000000000000000000000000000000000000000
--- a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/FTK_RawTrackContainer_tlp1.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TRIGFTK_RAWDATATPCNV_FTK_RAWTRACKCONTAINER_tlp4_H
-#define TRIGFTK_RAWDATATPCNV_FTK_RAWTRACKCONTAINER_tlp4_H
-
-#include "FTK_RawTrackContainer_p1.h"
-#include "FTK_RawTrack_p1.h"
-
-class FTK_RawTrackContainer_tlp1
-{
- public:
-  
-  FTK_RawTrackContainer_tlp1() {}
-  friend class FTK_RawTrackContainerCnv_tlp1;
-  
- private:
-  
-  std::vector< FTK_RawTrackContainer_p1 >  m_FTK_RawTrackContainers;
-  std::vector< FTK_RawTrack_p1 >           m_FTK_RawTracks;
-
-};
-
-#endif
diff --git a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/FTK_RawTrack_p1.h b/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/FTK_RawTrack_p1.h
deleted file mode 100644
index 77f7771b4a9840737562e3dcf82600f2c1a8de3f..0000000000000000000000000000000000000000
--- a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/FTK_RawTrack_p1.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TrigFTK_RawDataTPCnv_FTK_RawTrack_p1_H
-#define TrigFTK_RawDataTPCnv_FTK_RawTrack_p1_H
-
-#include "TrigFTK_RawData/FTK_RawTrack.h"
-#include <stdint.h>
-
-class FTK_RawTrack_p1
-{
-  
- public:
-
-  FTK_RawTrack_p1() {}
-  friend class FTK_RawTrackCnv_p1;  
-  
- private:
-  
-  uint32_t m_pars[6];
-  uint32_t m_pars_pix[8];
-  uint32_t m_pars_sct[8];
-  signed long m_barcodes_sct[8];
-  signed long m_barcodes_pix[4];
-  signed long m_barcode;
-
-};
-
-#endif 
diff --git a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnvDict.h b/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnvDict.h
deleted file mode 100644
index f6ad12cec0f9b9df6865cca8be6272b82e1f2011..0000000000000000000000000000000000000000
--- a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnvDict.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TRIGFTK_RAWDATATPCNV_TRIGINDETEVENTTPCNVDICT_H
-#define TRIGFTK_RAWDATATPCNV_TRIGINDETEVENTTPCNVDICT_H
-
-#include "TrigFTK_RawDataTPCnv/FTK_RawTrack_p1.h"
-#include "TrigFTK_RawDataTPCnv/FTK_RawTrackContainer_p1.h"
-#include "TrigFTK_RawDataTPCnv/FTK_RawTrackContainer_tlp1.h"
-
-//dummy instances of all objects using std::vector<TPObjRef> for the dictionary
-struct dummy_TrigFTK_RawDataTPCnvDict
-{
-
-  std::vector<FTK_RawTrackContainer_p1>       m_dummyFTK_RawTrackContainer_p1;
-  std::vector<FTK_RawTrack_p1>                m_dummyFTK_RawTrack_p1;
-
-};
-
-#endif
diff --git a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/selection.xml b/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/selection.xml
deleted file mode 100644
index 6dd7b78ccfc9e34448d074606f6556820c8678c0..0000000000000000000000000000000000000000
--- a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/selection.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<lcgdict>
-
-<!-- FTKRawTrack-->
-  <class name="FTK_RawTrack_p1" />
-  <class name="std::vector<FTK_RawTrack_p1>" />
-  <class name="FTK_RawTrackContainer_tlp1" id="C1A5436E-8520-4399-82FC-E6828B19688D" />
-  <class name="FTK_RawTrackContainer_p1"   id="FF688A0E-527F-4F88-9738-830F97EC0CFD" />
-  <class name="std::vector<FTK_RawTrackContainer_p1>"/>
-  
-</lcgdict>
diff --git a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/share/FTK_RawTrackCnv_p1_test.ref b/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/share/FTK_RawTrackCnv_p1_test.ref
deleted file mode 100644
index a5bce3fd2565d8f458555a0c6f42d0504a848bd5..0000000000000000000000000000000000000000
--- a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/share/FTK_RawTrackCnv_p1_test.ref
+++ /dev/null
@@ -1 +0,0 @@
-test1
diff --git a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/src/FTK_RawTrackCnv_p1.cxx b/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/src/FTK_RawTrackCnv_p1.cxx
deleted file mode 100644
index 14f30172d1d5b3672cbe3cb7f0fcb88381bb5f41..0000000000000000000000000000000000000000
--- a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/src/FTK_RawTrackCnv_p1.cxx
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "TrigFTK_RawData/FTK_RawTrack.h"
-#include "TrigFTK_RawDataTPCnv/FTK_RawTrackCnv_p1.h"
-#include "TrigFTK_RawDataTPCnv/FTK_RawTrack_p1.h"
-
-void FTK_RawTrackCnv_p1::persToTrans(const FTK_RawTrack_p1* persObj,
-				     FTK_RawTrack* transObj,
-				     MsgStream &/*log*/)
-{
-
-  transObj->setTH1(persObj->m_pars[th1]);
-  transObj->setTH2(persObj->m_pars[th2]);
-  transObj->setTH3(persObj->m_pars[th3]);
-  transObj->setTH4(persObj->m_pars[th4]);
-  transObj->setTH5(persObj->m_pars[th5]);
-  transObj->setTH6(persObj->m_pars[th6]);
-  transObj->setBarcode(persObj->m_barcode);
-
-  // Pixel Clusters //
-  std::vector<FTK_RawPixelCluster> pix_clusters;
-  unsigned int iword=0;
-  for (unsigned int ipix=0; ipix<4; ipix++) {
-    FTK_RawPixelCluster pix_clus(persObj->m_pars_pix[iword], persObj->m_pars_pix[iword+1],persObj->m_barcodes_pix[ipix]);
-    iword+=2;
-    pix_clusters.push_back(pix_clus);
-  }
-  transObj->setPixelClusters(pix_clusters);
-
-  std::vector<FTK_RawSCT_Cluster> sct_clusters;
-
-  for (unsigned int isct=0; isct<8; isct++) {
-    FTK_RawSCT_Cluster sct_clus(persObj->m_pars_sct[isct], persObj->m_barcodes_sct[isct]);
-    sct_clusters.push_back(sct_clus);
-  }
-  transObj->setSCTClusters(sct_clusters);
-}
-
-void FTK_RawTrackCnv_p1::transToPers(const FTK_RawTrack* transObj,
-				     FTK_RawTrack_p1* persObj,
-				     MsgStream &log)
-{
-  log << MSG::DEBUG << "FTK_RawTrackCnv_p1::transToPers called" << endmsg;
-
-  persObj->m_pars[th1] = transObj->getTH1();
-  persObj->m_pars[th2] = transObj->getTH2();
-  persObj->m_pars[th3] = transObj->getTH3();
-  persObj->m_pars[th4] = transObj->getTH4();
-  persObj->m_pars[th5] = transObj->getTH5();
-  persObj->m_pars[th6] = transObj->getTH6();
-  persObj->m_barcode   = transObj->getBarcode();
-
-  //Pixel Clusters
-  persObj->m_pars_pix[0]     = transObj->getPixelWordA(0);
-  persObj->m_pars_pix[1]     = transObj->getPixelWordB(0);
-  persObj->m_barcodes_pix[0] = transObj->getPixelBarcode(0);
-
-
-  persObj->m_pars_pix[2]     = transObj->getPixelCluster(1).getWordA();
-  persObj->m_pars_pix[3]     = transObj->getPixelCluster(1).getWordB();
-  persObj->m_barcodes_pix[1] = transObj->getPixelCluster(1).getBarcode();
-
-  persObj->m_pars_pix[4]     = transObj->getPixelCluster(2).getWordA();
-  persObj->m_pars_pix[5]     = transObj->getPixelCluster(2).getWordB();
-  persObj->m_barcodes_pix[2] = transObj->getPixelCluster(2).getBarcode();
-
-  persObj->m_pars_pix[6]     = transObj->getPixelCluster(3).getWordA();
-  persObj->m_pars_pix[7]     = transObj->getPixelCluster(3).getWordB();
-  persObj->m_barcodes_pix[3] = transObj->getPixelCluster(3).getBarcode();
-
-  // SCT Clusters //
-  persObj->m_pars_sct[0]     = transObj->getSCTCluster(0).getWord();
-  persObj->m_barcodes_sct[0] = transObj->getSCTCluster(0).getBarcode();
-  
-  persObj->m_pars_sct[1]     = transObj->getSCTCluster(1).getWord();
-  persObj->m_barcodes_sct[1] = transObj->getSCTCluster(1).getBarcode();
-
-  persObj->m_pars_sct[2]     = transObj->getSCTCluster(2).getWord();
-  persObj->m_barcodes_sct[2] = transObj->getSCTCluster(2).getBarcode();
-
-  persObj->m_pars_sct[3]     = transObj->getSCTCluster(3).getWord();
-  persObj->m_barcodes_sct[3] = transObj->getSCTCluster(3).getBarcode();
-
-  persObj->m_pars_sct[4]     = transObj->getSCTCluster(4).getWord();
-  persObj->m_barcodes_sct[4] = transObj->getSCTCluster(4).getBarcode();
-
-  persObj->m_pars_sct[5]     = transObj->getSCTCluster(5).getWord();
-  persObj->m_barcodes_sct[5] = transObj->getSCTCluster(5).getBarcode();
-
-  persObj->m_pars_sct[6]     = transObj->getSCTCluster(6).getWord();
-  persObj->m_barcodes_sct[6] = transObj->getSCTCluster(6).getBarcode();
-
-  persObj->m_pars_sct[7]     = transObj->getSCTCluster(7).getWord();
-  persObj->m_barcodes_sct[7] = transObj->getSCTCluster(7).getBarcode();
-}
-
-
diff --git a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/src/FTK_RawTrackContainerCnv_p1.cxx b/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/src/FTK_RawTrackContainerCnv_p1.cxx
deleted file mode 100644
index 154486c91347d7a4a56373509a06a12faf78c37b..0000000000000000000000000000000000000000
--- a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/src/FTK_RawTrackContainerCnv_p1.cxx
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "TrigFTK_RawData/FTK_RawTrackContainer.h"
-#include "TrigFTK_RawDataTPCnv/FTK_RawTrackContainerCnv_p1.h"
-#include "TrigFTK_RawDataTPCnv/FTK_RawTrackContainer_p1.h"
-
-void FTK_RawTrackContainerCnv_p1::persToTrans(const FTK_RawTrackContainer_p1* persObj, 
-						 FTK_RawTrackContainer* transObj, 
-						 MsgStream &log)
-{
-  log << MSG::DEBUG << "FTK_RawTrackContainerCnv_p1::persToTrans called " << endmsg;
-  
-  m_FTK_RawTrackVectorCnv.persToTrans( &(persObj->m_FTK_RawTrackVector), transObj, log );
-}
-
-
-void FTK_RawTrackContainerCnv_p1::transToPers(const FTK_RawTrackContainer* transObj, 
-						 FTK_RawTrackContainer_p1* persObj, 
-						 MsgStream &log)
-{
-  log << MSG::DEBUG << "FTK_RawTrackContainerCnv_p1::transToPers called " << endmsg;
-  
-  m_FTK_RawTrackVectorCnv.transToPers( transObj, &(persObj->m_FTK_RawTrackVector), log );
-  
-}
diff --git a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/src/FTK_RawTrackContainerCnv_tlp1.cxx b/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/src/FTK_RawTrackContainerCnv_tlp1.cxx
deleted file mode 100644
index 8321c9e537501abfa1390803a294e88967b4743a..0000000000000000000000000000000000000000
--- a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/src/FTK_RawTrackContainerCnv_tlp1.cxx
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "TrigFTK_RawDataTPCnv/FTK_RawTrackContainerCnv_tlp1.h"
-
-
-//constructor
-FTK_RawTrackContainerCnv_tlp1::FTK_RawTrackContainerCnv_tlp1(){
-
-  // add the "main" base class converter
-  addMainTPConverter();
-
-  // add all converters needed in the top level converter
-  // do not change the order of adding converters
-  addTPConverter( &m_FTK_RawTrackCnv );
-
-}
-
-void FTK_RawTrackContainerCnv_tlp1::setPStorage( FTK_RawTrackContainer_tlp1* storage ){
-
-   //for the base class converter
-   setMainCnvPStorage( &storage->m_FTK_RawTrackContainers );
-
-   //for all other converters defined in the base class
-   m_FTK_RawTrackCnv.           setPStorage( &storage->m_FTK_RawTracks );
-
-}
-
-
diff --git a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/src/TrigFTK_RawDataTPCnv.cxx b/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/src/TrigFTK_RawDataTPCnv.cxx
deleted file mode 100644
index b25bad76146846db493f01896070592a09a93e33..0000000000000000000000000000000000000000
--- a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/src/TrigFTK_RawDataTPCnv.cxx
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// generate the T/P converter entries
-#include "AthenaKernel/TPCnvFactory.h"
-
-#include "TrigFTK_RawDataTPCnv/FTK_RawTrack_p1.h"
-#include "TrigFTK_RawDataTPCnv/FTK_RawTrackContainer_p1.h"
-#include "TrigFTK_RawDataTPCnv/FTK_RawTrackContainerCnv_tlp1.h"
-#include "TrigFTK_RawDataTPCnv/FTK_RawTrackContainer_tlp1.h"
-
-DECLARE_TPCNV_FACTORY(FTK_RawTrackContainerCnv_tlp1,
-                      FTK_RawTrackContainer,
-                      FTK_RawTrackContainer_tlp1,
-                      Athena::TPCnvVers::Current) 
-
diff --git a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/test/FTK_RawTrackCnv_p1_test.cxx b/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/test/FTK_RawTrackCnv_p1_test.cxx
deleted file mode 100644
index 64350b15fd082182f6fec88eaa2a10c9d5b46ff2..0000000000000000000000000000000000000000
--- a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/test/FTK_RawTrackCnv_p1_test.cxx
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id$
-/**
- * @file TrigFTK_RawDataTPCnv/test/FTK_RawTrackCnv_p1_test.cxx
- * @author scott snyder <snyder@bnl.gov>
- * @date Feb, 2016
- * @brief Tests for FTK_RawTrackCnv_p1.
- */
-
-
-#undef NDEBUG
-#include "TrigFTK_RawDataTPCnv/FTK_RawTrackCnv_p1.h"
-#include "GaudiKernel/MsgStream.h"
-#include "TestTools/leakcheck.h"
-#include <cassert>
-#include <iostream>
-
-
-void compare (const FTK_RawPixelCluster& p1,
-              const FTK_RawPixelCluster& p2)
-{
-  assert (p1.getWordA() == p2.getWordA());
-  assert (p1.getWordB() == p2.getWordB());
-  assert (p1.getBarcode() == p2.getBarcode());
-}
-
-
-void compare (const FTK_RawSCT_Cluster& p1,
-              const FTK_RawSCT_Cluster& p2)
-{
-  assert (p1.getWord() == p2.getWord());
-  assert (p1.getBarcode() == p2.getBarcode());
-}
-
-
-void compare (const std::vector<FTK_RawPixelCluster>& p1,
-              const std::vector<FTK_RawPixelCluster>& p2)
-{
-  assert (p1.size() == p2.size());
-  for (size_t i = 0; i < p1.size(); i++)
-    compare (p1[i], p2[i]);
-}
-
-
-void compare (const std::vector<FTK_RawSCT_Cluster>& p1,
-              const std::vector<FTK_RawSCT_Cluster>& p2)
-{
-  assert (p1.size() == p2.size());
-  for (size_t i = 0; i < p1.size(); i++)
-    compare (p1[i], p2[i]);
-}
-
-
-void compare (const FTK_RawTrack& p1,
-              const FTK_RawTrack& p2)
-{
-  assert (p1.getTH1() == p2.getTH1());
-  assert (p1.getTH2() == p2.getTH2());
-  assert (p1.getTH3() == p2.getTH3());
-  assert (p1.getTH4() == p2.getTH4());
-  assert (p1.getTH5() == p2.getTH5());
-  assert (p1.getTH6() == p2.getTH6());
-  assert (p1.getBarcode() == p2.getBarcode());
-  compare (p1.getPixelClusters(), p2.getPixelClusters());
-  compare (p1.getSCTClusters(), p2.getSCTClusters());
-}
-
-
-void testit (const FTK_RawTrack& trans1)
-{
-  MsgStream log (0, "test");
-  FTK_RawTrackCnv_p1 cnv;
-  FTK_RawTrack_p1 pers;
-  cnv.transToPers (&trans1, &pers, log);
-  FTK_RawTrack trans2;
-  cnv.persToTrans (&pers, &trans2, log);
-
-  compare (trans1, trans2);
-}
-
-
-void test1()
-{
-  std::cout << "test1\n";
-  Athena_test::Leakcheck check;
-
-  FTK_RawTrack trans1 (123, 234, 345, 456, 567, 678);
-  trans1.setBarcode (789);
-
-  for (size_t i=0; i < trans1.getPixelClusters().size(); i++) {
-    trans1.setPixelCluster (i,FTK_RawPixelCluster (11 + i*100, 22 + i*100));
-    trans1.getPixelClusters()[i].setBarcode (33 + i*100);
-  }
-    
-  for (size_t i=0; i < trans1.getSCTClusters().size(); i++) {
-    trans1.setSCTCluster (i,FTK_RawSCT_Cluster (44 + i*100, 55 + i*100));
-  }
-    
-  testit (trans1);
-}
-
-
-int main()
-{
-  test1();
-  return 0;
-}
diff --git a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/test/TrigFTK_RawDataTPCnv.xml b/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/test/TrigFTK_RawDataTPCnv.xml
deleted file mode 100755
index 267e4d8a978710e5f40d6c7c0f6406b85856ba7e..0000000000000000000000000000000000000000
--- a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/test/TrigFTK_RawDataTPCnv.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<atn>
-   <TEST name="TrigFTK_RawDataTPCnvTests" type="makecheck">
-      <package>rigger/TrigFTK/TrigFTK_RawDataTPCnv</package>
-      <author> scott snyder </author>
-      <mailto> snyder@bnl.gov </mailto>
-      <expectations>
-         <errorMessage>Athena exited abnormally</errorMessage>
-         <warningMessage> # WARNING_MESSAGE : post.sh> ERROR</warningMessage>
-         <successMessage>check ok</successMessage>
-         <returnValue>0</returnValue>
-      </expectations>
-   </TEST>
-</atn>