diff --git a/Simulation/G4SimCnv/G4SimTPCnv/CMakeLists.txt b/Simulation/G4SimCnv/G4SimTPCnv/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..19962877e7adaf644535ef409798ce03afb1f88e
--- /dev/null
+++ b/Simulation/G4SimCnv/G4SimTPCnv/CMakeLists.txt
@@ -0,0 +1,40 @@
+################################################################################
+# Package: G4SimTPCnv
+################################################################################
+
+# Declare the package name:
+atlas_subdir( G4SimTPCnv )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+                          Database/AthenaPOOL/AthenaPoolCnvSvc
+                          Database/AthenaPOOL/AthenaPoolServices
+                          Simulation/G4Sim/TrackRecord
+                          PRIVATE
+                          Control/AthenaKernel )
+
+# External dependencies:
+find_package( CLHEP )
+find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+
+# Component(s) in the package:
+atlas_add_tpcnv_library( G4SimTPCnv
+                         src/*.cxx
+                         PUBLIC_HEADERS G4SimTPCnv
+                         INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
+                         PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+                         DEFINITIONS ${CLHEP_DEFINITIONS}
+                         LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaPoolCnvSvcLib AthenaKernel )
+
+atlas_add_dictionary( G4SimTPCnvDict
+                      G4SimTPCnv/G4SimTPCnvDict.h
+                      G4SimTPCnv/selection.xml
+                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaPoolCnvSvcLib AthenaKernel G4SimTPCnv )
+
+atlas_add_dictionary( OLD_G4SimTPCnvDict
+                      G4SimTPCnv/G4SimTPCnvDict.h
+                      G4SimTPCnv/OLD_selection.xml
+                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaPoolCnvSvcLib AthenaKernel G4SimTPCnv )
+
diff --git a/Simulation/G4SimCnv/G4SimTPCnv/G4SimTPCnv/ARA_selection.xml b/Simulation/G4SimCnv/G4SimTPCnv/G4SimTPCnv/ARA_selection.xml
deleted file mode 100755
index adb8b731dcefbace9451bc7d67983002828be18c..0000000000000000000000000000000000000000
--- a/Simulation/G4SimCnv/G4SimTPCnv/G4SimTPCnv/ARA_selection.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<lcgdict>
-
-   <class name="T_TPCnv<TrackRecordCollection,TrackRecordCollection_p2>"/>
-   <class name="T_AtlasHitsVectorCnv<TrackRecordCollection,TrackRecordCollection_p2,TrackRecordCnv_p1>"/>
-   <class name="T_AthenaPoolTPCnvBase<TrackRecordCollection,TrackRecordCollection_p2>"/>
-   <class name="T_AthenaPoolTPPolyCnvBase<TrackRecordCollection,TrackRecordCollection,TrackRecordCollection_p2>"/>
-   <class name="T_AthenaPoolTPAbstractPolyCnvBase<TrackRecordCollection,TrackRecordCollection,TrackRecordCollection_p2>"/>
-   <class name="ITPConverterFor<TrackRecordCollection>"/>
-
-</lcgdict>
-
diff --git a/Simulation/G4SimCnv/G4SimTPCnv/G4SimTPCnv/G4SimTPCnvDict.h b/Simulation/G4SimCnv/G4SimTPCnv/G4SimTPCnv/G4SimTPCnvDict.h
index 37a85f80aebc0b4d158aa238ec1c0a0dc045b484..6cf20df2d24243eaf40114b7cf84cd83f70c0626 100755
--- a/Simulation/G4SimCnv/G4SimTPCnv/G4SimTPCnv/G4SimTPCnvDict.h
+++ b/Simulation/G4SimCnv/G4SimTPCnv/G4SimTPCnv/G4SimTPCnvDict.h
@@ -5,7 +5,6 @@
 #ifndef G4SIMCNVDICT_H
 #define G4SIMCNVDICT_H
 
-#include "G4SimTPCnv/TrackRecordCollectionCnv_p2.h"
 #include "G4SimTPCnv/TrackRecord_p1.h"
 #include "G4SimTPCnv/TrackRecordCollection_p1.h"
 #include "G4SimTPCnv/TrackRecordCollection_p2.h"
@@ -15,9 +14,5 @@
 #include "G4SimTPCnv/TrackRecord_p0.h"
 #include "G4SimTPCnv/TrackRecordStreamer_p0.h"
 
-struct GCCXML_DUMMY_INSTANTIATION_G4SIMTPCNV {
-  T_TPCnv<TrackRecordCollection,TrackRecordCollection_p2> m_cnv;
-};
-
 #endif
 
diff --git a/Simulation/G4SimCnv/G4SimTPCnv/G4SimTPCnv/TrackRecordCollectionCnv_p2.h b/Simulation/G4SimCnv/G4SimTPCnv/G4SimTPCnv/TrackRecordCollectionCnv_p2.h
index 7b767bcd278591b0d50b4ee7c41e095c6797bb78..57ecd57c6cca487791538f9984e8a7ca6decf013 100755
--- a/Simulation/G4SimCnv/G4SimTPCnv/G4SimTPCnv/TrackRecordCollectionCnv_p2.h
+++ b/Simulation/G4SimCnv/G4SimTPCnv/G4SimTPCnv/TrackRecordCollectionCnv_p2.h
@@ -2,6 +2,9 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
+#ifndef G4SIMTPCNV_TRACKRECORDCOLLECTIONCNV_P2_H
+#define G4SIMTPCNV_TRACKRECORDCOLLECTIONCNV_P2_H
+
 #define private public
 #include "G4SimTPCnv/TrackRecordCollection_p2.h"
 #undef private
@@ -11,10 +14,5 @@
                                                                                                                                                            
 typedef T_AtlasHitsVectorCnv< TrackRecordCollection, TrackRecordCollection_p2, TrackRecordCnv_p1 >  TrackRecordCollectionCnv_p2;
 
-template<>
-class T_TPCnv<TrackRecordCollection, TrackRecordCollection_p2>
-  : public TrackRecordCollectionCnv_p2
-{
-public:
-};
 
+#endif // not G4SIMTPCNV_TRACKRECORDCOLLECTIONCNV_P2_H
diff --git a/Simulation/G4SimCnv/G4SimTPCnv/cmt/requirements b/Simulation/G4SimCnv/G4SimTPCnv/cmt/requirements
index 07b3264d82a257c6c914b50cbcd4312ec4dda219..ca1700a59716a566486021a883acbbc0fe5904ed 100644
--- a/Simulation/G4SimCnv/G4SimTPCnv/cmt/requirements
+++ b/Simulation/G4SimCnv/G4SimTPCnv/cmt/requirements
@@ -21,6 +21,5 @@ use AthenaKernel        AthenaKernel-*         Control
 # Pattern to build the dict lib. User should create a single header
 # file: <package>Dict.h which includes all other .h files. See EventInfoDict
 apply_pattern lcgdict dict=G4SimTPCnv  selectionfile=selection.xml headerfiles="../G4SimTPCnv/G4SimTPCnvDict.h"
-apply_pattern lcgdict dict=ARA_G4SimTPCnv  selectionfile=ARA_selection.xml headerfiles="../G4SimTPCnv/G4SimTPCnvDict.h"
 apply_pattern lcgdict dict=OLD_G4SimTPCnv  selectionfile=OLD_selection.xml headerfiles="../G4SimTPCnv/G4SimTPCnvDict.h"
 end_private
\ No newline at end of file