diff --git a/src/OptionHandlerFactory.cc b/src/OptionHandlerFactory.cc
index e3863170..ea88e8f3 100644
--- a/src/OptionHandlerFactory.cc
+++ b/src/OptionHandlerFactory.cc
@@ -303,18 +303,6 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers()
     handlers.push_back(op);
   }
 #endif // ENABLE_ASYNC_DNS
-  {
-    // TODO Deprecated
-    OptionHandler* op(new DeprecatedOptionHandler(new BooleanOptionHandler
-                                                  (PREF_ENABLE_DIRECT_IO,
-                                                   TEXT_ENABLE_DIRECT_IO,
-                                                   NO_DEFAULT_VALUE,
-                                                   OptionHandler::OPT_ARG)));
-    op->addTag(TAG_DEPRECATED);
-    op->addTag(TAG_ADVANCED);
-    op->addTag(TAG_FILE);
-    handlers.push_back(op);
-  }
 #if defined HAVE_MMAP || defined __MINGW32__
   {
     OptionHandler* op(new BooleanOptionHandler
@@ -2220,20 +2208,6 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers()
     op->setChangeOptionForReserved(true);
     handlers.push_back(op);
   }
-  {
-    OptionHandler* op
-      (new DeprecatedOptionHandler(new NumberOptionHandler
-                                   (PREF_METALINK_SERVERS,
-                                    TEXT_METALINK_SERVERS,
-                                    NO_DEFAULT_VALUE,
-                                    1, -1,
-                                    'C'),
-                                   splitHandler));
-    op->addTag(TAG_DEPRECATED);
-    op->addTag(TAG_METALINK);
-    op->setInitialOption(true);
-    handlers.push_back(op);
-  }
   {
     OptionHandler* op(new DefaultOptionHandler
                       (PREF_METALINK_VERSION,
diff --git a/src/prefs.cc b/src/prefs.cc
index afeee6b5..c937b958 100644
--- a/src/prefs.cc
+++ b/src/prefs.cc
@@ -237,8 +237,6 @@ const Pref* PREF_AUTO_FILE_RENAMING = makePref("auto-file-renaming");
 // value: true | false
 const Pref* PREF_PARAMETERIZED_URI = makePref("parameterized-uri");
 // value: true | false
-const Pref* PREF_ENABLE_DIRECT_IO = makePref("enable-direct-io");
-// value: true | false
 const Pref* PREF_ALLOW_PIECE_LENGTH_CHANGE = makePref("allow-piece-length-change");
 // value: true | false
 const Pref* PREF_NO_CONF = makePref("no-conf");
@@ -547,8 +545,6 @@ const Pref* PREF_METALINK_LANGUAGE = makePref("metalink-language");
 const Pref* PREF_METALINK_OS = makePref("metalink-os");
 // values: a string
 const Pref* PREF_METALINK_LOCATION = makePref("metalink-location");
-// values: 1*digit
-const Pref* PREF_METALINK_SERVERS = makePref("metalink-servers");
 // values: true | false | mem
 const Pref* PREF_FOLLOW_METALINK = makePref("follow-metalink");
 // values: http | https | ftp | none
diff --git a/src/prefs.h b/src/prefs.h
index 9cc5f3bc..92c699a2 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -172,8 +172,6 @@ extern const Pref* PREF_AUTO_FILE_RENAMING;
 // value: true | false
 extern const Pref* PREF_PARAMETERIZED_URI;
 // value: true | false
-extern const Pref* PREF_ENABLE_DIRECT_IO;
-// value: true | false
 extern const Pref* PREF_ALLOW_PIECE_LENGTH_CHANGE;
 // value: true | false
 extern const Pref* PREF_NO_CONF;
@@ -481,8 +479,6 @@ extern const Pref* PREF_METALINK_LANGUAGE;
 extern const Pref* PREF_METALINK_OS;
 // values: a string
 extern const Pref* PREF_METALINK_LOCATION;
-// values: 1*digit
-extern const Pref* PREF_METALINK_SERVERS;
 // values: true | false | mem
 extern const Pref* PREF_FOLLOW_METALINK;
 // values: http | https | ftp | none