diff --git a/Database/AthenaPOOL/AthenaPoolUtilities/AthenaPoolUtilities/CondAttrListCollection.h b/Database/AthenaPOOL/AthenaPoolUtilities/AthenaPoolUtilities/CondAttrListCollection.h
index 9df74c4ce5eaceed51a00785d8b036758bc649ee..aee61872909d128686ece41b642695d85229971b 100644
--- a/Database/AthenaPOOL/AthenaPoolUtilities/AthenaPoolUtilities/CondAttrListCollection.h
+++ b/Database/AthenaPOOL/AthenaPoolUtilities/AthenaPoolUtilities/CondAttrListCollection.h
@@ -16,7 +16,6 @@
 #ifndef DBDATAOBJECTS_CONDATTRLISTCOLLECTION_H
 #define DBDATAOBJECTS_CONDATTRLISTCOLLECTION_H 
 
-//<<<<<< INCLUDES                                                       >>>>>>
 
 #include "CoralBase/Attribute.h"
 #include "CoralBase/AttributeList.h"
@@ -24,7 +23,6 @@
 
 #include "AthenaKernel/IOVRange.h"
 #include "AthenaKernel/CLASS_DEF.h"
-#include "CxxUtils/checker_macros.h"
 #include "GaudiKernel/DataObject.h"
 
 #include <vector>
@@ -133,9 +131,9 @@ public:
     bool                 hasUniqueIOV() const;
 
     /// Adding in chan/attrList pairs
-    bool                 add ATLAS_NOT_THREAD_SAFE (ChanNum chanNum, const AttributeList& attributeList);
+    bool                 add(ChanNum chanNum, const AttributeList& attributeList);
     /// Adding in chan/attrList pairs with shared data
-    void                 addShared ATLAS_NOT_THREAD_SAFE (ChanNum chanNum, const AttributeList& attributeList);
+    void                 addShared(ChanNum chanNum, const AttributeList& attributeList);
 
     /// Adding in chan/iov range pairs
     void                 add(ChanNum chanNum, const IOVRange& range);
@@ -449,7 +447,7 @@ CondAttrListCollection::hasUniqueIOV() const
 
 /// Adding in chan/attrList pairs: ASSUMED TO BE IN ORDER
 inline bool                    
