diff --git a/assets/javascripts/discourse/components/docs-topic-list.js b/assets/javascripts/discourse/components/docs-topic-list.js
deleted file mode 100644
index 2d16744..0000000
--- a/assets/javascripts/discourse/components/docs-topic-list.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import Component from "@ember/component";
-import { action } from "@ember/object";
-import { classNames } from "@ember-decorators/component";
-import discourseComputed from "discourse-common/utils/decorators";
-import { getDocs } from "../../lib/get-docs";
-
-@classNames("docs-topic-list")
-export default class DocsTopicList extends Component {
-  urlPath = getDocs();
-
-  @discourseComputed("order")
-  sortTitle(order) {
-    return order === "title";
-  }
-
-  @discourseComputed("order")
-  sortActivity(order) {
-    return order === "activity";
-  }
-
-  @action
-  sortListActivity() {
-    this.sortBy("activity");
-    return false;
-  }
-
-  @action
-  sortListTitle() {
-    this.sortBy("title");
-    return false;
-  }
-}
diff --git a/assets/javascripts/discourse/initializers/setup-docs.js b/assets/javascripts/discourse/initializers/setup-docs.js
index ac3e96c..f3912a8 100644
--- a/assets/javascripts/discourse/initializers/setup-docs.js
+++ b/assets/javascripts/discourse/initializers/setup-docs.js
@@ -17,6 +17,15 @@ function initialize(api, container) {
       href: "/" + docsPath,
     });
   }
+
+  api.registerValueTransformer("topic-list-columns", ({ value: columns }) => {
+    if (container.lookup("service:router").currentRouteName === "docs.index") {
+      columns.delete("posters");
+      columns.delete("replies");
+      columns.delete("views");
+    }
+    return columns;
+  });
 }
 
 export default {
diff --git a/assets/javascripts/discourse/templates/components/docs-topic-list-item.hbs b/assets/javascripts/discourse/templates/components/docs-topic-list-item.hbs
deleted file mode 100644
index 87721b9..0000000
--- a/assets/javascripts/discourse/templates/components/docs-topic-list-item.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{this.topicListItemContents}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/components/docs-topic-list.hbs b/assets/javascripts/discourse/templates/components/docs-topic-list.hbs
deleted file mode 100644
index cd28b4d..0000000
--- a/assets/javascripts/discourse/templates/components/docs-topic-list.hbs
+++ /dev/null
@@ -1,41 +0,0 @@
-<LoadMore @selector=".topic-list tr" @action={{this.loadMore}}>
-  <table class="topic-list">
-    <thead class="topic-list-header">
-      <th role="button" class="topic-list-data" {{action "sortListTitle"}}>
-        {{i18n "docs.column_titles.topic"}}
-
-        {{#if this.sortTitle}}
-          {{#if this.ascending}}
-            {{d-icon "angle-up"}}
-          {{else}}
-            {{d-icon "angle-down"}}
-          {{/if}}
-        {{/if}}
-      </th>
-
-      <th role="button" class="topic-list-data" {{action "sortListActivity"}}>
-        {{i18n "docs.column_titles.activity"}}
-
-        {{#if this.sortActivity}}
-          {{#if this.ascending}}
-            {{d-icon "angle-up"}}
-          {{else}}
-            {{d-icon "angle-down"}}
-          {{/if}}
-        {{/if}}
-      </th>
-    </thead>
-
-    <tbody class="topic-list-body">
-      {{#each this.topics as |topic|}}
-        {{docs-topic-list-item
-          topic=topic
-          urlPath=this.urlPath
-          showExcerpt=this.showExcerpts
-        }}
-      {{/each}}
-    </tbody>
-  </table>
-</LoadMore>
-
-<ConditionalLoadingSpinner @condition={{this.loading}} />
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/docs-index.hbs b/assets/javascripts/discourse/templates/docs-index.hbs
index 3dea2e5..c42d0ad 100644
--- a/assets/javascripts/discourse/templates/docs-index.hbs
+++ b/assets/javascripts/discourse/templates/docs-index.hbs
@@ -243,15 +243,15 @@
           {{/if}}
 
           {{#unless this.emptyResults}}
-            <DocsTopicList
-              @topics={{this.topics}}
-              @showExcerpts={{this.showExcerpts}}
-              @ascending={{this.ascending}}
-              @order={{this.orderColumn}}
-              @sortBy={{action "sortBy"}}
-              @loadMore={{action "loadMore"}}
-              @loading={{this.isLoadingMore}}
-            />
+            <LoadMore @selector=".topic-list tr" @action={{this.loadMore}}>
+              <BasicTopicList
+                @topics={{this.topics}}
+                @ascending={{this.ascending}}
+                @order={{this.orderColumn}}
+                @changeSort={{action "sortBy"}}
+              />
+            </LoadMore>
+            <ConditionalLoadingSpinner @condition={{this.isLoadingMore}} />
           {{/unless}}
         </div>
       {{/if}}
diff --git a/assets/javascripts/discourse/templates/docs-topic-link.hbr b/assets/javascripts/discourse/templates/docs-topic-link.hbr
deleted file mode 100644
index ab7afc2..0000000
--- a/assets/javascripts/discourse/templates/docs-topic-link.hbr
+++ /dev/null
@@ -1 +0,0 @@
-<a href="/{{urlPath}}?topic={{topic.id}}" class="docs-topic-link">{{{topic.fancyTitle}}}</a>
diff --git a/assets/javascripts/discourse/templates/docs-topic-list-item.hbr b/assets/javascripts/discourse/templates/docs-topic-list-item.hbr
deleted file mode 100644
index 026c4b2..0000000
--- a/assets/javascripts/discourse/templates/docs-topic-list-item.hbr
+++ /dev/null
@@ -1,19 +0,0 @@
-{{~raw-plugin-outlet name="topic-list-before-columns"}}
-
-<td class="main-link topic-list-data">
-  {{~raw-plugin-outlet name="topic-list-before-link"}}
-  <span class="link-top-line">
-    {{~raw "topic-status" topic=topic}}
-    {{~raw "docs-topic-link" topic=topic urlPath=urlPath}}
-  </span>
-  <span class="link-bottom-line">
-    {{category-link topic.category}}
-    {{discourse-tags topic mode="list"}}
-  </span>
-  {{!-- {{#if showExcerpt}} --}}
-    {{~raw "list/topic-excerpt" topic=topic}}
-  {{!-- {{/if}} --}}
-</td>
-<td class="topic-list-data">
-  {{format-date topic.bumped_at format="tiny" noTitle="true"}}
-</td>
\ No newline at end of file
diff --git a/assets/stylesheets/common/docs.scss b/assets/stylesheets/common/docs.scss
index b1df0bd..c261b71 100644
--- a/assets/stylesheets/common/docs.scss
+++ b/assets/stylesheets/common/docs.scss
@@ -274,3 +274,12 @@
     width: 100%;
   }
 }
+
+// TODO: Remove once legacy topic-list is removed
+.docs-browse {
+  .topic-list-data.replies,
+  .topic-list-data.posts,
+  .topic-list-data.views {
+    display: none;
+  }
+}