diff --git a/src/vs/workbench/api/browser/mainThreadTerminalService.ts b/src/vs/workbench/api/browser/mainThreadTerminalService.ts
index f57f336bfef008209c87fc2d22bac20a209786e4..c53cedd6be0ff86f8fc0df7849ede66ea93d40ec 100644
--- a/src/vs/workbench/api/browser/mainThreadTerminalService.ts
+++ b/src/vs/workbench/api/browser/mainThreadTerminalService.ts
@@ -425,7 +425,6 @@ class ExtensionTerminalLinkProvider implements ITerminalExternalLinkProvider {
 	async provideLinks(instance: ITerminalInstance, line: string): Promise<ITerminalLink[] | undefined> {
 		const proxy = this._proxy;
 		const extHostLinks = await proxy.$provideLinks(instance.id, line);
-		console.log('ExtensionTerminalLinkProvider#provideLinks', extHostLinks);
 		return extHostLinks.map(dto => ({
 			id: dto.id,
 			startIndex: dto.startIndex,
diff --git a/src/vs/workbench/api/common/extHostTerminalService.ts b/src/vs/workbench/api/common/extHostTerminalService.ts
index ec5c5bfe8b79153d294c59754eac848e6c0f25d8..dc47c5d8b79d3e5b070c014c128906ea5fb40eab 100644
--- a/src/vs/workbench/api/common/extHostTerminalService.ts
+++ b/src/vs/workbench/api/common/extHostTerminalService.ts
@@ -341,23 +341,6 @@ export abstract class BaseExtHostTerminalService implements IExtHostTerminalServ
 			onFirstListenerAdd: () => this._proxy.$startSendingDataEvents(),
 			onLastListenerRemove: () => this._proxy.$stopSendingDataEvents()
 		});
-
-		this.registerLinkProvider({
-			provideTerminalLinks(ctx) {
-				const links: vscode.TerminalLink[] = [
-					{
-						startIndex: 0,
-						length: 10,
-						tooltip: `Open this custom "${ctx.line.substr(0, 10)}" link`
-					}
-				];
-				return links;
-			},
-			handleTerminalLink(link) {
-				console.log('Handled link on ext host, tooltip=' + link.tooltip);
-				return true;
-			}
-		});
 	}
 
 	public abstract createTerminal(name?: string, shellPath?: string, shellArgs?: string[] | string): vscode.Terminal;
diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.ts b/src/vs/workbench/contrib/terminal/browser/terminal.ts
index 3ac17a37a992246bd664026cb715df8f9a6bf0e9..39098571234550c1df26a6c7d0846d0663a8ad8c 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminal.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminal.ts
@@ -301,9 +301,6 @@ export interface ITerminalInstance {
 	/** A promise that resolves when the terminal's pty/process have been created. */
 	processReady: Promise<void>;
 
-	/** A promise that resolves when xterm.js has been created. */
-	xtermReady: Promise<void>;
-
 	/**
 	 * The title of the terminal. This is either title or the process currently running or an
 	 * explicit name given to the terminal instance through the extension API.
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
index b4062905071834b0aa49d3e4c538847b1bb6e10b..fcfa7758d3c6242692d74ff2285261835f7d1a35 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
@@ -129,7 +129,6 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 	// TODO: Should this be an event as it can fire twice?
 	public get processReady(): Promise<void> { return this._processManager.ptyProcessReady; }
 	public get areLinksReady(): boolean { return this._areLinksReady; }
-	public get xtermReady(): Promise<void> { return this._xtermReadyPromise.then(() => { }); }
 	public get exitCode(): number | undefined { return this._exitCode; }
 	public get title(): string { return this._title; }
 	public get hadFocusOnExit(): boolean { return this._hadFocusOnExit; }
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalService.ts b/src/vs/workbench/contrib/terminal/browser/terminalService.ts
index a9fb065be2d2e4168bcfd0f759fe677288b33b25..802883f5f937ae09069e44ab8d1f343f807ec36b 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalService.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalService.ts
@@ -88,8 +88,6 @@ export class TerminalService implements ITerminalService {
 	public get onInstancesChanged(): Event<void> { return this._onInstancesChanged.event; }
 	private readonly _onInstanceTitleChanged = new Emitter<ITerminalInstance>();
 	public get onInstanceTitleChanged(): Event<ITerminalInstance> { return this._onInstanceTitleChanged.event; }
-	private readonly _onInstanceXtermReady = new Emitter<ITerminalInstance>();
-	public get onInstanceXtermReady(): Event<ITerminalInstance> { return this._onInstanceXtermReady.event; }
 	private readonly _onActiveInstanceChanged = new Emitter<ITerminalInstance | undefined>();
 	public get onActiveInstanceChanged(): Event<ITerminalInstance | undefined> { return this._onActiveInstanceChanged.event; }
 	private readonly _onTabDisposed = new Emitter<ITerminalTab>();
@@ -490,7 +488,6 @@ export class TerminalService implements ITerminalService {
 		const disposables: IDisposable[] = [];
 		this._linkProviders.add(linkProvider);
 		for (const instance of this.terminalInstances) {
-			// Only register immediately when xterm is ready
 			if (instance.areLinksReady) {
 				disposables.push(instance.registerLinkProvider(linkProvider));
 			}
@@ -665,7 +662,6 @@ export class TerminalService implements ITerminalService {
 	public createInstance(container: HTMLElement | undefined, shellLaunchConfig: IShellLaunchConfig): ITerminalInstance {
 		const instance = this._instantiationService.createInstance(TerminalInstance, this._terminalFocusContextKey, this._terminalShellTypeContextKey, this._configHelper, container, shellLaunchConfig);
 		this._onInstanceCreated.fire(instance);
-		instance.xtermReady.then(() => this._onInstanceXtermReady.fire(instance));
 		return instance;
 	}