diff --git a/Wikifetch/plugin.py b/Wikifetch/plugin.py
index e6fe0be..399070e 100644
--- a/Wikifetch/plugin.py
+++ b/Wikifetch/plugin.py
@@ -35,7 +35,7 @@ import re
 import sys
 import lxml.html
 import supybot.utils as utils
-from supybot.commands import *
+from supybot.commands import wrap, getopts, additional
 import supybot.plugins as plugins
 import supybot.ircutils as ircutils
 import supybot.callbacks as callbacks
@@ -54,12 +54,6 @@ if sys.version_info[0] >= 3:
 else:
     from urllib import quote_plus
 
-# Some smart person decided to override the any and all builtins, causing it to break on genexpr...
-if isinstance(__builtins__, dict):
-    any = __builtins__['any']
-else:
-    any = __builtins__.any
-
 class Wikifetch(callbacks.Plugin):
     """Grabs data from Wikipedia and other MediaWiki-powered sites."""
     threaded = True