diff --git a/Control/AthenaKernel/AthenaKernel/IDictLoaderSvc.h b/Control/AthenaKernel/AthenaKernel/IDictLoaderSvc.h
index b1a403c6ff46be3db853adac13c85a1ff01ad534..20e7cabfa4414bbc6c1aa8e20f9b8480899a2505 100644
--- a/Control/AthenaKernel/AthenaKernel/IDictLoaderSvc.h
+++ b/Control/AthenaKernel/AthenaKernel/IDictLoaderSvc.h
@@ -73,7 +73,7 @@ class IDictLoaderSvc
    *         by any necessary means.
    */
   virtual
-  const RootType load_type ATLAS_NOT_THREAD_SAFE (const std::string& type_name) = 0;
+  const RootType load_type (const std::string& type_name) = 0;
 
   /** @brief retrieve a @c RootType by @c std::type_info (auto)loading the
    *         dictionary by any necessary means.
@@ -81,13 +81,13 @@ class IDictLoaderSvc
    *         succeed *IF* the dictionary for that type has been generated.
    */
   virtual
-  const RootType load_type ATLAS_NOT_THREAD_SAFE (const std::type_info& typeinfo) = 0;
+  const RootType load_type (const std::type_info& typeinfo) = 0;
 
   /** @brief retrieve a @c RootType by name (auto)loading the dictionary
    *         by any necessary means.
    */
   virtual
-  const RootType load_type ATLAS_NOT_THREAD_SAFE (CLID clid) = 0;
+  const RootType load_type (CLID clid) = 0;
 
 }; 
 
diff --git a/Control/AthenaServices/src/AthDictLoaderSvc.cxx b/Control/AthenaServices/src/AthDictLoaderSvc.cxx
index be0751a16b8241d5acacc5d83db5bbdf572aee41..9d16659fc4e4b8f1f9ae056f87026791f88cd4bd 100644
--- a/Control/AthenaServices/src/AthDictLoaderSvc.cxx
+++ b/Control/AthenaServices/src/AthDictLoaderSvc.cxx
@@ -148,14 +148,14 @@ AthDictLoaderSvc::has_type (CLID clid)
  *         by any necessary means.
  */
 const RootType
-AthDictLoaderSvc::load_type ATLAS_NOT_THREAD_SAFE (const std::string& type_name)
+AthDictLoaderSvc::load_type (const std::string& type_name)
 {
   ATH_MSG_DEBUG ("loading [" << type_name << "]...");
 
   // MN: short-cutting all the dance with type names done in DSODB...
   // may need verification
   // return RootType::ByName (m_dsodb->load_type(type_name));
-  return RootType::ByName(type_name);
+  return RootType::ByNameNoQuiet(type_name);
 }
 
 /** @brief retrieve a @c Reflex::Type by @c std::type_info (auto)loading the
@@ -164,7 +164,7 @@ AthDictLoaderSvc::load_type ATLAS_NOT_THREAD_SAFE (const std::string& type_name)
  *         succeed *IF* the dictionary for that type has been generated.
  */
 const RootType
-AthDictLoaderSvc::load_type ATLAS_NOT_THREAD_SAFE (const std::type_info& typeinfo)
+AthDictLoaderSvc::load_type (const std::type_info& typeinfo)
 {
   ATH_MSG_DEBUG 
     ("loading [" << System::typeinfoName(typeinfo) << " (from typeinfo)]...");
@@ -175,7 +175,7 @@ AthDictLoaderSvc::load_type ATLAS_NOT_THREAD_SAFE (const std::type_info& typeinf
  *         by any necessary means.
  */
 const RootType
-AthDictLoaderSvc::load_type ATLAS_NOT_THREAD_SAFE (CLID clid)
+AthDictLoaderSvc::load_type (CLID clid)
 {
   std::string name = "<N/A>";
   if (!m_clidSvc->getTypeNameOfID(clid, name).isSuccess()) {
@@ -210,25 +210,3 @@ AthDictLoaderSvc::load_type ATLAS_NOT_THREAD_SAFE (CLID clid)
   }
   return type;
 }
-
-/////////////////////////////////////////////////////////////////// 
-// Const methods: 
-///////////////////////////////////////////////////////////////////
-
-/////////////////////////////////////////////////////////////////// 
-// Non-const methods: 
-/////////////////////////////////////////////////////////////////// 
-
-/////////////////////////////////////////////////////////////////// 
-// Protected methods: 
-/////////////////////////////////////////////////////////////////// 
-
-/////////////////////////////////////////////////////////////////// 
-// Const methods: 
-///////////////////////////////////////////////////////////////////
-
-/////////////////////////////////////////////////////////////////// 
-// Non-const methods: 
-/////////////////////////////////////////////////////////////////// 
-
-
diff --git a/Control/AthenaServices/src/AthDictLoaderSvc.h b/Control/AthenaServices/src/AthDictLoaderSvc.h
index fb611289eecd02e437e08f984ccc97312a3d5393..891e515f4e77845c5720491e91de0294aa71bd54 100644
--- a/Control/AthenaServices/src/AthDictLoaderSvc.h
+++ b/Control/AthenaServices/src/AthDictLoaderSvc.h
@@ -90,7 +90,7 @@ class ATLAS_CHECK_THREAD_SAFETY AthDictLoaderSvc
    *         by any necessary means.
    */
   virtual
-  const RootType load_type ATLAS_NOT_THREAD_SAFE (const std::string& type_name);
+  const RootType load_type (const std::string& type_name);
 
   /** @brief retrieve a @c Reflex::Type by @c std::type_info (auto)loading the
    *         dictionary by any necessary means.
@@ -98,13 +98,13 @@ class ATLAS_CHECK_THREAD_SAFETY AthDictLoaderSvc
    *         succeed *IF* the dictionary for that type has been generated.
    */
   virtual
-  const RootType load_type ATLAS_NOT_THREAD_SAFE (const std::type_info& typeinfo);
+  const RootType load_type (const std::type_info& typeinfo);
 
   /** @brief retrieve a @c Reflex::Type by name (auto)loading the dictionary
    *         by any necessary means.
    */
   virtual
-  const RootType load_type ATLAS_NOT_THREAD_SAFE (CLID clid);
+  const RootType load_type (CLID clid);
 
   /////////////////////////////////////////////////////////////////// 
   // Private data: 
diff --git a/Trigger/TrigDataAccess/TrigSerializeTP/TrigSerializeTP/ATLAS_CHECK_THREAD_SAFETY b/Trigger/TrigDataAccess/TrigSerializeTP/TrigSerializeTP/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..0e42c95d0296143414ac84c056aa9ee9b50914b5
--- /dev/null
+++ b/Trigger/TrigDataAccess/TrigSerializeTP/TrigSerializeTP/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Trigger/TrigDataAccess/TrigSerializeTP