diff --git a/core/config.py b/core/config.py
index 8a16c17..e03babe 100755
--- a/core/config.py
+++ b/core/config.py
@@ -30,19 +30,15 @@ if not os.path.exists('config'):
           "acls": {},
           "api_keys":
           {
-            "geoip": "INSERT API KEY FROM ipinfodb.com HERE",
-            "tvdb": "INSERT API KEY FROM thetvdb.com HERE",
-            "bitly_user": "INSERT USERNAME FROM bitly.com HERE",
-            "bitly_api": "INSERT API KEY FROM bitly.com HERE",
-            "wolframalpha": "INSERT API KEY FROM wolframalpha.com HERE",
-            "lastfm": "INSERT API KEY FROM lastfm HERE",
-            "rottentomatoes": "INSERT API KEY FROM rottentomatoes HERE",
-            "mc_user": "INSERT minecraft USERNAME HERE",
-            "mc_pass": "INSERT minecraft PASSWORD HERE",
+            "tvdb": "",
+            "wolframalpha": "",
+            "lastfm": "",
+            "rottentomatoes": "",
             "twitter_consumer_key": "",
             "twitter_consumer_secret": "",
             "twitter_access_token": "",
-            "twitter_access_secret": ""
+            "twitter_access_secret": "",
+            "wunderground": ""
           },
           "plugins":
           {
diff --git a/plugins/mctools.py b/plugins/mctools.py
index f80d2af..ea137c5 100755
--- a/plugins/mctools.py
+++ b/plugins/mctools.py
@@ -61,22 +61,6 @@ def srvData(domain):
             data = [getsrv['data'][2],getsrv['data'][3]]
             return data
 
-@hook.command(autohelp=False)
-def mclogin(inp, bot=None):
-    "mclogin -- Checks the status of Minecraft's login servers."
-    username = bot.config.get("api_keys", {}).get("mc_user", None)
-    password = bot.config.get("api_keys", {}).get("mc_pass", None)
-    if password is None:
-        return "error: no login set"
-
-    login = http.get("https://login.minecraft.net/", user=username,
-                     password=password, version=13)
-
-    if username.lower() in login.lower():
-        return "Minecraft login servers appear to be online!"
-    else:
-        return "Minecraft login servers appear to be offline!"
-
 
 @hook.command(autohelp=False)
 def mcstatus(inp, say=None):