diff --git a/Library/Homebrew/bottle_version.rb b/Library/Homebrew/bottle_version.rb
deleted file mode 100644
index 25f15b9fcd..0000000000
--- a/Library/Homebrew/bottle_version.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-class BottleVersion < Version
-  def self._parse spec
-    spec = Pathname.new(spec) unless spec.is_a? Pathname
-    stem = spec.stem
-
-    # e.g. 5-20150215 from gcc5-5-20150215.yosemite.bottle.tar.gz
-    m = /[a-z]{3}\d-(\d{1}-\d{8})/.match(stem)
-    return m.captures.first unless m.nil?
-
-    # e.g. 1.0.2a-1 from openssl-1.0.2a-1.yosemite.bottle.1.tar.gz
-    m = /-(\d+\.\d+(\.\d+)+[a-z]-\d+)/.match(stem)
-    return m.captures.first unless m.nil?
-
-    # e.g. perforce-2013.1.610569-x86_64.mountain_lion.bottle.tar.gz
-    m = /-([\d\.]+-x86(_64)?)/.match(stem)
-    return m.captures.first unless m.nil?
-
-    # e.g. R14B04 from erlang-r14-R14B04.yosemite.bottle.tar.gz
-    m = /erlang-r\d+-(R\d+B\d+(-\d)?)/.match(stem)
-    return m.captures.first unless m.nil?
-
-    # e.g. x264-r2197.4.mavericks.bottle.tar.gz
-    # e.g. lz4-r114.mavericks.bottle.tar.gz
-    m = /-(r\d+\.?\d*)/.match(stem)
-    return m.captures.first unless m.nil?
-
-    # e.g. 00-5.0.5 from zpython-00-5.0.5.mavericks.bottle.tar.gz
-    # but not 00-2.0.0 from avce00-2.0.0.yosemite.bottle.tar.gz
-    m = /-(00-\d+\.\d+(\.\d+)+)/.match(stem)
-    return m.captures.first unless m.nil?
-
-    # e.g. 13-2.9.19 from libpano-13-2.9.19_1.yosemite.bottle.tar.gz
-    # e.g. 11-062 from apparix-11-062.yosemite.bottle.tar.gz
-    # but not 11-062.. from apparix-11-062..bottle.tar.gz
-    m = /\D+-(\d+-\d+(\.\d+)*)/.match(stem)
-    return m.captures.first unless m.nil?
-
-    # e.g. 1.6.39 from pazpar2-1.6.39.mavericks.bottle.tar.gz
-    m = /-(\d+\.\d+(\.\d+)+)/.match(stem)
-    return m.captures.first unless m.nil?
-
-    # e.g. ssh-copy-id-6.2p2.mountain_lion.bottle.tar.gz
-    # e.g. icu4c-52.1.mountain_lion.bottle.tar.gz
-    m = /-(\d+\.(\d)+(p(\d)+)?)/.match(stem)
-    return m.captures.first unless m.nil?
-
-    # e.g. 20120731 from fontforge-20120731.mavericks.bottle.tar.gz
-    m = /-(\d{8})/.match(stem)
-    return m.captures.first unless m.nil?
-
-    # e.g. 2007f from imap-uw-2007f.yosemite.bottle.tar.gz
-    m = /-(\d+[a-z])/.match(stem)
-    return m.captures.first unless m.nil?
-
-    # e.g. 22 from ngircd-22.mavericks.bottle.tar.gz
-    m = /-(\d{2})/.match(stem)
-    return m.captures.first unless m.nil?
-
-    # e.g. p17 from psutils-p17.yosemite.bottle.tar.gz
-    m = /-(p\d{2})/.match(stem)
-    return m.captures.first unless m.nil?
-
-    super
-  end
-end
diff --git a/Library/Homebrew/bottles.rb b/Library/Homebrew/bottles.rb
index 5890e28c43..c1d6225df6 100644
--- a/Library/Homebrew/bottles.rb
+++ b/Library/Homebrew/bottles.rb
@@ -1,7 +1,6 @@
 require 'tab'
 require 'os/mac'
 require 'extend/ARGV'
-require 'bottle_version'
 
 def built_as_bottle? f
   return false unless f.installed?
diff --git a/Library/Homebrew/test/test_bottle_versions.rb b/Library/Homebrew/test/test_bottle_versions.rb
deleted file mode 100644
index 73edd8e19e..0000000000
--- a/Library/Homebrew/test/test_bottle_versions.rb
+++ /dev/null
@@ -1,88 +0,0 @@
-require 'testing_env'
-require 'bottle_version'
-
-class BottleVersionParsingTests < Homebrew::TestCase
-  def assert_version_detected expected, path
-    assert_equal expected, BottleVersion.parse(path).to_s
-  end
-
-  def test_perforce_style
-    assert_version_detected '2013.1.610569-x86_64',
-      '/usr/local/perforce-2013.1.610569-x86_64.mountain_lion.bottle.tar.gz'
-  end
-
-  def test_ssh_copy_id_style
-    assert_version_detected '6.2p2',
-      '/usr/local/ssh-copy-id-6.2p2.mountain_lion.bottle.tar.gz'
-  end
-
-  def test_icu4c_style
-    assert_version_detected '52.1',
-      '/usr/local/icu4c-52.1.mavericks.bottle.tar.gz'
-  end
-
-  def test_x264_style
-    assert_version_detected 'r2197.4',
-      '/usr/local/x264-r2197.4.mavericks.bottle.tar.gz'
-  end
-
-  def test_lz4_style
-    assert_version_detected 'r114',
-      '/usr/local/lz4-r114.mavericks.bottle.tar.gz'
-  end
-
-  def test_pazpar2_style
-    assert_version_detected '1.6.39',
-      '/usr/local/pazpar2-1.6.39.mavericks.bottle.tar.gz'
-  end
-
-  def test_zpython_style
-    assert_version_detected '00-5.0.5',
-      '/usr/local/zpython-00-5.0.5.mavericks.bottle.tar.gz'
-  end
-
-  def test_fontforge_style
-    assert_version_detected '20120731',
-      '/usr/local/fontforge-20120731.mavericks.bottle.tar.gz'
-  end
-
-  def test_erlang_style
-    assert_version_detected 'R16B03-1',
-      'erlang-R16B03-1.mavericks.bottle.2.tar.gz'
-  end
-
-  def test_erlang_versions_style
-    assert_version_detected 'R14B04',
-      'erlang-r14-R14B04.yosemite.bottle.tar.gz'
-  end
-
-  def test_libpano_style
-    assert_version_detected '13-2.9.19',
-      'libpano-13-2.9.19_1.yosemite.bottle.tar.gz'
-  end
-
-  def test_imapuw_style
-    assert_version_detected '2007f',
-      'imap-uw-2007f.yosemite.bottle.tar.gz'
-  end
-
-  def test_ngircd_style
-    assert_version_detected '22',
-      'ngircd-22.mavericks.bottle.tar.gz'
-  end
-
-  def test_apparix_style
-    assert_version_detected '11-062',
-      'apparix-11-062.yosemite.bottle.tar.gz'
-  end
-
-  def test_gcc_versions_style
-    assert_version_detected '5-20150215',
-      'gcc5-5-20150215.yosemite.bottle.tar.gz'
-  end
-
-  def test_openssl_style
-    assert_version_detected '1.0.2a-1',
-      'openssl-1.0.2a-1.yosemite.bottle.1.tar.gz'
-  end
-end