diff --git a/lib/core/option.py b/lib/core/option.py
index 65c9a009d..45bd976ba 100644
--- a/lib/core/option.py
+++ b/lib/core/option.py
@@ -1194,9 +1194,6 @@ def __cleanupOptions():
     if conf.data:
         conf.data = urldecode(conf.data)
 
-    if conf.template:
-        map(lambda x: conf.__setitem__(x, True), ['tor', 'flushSession', 'batch', 'getBanner', 'getCurrentUser', 'getCurrentDb', 'getDbs', 'randomAgent'])
-
 def __setConfAttributes():
     """
     This function set some needed attributes into the configuration
diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py
index da031a553..780a756af 100644
--- a/lib/parse/cmdline.py
+++ b/lib/parse/cmdline.py
@@ -535,9 +535,6 @@ def cmdLineParser():
         parser.add_option("--group-concat", dest="groupConcat", action="store_true",
                            default=False, help=SUPPRESS_HELP)
 
-        parser.add_option("--template", dest="template", action="store_true",
-                          default=False, help=SUPPRESS_HELP)
-
         parser.add_option_group(target)
         parser.add_option_group(request)
         parser.add_option_group(optimization)