diff --git a/src/issues/issueCompletionProvider.ts b/src/issues/issueCompletionProvider.ts
index db2506f354..63bd4a527d 100644
--- a/src/issues/issueCompletionProvider.ts
+++ b/src/issues/issueCompletionProvider.ts
@@ -100,7 +100,9 @@ export class IssueCompletionProvider implements vscode.CompletionItemProvider {
 			return [];
 		}
 
-		if ((document.languageId !== 'scminput') && (document.languageId !== 'git-commit') && !(await isComment(document, position))) {
+		const isPositionComment = document.languageId === 'plaintext' || document.languageId === 'markdown' || await isComment(document, position);
+
+		if ((document.languageId !== 'scminput') && (document.languageId !== 'git-commit') && !isPositionComment) {
 			return [];
 		}
 
diff --git a/src/issues/issueLinkProvider.ts b/src/issues/issueLinkProvider.ts
deleted file mode 100644
index fafc7b7f6b..0000000000
--- a/src/issues/issueLinkProvider.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-import * as vscode from 'vscode';
-import { StateManager } from './stateManager';
-import {
-	getIssue,
-	isComment,
-	MAX_LINE_LENGTH,
-} from './util';
-import { EDITOR, WORD_WRAP } from '../common/settingKeys';
-import { ReposManagerState } from '../github/folderRepositoryManager';
-import { RepositoriesManager } from '../github/repositoriesManager';
-import { ISSUE_EXPRESSION, ParsedIssue, parseIssueExpressionOutput } from '../github/utils';
-
-const MAX_LINE_COUNT = 2000;
-
-class IssueDocumentLink extends vscode.DocumentLink {
-	constructor(
-		range: vscode.Range,
-		public readonly mappedLink: { readonly value: string; readonly parsed: ParsedIssue },
-		public readonly uri: vscode.Uri,
-	) {
-		super(range);
-	}
-}
-
-export class IssueLinkProvider implements vscode.DocumentLinkProvider {
-	constructor(private manager: RepositoriesManager, private stateManager: StateManager) { }
-
-	async provideDocumentLinks(
-		document: vscode.TextDocument,
-		_token: vscode.CancellationToken,
-	): Promise<vscode.DocumentLink[]> {
-		const links: vscode.DocumentLink[] = [];
-		const wraps: boolean = vscode.workspace.getConfiguration(EDITOR, document).get(WORD_WRAP, 'off') !== 'off';
-		for (let i = 0; i < Math.min(document.lineCount, MAX_LINE_COUNT); i++) {
-			let searchResult = -1;
-			let lineOffset = 0;
-			const line = document.lineAt(i).text;
-			const lineLength = wraps ? line.length : Math.min(line.length, MAX_LINE_LENGTH);
-			let lineSubstring = line.substring(0, lineLength);
-			while ((searchResult = lineSubstring.search(ISSUE_EXPRESSION)) >= 0) {
-				const match = lineSubstring.match(ISSUE_EXPRESSION);
-				const parsed = parseIssueExpressionOutput(match);
-				if (match && parsed) {
-					const startPosition = new vscode.Position(i, searchResult + lineOffset);
-					if (await isComment(document, startPosition)) {
-						const link = new IssueDocumentLink(
-							new vscode.Range(
-								startPosition,
-								new vscode.Position(i, searchResult + lineOffset + match[0].length - 1),
-							),
-							{ value: match[0], parsed },
-							document.uri,
-						);
-						links.push(link);
-					}
-				}
-				lineOffset += searchResult + (match ? match[0].length : 0);
-				lineSubstring = line.substring(lineOffset, line.length);
-			}
-		}
-		return links;
-	}
-
-	async resolveDocumentLink(
-		link: IssueDocumentLink,
-		_token: vscode.CancellationToken,
-	): Promise<vscode.DocumentLink | undefined> {
-		if (this.manager.state === ReposManagerState.RepositoriesLoaded) {
-			const folderManager = this.manager.getManagerForFile(link.uri);
-			if (!folderManager) {
-				return;
-			}
-			const issue = await getIssue(
-				this.stateManager,
-				folderManager,
-				link.mappedLink.value,
-				link.mappedLink.parsed,
-			);
-			if (issue) {
-				link.target = await vscode.env.asExternalUri(vscode.Uri.parse(issue.html_url));
-			}
-			return link;
-		}
-	}
-}
diff --git a/src/issues/issueTodoProvider.ts b/src/issues/issueTodoProvider.ts
index fcdf556073..383e6007aa 100644
--- a/src/issues/issueTodoProvider.ts
+++ b/src/issues/issueTodoProvider.ts
@@ -120,7 +120,7 @@ export class IssueTodoProvider implements vscode.CodeActionProvider, vscode.Code
 			if (!todoInfo) {
 				continue;
 			}
-			if (!(await isComment(document, new vscode.Position(lineNumber, firstNonWhitespaceCharacterIndex), []))) {
+			if (!(await isComment(document, new vscode.Position(lineNumber, firstNonWhitespaceCharacterIndex)))) {
 				continue;
 			}
 			const { match, search, insertIndex } = todoInfo;
diff --git a/src/issues/userCompletionProvider.ts b/src/issues/userCompletionProvider.ts
index 6ed98c11bf..fbd5413cfd 100644
--- a/src/issues/userCompletionProvider.ts
+++ b/src/issues/userCompletionProvider.ts
@@ -77,7 +77,9 @@ export class UserCompletionProvider implements vscode.CompletionItemProvider {
 			return [];
 		}
 
-		if (!this.isCodeownersFiles(document.uri) && (document.languageId !== 'scminput') && (document.languageId !== 'git-commit') && !(await isComment(document, position))) {
+		const isPositionComment = document.languageId === 'plaintext' || document.languageId === 'markdown' || await isComment(document, position);
+
+		if (!this.isCodeownersFiles(document.uri) && (document.languageId !== 'scminput') && (document.languageId !== 'git-commit') && !isPositionComment) {
 			return [];
 		}
 
diff --git a/src/issues/util.ts b/src/issues/util.ts
index 955e8951ce..87a4e7e382 100644
--- a/src/issues/util.ts
+++ b/src/issues/util.ts
@@ -516,13 +516,12 @@ export async function pushAndCreatePR(
 	}
 }
 
-export async function isComment(document: vscode.TextDocument, position: vscode.Position, excludedLanguageIds = ['markdown', 'plaintext']): Promise<boolean> {
-	if (!excludedLanguageIds.includes(document.languageId)) {
-		const tokenInfo = await vscode.languages.getTokenInformationAtPosition(document, position);
-		if (tokenInfo.type !== vscode.StandardTokenType.Comment) {
-			return false;
-		}
+export async function isComment(document: vscode.TextDocument, position: vscode.Position): Promise<boolean> {
+	const tokenInfo = await vscode.languages.getTokenInformationAtPosition(document, position);
+	if (tokenInfo.type !== vscode.StandardTokenType.Comment) {
+		return false;
 	}
+
 	return true;
 }