diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index e3e04c724f..fb65914944 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -335,7 +335,7 @@ class acp_styles
 		$uninstalled = array();
 		foreach ($rows as $style)
 		{
-			$result = $this->uninstall_style($style, $delete_files);
+			$result = $this->uninstall_style($style);
 
 			if (is_string($result))
 			{
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index 0413c4f2fe..47c18f6dd9 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -469,7 +469,7 @@ class messenger
 
 		$domain = ($config['server_name']) ?: $request->server('SERVER_NAME', 'phpbb.generated');
 
-		return md5(unique_id(time())) . '@' . $domain;
+		return md5(unique_id()) . '@' . $domain;
 	}
 
 	/**
diff --git a/phpBB/phpbb/captcha/plugins/captcha_abstract.php b/phpBB/phpbb/captcha/plugins/captcha_abstract.php
index b508767d17..48605fe17a 100644
--- a/phpBB/phpbb/captcha/plugins/captcha_abstract.php
+++ b/phpBB/phpbb/captcha/plugins/captcha_abstract.php
@@ -235,7 +235,7 @@ abstract class captcha_abstract
 		global $db, $user;
 
 		$this->code = gen_rand_string_friendly(mt_rand(CAPTCHA_MIN_CHARS, CAPTCHA_MAX_CHARS));
-		$this->confirm_id = md5(unique_id($user->ip));
+		$this->confirm_id = md5(unique_id());
 		$this->seed = hexdec(substr(unique_id(), 4, 10));
 		$this->solved = 0;
 		// compute $seed % 0x7fffffff
diff --git a/phpBB/phpbb/captcha/plugins/qa.php b/phpBB/phpbb/captcha/plugins/qa.php
index 966b8d32f2..12280e5d7d 100644
--- a/phpBB/phpbb/captcha/plugins/qa.php
+++ b/phpBB/phpbb/captcha/plugins/qa.php
@@ -442,7 +442,7 @@ class qa
 		{
 			return;
 		}
-		$this->confirm_id = md5(unique_id($user->ip));
+		$this->confirm_id = md5(unique_id());
 		$this->question = (int) array_rand($this->question_ids);
 
 		$sql = 'INSERT INTO ' . $this->table_qa_confirm . ' ' . $db->sql_build_array('INSERT', array(
diff --git a/phpBB/phpbb/config_php_file.php b/phpBB/phpbb/config_php_file.php
index e3f7357720..09017ad47a 100644
--- a/phpBB/phpbb/config_php_file.php
+++ b/phpBB/phpbb/config_php_file.php
@@ -42,8 +42,6 @@ class config_php_file
 	*/
 	protected $config_file;
 
-	private $defined_vars;
-
 	/**
 	* Constructor
 	*
@@ -102,10 +100,10 @@ class config_php_file
 	{
 		if (!$this->config_loaded && file_exists($this->config_file))
 		{
-			$this->defined_vars = get_defined_vars();
+			$defined_vars = get_defined_vars();
 
 			require($this->config_file);
-			$this->config_data = array_diff_key(get_defined_vars(), $this->defined_vars);
+			$this->config_data = array_diff_key(get_defined_vars(), $defined_vars);
 
 			$this->config_loaded = true;
 		}
diff --git a/phpBB/phpbb/tree/nestedset.php b/phpBB/phpbb/tree/nestedset.php
index eadd2b3273..b25a91b7b9 100644
--- a/phpBB/phpbb/tree/nestedset.php
+++ b/phpBB/phpbb/tree/nestedset.php
@@ -395,7 +395,7 @@ abstract class nestedset implements \phpbb\tree\tree_interface
 
 		$this->db->sql_transaction('begin');
 
-		$this->remove_subset($move_items, $current_parent, false, true);
+		$this->remove_subset($move_items, $current_parent, false);
 
 		if ($new_parent_id)
 		{
@@ -414,7 +414,7 @@ abstract class nestedset implements \phpbb\tree\tree_interface
 				throw new \OutOfBoundsException($this->message_prefix . 'INVALID_PARENT');
 			}
 
-			$new_right_id = $this->prepare_adding_subset($move_items, $new_parent, true);
+			$new_right_id = $this->prepare_adding_subset($move_items, $new_parent);
 
 			if ($new_right_id > $current_parent[$this->column_right_id])
 			{
@@ -493,7 +493,7 @@ abstract class nestedset implements \phpbb\tree\tree_interface
 
 		$this->db->sql_transaction('begin');
 
-		$this->remove_subset($move_items, $item, false, true);
+		$this->remove_subset($move_items, $item, false);
 
 		if ($new_parent_id)
 		{
@@ -512,7 +512,7 @@ abstract class nestedset implements \phpbb\tree\tree_interface
 				throw new \OutOfBoundsException($this->message_prefix . 'INVALID_PARENT');
 			}
 
-			$new_right_id = $this->prepare_adding_subset($move_items, $new_parent, true);
+			$new_right_id = $this->prepare_adding_subset($move_items, $new_parent);
 
 			if ($new_right_id > (int) $item[$this->column_right_id])
 			{