diff --git a/modules/bitcoin.py b/modules/bitcoin.py
deleted file mode 100644
index 6bb5720..0000000
--- a/modules/bitcoin.py
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/python3
-"""
-bitcoin.py - bitcoin currency conversion
-author: mutantmonkey <mutantmonkey@mutantmonkey.in>
-"""
-
-import decimal
-import web
-
-
-def bitcoin(phenny, input):
-    """.bitcoin <amount> <currency> [<output currency]> - Convert an
-    arbitrary amount of some currency to or from Bitcoin."""
-
-    amount = input.group(2)
-    currency = input.group(3)
-
-    if not amount or not currency:
-        phenny.say("You need to need to specify an amount and a currency, "
-                   "like .bitcoin 1 EUR")
-        return
-
-    if currency.upper() == 'BTC':
-        from_btc = True
-        currency = input.group(4)
-    else:
-        from_btc = False
-        currency = currency.upper()
-
-    if not currency:
-        currency = 'USD'
-    currency = currency.strip()[:3].upper()
-
-    try:
-        amount = decimal.Decimal(amount)
-    except decimal.InvalidOperation:
-        phenny.say("Please specify a valid decimal amount to convert.")
-        return
-
-    try:
-        data = web.get('http://data.mtgox.com/api/2/BTC{}/money/ticker'.format(
-            web.quote(currency)))
-    except web.HTTPError:
-        phenny.say("Sorry, I don't know how to convert those right now.")
-        return
-
-    data = web.json(data)
-    rate = decimal.Decimal(data['data']['last_local']['value'])
-
-    if from_btc:
-        amount2 = amount * rate
-        amount2 = round(amount2, 2)
-        currency2 = data['data']['last_local']['currency'].strip()[:3]
-    else:
-        amount2 = amount / rate
-        amount2 = round(amount2, 8)
-        currency2 = 'BTC'
-
-    phenny.say("{amount} {currency}".format(amount=amount2,
-                                            currency=currency2))
-bitcoin.rule = (['bitcoin'], r'([\d\.]+)\s(\w+)(\s\w+)?')
diff --git a/modules/test/test_bitcoin.py b/modules/test/test_bitcoin.py
deleted file mode 100644
index 0342073..0000000
--- a/modules/test/test_bitcoin.py
+++ /dev/null
@@ -1,99 +0,0 @@
-"""
-test_bitcoin.py - tests for the bitcoin
-author: mutantmonkey <mutantmonkey@mutantmonkey.in>
-"""
-
-import unittest
-from mock import MagicMock, Mock
-from modules.bitcoin import bitcoin
-
-
-class TestCalc(unittest.TestCase):
-    def makegroup(*args):
-        args2 = [] + list(args)
-        def group(x):
-            if x > 0 and x <= len(args2):
-                return args2[x - 1]
-            else:
-                return None
-        return group
-
-    def setUp(self):
-        self.phenny = MagicMock()
-
-    def test_negative(self):
-        input = Mock(group=self.makegroup('1', 'USD'))
-        bitcoin(self.phenny, input)
-
-        out = self.phenny.say.call_args[0][0]
-        self.assertRegex(out, r'[\d\.]+ BTC')
-
-    def test_usd(self):
-        input = Mock(group=self.makegroup('1', 'USD'))
-        bitcoin(self.phenny, input)
-
-        out = self.phenny.say.call_args[0][0]
-        self.assertRegex(out, r'[\d\.]+ BTC')
-
-    def test_usd_decimal(self):
-        input = Mock(group=self.makegroup('1.25', 'USD'))
-        bitcoin(self.phenny, input)
-
-        out = self.phenny.say.call_args[0][0]
-        self.assertRegex(out, r'[\d\.]+ BTC')
-
-    def test_eur(self):
-        input = Mock(group=self.makegroup('1', 'EUR'))
-        bitcoin(self.phenny, input)
-
-        out = self.phenny.say.call_args[0][0]
-        self.assertRegex(out, r'[\d\.]+ BTC')
-
-    def test_xzz(self):
-        input = Mock(group=self.makegroup('1', 'XZZ'))
-        bitcoin(self.phenny, input)
-
-        out = self.phenny.say.call_args[0][0]
-        self.assertNotRegex(out, r'[\d\.]+ BTC')
-
-    def test_btc(self):
-        input = Mock(group=self.makegroup('1', 'BTC'))
-        bitcoin(self.phenny, input)
-
-        out = self.phenny.say.call_args[0][0]
-        self.assertRegex(out, r'\d+\.\d{2} USD')
-
-    def test_btcusd(self):
-        input = Mock(group=self.makegroup('1', 'BTC', 'USD'))
-        bitcoin(self.phenny, input)
-
-        out = self.phenny.say.call_args[0][0]
-        self.assertRegex(out, r'\d+\.\d{2} USD')
-
-    def test_eurbtc(self):
-        input = Mock(group=self.makegroup('1', 'BTC', 'EUR'))
-        bitcoin(self.phenny, input)
-
-        out = self.phenny.say.call_args[0][0]
-        self.assertRegex(out, r'\d+\.\d{2} EUR')
-
-    def test_xzzbtc(self):
-        input = Mock(group=self.makegroup('1', 'BTC', 'XZZ'))
-        bitcoin(self.phenny, input)
-
-        out = self.phenny.say.call_args[0][0]
-        self.assertNotRegex(out, r'[\d\.]+ BTC')
-
-    def test_invalid(self):
-        input = Mock(group=self.makegroup('.-1', 'USD'))
-        bitcoin(self.phenny, input)
-
-        out = self.phenny.say.call_args[0][0]
-        self.assertNotRegex(out, r'[\d\.]+ BTC')
-
-    def test_lettercase(self):
-        input = Mock(group=self.makegroup('1', 'btc', 'EuR'))
-        bitcoin(self.phenny, input)
-
-        out = self.phenny.say.call_args[0][0]
-        self.assertRegex(out, r'\d+\.\d{2} EUR')