diff --git a/lib/widgets/note_viewer.dart b/lib/widgets/note_viewer.dart
index 243f10bd..27947718 100644
--- a/lib/widgets/note_viewer.dart
+++ b/lib/widgets/note_viewer.dart
@@ -1,11 +1,8 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
-import 'package:flutter_markdown/flutter_markdown.dart';
-import 'package:markdown/markdown.dart' as md;
 import 'package:provider/provider.dart';
 
-import 'package:gitjournal/core/link.dart';
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
@@ -53,15 +50,6 @@ class NoteViewer extends StatelessWidget {
     return view;
   }
 
-  static md.ExtensionSet markdownExtensions() {
-    // It's important to add both these inline syntaxes before the other
-    // syntaxes as the LinkSyntax intefers with both of these
-    var markdownExtensions = md.ExtensionSet.gitHubFlavored;
-    markdownExtensions.inlineSyntaxes.insert(0, WikiLinkSyntax());
-    markdownExtensions.inlineSyntaxes.insert(1, TaskListSyntax());
-    return markdownExtensions;
-  }
-
   /*
   Widget _buildFooter(BuildContext context) {
     return Padding(
diff --git a/test/markdown_rendering_test.dart b/test/markdown_rendering_test.dart
index 1b3bba54..84f298cb 100644
--- a/test/markdown_rendering_test.dart
+++ b/test/markdown_rendering_test.dart
@@ -1,7 +1,7 @@
 import 'package:markdown/markdown.dart' as md;
 import 'package:test/test.dart';
 
-import 'package:gitjournal/widgets/note_viewer.dart';
+import 'package:gitjournal/widgets/markdown_renderer.dart';
 
 void main() {
   test('Parses Wiki Lnks and task items', () {
@@ -10,8 +10,8 @@ void main() {
 
     var doc = md.Document(
       encodeHtml: false,
-      extensionSet: NoteViewer.markdownExtensions(),
-      inlineSyntaxes: NoteViewer.markdownExtensions().inlineSyntaxes,
+      extensionSet: MarkdownRenderer.markdownExtensions(),
+      inlineSyntaxes: MarkdownRenderer.markdownExtensions().inlineSyntaxes,
     );
     var nodes = doc.parseLines(lines);
 
@@ -30,8 +30,8 @@ void main() {
 
     var doc = md.Document(
       encodeHtml: false,
-      extensionSet: NoteViewer.markdownExtensions(),
-      inlineSyntaxes: NoteViewer.markdownExtensions().inlineSyntaxes,
+      extensionSet: MarkdownRenderer.markdownExtensions(),
+      inlineSyntaxes: MarkdownRenderer.markdownExtensions().inlineSyntaxes,
     );
     var nodes = doc.parseLines(lines);