diff --git a/indra/lib/python/indra/util/named_query.py b/indra/lib/python/indra/util/named_query.py
index 5c19368240afa08b8576f3f16ec01c4b738c5f76..6bf956107dec95dc92d042eab0920da463cea872 100644
--- a/indra/lib/python/indra/util/named_query.py
+++ b/indra/lib/python/indra/util/named_query.py
@@ -36,14 +36,6 @@
 import re
 import time
 
-#import sys # *TODO: remove. only used in testing.
-#import pprint # *TODO: remove. only used in testing.
-
-try:
-    set = set
-except NameError:
-    from sets import Set as set
-
 from indra.base import llsd
 from indra.base import config
 
@@ -195,8 +187,6 @@ def _convert_sql(self, sql):
         style. It also has to look for %:name% and :name% and
         ready them for use in LIKE statements"""
         if sql:
-            #print >>sys.stderr, "sql:",sql
-            
             # This first sub is to properly escape any % signs that
             # are meant to be literally passed through to mysql in the
             # query.  It leaves any %'s that are used for
@@ -408,7 +398,6 @@ def _construct_sql(self, params):
         # build the query from the options available and the params
         base_query = []
         base_query.append(self._base_query)
-        #print >>sys.stderr, "base_query:",base_query
         for opt, extra_where in self._options.items():
             if type(extra_where) in (dict, list, tuple):
                 if opt in params:
@@ -418,7 +407,6 @@ def _construct_sql(self, params):
                     base_query.append(extra_where)
         if self._query_suffix:
             base_query.append(self._query_suffix)
-        #print >>sys.stderr, "base_query:",base_query
         full_query = '\n'.join(base_query)
 
         # Go through the query and rewrite all of the ones with the
diff --git a/indra/lib/python/uuid.py b/indra/lib/python/uuid.py
index 48dac84377a22f12a1c9f91343c39b8751d3977f..0bc21a35f8bbff7a6c1a7debb8c949f01d340f13 100644
--- a/indra/lib/python/uuid.py
+++ b/indra/lib/python/uuid.py
@@ -446,8 +446,14 @@ def uuid1(node=None, clock_seq=None):
 
 def uuid3(namespace, name):
     """Generate a UUID from the MD5 hash of a namespace UUID and a name."""
-    import md5
-    hash = md5.md5(namespace.bytes + name).digest()
+    try:
+        # Python 2.6
+        from hashlib import md5
+    except ImportError:
+        # Python 2.5 and earlier
+        from md5 import new as md5
+        
+    hash = md5(namespace.bytes + name).digest()
     return UUID(bytes=hash[:16], version=3)
 
 def uuid4():
diff --git a/scripts/install.py b/scripts/install.py
index 7368af0b37ffc76d419d3a4c4958607fe07aabf0..c2adf4d0a27ce79b9edfb4a28ea594141a13039b 100755
--- a/scripts/install.py
+++ b/scripts/install.py
@@ -84,18 +84,6 @@ def add_indra_lib_path():
 from indra.base import llsd
 from indra.util import helpformatter
 
-# *HACK: Necessary for python 2.3. Consider removing this code wart
-# after etch has deployed everywhere. 2008-12-23 Phoenix
-try:
-    sorted = sorted
-except NameError:
-    def sorted(in_list):
-        "Return a list which is a sorted copy of in_list."
-        # Copy the source to be more functional and side-effect free.
-        out_list = copy.copy(in_list)
-        out_list.sort()
-        return out_list
-
 class InstallFile(object):
     "This is just a handy way to throw around details on a file in memory."
     def __init__(self, pkgname, url, md5sum, cache_dir, platform_path):