diff --git a/app/controllers/wiki_pages_controller.rb b/app/controllers/wiki_pages_controller.rb
index a8539e69c..5530e2a4b 100644
--- a/app/controllers/wiki_pages_controller.rb
+++ b/app/controllers/wiki_pages_controller.rb
@@ -16,7 +16,7 @@ class WikiPagesController < ApplicationController
   end
 
   def index
-    @wiki_pages = WikiPage.includes(:creator).paginated_search(params)
+    @wiki_pages = WikiPage.paginated_search(params)
     respond_with(@wiki_pages) do |format|
       format.html do
         if params[:page].nil? || params[:page].to_i == 1
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index a51ac57bd..2bc2678d5 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -15,14 +15,12 @@ class WikiPage < ApplicationRecord
 
   attr_accessor :skip_secondary_validations
   array_attribute :other_names
-  belongs_to_creator
-  belongs_to_updater
   has_one :tag, :foreign_key => "name", :primary_key => "title"
   has_one :artist, -> {where(:is_active => true)}, :foreign_key => "name", :primary_key => "title"
   has_many :versions, -> {order("wiki_page_versions.id ASC")}, :class_name => "WikiPageVersion", :dependent => :destroy
   has_many :dtext_links, as: :model, dependent: :destroy
 
-  api_attributes including: [:creator_name, :category_name]
+  api_attributes including: [:category_name]
 
   module SearchMethods
     def titled(title)
@@ -63,7 +61,7 @@ class WikiPage < ApplicationRecord
     def search(params = {})
       q = super
 
-      q = q.search_attributes(params, :creator, :updater, :is_locked, :is_deleted, :body)
+      q = q.search_attributes(params, :is_locked, :is_deleted, :body)
       q = q.text_attribute_matches(:body, params[:body_matches], index_column: :body_index, ts_config: "danbooru")
 
       if params[:title].present?
@@ -102,10 +100,6 @@ class WikiPage < ApplicationRecord
     end
   end
 
-  def creator_name
-    creator.name
-  end
-
   extend SearchMethods
 
   def validate_not_locked
diff --git a/app/views/wiki_pages/index.html.erb b/app/views/wiki_pages/index.html.erb
index 1dac46316..3cc739c41 100644
--- a/app/views/wiki_pages/index.html.erb
+++ b/app/views/wiki_pages/index.html.erb
@@ -14,7 +14,7 @@
       <% @wiki_pages.each do |wiki_page| %>
         <tr>
           <td class="category-<%= wiki_page.category_name %>"><%= link_to wiki_page.pretty_title, wiki_page_path(wiki_page, :noredirect => 1) %></td>
-          <td><%= wiki_page.updated_at.strftime("%Y-%m-%d %H:%M") %> by <%= h link_to_user wiki_page.updater %></td>
+          <td><%= time_ago_in_words_tagged(wiki_page.updated_at) %></td>
         </tr>
       <% end %>
     </tbody>
diff --git a/app/views/wiki_pages/search.html.erb b/app/views/wiki_pages/search.html.erb
index 09a511be4..4ce4bc6ee 100644
--- a/app/views/wiki_pages/search.html.erb
+++ b/app/views/wiki_pages/search.html.erb
@@ -3,7 +3,6 @@
     <%= search_form_for(wiki_pages_path) do |f| %>
       <%= f.input :title, hint: "Use * for wildcard searches", input_html: { "data-autocomplete": "wiki-page" } %>
       <%= f.input :other_names_match, label: "Other names", hint: "Use * for wildcard searches" %>
-      <%= f.input :creator_name, input_html: { "data-autocomplete": "user" } %>
       <%= f.input :body_matches, label: "Body" %>
       <%= f.input :other_names_present, as: :select %>
       <%= f.input :hide_deleted, as: :select, include_blank: false %>
diff --git a/db/migrate/20191024194544_drop_creator_and_updater_from_wiki_pages.rb b/db/migrate/20191024194544_drop_creator_and_updater_from_wiki_pages.rb
new file mode 100644
index 000000000..8de0ad280
--- /dev/null
+++ b/db/migrate/20191024194544_drop_creator_and_updater_from_wiki_pages.rb
@@ -0,0 +1,6 @@
+class DropCreatorAndUpdaterFromWikiPages < ActiveRecord::Migration[6.0]
+  def change
+    remove_column :wiki_pages, :creator_id, :integer
+    remove_column :wiki_pages, :updater_id, :integer
+  end
+end
diff --git a/db/structure.sql b/db/structure.sql
index 8182a105c..237fe529c 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -3206,14 +3206,12 @@ ALTER SEQUENCE public.wiki_page_versions_id_seq OWNED BY public.wiki_page_versio
 
 CREATE TABLE public.wiki_pages (
     id integer NOT NULL,
-    creator_id integer NOT NULL,
     title character varying NOT NULL,
     body text NOT NULL,
     body_index tsvector NOT NULL,
     is_locked boolean DEFAULT false NOT NULL,
     created_at timestamp without time zone,
     updated_at timestamp without time zone,
-    updater_id integer,
     other_names text[] DEFAULT '{}'::text[] NOT NULL,
     is_deleted boolean DEFAULT false NOT NULL
 );
@@ -7408,6 +7406,7 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20190919175836'),
 ('20190923071044'),
 ('20190926000912'),
-('20191023191749');
+('20191023191749'),
+('20191024194544');
 
 
diff --git a/test/factories/wiki_page.rb b/test/factories/wiki_page.rb
index 1fd138b87..713bcd37c 100644
--- a/test/factories/wiki_page.rb
+++ b/test/factories/wiki_page.rb
@@ -1,6 +1,5 @@
 FactoryBot.define do
   factory(:wiki_page) do
-    creator :factory => :user
     title {FFaker::Lorem.words.join(" ")}
     body {FFaker::Lorem.sentences.join(" ")}
   end