diff --git a/lib/galaxy/datatypes/assembly.py b/lib/galaxy/datatypes/assembly.py
index c467226c05a..4f047e865fa 100644
--- a/lib/galaxy/datatypes/assembly.py
+++ b/lib/galaxy/datatypes/assembly.py
@@ -13,7 +13,6 @@ from galaxy.datatypes import sequence
 from galaxy.datatypes.images import Html
 from galaxy.datatypes.metadata import MetadataElement
 
-
 log = logging.getLogger(__name__)
 
 
diff --git a/lib/galaxy/util/hash_util.py b/lib/galaxy/util/hash_util.py
index 1ec70f721c7..3ffd9cb1a22 100644
--- a/lib/galaxy/util/hash_util.py
+++ b/lib/galaxy/util/hash_util.py
@@ -16,9 +16,11 @@ try:
 except ImportError, e:
     from sha import new as sha1
     import sha
-    from md5 import new as md5  # noqa
+    from md5 import new as md5
 import hmac
 
+__all__ = ['md5', 'hashlib', 'sha1', 'sha', 'new_secure_hash', 'hmac_new', 'is_hashable']
+
 log = logging.getLogger( __name__ )
 
 
diff --git a/lib/galaxy/webapps/tool_shed/controllers/user.py b/lib/galaxy/webapps/tool_shed/controllers/user.py
index 7b093840d70..43b984cff88 100644
--- a/lib/galaxy/webapps/tool_shed/controllers/user.py
+++ b/lib/galaxy/webapps/tool_shed/controllers/user.py
@@ -1 +1,3 @@
-from galaxy.webapps.galaxy.controllers.user import *
+from galaxy.webapps.galaxy.controllers.user import User
+
+__all__ = ['User']