diff --git a/devstack/post_test_hook.sh b/devstack/post_test_hook.sh
index f94e61c1d..95e9c7d6a 100644
--- a/devstack/post_test_hook.sh
+++ b/devstack/post_test_hook.sh
@@ -29,16 +29,6 @@ if [ "$DEVSTACK_GATE_USE_PYTHON3" == "True" ]; then
 fi
 
 sudo cp -rf $DEVSTACK_PATH/tempest/etc/logging.conf.sample $DEVSTACK_PATH/tempest/etc/logging.conf
-
-${PYTHON:-python} $DEVSTACK_PATH/vitrage-tempest-plugin/vitrage_tempest_tests/add_legacy_dir_templates.py
-
-# restart due to configuration files changes
-sudo systemctl restart devstack@vitrage-graph.service
-
-# wait for 30 seconds (initialization might take time)
-sleep 30
-
-
 cd $DEVSTACK_PATH/tempest/
 sudo -E testr init
 
diff --git a/vitrage/evaluator/__init__.py b/vitrage/evaluator/__init__.py
index 4c020fc90..0796b239a 100644
--- a/vitrage/evaluator/__init__.py
+++ b/vitrage/evaluator/__init__.py
@@ -18,18 +18,6 @@ from vitrage.evaluator.template_schemas import init_template_schemas
 
 # Register options for the service
 OPTS = [
-    cfg.StrOpt('templates_dir',
-               default='/etc/vitrage/templates',
-               help='A path for the templates used by the evaluator'
-               ),
-    cfg.StrOpt('equivalences_dir',
-               default='/etc/vitrage/templates/equivalences',
-               help='A path for entity equivalences used by the evaluator'
-               ),
-    cfg.StrOpt('def_templates_dir',
-               default='/etc/vitrage/templates/def_templates',
-               help='A path for def_template templates used by the evaluator'
-               ),
     cfg.IntOpt('workers',
                default=None,
                min=1,
diff --git a/vitrage/tests/functional/test_configuration.py b/vitrage/tests/functional/test_configuration.py
index 7c9921059..decc1f926 100644
--- a/vitrage/tests/functional/test_configuration.py
+++ b/vitrage/tests/functional/test_configuration.py
@@ -23,8 +23,6 @@ from vitrage.evaluator.template_db.template_repository import \
 from vitrage import storage
 from vitrage.storage.sqlalchemy import models
 
-TEMPLATE_DIR = '/etc/vitrage/templates'
-
 
 class TestConfiguration(object):