diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
index 9a353aad9..66207db1c 100644
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@@ -15,7 +15,6 @@ class UploadsController < ApplicationController
       end
 
       @post = find_post_by_url(@normalized_url)
-      extract_artist_commentary(@upload, data)
 
       begin
         @source = Sources::Site.new(params[:url], :referer_url => params[:ref])
@@ -72,17 +71,6 @@ class UploadsController < ApplicationController
   end
 
 protected
-  def extract_artist_commentary(upload, data)
-    if data[:artist_commentary_desc]
-      upload.artist_commentary_title = strip_tags(data[:artist_commentary_title])
-      upload.artist_commentary_desc = strip_tags(data[:artist_commentary_desc])
-    end
-  end
-
-  def strip_tags(s)
-    Rails::Html::FullSanitizer.new.sanitize(s, encode_special_chars: false)
-  end
-
   def find_post_by_url(normalized_url)
     if normalized_url.nil?
       Post.where(source: params[:url]).first
diff --git a/app/logical/downloads/rewrite_strategies/deviant_art.rb b/app/logical/downloads/rewrite_strategies/deviant_art.rb
index 97a162ddc..f9d2ec94a 100644
--- a/app/logical/downloads/rewrite_strategies/deviant_art.rb
+++ b/app/logical/downloads/rewrite_strategies/deviant_art.rb
@@ -11,8 +11,6 @@ module Downloads
         if url =~ %r{deviantart\.com/art/} || url =~ %r{deviantart\.net/.+/[a-z0-9_]+(_by_[a-z0-9_]+)?-d([a-z0-9]+)\.}i
           url, headers = rewrite_html_pages(url, headers)
           url, headers = rewrite_thumbnails(url, headers)
-          data[:artist_commentary_title] = source.artist_commentary_title
-          data[:artist_commentary_desc] = source.artist_commentary_desc
         end
 
         return [url, headers, data]
diff --git a/app/logical/downloads/rewrite_strategies/pixiv.rb b/app/logical/downloads/rewrite_strategies/pixiv.rb
index f7d47f5ed..23b81ecd3 100644
--- a/app/logical/downloads/rewrite_strategies/pixiv.rb
+++ b/app/logical/downloads/rewrite_strategies/pixiv.rb
@@ -18,8 +18,6 @@ module Downloads
           url, headers = rewrite_thumbnails(url, headers)
           url, headers = rewrite_old_small_manga_pages(url, headers)
           url, headers = rewrite_to_thumbnails(url, headers) if data.delete(:get_thumbnail)
-          data[:artist_commentary_title] = source.artist_commentary_title
-          data[:artist_commentary_desc] = source.artist_commentary_desc
         end
 
         # http://i2.pixiv.net/img-zip-ugoira/img/2014/08/05/06/01/10/44524589_ugoira1920x1080.zip
diff --git a/app/logical/downloads/rewrite_strategies/twitter.rb b/app/logical/downloads/rewrite_strategies/twitter.rb
index be7175973..c3c56725c 100644
--- a/app/logical/downloads/rewrite_strategies/twitter.rb
+++ b/app/logical/downloads/rewrite_strategies/twitter.rb
@@ -9,7 +9,7 @@ module Downloads
 
       def rewrite(url, headers, data = {})
         if url =~ %r!^https?://(?:mobile\.)?twitter\.com!
