Remove cat_without_underscores bottle methods.

Library/Homebrew/formula.rb

@@ -40,10 +40,6 @@ class Formula
       unless bottle.checksum.nil? || bottle.checksum.empty?
         @bottle = bottle
         bottle.url ||= bottle_url(self)
-        if bottle.cat_without_underscores
-          bottle.url.gsub!(MacOS.cat.to_s,
-                           MacOS.cat_without_underscores.to_s)
-        end
       end
     end
 

Library/Homebrew/formula_support.rb

@@ -76,15 +76,12 @@ end
 
 class Bottle < SoftwareSpec
   attr_writer :url
-  # TODO: Can be removed when all bottles migrated to underscored cat symbols.
-  attr_reader :cat_without_underscores
 
   def initialize
     super
     @revision = 0
     @prefix = '/usr/local'
     @cellar = '/usr/local/Cellar'
-    @cat_without_underscores = false
   end
 
   # Checksum methods in the DSL's bottle block optionally take
@@ -101,9 +98,6 @@ class Bottle < SoftwareSpec
 
         if @#{cksum}.has_key? MacOS.cat
           @checksum = @#{cksum}[MacOS.cat]
-        elsif @#{cksum}.has_key? MacOS.cat_without_underscores
-          @checksum = @#{cksum}[MacOS.cat_without_underscores]
-          @cat_without_underscores = true
         end
       end
     EOS

Library/Homebrew/macos.rb

@@ -27,13 +27,6 @@ module MacOS extend self
     end
   end
 
-  # TODO: Can be removed when all bottles migrated to underscored cat symbols.
-  def cat_without_underscores
-    possibly_underscored_cat = cat
-    return nil unless possibly_underscored_cat
-    cat.to_s.gsub('_', '').to_sym
-  end
-
   def oldest_cpu
     if Hardware::CPU.type == :intel
       if Hardware::CPU.is_64_bit?