diff --git a/ChangeLog b/ChangeLog
index e7913271..93178c86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-12  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Removed HandleRegistry
+	* src/HandleRegistry.h
+	* src/Makefile.am
+
 2010-06-12  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Renamed member variables.
diff --git a/src/HandleRegistry.h b/src/HandleRegistry.h
deleted file mode 100644
index 8845fbfa..00000000
--- a/src/HandleRegistry.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* <!-- copyright */
-/*
- * aria2 - The high speed download utility
- *
- * Copyright (C) 2006 Tatsuhiro Tsujikawa
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-/* copyright --> */
-#ifndef _D_HANDLE_REGISTRY_H_
-#define _D_HANDLE_REGISTRY_H_
-
-#include "common.h"
-
-#include <map>
-#include <vector>
-
-#include "SharedHandle.h"
-
-namespace aria2 {
-
-template<typename K, typename T>
-class HandleRegistry {
-  typedef std::map<K, SharedHandle<T> > HandleMap;
-private:
-  HandleMap handleMap;
-public:
-  void registerHandle(const K& key, const SharedHandle<T>& obj) {
-    unregisterHandle(key);
-    typename HandleMap::value_type p(key, obj);
-    handleMap.insert(p);
-  }
-
-  void unregisterHandle(const K& key) {
-    handleMap.erase(key);
-  }
-
-  SharedHandle<T> getHandle(const K& key) {
-    typename HandleMap::const_iterator itr = handleMap.find(key);
-    if(itr == handleMap.end()) {
-      return SharedHandle<T>();
-    } else {
-      return itr->second;
-    }
-  }
-
-  std::vector<SharedHandle<T> > getAll()
-  {
-    std::vector<SharedHandle<T> > l;
-    for(typename HandleMap::const_iterator itr = handleMap.begin(),
-          eoi = handleMap.end(); itr != eoi; ++itr) {
-      const typename HandleMap::value_type& p = *itr;
-      l.push_back(p.second);
-    }
-    return l;
-  }
-
-  void clear() {
-    handleMap.clear();
-  }
-};
-
-} // namespace aria2
-
-#endif // _D_HANDLE_REGISTRY_H_
diff --git a/src/Makefile.am b/src/Makefile.am
index 3320f13a..becda418 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -54,7 +54,6 @@ SRCS =  Socket.h\
 	TimerA2.cc TimerA2.h\
 	TimeA2.cc TimeA2.h\
 	SharedHandle.h\
-	HandleRegistry.h\
 	FeatureConfig.cc FeatureConfig.h\
 	DownloadEngineFactory.cc DownloadEngineFactory.h\
 	SpeedCalc.cc SpeedCalc.h\