diff --git a/src/calibre/library/catalog.py b/src/calibre/library/catalog.py
index 9555a69b0d..5c9d2e5161 100644
--- a/src/calibre/library/catalog.py
+++ b/src/calibre/library/catalog.py
@@ -3459,17 +3459,17 @@ class EPUB_MOBI(CatalogPlugin):
 
         if opts.connected_device['name']:
             if opts.connected_device['serial']:
-                build_log.append(" connected_device: '%s' #%s%s " % \
+                build_log.append(u" connected_device: '%s' #%s%s " % \
                     (opts.connected_device['name'],
                      opts.connected_device['serial'][0:4],
                      'x' * (len(opts.connected_device['serial']) - 4)))
-                build_log.append(" save_template: '%s'" % opts.connected_device['save_template'])
+                build_log.append(u" save_template: '%s'" % opts.connected_device['save_template'])
             else:
-                build_log.append(" connected_device: '%s'" % opts.connected_device['name'])
+                build_log.append(u" connected_device: '%s'" % opts.connected_device['name'])
                 for storage in opts.connected_device['storage']:
                     if storage:
-                        build_log.append("  mount point: %s" % storage)
-                build_log.append("  save_template: '%s'" % opts.connected_device['save_template'])
+                        build_log.append(u"  mount point: %s" % storage)
+                build_log.append(u"  save_template: '%s'" % opts.connected_device['save_template'])
 
         opts_dict = vars(opts)
         if opts_dict['ids']:
diff --git a/todo b/todo
deleted file mode 100644
index 7a639b25df..0000000000
--- a/todo
+++ /dev/null
@@ -1,11 +0,0 @@
-
-* Refactor web.fetch.simple to use per connection timeouts via the timeout kwarg for mechanize.open
-
-* Testing framework
-
-
-* Add a languages column to books. Best implementation is comma separated IANA codes
-* Add a hash column to the formats table (used for stanza identifier)
-
-* Fix blockquote handling in sphinx templates
-* Fix ebook-viewer going to links