diff --git a/core/AmThread.h b/core/AmThread.h
index c90426ee..ca50f0b5 100644
--- a/core/AmThread.h
+++ b/core/AmThread.h
@@ -168,24 +168,6 @@ public:
   void add(AmThread*);
 };
 
-template<class T>
-class AmThreadLocalStorage
-{
-  static thread_local std::unique_ptr<T> t;
-  
-public:
-  T* get() {
-    return t.get();
-  }
-
-  void set(T* p) {
-    t.reset(p);
-  }
-};
-
-template<class T>
-thread_local std::unique_ptr<T> AmThreadLocalStorage<T>::t;
-
 #endif
 
 // Local Variables: