diff --git a/extension.json b/extension.json
index f6805f49b..80cf40d86 100644
--- a/extension.json
+++ b/extension.json
@@ -86,7 +86,6 @@
 				"mediawiki.util",
 				"mediawiki.storage",
 				"mediawiki.String",
-				"mediawiki.cookie",
 				"ext.visualEditor.core.utils.parsing"
 			],
 			"messages": [
diff --git a/includes/CommentFormatter.php b/includes/CommentFormatter.php
index c332e88d4..b1f93803e 100644
--- a/includes/CommentFormatter.php
+++ b/includes/CommentFormatter.php
@@ -45,7 +45,7 @@ class CommentFormatter {
 
 		// Never add tools twice.
 		// This is required because we try again to add tools to cached content
-		// to support query string or cookie enabling
+		// to support query string enabling.
 		if ( strpos( $text, static::MARKER_COMMENT ) !== false ) {
 			return;
 		}
diff --git a/includes/Hooks/PageHooks.php b/includes/Hooks/PageHooks.php
index 7fb1c8320..b91d67151 100644
--- a/includes/Hooks/PageHooks.php
+++ b/includes/Hooks/PageHooks.php
@@ -145,7 +145,7 @@ class PageHooks implements
 	public function onOutputPageBeforeHTML( $output, &$text ) {
 		$lang = $output->getLanguage();
 		// Check after the parser cache if tools need to be added for
-		// non-cacheable reasons i.e. query string or cookie
+		// non-cacheable reasons (i.e. query string).
 		// The addDiscussionTools method is responsible for ensuring that
 		// tools aren't added twice.
 		foreach ( CommentFormatter::USE_WITH_FEATURES as $feature ) {