-          url, headers = rewrite_status_page(url, headers, data)
+          url = source.image_url
         elsif url =~ %r{^https?://pbs\.twimg\.com}
           url, headers = rewrite_thumbnails(url, headers, data)
         end
@@ -18,12 +18,6 @@ module Downloads
       end
 
     protected
-      def rewrite_status_page(url, headers, data)
-        url = source.image_url
-        data[:artist_commentary_desc] = source.artist_commentary_desc
-        return [url, headers, data]
-      end
-
       def rewrite_thumbnails(url, headers, data)
         if url =~ %r{^(https?://pbs\.twimg\.com/media/[^:]+)}
           url = $1 + ":orig"
diff --git a/app/logical/sources/site.rb b/app/logical/sources/site.rb
index e03ce08e9..b4fd61e88 100644
--- a/app/logical/sources/site.rb
+++ b/app/logical/sources/site.rb
@@ -6,8 +6,8 @@ module Sources
     delegate :get, :get_size, :site_name, :artist_name, 
       :profile_url, :image_url, :tags, :artist_record, :unique_id, 
       :page_count, :file_url, :ugoira_frame_data, :ugoira_content_type, :image_urls,
-      :has_artist_commentary?, :artist_commentary_title,
-      :artist_commentary_desc, :rewrite_thumbnails, :illust_id_from_url, :to => :strategy
+      :artist_commentary_title, :artist_commentary_desc,
+      :rewrite_thumbnails, :illust_id_from_url, :to => :strategy
 
     def self.strategies
       [Strategies::PixivWhitecube, Strategies::Pixiv, Strategies::NicoSeiga, Strategies::DeviantArt, Strategies::ArtStation, Strategies::Nijie, Strategies::Twitter, Strategies::Tumblr, Strategies::Pawoo]
diff --git a/app/logical/sources/strategies/base.rb b/app/logical/sources/strategies/base.rb
index 27ac0bb78..65b408a07 100644
--- a/app/logical/sources/strategies/base.rb
+++ b/app/logical/sources/strategies/base.rb
@@ -53,11 +53,6 @@ module Sources
         false
       end
 
-      # Determines whether or not to automatically create an ArtistCommentary
-      def has_artist_commentary?
-        false
-      end
-
       def normalize_for_artist_finder!
         url
       end
diff --git a/app/logical/sources/strategies/pixiv.rb b/app/logical/sources/strategies/pixiv.rb
index 281a3734c..849ce331f 100644
--- a/app/logical/sources/strategies/pixiv.rb
+++ b/app/logical/sources/strategies/pixiv.rb
@@ -41,10 +41,6 @@ module Sources
         "http://www.pixiv.net"
       end
 
-      def has_artist_commentary?
-        @artist_commentary_desc.present?
-      end
-
       def normalized_for_artist_finder?
         url =~ %r!https?://img\.pixiv\.net/img/#{MONIKER}/?$!i
       end
diff --git a/app/logical/sources/strategies/pixiv_whitecube.rb b/app/logical/sources/strategies/pixiv_whitecube.rb
index 9f673fd84..3fc4dc0b0 100644
--- a/app/logical/sources/strategies/pixiv_whitecube.rb
+++ b/app/logical/sources/strategies/pixiv_whitecube.rb
@@ -26,10 +26,6 @@ module Sources
         "http://www.pixiv.net"
       end
 
-      def has_artist_commentary?
-        @artist_commentary_desc.present?
-      end
-
       def normalizable_for_artist_finder?
         true
       end
diff --git a/app/logical/sources/strategies/twitter.rb b/app/logical/sources/strategies/twitter.rb
index 0767c0c5b..fe21f696d 100644
--- a/app/logical/sources/strategies/twitter.rb
+++ b/app/logical/sources/strategies/twitter.rb
@@ -30,10 +30,6 @@ module Sources::Strategies
       @artist_commentary_desc = attrs[:text]
     end
 
-    def has_artist_commentary?
-      @artist_commentary_desc.present?
-    end
-
     def image_urls
       TwitterService.new.image_urls(url)
     end
diff --git a/app/models/upload.rb b/app/models/upload.rb
index bcf4e1672..9a883e0e4 100644
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -509,10 +509,6 @@ class Upload < ActiveRecord::Base
         :original_description => artist_commentary_desc
       )
     end
-
-    def has_artist_commentary?
-      artist_commentary_desc.present?
-    end
   end
 
   include ConversionMethods
diff --git a/app/views/uploads/new.html.erb b/app/views/uploads/new.html.erb
index b066ac11b..0537f2b0f 100644
--- a/app/views/uploads/new.html.erb
+++ b/app/views/uploads/new.html.erb
@@ -69,15 +69,15 @@
           <%= f.text_field :parent_id %>
         </div>
 
-        <% if @upload.has_artist_commentary? %>
+        <div>
           <div class="input">
             <%= f.label :artist_commentary_title, "Artist Commentary Title" %>
-            <%= f.text_field :artist_commentary_title, :value => @upload.artist_commentary_title %>
+            <%= f.text_field :artist_commentary_title %>
           </div>
 
           <div class="input">
             <%= f.label :artist_commentary_desc, "Artist Commentary" %>
-            <%= f.text_area :artist_commentary_desc, :value => @upload.artist_commentary_desc, :size => "60x5" %>
+            <%= f.text_area :artist_commentary_desc, :size => "60x5" %>
           </div>
 
           <div class="input">
@@ -86,7 +86,7 @@
               Include Commentary
             </label>
           </div>
-        <% end %>
+        </div>
 
         <% if Danbooru.config.iqdbs_server %>
           <% if params[:url] %>