diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index 1d36ceadba..377a0a47a8 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -120,16 +120,12 @@ class phpbb_template_twig implements phpbb_template
 			$loader,
 			array(
 				'cache'			=> $this->cachepath,
-				'debug'			=> true, // @todo
-				'auto_reload'	=> true, // @todo
+				'debug'			=> defined('DEBUG'),
+				'auto_reload'	=> (bool) $this->config['load_tplcompile'],
 				'autoescape'	=> false,
 			)
 		);
 
-		// Clear previous cache files (while WIP)
-		// @todo remove
-		$this->clear_cache();
-
 		$this->twig->addExtension(
 			new phpbb_template_twig_extension(
 				$this->user