-CondAttrListCollection::add ATLAS_NOT_THREAD_SAFE (ChanNum chanNum, const AttributeList& attributeList)
+CondAttrListCollection::add(ChanNum chanNum, const AttributeList& attributeList)
 {
   if (m_attrMap.size()==0) {   
     m_spec=new coral::AttributeListSpecification();
@@ -466,7 +464,7 @@ CondAttrListCollection::add ATLAS_NOT_THREAD_SAFE (ChanNum chanNum, const Attrib
 
 /// Adding in chan/attrList pairs with shared AttrList: ASSUMED TO BE IN ORDER
 inline void                    
-CondAttrListCollection::addShared ATLAS_NOT_THREAD_SAFE (ChanNum chanNum, const AttributeList& attributeList)
+CondAttrListCollection::addShared(ChanNum chanNum, const AttributeList& attributeList)
 {
   if (m_attrMap.size()==0) {   
     m_spec=new coral::AttributeListSpecification();
diff --git a/Database/AthenaPOOL/AthenaPoolUtilities/AthenaPoolUtilities/CondAttrListVec.h b/Database/AthenaPOOL/AthenaPoolUtilities/AthenaPoolUtilities/CondAttrListVec.h
index d9f02a88afeaafbae60da2e9478f3bb89205f3f7..3003320e9240d6aac3755d7c8bfcb894e6959ff7 100644
--- a/Database/AthenaPOOL/AthenaPoolUtilities/AthenaPoolUtilities/CondAttrListVec.h
+++ b/Database/AthenaPOOL/AthenaPoolUtilities/AthenaPoolUtilities/CondAttrListVec.h
@@ -18,7 +18,6 @@
 #ifndef DBDATAOBJECTS_CONDATTRLISTVEC_H 
 #define DBDATAOBJECTS_CONDATTRLISTVEC_H 
 
-//<<<<<< INCLUDES                                                       >>>>>>
 
 #include "CoralBase/Attribute.h"
 #include "CoralBase/AttributeList.h"
@@ -26,7 +25,6 @@
 #include "AthenaKernel/IOVRange.h"
 #include "AthenaKernel/CLASS_DEF.h"
 #include "CxxUtils/CachedValue.h"
-#include "CxxUtils/checker_macros.h"
 #include "GaudiKernel/DataObject.h"
 
 class CondAttrListVec : public DataObject
@@ -86,8 +84,7 @@ class CondAttrListVec : public DataObject
 
   // adding new data sliced out of a vector of AttributeLists
   // specify IOV range, channel, vector and start/end offsets
-  void addSlice ATLAS_NOT_THREAD_SAFE
-               (const IOVRange& range,const unsigned int chan,
+  void addSlice(const IOVRange& range,const unsigned int chan,
 		const std::vector<coral::AttributeList>& data,
 		const unsigned int datastart,const unsigned int dataend);
 
@@ -267,7 +264,7 @@ inline void CondAttrListVec::add(const IOVRange& range,
   m_iovmap[chan]=range;
 }
 
-inline void CondAttrListVec::addSlice ATLAS_NOT_THREAD_SAFE
+inline void CondAttrListVec::addSlice
           (const IOVRange& range,
 	   const unsigned int chan, 
 	   const std::vector<coral::AttributeList>& data,
diff --git a/Database/AthenaPOOL/AthenaPoolUtilities/AthenaPoolUtilities/TagAthenaAttributeList.h b/Database/AthenaPOOL/AthenaPoolUtilities/AthenaPoolUtilities/TagAthenaAttributeList.h
index f0d8642a37b6840aa49ac86bce0dfa7202ab2706..a667e02f1cff3c0872d188a8d9a1289858a02841 100644
--- a/Database/AthenaPOOL/AthenaPoolUtilities/AthenaPoolUtilities/TagAthenaAttributeList.h
+++ b/Database/AthenaPOOL/AthenaPoolUtilities/AthenaPoolUtilities/TagAthenaAttributeList.h
@@ -27,7 +27,6 @@
 #include "CoralBase/AttributeListSpecification.h"
 #include "AthenaPoolUtilities/AthenaAttributeListSpecification.h"
 #include "AthenaKernel/CLASS_DEF.h"
-#include "CxxUtils/checker_macros.h"
 
 #include "GaudiKernel/DataObject.h"
 
@@ -48,11 +47,11 @@ class TagAthenaAttributeList : public coral::AttributeList,
 public:
 
     /// Construct empty attribute list with empty specification.
-    TagAthenaAttributeList() ATLAS_CTORDTOR_NOT_THREAD_SAFE;
+    TagAthenaAttributeList();
 
     /// Copy attribute lists.
-    TagAthenaAttributeList(const coral::AttributeList& rhs) ATLAS_CTORDTOR_NOT_THREAD_SAFE;
-    TagAthenaAttributeList(const TagAthenaAttributeList& rhs) ATLAS_CTORDTOR_NOT_THREAD_SAFE;
+    TagAthenaAttributeList(const coral::AttributeList& rhs);
+    TagAthenaAttributeList(const TagAthenaAttributeList& rhs);
     /// Assignment.
     TagAthenaAttributeList& operator= (const TagAthenaAttributeList& rhs);
         
@@ -64,9 +63,9 @@ public:
 
     /// base on Spec with (name,type,info) tuple as well
     /// Otherwise it acts as coral version
-    explicit TagAthenaAttributeList(const AthenaAttributeListSpecification& rhs) ATLAS_CTORDTOR_NOT_THREAD_SAFE;
+    explicit TagAthenaAttributeList(const AthenaAttributeListSpecification& rhs);
 
-    ~TagAthenaAttributeList() ATLAS_CTORDTOR_NOT_THREAD_SAFE;
+    ~TagAthenaAttributeList();
 
     /// Extends the AttributeList by one attribute, given a specification. 
     /// In case the specification is shared, a copy is triggered.