diff --git a/Makefile b/Makefile
index 8a5815033..967430445 100644
--- a/Makefile
+++ b/Makefile
@@ -337,7 +337,7 @@ setup-deb: is-known-debian-arch
 	ln -s misc/$(TAHOE_ARCH)/debian debian
 	chmod +x debian/rules
 
-# etch (current debian stable) has python-simplejson-1.3, which doesn't 
+# etch (current debian stable) has python-simplejson-1.3, which doesn't
 #  support indent=
 # sid (debian unstable) currently has python-simplejson 1.7.1
 # edgy has 1.3, which doesn't support indent=
diff --git a/src/allmydata/storage/server.py b/src/allmydata/storage/server.py
index 1827dd5c4..5f60ef180 100644
--- a/src/allmydata/storage/server.py
+++ b/src/allmydata/storage/server.py
@@ -5,7 +5,7 @@ from twisted.application import service
 
 from zope.interface import implements
 from allmydata.interfaces import RIStorageServer, IStatsProducer
-from allmydata.util import base32, fileutil, log, time_format
+from allmydata.util import fileutil, log, time_format
 import allmydata # for __full_version__
 
 from allmydata.storage.common import si_b2a, si_a2b, storage_index_to_dir