diff --git a/Event/xAOD/xAODHIEventAthenaPool/cmt/Makefile b/Event/xAOD/xAODHIEventAthenaPool/cmt/Makefile
deleted file mode 100644
index c2c9dbbed79a7894e694cf7a0c7d1bf0756334c3..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODHIEventAthenaPool/cmt/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-include $(CMTROOT)/src/Makefile.header
-
-include $(CMTROOT)/src/constituents.make
-
diff --git a/Event/xAOD/xAODHIEventAthenaPool/cmt/install.x86_64-slc6-gcc47-opt.history b/Event/xAOD/xAODHIEventAthenaPool/cmt/install.x86_64-slc6-gcc47-opt.history
deleted file mode 100644
index 6c21335ab8cd6fe3e9d1ff2afd176e37c47d5269..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODHIEventAthenaPool/cmt/install.x86_64-slc6-gcc47-opt.history
+++ /dev/null
@@ -1,24 +0,0 @@
-(i__main__
-LogFile
-p0
-(dp1
-S'_installed_files'
-p2
-(dp3
-S'../../../Event/xAOD/xAODHIEventShapeAthenaPool/x86_64-slc6-gcc47-opt/libxAODHIEventShapeAthenaPoolPoolCnv.so'
-p4
-S'../../../../InstallArea/x86_64-slc6-gcc47-opt/lib/libxAODHIEventShapeAthenaPoolPoolCnv.so'
-p5
-sS'../../../Event/xAOD/xAODHIEventShapeAthenaPool/x86_64-slc6-gcc47-opt/libxAODHIEventShapeAthenaPoolPoolCnv.so.debug'
-p6
-S'../../../../InstallArea/x86_64-slc6-gcc47-opt/lib/libxAODHIEventShapeAthenaPoolPoolCnv.so.debug'
-p7
-sS'../../../Event/xAOD/xAODHIEventAthenaPool/x86_64-slc6-gcc47-opt/libxAODHIEventAthenaPoolPoolCnv.so'
-p8
-S'../../../../InstallArea/x86_64-slc6-gcc47-opt/lib/libxAODHIEventAthenaPoolPoolCnv.so'
-p9
-sS'../../../Event/xAOD/xAODHIEventAthenaPool/x86_64-slc6-gcc47-opt/libxAODHIEventAthenaPoolPoolCnv.so.debug'
-p10
-S'../../../../InstallArea/x86_64-slc6-gcc47-opt/lib/libxAODHIEventAthenaPoolPoolCnv.so.debug'
-p11
-ssb.
\ No newline at end of file
diff --git a/Event/xAOD/xAODHIEventAthenaPool/cmt/version.cmt b/Event/xAOD/xAODHIEventAthenaPool/cmt/version.cmt
deleted file mode 100644
index b24187400a3dddc4fea1bdbb06ec1da2cf7b64a5..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODHIEventAthenaPool/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-xAODHIEventAthenaPool-r639600
diff --git a/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventAthenaPoolCnv_entries.cxx b/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventAthenaPoolCnv_entries.cxx
deleted file mode 100644
index f588baadd3ff304783883562bfa5419416c24951..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventAthenaPoolCnv_entries.cxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
- * @file ExamplePackageCnv_entries.cxx
- * @brief Declares component instantiation factories for an example POOL converter
- * @author RD Schaffer <R.D.Schaffer@cern.ch>
- * $Id: ExamplePackageCnv_entries.cxx,v 1.3 2005-01-12 20:46:47 kkarr Exp $
- */
-
-#include "xAODHIEventAthenaPoolCnv_entries.h"
-
-DECLARE_FACTORY_ENTRIES(xAODHIEventAthenaPoolPoolCnv) {
-
-/**
- * @file ExamplePackageCnv_entries_element.cxx
- * @brief Declares component instantiation factories for a converter
- * @author RD Schaffer <R.D.Schaffer@cern.ch>
- * $Id: ExamplePackageCnv_entries_element.cxx,v 1.3 2005-01-12 20:47:00 kkarr Exp $
- */
-
- DECLARE_CONVERTER(xAODHIEventShapeAuxContainerCnv);
-
-/**
- * @file ExamplePackageCnv_entries_element.cxx
- * @brief Declares component instantiation factories for a converter
- * @author RD Schaffer <R.D.Schaffer@cern.ch>
- * $Id: ExamplePackageCnv_entries_element.cxx,v 1.3 2005-01-12 20:47:00 kkarr Exp $
- */
-
- DECLARE_CONVERTER(xAODHIEventShapeCnv);
-
-/**
- * @file ExamplePackageCnv_entries_element.cxx
- * @brief Declares component instantiation factories for a converter
- * @author RD Schaffer <R.D.Schaffer@cern.ch>
- * $Id: ExamplePackageCnv_entries_element.cxx,v 1.3 2005-01-12 20:47:00 kkarr Exp $
- */
-
- DECLARE_CONVERTER(xAODHIEventShapeContainerCnv);
-
-}
diff --git a/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventAthenaPoolCnv_entries.h b/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventAthenaPoolCnv_entries.h
deleted file mode 100644
index cc29e57dfe533f32e0695f10e57a46e6769dac42..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventAthenaPoolCnv_entries.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
- * @file ExamplePackageCnv_entries.h
- * @brief Includes header files needed by ExamplePackageCnv_entries.cxx
- * @author RD Schaffer <R.D.Schaffer@cern.ch>
- * $Id: ExamplePackageCnv_entries.h,v 1.2 2005-01-12 20:46:52 kkarr Exp $
- */
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-#include "xAODHIEventShapeAuxContainerCnv.h"
-DECLARE_CONVERTER_FACTORY(xAODHIEventShapeAuxContainerCnv)
-#include "xAODHIEventShapeCnv.h"
-DECLARE_CONVERTER_FACTORY(xAODHIEventShapeCnv)
-#include "xAODHIEventShapeContainerCnv.h"
-DECLARE_CONVERTER_FACTORY(xAODHIEventShapeContainerCnv)
diff --git a/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventAthenaPoolCnv_load.cxx b/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventAthenaPoolCnv_load.cxx
deleted file mode 100644
index 1165e9a03b44fb328bafa30c3dfebe211e3d9c95..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventAthenaPoolCnv_load.cxx
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
- * @file ExamplePackageCnv_load.cxx
- * @brief Loads component instantiation factories for an example POOL converter
- * @author RD Schaffer <R.D.Schaffer@cern.ch>
- * $Id: ExamplePackageCnv_load.cxx,v 1.3 2005-01-12 20:47:08 kkarr Exp $
- */
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(xAODHIEventAthenaPoolPoolCnv)
-
diff --git a/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventAthenaPoolItemList_joboptions.py b/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventAthenaPoolItemList_joboptions.py
deleted file mode 100644
index 6142706903f9a85d4464e70356dd58700f23db9b..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventAthenaPoolItemList_joboptions.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-## @file xAODHIEventAthenaPoolItemList_joboptions.py
-## @brief Adds items for generated converters to full item list of
-## POOL persistifiable objects
-## @author RD Schaffer <R.D.Schaffer@cern.ch>
-## $Id: ExampleItemList_joboptionsHdr.py,v 1.1 2005-08-17 09:31:19 schaffer Exp $
-
-
-
-try:
- fullItemList += [ "xAOD::HIEventShapeAuxContainer#*" ]
-except:
- fullItemList = []
- fullItemList += [ "xAOD::HIEventShapeAuxContainer#*" ]
-
-
-try:
- fullItemList += [ "xAOD::HIEventShapeContainer#*" ]
-except:
- fullItemList = []
- fullItemList += [ "xAOD::HIEventShapeContainer#*" ]
-
-
-try:
- fullItemList += [ "xAOD::HIEventShape#*" ]
-except:
- fullItemList = []
- fullItemList += [ "xAOD::HIEventShape#*" ]
-
-
diff --git a/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventAthenaPoolPoolCnvGenCnv.stamp b/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventAthenaPoolPoolCnvGenCnv.stamp
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventAthenaPoolPoolCnvGenCnvBegin.stamp b/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventAthenaPoolPoolCnvGenCnvBegin.stamp
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventAthenaPoolPoolCnvGenCnvEnd.stamp b/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventAthenaPoolPoolCnvGenCnvEnd.stamp
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventAthenaPoolPoolCnvGenCnvReset.stamp b/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventAthenaPoolPoolCnvGenCnvReset.stamp
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventAthenaPool_joboptions.py b/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventAthenaPool_joboptions.py
deleted file mode 100644
index a8db76731c9db9ce3370d958d34a5f1d1258b956..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventAthenaPool_joboptions.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# Just a dummy joboption - cnvs are auto-loaded
diff --git a/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventShapeAuxContainerCnv.cxx b/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventShapeAuxContainerCnv.cxx
deleted file mode 100644
index f018889d78c9510d92e407d8426ab8c66c9527cc..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventShapeAuxContainerCnv.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
- * @file HIEventShapeAuxContainerCnv.cxx
- * @brief Generated implementation file which includes header files needed by HIEventShapeAuxContainerCnv
- * @author RD Schaffer <R.D.Schaffer@cern.ch>
- */
-
-#include "xAODHIEventShapeAuxContainerCnv.h"
-
diff --git a/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventShapeAuxContainerCnv.h b/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventShapeAuxContainerCnv.h
deleted file mode 100644
index 5fbba737b787ae33eeebc99d40453e0dfefa5e0d..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventShapeAuxContainerCnv.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
- * @file HIEventShapeAuxContainerCnv.h
- * @brief Generated header file which defines a typedef for templated converter class
- * @author RD Schaffer <R.D. Schaffer@cern.ch>
- */
-
-#ifndef HIEventShapeAuxContainerCnv_H
-#define HIEventShapeAuxContainerCnv_H
-
-#include "AthenaPoolCnvSvc/T_AthenaPoolCnv.h"
-#include "xAODHIEvent/HIEventShapeAuxContainer.h"
-
-typedef T_AthenaPoolCnv<xAOD::HIEventShapeAuxContainer> xAODHIEventShapeAuxContainerCnv;
-
-#endif
-
diff --git a/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventShapeAuxContainerCnv.h.stamp b/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventShapeAuxContainerCnv.h.stamp
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventShapeCnv.cxx b/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventShapeCnv.cxx
deleted file mode 100644
index 3506e0dde39da6642d81d19da7783d833494a77b..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventShapeCnv.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
- * @file HIEventShapeCnv.cxx
- * @brief Generated implementation file which includes header files needed by HIEventShapeCnv
- * @author RD Schaffer <R.D.Schaffer@cern.ch>
- */
-
-#include "xAODHIEventShapeCnv.h"
-
diff --git a/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventShapeCnv.h b/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventShapeCnv.h
deleted file mode 100644
index 8e69c02e32e404d14b041e37efca3670c826964a..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventShapeCnv.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
- * @file HIEventShapeCnv.h
- * @brief Generated header file which defines a typedef for templated converter class
- * @author RD Schaffer <R.D. Schaffer@cern.ch>
- */
-
-#ifndef HIEventShapeCnv_H
-#define HIEventShapeCnv_H
-
-#include "AthenaPoolCnvSvc/T_AthenaPoolCnv.h"
-#include "xAODHIEvent/HIEventShape.h"
-
-typedef T_AthenaPoolCnv<xAOD::HIEventShape> xAODHIEventShapeCnv;
-
-#endif
-
diff --git a/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventShapeCnv.h.stamp b/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventShapeCnv.h.stamp
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventShapeContainerCnv.h.stamp b/Event/xAOD/xAODHIEventAthenaPool/pool/xAODHIEventShapeContainerCnv.h.stamp
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/Event/xAOD/xAODHIEventAthenaPool/src/xAODHIEventShapeContainerCnv.cxx b/Event/xAOD/xAODHIEventAthenaPool/src/xAODHIEventShapeContainerCnv.cxx
index 38696752ce23cfa05580ec9c5744d591974a61e1..7d50924d65716f9507ffcf5fb390f7e71f1c4741 100644
--- a/Event/xAOD/xAODHIEventAthenaPool/src/xAODHIEventShapeContainerCnv.cxx
+++ b/Event/xAOD/xAODHIEventAthenaPool/src/xAODHIEventShapeContainerCnv.cxx
@@ -4,6 +4,7 @@
// $Id: xAODHIEventShapeContainerCnv.cxx 594317 2014-04-25 17:36:58Z krasznaa $
+
// System include(s):
#include <exception>
@@ -50,12 +51,6 @@ xAODHIEventShapeContainerCnv::createPersistent( xAOD::HIEventShapeContainer* tra
new xAOD::HIEventShapeContainer( trans->begin(), trans->end(),
SG::VIEW_ELEMENTS );
- // Prepare all objects to be written out:
- xAOD::HIEventShapeContainer::iterator itr = result->begin();
- xAOD::HIEventShapeContainer::iterator end = result->end();
- for( ; itr != end; ++itr ) {
- ( *itr )->toPersistent();
- }
// Return the new container:
return result;
@@ -68,15 +63,7 @@ xAOD::HIEventShapeContainer* xAODHIEventShapeContainerCnv::createTransient() {
// Check if we're reading the most up to date type:
if( compareClassGuid( v1_guid ) ) {
- xAOD::HIEventShapeContainer* ei =
- poolReadObject< xAOD::HIEventShapeContainer >();
-
- if(ei->ownPolicy() == SG::VIEW_ELEMENTS ){
- xAOD::HIEventShapeContainer *ein = new xAOD::HIEventShapeContainer(ei->begin(),ei->end(),SG::OWN_ELEMENTS);
- setStoreLink(ein,m_key);
- return ein;
- }
-
+ xAOD::HIEventShapeContainer* ei = poolReadObject< xAOD::HIEventShapeContainer >();
setStoreLink( ei, m_key );
return ei;
}